sale-client 3.5.123 → 3.5.126

package/build/dev-server.js

@@ -13,7 +13,7 @@ var compiler = webpack(config)
 var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
 // var fuwu = 'http://192.168.50.4:8400'
-var fuwu = 'http://121.36.106.17:8400'
+var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://121.36.106.17:8400/'
 // 铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
@@ -184,7 +184,7 @@ app.use(hotMiddleware)
 // serve pure static assets
 app.use('/static', express.static('./static'))
 
-module.exports = app.listen(8089, function (err) {
+module.exports = app.listen(8085, function (err) {
   if (err) {
     console.log(err)
     return

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/revenue/Common/PaymentCode.vue

@@ -1,149 +1,151 @@
-<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" @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: {},
-      // 用户信息
-      row: {},
-      // 付款金额
-      money: {}
-    },
-    data () {
-      return {
-        // 付款码弹框显示
-        paymentCodeShow: false,
-        // 付款码值
-        paymentCode: null,
-        // 付款码流程控制
-        paycoderesolve: null,
-        // 付款码返回数据
-        paymentCodeReturnData: {},
-        // 定时器
-        timer: null,
-        // 收费成功id
-        sellinggasId: null
-      }
-    },
-    created () {
-    },
-    ready () {
-    },
-    methods: {
-      // 返回结果为true意味着可以通行
-      flowPath () {
-        return new Promise((resolve) => {
-          this.paycoderesolve = resolve
-          // 如果是付款码支付则显示界面扫用户付款码收钱
-          if (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 () {
-        let data = {
-          f_userinfo_id: this.row ? this.row.f_userinfo_id : null,
-          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
-        }
-        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: '付款码支付查询出错,'})
-            res1 = res1.data
-            // 支付成功关闭定时器
-            if (res1.result_msg == '支付确认成功') {
-              self.paycoderesolve({msg: '支付完成', result: true})
-              self.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>
+<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" @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: {},
+      // 用户信息
+      row: {},
+      // 付款金额
+      money: {}
+    },
+    data () {
+      return {
+        // 付款码弹框显示
+        paymentCodeShow: false,
+        // 付款码值
+        paymentCode: null,
+        // 付款码流程控制
+        paycoderesolve: null,
+        // 付款码返回数据
+        paymentCodeReturnData: {},
+        // 定时器
+        timer: null,
+        // 收费成功id
+        sellinggasId: null
+      }
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+      // 返回结果为true意味着可以通行
+      flowPath () {
+        return new Promise((resolve) => {
+          this.paycoderesolve = resolve
+          // 如果是付款码支付则显示界面扫用户付款码收钱
+          if (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,
+          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
+        }
+        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: '付款码支付查询出错,'})
+            res1 = res1.data
+            // 支付成功关闭定时器
+            if (res1.result_msg == '支付确认成功') {
+              self.paycoderesolve({msg: '支付完成', result: true})
+              self.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/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,13 +414,12 @@
           dep: [],
           user: []
         },
-        config: {
-          examine: false
+        config:{
+          examine: false,
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
-        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -445,8 +444,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -476,7 +475,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -597,9 +596,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log('-----------val2:', val)
+        console.log("-----------val2:",val)
         this.imgfilename = `rs/image/file/` + val
-        console.log('-----------imgfilename2:', this.imgfilename)
+        console.log("-----------imgfilename2:",this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -633,17 +632,6 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        // 抄表员查询条件
-        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-        if (this.inputtouPerson.length !== 0) {
-          let str = JSON.stringify(this.inputtouPerson)
-          str = str.replace(/"/g, `'`)
-          str = str.replace(/\[/g, ``)
-          str = str.replace(/\]/g, ``)
-          console.log('=====抄表员model22222222222绑定====', str)
-          // 查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
-        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -708,7 +696,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      }
+      },
 
     },
     computed: {

package/src/filiale/dongguan/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -237,9 +237,11 @@
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer">
-      <button  type="button" class="button_search btn-ln fr"  @click='valveoperate(true)'>开阀</button>
+      <button  type="button" class="btn btn-info btn-ln fr"  @click='valveoperate("权限关阀")'>权限关阀</button>
       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      <button  type="button" class="btn btn-info btn-ln fr"  @click='valveoperate(false)'>关阀</button>
+      <button  type="button" class="button_search btn-ln fr"  @click='valveoperate("开阀")'>开阀</button>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <button  type="button" class="btn btn-info btn-ln fr"  @click='valveoperate("关阀")'>关阀</button>
     </footer>
   </modal>
 <!-- 销户-->
@@ -410,18 +412,31 @@
       },
       // 开关阀操作
       async valveoperate (oper) {
-        let msg = oper ? '开阀' : '关阀'
+        console.log('oper----------------',oper)
+        let msg = ''
+        let nnum
+        if (oper === '权限关阀'){
+          msg = '权限关阀'
+          nnum = 2
+        } else if (oper === '关阀') {
+          msg = '手动关阀'
+          nnum = 0
+        }else {
+          msg = '手动开阀'
+          nnum = 1
+        }
         let datas = {
           instructType: '阀门控制',
-          instructTitle: `手动${msg}`,
+          instructTitle: `${msg}`,
           condition: `t_userfiles.f_userfiles_id='${this.row.f_userfiles_id}'`,
           meterBrandName: this.row.f_alias,
           f_instruct_state: '待发送',
           inputtor: Vue.$login.f.name,
           reasonInfo: this.operateReason,
           meternumberf: this.row.f_meternumber,
-          contentData: {isOpen: oper ? 1 : 0}
+          contentData: {isOpen: nnum}
         }
+        console.log('-------------------->{data}',datas)
         await this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
           {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
             this.valve = false