sale-client 3.6.480 → 3.6.482

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Jul 08 09:48:59 CST 2024
+#Wed Jan 22 10:06:39 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/filiale/bayan/DisableManage.vue

@@ -0,0 +1,106 @@
+<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'
+  /**
+   *综合业务
+   表具停用组件
+   */
+  export default {
+    title: '表具停用',
+    props: ['row'],
+    data () {
+      return {
+        blodid: '',
+        showupload: true,
+        model: {},
+        randomBusinessId: '',
+        reason: this.$appdata.getParam('停用原因')
+      }
+    },
+    ready () {
+      this.blodid = this.row.f_userinfo_id
+      this.getRandomId()
+    },
+    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)
+        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/bayan/EnableManage.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="auto">
+    <disable-record partial='list'  :searchdata="row" @updatedata="handleChildStatusUpdate"></disable-Record>
     <validator name='v'>
       <form novalidate class="form-horizontal">
         <div class="row">
@@ -51,7 +52,8 @@
         </div>
       </form>
       <div style="text-align:right;">
-        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button :class="['btn-green', { disabled: !authArr.includes('强制启用') }]" @click="forceConfirm()" :disabled="!authArr.includes('强制启用')">强制启用</button>
+        <button class="button_search button_spacing" @click="confirm()"  :disabled="!isEnabled">确认</button>
         <button class="button_clear" @click="clean()" >取消</button>
       </div>
       <upload :blodid="model.f_userinfo_id"  :businessid="randomBusinessId" isremark="true" :deleteimg="true" fusetype="表具启用"></upload>
@@ -103,7 +105,7 @@ let meterEnable = async function (self, model, row) {
     f_blobid: returnData.data.id
   }
   await self.$resetpost('rs/logic/updatefiles', param)
-  if(self.kaifa){
+  if (self.kaifa) {
     let array = [{
       f_user_id: self.row.f_userfiles_id,
       f_alias: self.row.f_alias,
@@ -148,11 +150,12 @@ export default {
         f_date: '',
         f_reason: ''
       },
-      resid:[],
-      randomBusinessId:null,
+      resid: [],
+      isEnabled: false,
+      randomBusinessId: null,
       reason: this.$appdata.getParam('启用原因'),
       disable: {},
-      kaifa:false
+      kaifa: false
     }
   },
   ready () {
@@ -172,6 +175,11 @@ export default {
     }
   },
   methods: {
+    handleChildStatusUpdate (status) {
+      // 根据子组件的状态更新父组件逻辑
+      console.log('子组件状态更新为：', status)
+      this.isEnabled = status
+    },
     getRandomId () {
       this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         let res = Math.random() * 16 | 0
@@ -179,10 +187,10 @@ export default {
         return v.toString(16)
       })
     },
-    changeisuse(val){
-      if(val){
+    changeisuse (val) {
+      if (val) {
         this.kaifa = true
-      }else{
+      } else {
         this.kaifa = false
       }
     },
@@ -195,27 +203,62 @@ export default {
       let res = await this.$resetpost('rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取上次停用原因失败'})
       this.disable = res.data[0]
     },
-    confirm () {
+    forceConfirm () {
       meterEnable(this, this.model, this.row)
-      // this.$LogicService.meterEnable(this.model, this.row)
-      // .then(
-      //   (res) => this.$dispatch('success', '表具启用', this.row, res)
-      // ).catch(
-      //   (error) => {
-      //     if (error.state === 603) {
-      //       this.$error('重复提交')
-      //       return
-      //     }
-      //     this.$dispatch('error', '表具启用', this.row, error)
-      //   }
-      // )
+    },
+    async confirm () {
+      try {
+        // 查询是否存在未处理的隐患
+        const data = {
+          condition: `f_userinfo_id = '${this.row.f_userinfo_id}' AND f_is_deal = '未处理'`
+        }
+
+        const response = await this.$resetpost(
+          'rs/sql/HiddenDanger', // 假设这是查询接口
+          { data },
+          { resolveMsg: null, rejectMsg: '查询隐患失败' }
+        )
+        console.log('124565', response.data)
+        console.log('124565', response.data.length)
+        // 检查查询结果是否有未处理的隐患
+        if (response.data && response.data.length > 0) {
+          this.$showAlert('还有未处理的隐患，无法启用！', 'warning', 3000)
+          return
+        }
+
+        // 如果没有未处理的隐患，则执行启用逻辑
+        await meterEnable(this, this.model, this.row)
+      } catch (error) {
+        console.error('查询或启用操作失败：', error)
+        this.$error('操作失败，请重试！')
+      }
     },
     clean () {
       this.$dispatch('refresh')
     }
+  },
+  computed: {
+    authArr () {
+      return this.$login.r ? this.$login.r : []
+    }
   }
 }
 </script>
 
 <style>
+.btn-green {
+  background-color: green;
+  color: white;
+  border: none;
+  padding: 5px 10px;
+  border-radius: 3px;
+  cursor: pointer;
+}
+
+.btn-green.disabled {
+  background-color: gray;
+  color: #ccc;
+  cursor: not-allowed; /* 禁止鼠标点击的样式 */
+}
 </style>
+

package/src/filiale/bayan/disableRecord.vue

@@ -0,0 +1,131 @@
+<template>
+  <div style="height:100%">
+    <data-grid :model="model" class="table_sy"   partial='list' v-ref:grid >
+      <template partial='head' >
+        <tr>
+          <th><nobr>序号</nobr></th>
+          <th><nobr>停用时间</nobr></th>
+          <th><nobr>操作人</nobr></th>
+          <th><nobr>停用原因</nobr></th>
+          <th><nobr>其他原因</nobr></th>
+          <th><nobr>状态</nobr></th>
+          <th><nobr>操作</nobr></th>
+        </tr>
+      </template>
+      <template partial='body' >
+        <tr >
+          <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
+          <td style="text-align:center;white-space:nowrap;">{{row.f_operate_date}}</td>
+          <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
+          <td style="text-align:center;white-space:nowrap;">{{row.f_comments}}</td>
+          <td style="text-align:center;white-space:nowrap;">{{row.f_othereason}}</td>
+          <td style="text-align:center;white-space:nowrap;">{{row.f_disable_state}}</td>
+          <td style="text-align:center;white-space:nowrap;">
+            <button
+              :class="{'btn-green': row.f_disable_state !== '启用', 'btn-gray': row.f_disable_state === '启用'}"
+              :disabled="row.f_disable_state === '启用'"
+              @click="$parent.$parent.enableDisable(row)">
+              {{ row.f_disable_state === '启用' ? '已启用' : '启用' }}
+            </button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '停用记录查询',
+  data () {
+    return {
+      model: {rows: []},
+      f_calculation: '',
+      cardCental: false,
+      hasCardCental: false
+    }
+  },
+  props: ['searchdata'],
+  ready () {
+    this.getsalerecord()
+  },
+  computed: {
+    areAllEnabled () {
+      // 检查所有行的状态是否都为 "启用"
+      let i = this.model.rows.every(row => row.f_disable_state === '启用')
+      console.log('123456', i)
+      return this.model.rows.every(row => row.f_disable_state === '启用')
+    }
+  },
+  methods: {
+    cancel () {
+      this.cardCental = false
+    },
+    async getsalerecord () {
+      let http = new HttpResetClass()
+      // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
+      this.condition = `1=1 and f_userinfo_id = '${this.searchdata.f_userinfo_id}' and t.f_operate_date != (
+      select max(f_operate_date)
+      from t_disable
+      where f_userinfo_id = '${this.searchdata.f_userinfo_id}'
+    )`
+      let record = await http.load('POST', 'rs/sql/disableQuery', {data: {condition: this.condition, orderitem: `f_operate_date desc`}}, {
+        rejectMsg: '停用记录查询出错！！',
+        resolveMsg: null
+      })
+      this.model.rows = record.data
+    },
+    async enableDisable (row) {
+      // 更新表 t_disable 的 f_disable_state 字段为 '启用'
+      let http = new HttpResetClass()
+      try {
+        await http.load('POST', 'rs/logic/updateDisableState', {
+          data: {
+            id: row.id, // 假设 `row` 中有主键字段 `id`
+            f_disable_state: '启用'
+          }
+        }, {
+          resolveMsg: '启用成功！',
+          rejectMsg: '启用失败！'
+        })
+        // 更新本地数据
+        row.f_disable_state = '启用'
+      } catch (error) {
+        console.error('启用失败', error)
+      }
+    }
+  },
+  watch: {
+    'searchdata' () {
+      this.getsalerecord()
+    },
+    'model.rows': {
+      handler () {
+        const allEnabled = this.model.rows.every(row => row.f_disable_state === '启用')
+        this.$emit('updatedata', allEnabled)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+<style scoped>
+.btn-green {
+  background-color: green;
+  color: white;
+  border: none;
+  padding: 5px 10px;
+  border-radius: 3px;
+  cursor: pointer;
+}
+.btn-gray {
+  background-color: gray;
+  color: white;
+  border: none;
+  padding: 5px 10px;
+  border-radius: 3px;
+  cursor: not-allowed;
+}
+</style>

package/src/filiale/bayan/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 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) {
+    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_disable_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: '生成短信失败'})
+  },
+  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/bayan/sale.js

@@ -63,4 +63,8 @@ export default function () {
   Vue.component('warehouse-add-maintain', (resolve) => { require(['./AddWarehousemain'], resolve) })
   // 新表信息
   Vue.component('meter-message', (resolve) => { require(['./MeterMessage.vue'], resolve) })
+  // 表具停用
+  Vue.component('disable-manage', (resolve) => { require(['./DisableManage'], resolve) })
+  // 停用记录查看
+  Vue.component('disable-record', (resolve) => { require(['./disableRecord'], resolve) })
 }

package/src/filiale/qianneng/OtherChargeNew.vue

@@ -346,6 +346,7 @@
       }
     },
     methods: {
+
       setTypeprice (val, row) {
         console.log('f_typenumber', this.f_typenumber)
         if (this.f_typenumber !== ' ') {
@@ -398,6 +399,21 @@
         await this.$resetpost('rs/logic/sale_othercharge_logic_nopay', data, {resolveMsg: '生成其他欠费成功', rejectMsg: '生成其他欠费失败'})
         this.$dispatch('success')
       },
+      getBusinessData () {
+        if (this.model.f_print[0] === '电子发票') {
+          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
+          }
+          if (!this.row.f_address_phone) {
+            this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+          }
+          this.eticket_msg = true
+        }
+        return this.$LogicService.otherChargeData(this.model, this.row)
+      },
       // 校验发票信息
       checkInvoiceMsg () {
         if (this.model.f_print[0] === '电子发票') {

package/src/filiale/qianneng/PaymentCode.vue

@@ -0,0 +1,167 @@
+<template>
+  <div id='PaymentCode'>
+    <modal :show.sync="paymentCodeShow" backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">请扫描用户付款码</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-horizontal">
+          <div class="form-group">
+            <input type="text" class="form-control" id="paycode" @keyup.enter="ConfirmCode" @blur="paycodefocus"
+                   v-model="paymentCode" placeholder="请扫描用户付款码" v-el:paycode>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='closeCode'>取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'PaymentCode',
+    props: {
+      // 付款方式
+      payment: {},
+      // 业务类型
+      type: {},
+      // 用户信息
+      row: {},
+      // 付款金额
+      money: {}
+    },
+    data () {
+      return {
+        // 付款码弹框显示
+        paymentCodeShow: false,
+        // 付款码值
+        paymentCode: null,
+        // 付款码流程控制
+        paycoderesolve: null,
+        // 付款码返回数据
+        paymentCodeReturnData: {},
+        // 定时器
+        timer: null,
+        // 收费成功id
+        sellinggasId: null,
+        canPayment: this.$appdata.getSingleValue('微信支付付款方式') ? this.$appdata.getSingleValue('微信支付付款方式') : '',
+      }
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+      // 返回结果为true意味着可以通行
+      flowPath () {
+        return new Promise((resolve) => {
+          this.paycoderesolve = resolve
+          // 如果是付款码支付则显示界面扫用户付款码收钱
+          if (this.canPayment.indexOf(this.payment.toString()) !== -1 || this.payment.toString().indexOf('&') !== -1) {
+            this.paymentCodeShow = true
+            this.paycodefocus()
+          } else {
+            this.paycoderesolve({msg: '不是付款码支付', result: true})
+          }
+        })
+      },
+      // 付款码框获得焦点
+      paycodefocus () {
+        this.$nextTick(() => {
+          this.$els.paycode.focus()
+        })
+      },
+      // 付款码支付流程
+      async ConfirmCode () {
+        // 扫完一次码之后失去焦点，避免重复扫码
+        this.paymentCodeShow = false
+        let data = {
+          f_userinfo_id: this.row ? this.row.f_userinfo_id : null,
+          type: this.type ? this.type : '燃气费',
+          f_operatorid: this.$login.f.id,
+          f_operator: this.$login.f.name,
+          f_user_id: this.row ? this.row.f_user_id : null,
+          f_userfiles_id: this.row ? this.row.f_userfiles_id : null,
+          money: this.money,
+          f_payment: this.payment,
+          auth_code: this.paymentCode,
+          filiale: this.$login.f.orgid,
+          body: this.$login.f.orgs
+        }
+        if (this.type === '其他收费') {
+          data.f_details = this.$parent.getBusinessData()
+        }
+        let res = await this.$resetpost('rs/logic/WeiXinPay', data, {resolveMsg: null, rejectMsg: '服务器内部出错,'})
+        this.paymentCodeReturnData = res = res.data
+        if (res.result_msg == '支付确认成功') {
+          this.paycoderesolve({msg: '支付完成', result: true})
+          this.$closeAlert()
+        } else if (res.result_msg == '支付结果未知') {
+          // 支付结果未知, 根据商户订单号继续查询
+          this.$showAlert(`正在查询用户付款状态,请勿进行任何操作,耐心等待,如长时间未响应可手动取消`, 'warning')
+          let self = this
+          // 启动定时器之前先关闭定时器,防止之前的定时器未关闭
+          if (this.timer) {
+            this.closeTimer()
+          }
+          let times = 1
+          this.timer = setInterval(async () => {
+            times++
+            let res1 = await self.$resetpost('rs/logic/WeiXinPayStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
+            this.paymentCodeReturnData = res1.data
+            res1 = res1.data
+            // 支付成功关闭定时器
+            if (res1.result_msg == '支付确认成功') {
+              self.paycoderesolve({msg: '支付完成', result: true})
+              self.closeTimer()
+              return
+            }
+            if (res1.result_msg == '支付失败') {
+              this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
+              this.closeTimer()
+              return
+            }
+            if (times > 24) {
+              self.$showAlert(`多次查询未成功，请重新扫描用户付款码`, 'danger')
+              self.closeTimer()
+            }
+
+          }, 5000)
+        } else {
+          this.$showAlert(`${res.result_msg}, 请重新扫描用户付款码`, 'danger')
+        }
+        // 清空付款码
+        this.paymentCode = ''
+      },
+      // 付款成功更新收费记录订单号
+      async updateSellinggas () {
+        if (this.payment.toString().indexOf('&') !== -1) {
+          let sqldata = `update t_sellinggas set f_serial_id = '${this.paymentCodeReturnData.f_out_trade_no}' where id = '${this.sellinggasId}'`
+          await this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '更新收费记录订单号失败'})
+        }
+      },
+      // 关闭定时器
+      closeTimer () {
+        console.log('关闭定时器')
+        clearInterval(this.timer)
+        this.timer = null
+      },
+      closeCode () {
+        this.$showMessage('取消后无法继续收款,确定取消吗?', ['confirm', 'cancel']).then((res) => {
+          if (res == 'confirm') {
+            this.paymentCodeShow = false
+            this.$closeAlert()
+            this.paycoderesolve({msg: '支付取消', result: false})
+            this.closeTimer()
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/filiale/qianneng/sale.js

@@ -117,4 +117,6 @@ export default function () {
   Vue.component('message-report', (resolve) => { require(['./revenue/sms/MessageReport.vue'], resolve) })
   // 账单推送
   Vue.component('account-message-list', (resolve) => { require(['./revenue/sms/AccountMessageList.vue'], resolve) })
+  // 付款码支付
+  Vue.component('payment-code', (resolve) => { require(['./PaymentCode.vue'], resolve) })
 }

package/src/filiale/yangchun/ChargeList.vue

@@ -11,8 +11,8 @@
           <div  v-show="!$parent.$parent.authArr.includes('读卡限定')">
             <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.searchQuery" placeholder='编号 名称 地址 电话 表号'
-                     @keyup.enter="$parent.$parent.clean()" condition="(f_userinfo_code like '%{}%' OR f_user_name like '%{}%' OR f_user_phone like '%{}%' OR address.f_address like '%{}%' OR u.f_meternumber like '%{}%')">
+              <input type="text" class="input_search" style="width:60%"  v-model="model.searchQuery" placeholder='编号 名称 地址 电话 表号 备用电话 租户电话'
+                     @keyup.enter="$parent.$parent.clean()" condition="(f_userinfo_code like '%{}%' OR f_user_name like '%{}%' OR f_user_phone like '%{}%' OR address.f_address like '%{}%' OR u.f_meternumber like '%{}%' OR f_rent_phone like '%{}%' OR f_zuhu_phone like '%{}%')">
             </div>
             <div class="form-group col-sm-3" >
               <label class="font_normal_body">客户编号</label>

package/src/plugins/LogicService.js

@@ -99,10 +99,10 @@ let LogicService = {
       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_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,
@@ -132,6 +132,47 @@ let LogicService = {
     }
     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,