sale-client 3.6.252 → 3.6.254

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.252",
+  "version": "3.6.254",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/rongcheng/MeterinfoTest.vue

@@ -22,19 +22,19 @@
           <div class="col-sm-4 form-group" >
             <label for="f_llj_brand" class="font_normal_body"  title="参数:流量计品牌">&ensp;流量计品牌</label>
             <v-select :value.sync="row.f_llj_brand" v-model="row.f_llj_brand"
-                      :options='lljbrand' placeholder='流量计品牌'
+                      :options='lljbrand' placeholder='流量计品牌' :value-single="true"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" >
             <label for="f_llj_type" class="font_normal_body"  title="参数:流量计类型">&ensp;流量计类型</label>
             <v-select :value.sync="row.f_llj_type" v-model="row.f_llj_type"
-                      :options='lljtype' placeholder='流量计类型'
+                      :options='lljtype' placeholder='流量计类型' :value-single="true"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" >
             <label for="f_meter_flow" class="font_normal_body"  title="参数:气表流量">&ensp;气表流量</label>
             <v-select :value.sync="row.f_meter_flow" v-model="row.f_meter_flow"
-                      :options='meterflow' placeholder='气表流量'
+                      :options='meterflow' placeholder='气表流量' :value-single="true"
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group">
@@ -42,15 +42,6 @@
             <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_model" placeholder='流量计型号'
                    v-next-el="{id: 'meterbase'}">
           </div>
-<!--          <div class="col-sm-4 form-group" >-->
-<!--            <label for="f_llj_meternumber" class="font_normal_body">流量计表号</label>-->
-<!--            <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_meternumber"-->
-<!--                    placeholder='表号'>-->
-<!--          </div>-->
-<!--          <div style="" class="col-sm-8 form-group">-->
-<!--            <label for="f_llj_address" class="font_normal_body ">流量计位置</label>-->
-<!--            <input class="input_search" style="width:80%" placeholder='流量计安装位置' v-model="row.f_llj_address"/>-->
-<!--          </div>-->
           <div class="col-sm-4 form-group">
             <label for="f_llj_date" class="font_normal_body">流量计出厂</label>
             <datepicker style="width:60%" placeholder="流量计出厂日期"
@@ -66,7 +57,7 @@
                       v-model="row.f_bqf_type"
                       width="60%"
                       search="true"
-                      enterPush="true"
+                      enterPush="true"  :value-single="true"
                       :options="bqftype"
                       placeholder="表前阀型号"
                       close-on-select></v-select>

package/src/filiale/tongchuan/EticketManage.vue

@@ -0,0 +1,60 @@
+<template>
+  <tab-button v-ref:list>
+    <tabs header="开票记录">
+      <e-ticket-record-list></e-ticket-record-list>
+    </tabs>
+<!--    <tabs header="物联网表结算">-->
+<!--      <e-ticket-open-iot></e-ticket-open-iot>-->
+<!--    </tabs>-->
+    <tabs header="卡表结算">
+      <e-ticket-open-card></e-ticket-open-card>
+    </tabs>
+    <tabs header="抄表结算">
+      <e-ticket-open-hand></e-ticket-open-hand>
+    </tabs>
+    <tabs header="自定义开票">
+      <cust-query-eticket></cust-query-eticket>
+    </tabs>
+  </tab-button>
+</template>
+
+<script>
+import TabButton from '../../../comprehen/common/TabButton'
+import Tabs from '../../../comprehen/common/Tabs'
+export default {
+  name: 'eticket',
+  title: '发票管理',
+  components: { Tabs, TabButton },
+  data () {
+    return {// 页面开关
+      f_start_date: '',
+      f_end_date: '',
+      listpage: true,
+      width: {
+        left: '100%',
+        right: '0%'
+      },
+      // searchNumber:'',
+      rowData: {},
+      show: [true]
+    }
+  },
+  ready () {},
+  methods: {
+    cancel (obj) {
+      this.listpage = true
+    },
+    dealMsg (obj) {
+      this.rowData = obj
+      this.listpage = false
+      console.log(obj.model)
+      this.f_start_date = obj.model.startDate
+      this.f_end_date = obj.model.endDate
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/tongchuan/EticketOpenJBPage.vue

@@ -132,15 +132,16 @@
             <input class="form-control col-sm-2"
                    v-model="row.f_paper_name" placeholder="开票名称">
           </div>
-          <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <label class="control-label">发票种类:</label>            <v-select v-model="invoice_type"
+          <div class="col-sm-6 form-group form-input-group">
+            <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
+            <v-select v-model="invoice_is_pax"
                       placeholder='请选择'
-                      :value.sync="invoice_type"
+                      :value.sync="invoice_is_pax"
                       close-on-select
                       :width="60"
                       :value-single="true"
                       :search="false"
-                      :options='invoice_types' clear-button>
+                      :options='is_pax' clear-button>
             </v-select>
           </div>
           <div class="col-sm-12 form-group form-input-group">
@@ -153,15 +154,10 @@
             <input class="form-control col-sm-2"
                    v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
           </div>
-          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_address ? 'has-error' : '']">
-            <label class="control-label">开票地址:</label>
+          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
+            <label class="control-label">开票地址电话:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_buy_address" placeholder="开票地址">
-          </div>
-          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_buy_phone ? 'has-error' : '']">
-            <label class="control-label">开票电话:</label>
-            <input class="form-control col-sm-2"
-                   v-model="row.f_buy_phone" placeholder="开票电话">
+                   v-model="row.f_address_phone" placeholder="开票地址">
           </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">邮箱推送:</label>
@@ -173,7 +169,7 @@
     </article>
     <footer slot="modal-footer" class="modal-footer">
       <button type="button" class="btn button_search"
-              :disabled="!(row.f_paper_name&&row.f_buy_phone&&row.f_buy_address&&invoice_type)"
+              :disabled="!(row.f_paper_name&&row.f_address_phone)"
               @click='confirm'>确认收费
       </button>
     </footer>
@@ -224,8 +220,7 @@ export default {
       f_orgid: '',
       other: [],
       footer: [],
-      invoice_types: this.$appdata.getParam('发票种类'),
-      invoice_type: '',
+      invoice_is_pax: '征税',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
       initres: {
         org: [this.$login.f.orgid],
@@ -239,16 +234,14 @@ export default {
       // 合计数据
       sumsmodel: {},
       msg: [],
+      f_charge_type: '',
       orgname: [],
       depname: [],
       is_report: [{label: '是', value: ` = '是'`}, {label: '否', value: ' is null'}],
       eticket_msg: false,
       invoice_show_gas: '否',
       show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
-      row: {
-        f_buy_address: '',
-        f_buy_phone: ''
-      },
+      row: {},
       mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}],
       reissue_data: null,
       reissue_show: false
@@ -282,6 +275,10 @@ export default {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return
       }
+      if ([...new Set(this.selecteds.map(item => item.f_meter_classify))].length > 1) {
+        this.$showAlert('机表和物联网表不能一起结算,请选择具体的气表类型查询后再点击开票！！', 'warning', 2000)
+        return
+      }
       if (this.selecteds.filter(item => item.is_bill === '是').length >= 1) {
         // await this.$showMessage('选中的有已开过票得记录,确认开票吗?', ['confirm', 'cancel']).then(
         //   (response) => {
@@ -298,16 +295,24 @@ export default {
           condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
         }
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-      this.row = Object.assign(row.data[0], this.row)
-      this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+      this.row = row.data[0]
+      console.log([...new Set(this.selecteds.map(item => item.f_meter_classify))][0])
+      if ([...new Set(this.selecteds.map(item => item.f_meter_classify))][0] === '物联网表') {
+        this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+        this.f_charge_type = '物联网结算'
+      } else {
+        this.invoice_show_gas = '是'
+        this.f_charge_type = '机表结算'
+      }
       if (!this.row.f_taxpayer_id) {
         this.row.f_taxpayer_id = this.row.f_idnumber
       }
       if (!this.row.f_paper_name) {
         this.row.f_paper_name = this.row.f_user_name
       }
-      this.row.f_buy_address = this.row.f_address
-      this.row.f_buy_phone = this.row.f_user_phone
+      if (!this.row.f_address_phone) {
+        this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+      }
       this.eticket_msg = true
     },
     async open_report () {
@@ -334,7 +339,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '是', this.invoice_is_pax, '机表结算')
+      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, this.f_charge_type)
     },
     selfSearch (args) {
       this.selecteds = []

package/src/filiale/tongchuan/StairPrice/GasPrice.vue

@@ -20,6 +20,41 @@
                       v-model="model.f_user_type">
             </v-select>
           </div>
+          <div class="col-sm-6 form-group">
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_consolidated_user" v-show="false"
+                 >
+            <label class="font_normal_body" for="f_consolidated_user">合表用户</label>
+            <v-select :disabled='isEdit'
+                      :options='isLowIncomes'
+                      :value-single="true"
+                      :value.sync="model.f_consolidated_user"
+                      close-on-select
+                      placeholder='请选择'
+                      v-model="model.f_consolidated_user">
+            </v-select>
+          </div>
+          <div class="row" v-if="model.f_consolidated_user==='1'">
+          <div :class="[$v.f_resident_area.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <label class="font_normal_body" for="f_resident_area">居民面积</label>
+            <input :disabled='isEdit' class="input_search" placeholder="居民面积" style="width:60%" @blur="getPrice()"
+                   type="text" v-model="model.f_resident_area" v-validate:f_resident_area='{required: true }'>
+          </div>
+          <div :class="[$v.f_resident_price.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <label class="font_normal_body" for="f_resident_price">居民气价</label>
+            <input :disabled='isEdit' class="input_search" placeholder="居民气价" style="width:60%" @blur="getPrice()"
+                   type="text" v-model="model.f_resident_price" v-validate:f_resident_price='{required: true }'>
+          </div>
+          <div :class="[$v.f_non_resident_area.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <label class="font_normal_body" for="f_non_resident_area">非居民面积</label>
+            <input :disabled='isEdit' class="input_search" placeholder="非居民面积" style="width:60%" @blur="getPrice()"
+                   type="text" v-model="model.f_non_resident_area" v-validate:f_non_resident_area='{required: true }'>
+          </div>
+          <div :class="[$v.f_non_resident_price.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <label class="font_normal_body" for="f_non_resident_price">非居民气价</label>
+            <input :disabled='isEdit' class="input_search" placeholder="非居民气价" style="width:60%" @blur="getPrice()"
+                   type="text" v-model="model.f_non_resident_price" v-validate:f_non_resident_price='{required: true }'>
+          </div>
+          </div>
           <div :class="[$v.f_gasproperties.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
             <input class="input_search" style="width:60%" type="text" v-model="model.f_gasproperties" v-show="false"
                    v-validate:f_gasproperties='{required: true }'>
@@ -33,17 +68,17 @@
                       v-model="model.f_gasproperties">
             </v-select>
           </div>
-          <div :class="[$v.f_price_type.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_price_type" v-show="false"
-                   v-validate:f_price_type='{required: true }'>
+          <div :class="[$v.pricetype.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <input class="input_search" style="width:60%" type="text" v-model="$refs.pricetype.selectedItems" v-show="false"
+                   v-validate:pricetype='{required: true }'>
             <label title="参数:气价类型" class="font_normal_body" for="f_price_type">气价类型</label>
             <v-select :disabled='isEdit'
                       :options='pricetype'
                       :value-single="true"
                       :value.sync="model.f_price_type"
                       close-on-select
-                      id="f_price_type"
                       placeholder='请选择'
+                      v-ref:pricetype
                       v-model="model.f_price_type">
             </v-select>
           </div>
@@ -105,14 +140,6 @@
                    style="width:60%"
                    type="text" v-model="model.f_population_base" v-validate:f_population_base="{pattern: '/^[1-9]\\d*$/'}">
           </div>
-<!--          <div class="col-sm-6 form-group">-->
-<!--            <label class="font_normal_body">使用公司</label>-->
-<!--            <res-select :initresid='curorgid'-->
-<!--                        @res-select="getorg"-->
-<!--                        is-mul="false"-->
-<!--                        restype='organization'>-->
-<!--            </res-select>-->
-<!--          </div>-->
           <unit-price :is-disable.sync='isEdit' :unitmodel.sync='model.detailprice' v-if="unitshow"></unit-price>
         </div>
 
@@ -272,7 +299,7 @@ let initGen = async function (self, val) {
         blodid: '',
         stairshow: false,
         model: {
-          f_price_type: [],
+          f_price_type: '',
           f_stairmonths: 1,
           f_perform_date: '',
           detailprice: [],
@@ -320,12 +347,20 @@ let initGen = async function (self, val) {
           this.initModel()
         }
       },
+      'model.f_consolidated_user' (val) {
+        if (val === '1') {
+          this.model.f_price_type = '固定气价'
+        }
+      },
       'model.f_price_type' (val) {
         this.unitshow = false
         this.mixshow = false
         this.stairshow = false
         if (val === '固定气价') {
           this.model.detailprice = []
+          if (this.model.f_consolidated_user === '1') {
+            this.getPrice()
+          }
           this.unitshow = true
         } else if (val === '混合气价') {
           this.model.detailprice = []
@@ -341,6 +376,18 @@ let initGen = async function (self, val) {
       initGen(this, this.data)
     },
     methods: {
+      getPrice () {
+        if (this.model.f_resident_area && this.model.f_resident_price && this.model.f_non_resident_area && this.model.f_non_resident_price) {
+          let money = ((this.model.f_resident_area - 0) * (this.model.f_resident_price - 0)) + ((this.model.f_non_resident_area - 0) * (this.model.f_non_resident_price - 0))
+          console.log('money....' + money)
+          let area = ((this.model.f_resident_area - 0) + (this.model.f_non_resident_area - 0))
+          console.log('area....' + area)
+          let price = (money / area).toFixed(2)
+          console.log(price)
+          this.model.detailprice = []
+          this.model.detailprice.push({f_price: price})
+        }
+      },
       async CheckDuplicate () {
         if (!this.data) {
           let http = new HttpResetClass()
@@ -409,7 +456,7 @@ let initGen = async function (self, val) {
 
       async savePrice () {
         // 去除重复或者空的明细
-        if (this.model.f_price_type[0] === '阶梯气价') {
+        if (this.model.f_price_type === '阶梯气价') {
           this.removeDuplication(this.model)
         }
         // 审核配置
@@ -423,7 +470,7 @@ let initGen = async function (self, val) {
           // this.model.limit_gas.f_start_date = this.model.f_perform_date
         }
         // 现调用气价修改的逻辑   返回：version 和之前的对比 增加的话， 进行提示操作 反之 结束
-        await this.$LogicService.gasPrice(this.model, this.data)
+        await this.$TCLogicService.gasPrice(this.model, this.data)
         // 操作了气价 清空分公司initdata缓存
         let http = new HttpResetClass()
         await http.load('POST', 'rs/logic/delSaleInitData', {data: {}}, {resolveMsg: null, rejectMsg: null})

package/src/filiale/tongchuan/bill/EticketOpenCard.vue

@@ -121,6 +121,18 @@
                       :options='is_pax' clear-button>
             </v-select>
           </div>
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_type ? 'has-error' : '']">
+            <label class="control-label">发票种类:</label>
+            <v-select v-model="row.f_paper_type"
+                      placeholder='请选择'
+                      :value.sync="row.f_paper_type"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='invoice_types' clear-button>
+            </v-select>
+          </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">开户行及账号:</label>
             <input class="form-control col-sm-2"
@@ -177,6 +189,7 @@ export default {
       f_orgid: '',
       other: [],
       footer: [],
+      invoice_types: this.$appdata.getParam('发票种类'),
       invoice_is_pax: '征税',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
       initres: {

package/src/filiale/tongchuan/bill/EticketOpenJBPage.vue

@@ -126,6 +126,18 @@
                       :options='is_pax' clear-button>
             </v-select>
           </div>
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_type ? 'has-error' : '']">
+            <label class="control-label">发票种类:</label>
+            <v-select v-model="row.f_paper_type"
+                      placeholder='请选择'
+                      :value.sync="row.f_paper_type"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='invoice_types' clear-button>
+            </v-select>
+          </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">开户行及账号:</label>
             <input class="form-control col-sm-2"
@@ -182,6 +194,7 @@ export default {
       f_orgid: '',
       other: [],
       footer: [],
+      invoice_types: this.$appdata.getParam('发票种类'),
       invoice_is_pax: '征税',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
       initres: {

package/src/filiale/tongchuan/bill/EticketOpenPage.vue

@@ -125,6 +125,18 @@
                       :options='is_pax' clear-button>
             </v-select>
           </div>
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_type ? 'has-error' : '']">
+            <label class="control-label">发票种类:</label>
+            <v-select v-model="row.f_paper_type"
+                      placeholder='请选择'
+                      :value.sync="row.f_paper_type"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='invoice_types' clear-button>
+            </v-select>
+          </div>
           <div class="col-sm-12 form-group form-input-group">
             <label class="control-label">开户行及账号:</label>
             <input class="form-control col-sm-2"
@@ -181,6 +193,7 @@ export default {
       f_orgid: '',
       other: [],
       footer: [],
+      invoice_types: this.$appdata.getParam('发票种类'),
       invoice_is_pax: '征税',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
       initres: {
@@ -234,6 +247,7 @@ export default {
       if (!this.row.f_email) {
         this.row.f_email = this.row.f_email
       }
+      this.invoice_type = this.row.f_paper_type
       this.eticket_msg = true
     },
     async open_eTicket () {

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -61,7 +61,7 @@ export default {
           id: sellId,
           charge_item: type,
           invoice_type: 0,
-          invoice_kind,
+          invoice_kind: row.f_paper_type,
           retry,
           f_dept_id: this.$login.f.depids,
           f_operator: this.$login.f.name,

package/src/filiale/tongchuan/plugins/LogicService.js

@@ -0,0 +1,496 @@
+import Vue from 'vue'
+import co from 'co'
+
+let disableGen = function * (data) {
+  let owe = yield Vue.resetpost('rs/sql/getOverdue', {data: {f_userfiles_id: data.f_userfile_id + ''}}, {resolveMsg: null, rejectMsg: null})
+  console.log('表具停用看是否有欠费', owe.data)
+  let hasHandplan = yield Vue.resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userfiles_id = '${data.f_userfile_id + ''}'`}}, {resolveMsg: null, rejectMsg: null})
+  console.log('是否有未抄表数据', hasHandplan.data)
+  if (owe.data.length > 0 && hasHandplan.data.length > 0) {
+    Vue.showAlert('该表具还有欠费或者未抄表数据，不能停用！！', 'danger', 0)
+  } else {
+    yield Vue.resetpost('rs/entity/t_disable', data, {resolveMsg: '表具停用成功', rejectMsg: '表具停用失败'})
+  }
+}
+
+let TCLogicService = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.TCLogicService = Vue.prototype.$TCLogicService = TCLogicService
+  },
+
+  // 总分表
+  addSplit (total_id, split_tables) {
+    let data = {
+      total_id: total_id,
+      split_ids: split_tables
+    }
+    console.log('终于到总分表保存了，，，，', data)
+    return Vue.resetpost('rs/logic/totalsplit', {data: data}, {resolveMsg: '成功建立总分表关系', rejectMsg: '建立总分表关系出错!!!'})
+  },
+
+  // 表具启用
+  meterEnable (model, row) {
+    let data = {
+      f_userfiles_id: {
+        f_userfiles_id: row.f_userfiles_id,
+        f_table_state: '正常',
+        version: row.version
+      },
+      f_userfile_id: row.f_userfiles_id,
+      f_user_id: row.f_user_id,
+      record_userinfo: row.f_userinfo_id,
+      f_userinfo_id: row.f_userinfo_id,
+      f_user_name: row.f_user_name,
+      f_comments: model.f_reason[0],
+      f_othereason: model.f_othereason,
+      f_operat_type: '启用',
+      f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行表具启用操作`,
+      f_state: '有效',
+      f_operator: Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_zoneid: Vue.$login.f.zoneid,
+      f_zones: Vue.$login.f.zones
+    }
+    return Vue.resetpost('rs/entity/t_enable', data, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
+  },
+
+  // 表具停用
+  meterDisable (model, row) {
+    let data = {
+      f_userfiles_id: {
+        f_userfiles_id: row.f_userfiles_id,
+        f_table_state: '停用',
+        version: row.version
+      },
+      f_userfile_id: row.f_userfiles_id,
+      f_user_id: row.f_user_id,
+      f_userinfo_id: row.f_userinfo_id,
+      f_user_name: row.f_user_name,
+      f_comments: model.f_reason[0],
+      f_othereason: model.f_othereason,
+      f_operat_type: '停用',
+      f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行表具停用操作`,
+      f_state: '有效',
+      f_operator: Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_zoneid: Vue.$login.f.zoneid,
+      f_zones: Vue.$login.f.zones
+    }
+    let disable = disableGen(data)
+    return co(disable)
+  },
+
+  // 其他收费
+  otherCharge (model, row) {
+    let data = {
+      f_time_date: model.f_time_date,
+      f_serial_id: model.f_serial_id,
+      record_userinfo: row.f_userinfo_id,
+      f_serial_number: model.f_serial_number,
+      f_userfiles_id: row.f_userfiles_id,
+      f_user_id: row.f_user_id,
+      f_user_name:row.f_user_name,
+      f_address:row.f_address,
+      f_user_type:row.f_user_type,
+      f_gasproperties:row.f_gasproperties,
+      // f_number: model.f_number,
+      // f_unitprice: model.f_unitprice,
+      f_collection: model.f_collection,
+      f_comments: model.f_comments,
+      f_payment: model.f_payment[0],
+      f_voucher_number: model.f_voucher_number,
+      f_bill_style: model.f_print[0],
+      // f_brand_spec: model.f_brand_spec[0],
+      f_userinfo_id: row.f_userinfo_id,
+      f_service_person: model.f_service_person[0],
+      f_operat_type: '其他收费',
+      f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行其他收费操作`,
+      f_state: '有效',
+      f_operator: Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_zoneid: Vue.$login.f.zoneid,
+      f_zones: Vue.$login.f.zones,
+      // 其他费用信息
+      t_userfees: model.t_userfees,
+      f_fee_type: model.f_fee_type[0],
+      f_fee_time: model.f_fee_time[0],
+      otherdetail: model.otherdetail
+    }
+    return Vue.resetpost('rs/logic/sale_othercharge_logic', data, {resolveMsg: '其他收费成功', rejectMsg: '其他收费失败'})
+  },
+  otherChargeByPay (model, row) {
+    let data = {
+      f_serial_id: model.f_serial_id,
+      nopay_id: model.nopay_id,
+      record_userinfo: row.f_userinfo_id,
+      f_userfiles_id: row.f_userfiles_id,
+      f_user_id: row.f_user_id,
+      f_user_name:row.f_user_name,
+      f_address:row.f_address,
+      f_user_type:row.f_user_type,
+      f_gasproperties:row.f_gasproperties,
+      // f_number: model.f_number,
+      // f_unitprice: model.f_unitprice,
+      f_collection: model.f_collection,
+      f_comments: model.f_comments,
+      f_payment: model.f_payment[0],
+      f_voucher_number: model.f_voucher_number,
+      f_bill_style: model.f_print[0],
+      // f_brand_spec: model.f_brand_spec[0],
+      f_userinfo_id: row.f_userinfo_id,
+      f_service_person: model.f_service_person[0],
+      f_operat_type: '其他收费',
+      f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行其他收费操作`,
+      f_state: '有效',
+      f_operator: Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_zoneid: Vue.$login.f.zoneid,
+      f_zones: Vue.$login.f.zones,
+      // 其他费用信息
+      t_userfees: model.t_userfees,
+      otherdetail: model.otherdetail
+    }
+    return Vue.resetpost('rs/logic/sale_othercharge_bypay', data, {resolveMsg: '其他收费成功', rejectMsg: '其他收费失败'})
+  },
+// 维修收费
+  repairCharge (model, row) {
+    let data = {
+      record_userinfo: row.f_userinfo_id,
+      f_userfiles_id: row.f_userfiles_id,
+      f_user_id: row.f_user_id,
+      // f_number: model.f_number,
+      // f_unitprice: model.f_unitprice,
+      f_collection: model.f_collection,
+      f_comments: model.f_comments,
+      f_payment: model.f_payment[0],
+      f_voucher_number: model.f_voucher_number,
+      f_bill_style: model.f_print[0],
+      // f_brand_spec: model.f_brand_spec[0],
+      f_userinfo_id: row.f_userinfo_id,
+      f_service_person: model.f_service_person[0],
+      f_operat_type: '维修收费',
+      f_describe: `${Vue.$login.f.name}对客户${row.f_user_name}进行维修收费操作`,
+      f_state: '有效',
+      f_operator: Vue.$login.f.name,
+      f_operatorid: Vue.$login.f.id,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_zoneid: Vue.$login.f.zoneid,
+      f_zones: Vue.$login.f.zones,
+      // 其他费用信息
+      t_userfees: model.t_userfees,
+      f_fee_type: model.f_fee_type[0],
+      f_fee_time: model.f_fee_time[0],
+      otherdetail: model.otherdetail
+    }
+    return Vue.resetpost('rs/logic/repaircharge', data, {resolveMsg: '维修收费成功', rejectMsg: '维修收费失败'})
+  },
+  // 过户管理
+  changeAccount (model) {
+    // console.log('过户。，。。', model)
+    return Vue.resetpost('rs/logic/transferSave', {data: {model: model}}, {resolveMsg: '过户成功', rejectMsg: '过户失败'})
+  },
+
+  updateGasPrice (data) {
+    // 批量变更气价
+    return Vue.resetpost('rs/logic/updateBatchPrice', data, {resolveMsg: '批量修改成功', rejectMsg: '批量变更气价失败'})
+  },
+  // 增加气表品牌
+  addGasBrand (model, Arrlist) {
+    let data = {
+      f_meter_brand: model.f_meter_brand,
+      f_manufacturers: model.f_manufacturers,
+      f_meter_type: model.f_meter_type,
+      f_police_gas: model.f_police_gas ? model.f_police_gas : 0,
+      f_cardnumber: model.f_cardnumber,
+      f_card_password: model.f_card_password,
+      f_topup_ceil: model.f_topup_ceil ? model.f_topup_ceil : 0,
+      f_overdr_lines: model.f_overdr_lines ? model.f_overdr_lines : 0,
+      f_meter_limit: model.f_meter_limit ? model.f_meter_limit : 0,
+      f_checkout_limit: model.f_checkout_limit ? model.f_checkout_limit : 0,
+      f_is_replacement: model.f_is_replacement ? model.f_is_replacement : '',
+      f_alias: model.f_alias,
+      f_isdecimal: model.f_isdecimal,
+      f_collection_type: model.f_collection_type,
+      f_calculation: model.f_calculation,
+      f_system_settlement: model.f_system_settlement,
+      f_comments: model.f_comments,
+      f_is_check: model.f_is_check,
+      f_is_step: model.f_is_step,
+      f_priority: model.f_priority,
+      f_support_purchase: model.f_support_purchase,
+      f_issupport_feededuction: model.f_issupport_feededuction,
+      f_dynamic_expire: model.f_dynamic_expire,
+      f_hascard: model.f_hascard,
+      f_share_times: model.f_share_times,
+      f_share_open: model.f_share_open,
+      f_operatorid: Vue.$login.f.id,
+      f_operator: Vue.$login.f.name,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+
+      gasmodellist: Arrlist
+    }
+    return Vue.resetpost('rs/logic/addGasBrand', {data: data}, {resolveMsg: '添加气表成功', rejectMsg: '增加气表失败'})
+  },
+  // 修改气表品牌
+  modifyGasBrand (model, Arrlist) {
+    console.log('气表品牌保存，，', model)
+    model.f_operatorid = Vue.$login.f.id
+    model.f_operator = Vue.$login.f.name
+    model.f_orgid = Vue.$login.f.orgid
+    model.f_orgname = Vue.$login.f.orgs
+    model.f_depid = Vue.$login.f.depids
+    model.f_depname = Vue.$login.f.deps
+    return Vue.resetpost('rs/logic/updataGasBrand', {data: {data: model, gasmodellist: Arrlist}}, {resolveMsg: '修改气表品牌成功', rejectMsg: '修改气表品牌失败'})
+  },
+  // 删除气表品牌
+  delGasBrand (row) {
+    console.log(row)
+    return Vue.resetpost('rs/logic/delGasBrand', {data: {id: row.id, f_orgid: Vue.$login.f.orgid}})
+  },
+  deleteUsingOrg (row) {
+    console.log(row)
+    return Vue.resetpost('rs/logic/deleteUsingOrg', {data: {id: row.f_gasbrand_id, f_orgid: row.f_orgid}})
+  },
+  createMessage (data) {
+    return Vue.resetpost('rs/logic/messageBatchOperate', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
+  },
+  createMessageNew (data) {
+    return Vue.resetpost('rs/logic/messageBatchOperateNew', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
+  },
+  helpInfo (model) {
+    let data = {
+      id: model.id,
+      f_allowed_user: model.f_allowed_user,
+      f_allowed_company: model.f_allowed_company,
+      f_password: model.f_password,
+      f_operator: model.f_operator
+    }
+    return Vue.resetpost('rs/logic/helpInfoAdd', {data: data})
+  },
+  del (model) {
+    let data = {
+      id: model.id
+    }
+    return Vue.resetpost('rs/logic/delHelpRow', {data: data})
+  },
+
+  // 抄表册
+  gasMeterBook (model, row) {
+    console.log('表册信息保存，，', model)
+    let data = {
+      f_book_code:  model.f_book_code,
+      f_book_name: model.f_book_name,
+      f_inputtor: model.f_inputtor,
+      f_period: model.f_period,
+      f_hand_begin_date: model.f_hand_begin_date,
+      f_hand_end_date: model.f_hand_end_date,
+      f_book_remark: model.f_book_remark,
+      f_filiale_id: model.f_filiale_id,
+      f_filiale_name: model.f_filiale_name,
+      f_comments: model.f_comments,
+      f_state: '有效',
+      f_book_state: model.f_book_state,
+      f_meterbook_end_date:model.f_meterbook_end_date,
+      f_operatorid: Vue.$login.f.id,
+      f_operator: Vue.$login.f.name,
+      f_orgid: model.f_filiale_id,
+      f_orgname: model.f_filiale_name,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+      f_book_slice_area: model.f_book_slice_area,
+      userid: Vue.$login.f.id,
+      type: '添加'
+    }
+
+    if (row && row.id != null) {
+      data.id = row.id
+      data.version = row.version
+      data.type = '修改'
+    }
+    console.log('data提交之前', data)
+    return Vue.resetpost('rs/logic/saveMeterBook', {data: data})
+  },
+  gasPrice (model, row, blodid) {
+    console.log(123 + model)
+    let data = {
+      f_blodid: blodid,
+      f_price_type: model.f_price_type,
+      f_price_name: model.f_price_name,
+      f_user_type: model.f_user_type,
+      f_gasproperties: model.f_gasproperties,
+      f_perform_date: model.f_perform_date,
+      f_end_date: '2099-12-31 23:59:59',
+      f_islow_income: model.f_islow_income - 0,
+      f_limit_cycle: model.f_limit_cycle ? model.f_limit_cycle : 0,
+      f_limit_gas: model.f_limit_gas ? model.f_limit_gas : 0,
+
+      // 阶梯相关字段
+      f_stairmonths: null,
+      f_population_base: null,
+      f_stair_start_date: null,
+      f_add_price: model.f_add_price,
+      f_isheat: model.f_isheat - 0,
+      f_deduction_way: model.f_deduction_way,
+      // 采暖季相关字段
+      f_heat_start_date: model.f_heat_start_date ? model.f_heat_start_date : null,
+      f_heat_cycle: model.f_heat_cycle ? model.f_heat_cycle : null,
+
+      f_priority: model.f_priority,
+      f_comments: model.f_comments,
+      f_state: '有效',
+      f_operatorid: Vue.$login.f.id,
+      f_operator: Vue.$login.f.name,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+
+      // 所属分公司
+      f_filialeid: model.f_filialeid,
+      f_filialename: model.f_filialename,
+
+      detailprice: model.detailprice,
+      f_processid: model.f_processid,
+      userid: Vue.$login.f.id,
+      audit: model.audit,
+      type: '添加',
+      f_consolidated_user: model.f_consolidated_user,
+      f_resident_area: model.f_resident_area,
+      f_resident_price: model.f_resident_price,
+      f_non_resident_area: model.f_non_resident_area,
+      f_non_resident_price: model.f_non_resident_price
+    }
+    if(model.f_priceStates && model.f_priceStates=='否'){
+      data.f_end_date=null
+    }
+    if (model.toBeUsePriceId && model.toBeUsePriceVersion) {
+      // 待使用 气价的id
+      data.toBeUsePriceId = model.toBeUsePriceId
+      data.toBeUsePriceVersion = model.toBeUsePriceVersion
+    }
+
+    if (model.limit_gas) {
+      data.limit_gas = model.limit_gas
+    }
+
+    if (data.purchaselimit) {
+      data.purchaselimit.forEach((item, index) => {
+        data.purchaselimit[index].value = model.purchaselimit[index].value
+      })
+    }
+    if (data.f_price_type === '固定气价') {
+      if (data.detailprice[0].id) {
+        delete data.detailprice[0].id
+      }
+      data.detailprice[0].f_price_name = 1
+    } else if (data.f_price_type === '混合气价') {
+      if (delete data.detailprice[0].id) {
+        delete data.detailprice[0].id
+      }
+      data.detailprice[0].f_price_name = 1
+      data.detailprice[0].f_mixprice = model.detailprice[0].f_mixprice[0]
+      if (delete data.detailprice[1].id) {
+        delete data.detailprice[1].id
+      }
+      data.detailprice[1].f_price_name = 2
+      data.detailprice[1].f_mixprice = model.detailprice[1].f_mixprice[0]
+    } else if (data.f_price_type === '阶梯气价') {
+      data.f_stairmonths = model.f_stairmonths
+      data.f_population_base = model.f_population_base
+      data.f_stair_start_date = model.f_stair_start_date
+      data.detailprice.forEach((item, index) => {
+        data.detailprice[index].f_price_name = index + 1
+        if (index === 0){
+          data.detailprice[index].f_available_gas = data.detailprice[index].f_gas
+        } else {
+          data.detailprice[index].f_available_gas = data.detailprice[index].f_gas-data.detailprice[index-1].f_gas
+        }
+
+        if (data.detailprice[index].id) {
+          if (delete data.detailprice[index].id) {
+            delete data.detailprice[index].id
+          }
+        } else if (data.detailprice[index].f_ratio) {
+          data.detailprice[index].f_ratio = null
+        } else if (!data.detailprice[index].f_add_gas) {
+          data.detailprice[index].f_add_gas = 0
+        } else if (!data.detailprice[index].f_add_gas_heat) {
+          data.detailprice[index].f_add_gas_heat = 0
+        }
+      })
+    }
+    if (row && row.id != null) {
+      data.oldprice = {
+        id: row.id
+      }
+      data.type = '修改'
+      data.f_price_id = row.f_price_id
+      data.f_version = (row.f_version - 0)
+    }
+    console.log('data提交之前', data)
+    return Vue.resetpost('rs/logic/gasprice', {data: data})
+  },
+  basicLiving (model, row) {
+    console.log('看传过来的model')
+    console.log(model)
+    let data = {
+      f_userinfo_id: model.f_userinfo_id,
+      f_userfiles_id: model.f_userfiles_id,
+      f_start_date: model.f_start_date,
+      f_end_date: model.f_end_date,
+      // f_period: model.f_period,
+      f_state: '有效',
+      f_price_id: model.f_price_id,
+      f_operatorid: Vue.$login.f.id,
+      f_operator: Vue.$login.f.name,
+      f_orgid: Vue.$login.f.orgid,
+      f_orgname: Vue.$login.f.orgs,
+      f_depid: Vue.$login.f.depids,
+      f_depname: Vue.$login.f.deps,
+
+      type: '添加'
+    }
+    if (row && row.id != null) {
+      data.oldbasicliving = {
+        id: row.id
+      }
+      data.type = '修改'
+    }
+    console.log('data提交之前', data)
+    return Vue.resetpost('rs/logic/addBasicLiving', {data: data})
+  },
+  sendMessage (condition) {
+    return Vue.resetpost('rs/logic/sendSms', {condition: condition})
+  },
+  deletMessage (condition) {
+    return Vue.resetpost('rs/logic/deleteSms', {condition: condition}, {resolveMsg: '删除短信成功', rejectMsg: '删除短信失败'})
+  },
+  deletAllMessage (condition) {
+    return Vue.resetpost('rs/logic/deleteSms', {condition: condition, operate: 'all'}, {resolveMsg: '删除短信成功', rejectMsg: '删除短信失败'})
+  }
+}
+
+export default TCLogicService

package/src/filiale/tongchuan/sale.js

@@ -2,6 +2,9 @@
 
 import Vue from 'vue'
 
+import TCLogicService from './plugins/LogicService'
+Vue.use(TCLogicService)
+
 export default function () {
 // 档案信息
   Vue.component('file-user-files', (resolve) => { require(['./FileUserFiles'], resolve) })
@@ -140,4 +143,6 @@ export default function () {
   Vue.component('web-meter-info', (resolve) => { require(['./WebMeterInfo'], resolve) })
   // 税号审核
   Vue.component('paper-audit', (resolve) => { require(['./paperaudit'], resolve) })
+  // 电子发票管理
+  Vue.component('e-ticket-manage', (resolve) => { require(['./EticketManage'], resolve) })
 }