sale-client 3.6.518 → 3.6.520

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Apr 10 10:42:44 CST 2025
+gradle.version=5.2.1

package/package.json

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

package/src/components/charge/ChargeList.vue

@@ -107,6 +107,11 @@
                             style="width: 60%">
                 </res-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">证件号</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_idnumber" placeholder='证件号'
+                       condition="f_idnumber like '%{}%'">
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">卡&emsp;&emsp;号</label>
                 <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'

package/src/components/charge/business/machine/MachineMeterCenter.vue

@@ -226,24 +226,11 @@ let asyncMachineMeterCenter = async function (self) {
       // 开始打票
       if (self.config.hasPrint) {
         if (self.printInvoiceType.indexOf(self.data.f_print) === -1) {
-          if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
-              self.billData.url = 'rs/report/fmy_machine_bill'
-            }
-          }
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            self.data.id = res.data
-            self.data.f_bill_type = '机表收费'
-            self.data.f_bill_style = self.data.f_print[0]
-            self.print = true
-          } else {
-            // 如果不欠费就用下边的预存收据
+          if (self.model.f_print[0] == '热敏收据') {
+            self.billData.url = 'rs/report/machine_bill_thermal'
             if (self.$parent.$children[0].selecteds) {
-              console.log('1111111', self.$parent.$children[0].selecteds)
               if (self.$parent.$children[0].selectedRows === 0) {
-                console.log('22222222', self.$parent.$children[0].selectedRows)
-                self.billData.url = 'rs/report/pre_sell'
+                self.billData.url = 'rs/report/pre_sell_thermal'
               }
               // 获取选中的handplan的id
               self.data.handid = ''
@@ -251,12 +238,44 @@ let asyncMachineMeterCenter = async function (self) {
                 self.data.handid = self.data.handid + "','" + row.handplan_id
               })
             } else {
-              console.log('3333333')
               self.billData.url = 'rs/report/pre_sell'
               self.data.handid = ''
             }
             self.data.id = res.data
             self.print = true
+          } else {
+            if (self.$login.r.includes('非民用纸质票据拆分')) {
+              if (self.row.f_user_type === '非民用') {
+                self.billData.url = 'rs/report/fmy_machine_bill'
+              }
+            }
+            if (self.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              self.data.id = res.data
+              self.data.f_bill_type = '机表收费'
+              self.data.f_bill_style = self.data.f_print[0]
+              self.print = true
+            } else {
+              // 如果不欠费就用下边的预存收据
+              if (self.$parent.$children[0].selecteds) {
+                console.log('1111111', self.$parent.$children[0].selecteds)
+                if (self.$parent.$children[0].selectedRows === 0) {
+                  console.log('22222222', self.$parent.$children[0].selectedRows)
+                  self.billData.url = 'rs/report/pre_sell'
+                }
+                // 获取选中的handplan的id
+                self.data.handid = ''
+                self.$parent.$children[0].selecteds.forEach((row, index) => {
+                  self.data.handid = self.data.handid + "','" + row.handplan_id
+                })
+              } else {
+                console.log('3333333')
+                self.billData.url = 'rs/report/pre_sell'
+                self.data.handid = ''
+              }
+              self.data.id = res.data
+              self.print = true
+            }
           }
         } else if (self.data.f_print[0] === '国税发票') {
           // TODO

package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue

@@ -197,15 +197,21 @@ let overChargeGen = async function (self) {
     }
     if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
       if (self.printInvoiceType.indexOf(self.model.f_print) === -1) {
-        if (self.config.hasBillManage) {
-          // 启用发票管理，获取票据管理中的票号并存储记录
-          self.row.id = res.data
-          self.row.f_bill_type = '超用收费'
-          self.row.f_bill_style = self.model.f_print[0]
+        if (self.model.f_print[0] == '热敏收据') {
+          self.billData.url = 'rs/report/overuse_bill_thermal'
+          self.row.id = res.data.id
           self.print = true
         } else {
-          self.row.id = res.data
-          self.print = true
+          if (self.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录
+            self.row.id = res.data
+            self.row.f_bill_type = '超用收费'
+            self.row.f_bill_style = self.model.f_print[0]
+            self.print = true
+          } else {
+            self.row.id = res.data
+            self.print = true
+          }
         }
       } else {
         if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {

package/src/filiale/fugu/components/plugins/LogicService.js

@@ -0,0 +1,544 @@
+import Vue from 'vue'
+import co from 'co'
+
+let disableGen = function * (data, owedisable) {
+  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(owedisable){
+    if (owe.data.length > 0 && hasHandplan.data.length > 0) {
+      Vue.showAlert('该表具还有欠费或者未抄表数据！！', 'danger', 0)
+    }
+    yield Vue.resetpost('rs/entity/t_disable', data, {resolveMsg: '表具停用成功', rejectMsg: '表具停用失败'})
+
+  }else{
+    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 LogicService = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.LogicService = Vue.prototype.$LogicService = LogicService
+  },
+
+  // 总分表
+  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, owedisable) {
+    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_phone: row.f_user_phone,
+      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, owedisable)
+    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: '其他收费失败'})
+  },
+  otherChargeData (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 data
+  },
+  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: '生成短信失败'})
+  },
+  createCustomMessage (data) {
+    return Vue.resetpost('rs/customMessage/send', {data: data}, {resolveMsg: null, rejectMsg: null})
+  },
+  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_hand_month: model.f_hand_month ? model.f_hand_month : null,
+      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) {
+    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: '添加'
+    }
+    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 LogicService

package/src/filiale/fugu/components/revenue/DisableManage.vue

@@ -0,0 +1,118 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_reason" class="font_normal_body">停用原因</label>
+            <v-select v-model="model.f_reason"
+                      placeholder='停用原因'
+                      :value.sync="model.f_reason"
+                      :options='reason'
+                      v-ref:reason
+                      close-on-select ></v-select>
+          </div>
+        </div>
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group">
+            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"/>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <upload :blodid="blodid"  :businessid="randomBusinessId" isremark="true" :deleteimg="true" fusetype="停用"></upload>
+</template>
+<script>
+import LogicService from "../plugins/LogicService";
+  /**
+   *综合业务
+   表具停用组件
+   */
+
+  let asyncMachineMeterCenter = async function (self){
+    await self.$getConfig(self,'disableGen')
+    console.log('欠费禁用config', self.config)
+    self.data.disable = self.config.disableGen
+  }
+
+  export default {
+    title: '表具停用',
+    props: ['row'],
+    data () {
+      return {
+        config: {
+          disableGen: true
+        },
+        disable:true,
+        blodid: '',
+        showupload: true,
+        model: {},
+        randomBusinessId: '',
+        reason: this.$appdata.getParam('停用原因')
+      }
+    },
+    ready () {
+      this.blodid = this.row.f_userinfo_id
+      this.getRandomId()
+      asyncMachineMeterCenter(this)
+    },
+    methods: {
+      getRandomId () {
+        this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let res = Math.random() * 16 | 0
+          let v = c == 'x' ? res : (res & 0x3 | 0x8)
+          return v.toString(16)
+        })
+      },
+      async confirm () {
+        await LogicService.meterDisable(this.model, this.row, this.disable)
+        let array = [{
+          f_user_id: this.row.f_user_id,
+          f_userfiles_id: this.row.f_userfiles_id,
+          f_alias: this.row.f_alias,
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_orgname: this.$login.f.orgs,
+          f_orgid: this.$login.f.orgid,
+          f_meternumber: this.row.f_meternumber
+        }]
+        if (this.row.f_meter_type === '物联网表') {
+          await this.$resetpost('rs/logic/iot_instructUpdateAndDelect',
+            {
+              data: {
+                data1: {
+                  f_apply_type: '阀门控制',
+                  userid: array,
+                  nowDate: new Date(),
+                  f_apply_value: '关阀',
+                  f_apply_beizhu: '表具停用自动关阀',
+                  f_apply_operator: this.$login.f.name
+                },
+                data2: {
+                  userid: array,
+                  instructtype: '阀门控制',
+                  isOpen: '关阀',
+                  instructTitle: '手动关阀',
+                  reasonInfo: '表具停用自动关阀',
+                  f_instruct_state: '待发送',
+                  inputtor: this.$login.f.name
+                }
+              }
+            })
+        }
+        this.$dispatch('success')
+      },
+      clean () {
+        this.$dispatch('refresh')
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/filiale/fugu/sale.js

@@ -25,4 +25,6 @@ export default function () {
   Vue.component('card-meter-center', (resolve) => { require(['./business/CardMeterCenter'], resolve) })
   // 交费具体信息金额
   Vue.component('meter-operate-maintain', (resolve) => { require(['./components/revenue/MeterOperatemain'], resolve) })
+  // 表具停用
+  Vue.component('disable-manage', (resolve) => { require(['./components/revenue/DisableManage'], resolve) })
 }

package/src/filiale/wuhai/CardMeterCenter.vue

@@ -362,25 +362,31 @@
       // 开始打票
       if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
-          if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
-              self.billData.url = 'rs/report/fmy_card_bill'
-            }
-          }
-          if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
-            self.billData.url = 'rs/report/fee_card_bill'
-          }
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            self.row.id = res
-            self.row.f_bill_type = '卡表收费'
-            self.row.f_bill_style = self.model.f_print[0]
-            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+          if (self.model.f_print[0] == '热敏收据') {
+            self.billData.url = 'rs/report/card_bill_thermal'
+            self.row.id = res.data.id
             self.print = true
           } else {
-            self.row.id = res
-            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
-            self.print = true
+            if (self.$login.r.includes('非民用纸质票据拆分')) {
+              if (self.row.f_user_type === '非民用') {
+                self.billData.url = 'rs/report/fmy_card_bill'
+              }
+            }
+            if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
+              self.billData.url = 'rs/report/fee_card_bill'
+            }
+            if (self.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              self.row.id = res
+              self.row.f_bill_type = '卡表收费'
+              self.row.f_bill_style = self.model.f_print[0]
+              self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+              self.print = true
+            } else {
+              self.row.id = res
+              self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+              self.print = true
+            }
           }
         } else {
           if (self.model.f_print[0] === '电子发票') {

package/src/filiale/wuhai/IOTMeterCenter.vue

@@ -327,24 +327,30 @@
       await self.$resetpost('rs/logic/updatefiles', data)
       console.log('物联网收费返回。。。', res.data.id)
       // 开始打票
-      console.log('开始打票', self.config)
+      console.log('开始打票', self.config, self.model)
       if (self.config.hasPrint) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
-          console.log('self.config.hasBillManage', self.config.hasBillManage)
-          if (self.$login.r.includes('非民用纸质票据拆分')) {
-            if (self.row.f_user_type === '非民用') {
-              self.billData.url = 'rs/report/fmy_iot_bill'
-            }
-          }
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
+          if (self.model.f_print[0] == '热敏收据') {
+            self.billData.url = 'rs/report/iot_bill_thermal'
             self.row.id = res.data.id
-            self.row.f_bill_type = '物联网收费'
-            self.row.f_bill_style = self.model.f_print[0]
             self.print = true
           } else {
-            self.row.id = res.data.id
-            self.print = true
+            console.log('self.config.hasBillManage', self.config.hasBillManage)
+            if (self.$login.r.includes('非民用纸质票据拆分')) {
+              if (self.row.f_user_type === '非民用') {
+                self.billData.url = 'rs/report/fmy_iot_bill'
+              }
+            }
+            if (self.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              self.row.id = res.data.id
+              self.row.f_bill_type = '物联网收费'
+              self.row.f_bill_style = self.model.f_print[0]
+              self.print = true
+            } else {
+              self.row.id = res.data.id
+              self.print = true
+            }
           }
         } else if (self.config.printType === '国税发票') {
           // TODO

package/src/filiale/wuhai/NoCardMeterCenter.vue

@@ -238,19 +238,25 @@
       // 开始打票
       if (self.config.hasPrint) {
         if (self.model.f_print.indexOf('电子发票') == -1) {
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            self.row.id = res
-            self.row.f_bill_type = '卡表收费'
-            self.row.f_bill_style = self.model.f_print[0]
-            self.row.f_preamount = self.model.f_preamount
-            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
-            self.row.f_collection = self.model.f_collection
+          if (self.model.f_print[0] == '热敏收据') {
+            self.billData.url = 'rs/report/card_bill_thermal'
+            self.row.id = res.data.id
             self.print = true
           } else {
-            self.row.id = res
-            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
-            self.print = true
+            if (self.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              self.row.id = res
+              self.row.f_bill_type = '卡表收费'
+              self.row.f_bill_style = self.model.f_print[0]
+              self.row.f_preamount = self.model.f_preamount
+              self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+              self.row.f_collection = self.model.f_collection
+              self.print = true
+            } else {
+              self.row.id = res
+              self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+              self.print = true
+            }
           }
         } else {
           if (self.model.f_print[0] === '电子发票') {

package/src/filiale/wuhai/UserGeneralInfoTest.vue

@@ -106,7 +106,7 @@
 <script>
 import UserPaperInfoTest from './../../components/FilesManage/UserPaperInfoTest'
 import {HttpResetClass} from 'vue-client'
-import * as Util from '../../util'
+import * as Util from '../../Util'
 
 let getFileGen = async function (self, data) {
   let http = new HttpResetClass()