sale-client 3.5.175 → 3.5.176-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.175",
+  "version": "3.5.176-2",
   "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/charge/ChargeManage.vue

@@ -13,7 +13,7 @@
                        v-ref:list></charge-list>
 
           <div class="auto" style="margin-top: 1%;" v-if="row">
-            <charge-oper :data.sync="row" :card-info="cardInfo"></charge-oper>
+            <charge-oper :data.sync="row" :card-info="cardInfo" v-ref:oper></charge-oper>
           </div>
       </div>
       </div>
@@ -43,7 +43,6 @@
 </template>
 <script>
   import ChargeOper from './ChargeOper'
-  import {HttpResetClass} from 'vue-client'
 
 export default {
     title: '收费(综合)',
@@ -61,6 +60,7 @@ export default {
         showModal: false,
         rowData: {},
         dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+        reSearchShowMsy: !!this.$appdata.getSingleValue('收费后验证'),
         show: [true],
         selectFiled: '其他信息',
         worktype: '其他信息'
@@ -128,10 +128,9 @@ export default {
         this.cardInfo = null
       },
       clearCondition () {
-
         Object.keys(this.$refs.list.$refs.paged.$refs.cri.model).forEach((key) => {
-          console.log("key",key)
-          console.log("对应啥数据",this.$refs.list.$refs.paged.$refs.cri.model[key])
+          console.log('key', key)
+          console.log('对应啥数据', this.$refs.list.$refs.paged.$refs.cri.model[key])
           this.$refs.list.$refs.paged.$refs.cri.model[key] = []
         })
         // console.log('清数据。。。', this.$refs.list.$refs.paged.$refs.grid.model.rows)
@@ -182,6 +181,15 @@ export default {
           this.serRow(row)
           return
         }
+        if (name === '卡表收费' && this.reSearchShowMsy) {
+          this.$refs.list.$refs.paged.$refs.cri.$refs.readcard.readCard()
+          this.$refs.oper.noButton = false
+          return
+        }
+        if (name === '物联网收费' && this.reSearchShowMsy) {
+          this.serRow(row)
+          return
+        }
         console.log('成功事件')
         this.clean()
         this.$refs.list.search()

package/src/components/charge/business/CardMeterCenter.vue

@@ -373,7 +373,7 @@
           }
         }
       } else {
-        self.$dispatch('success')
+        self.$dispatch('success', '卡表收费')
       }
       self.clickConfirm = false
     } catch (error) {
@@ -395,20 +395,20 @@
     // 添加 “系统余额透支” 付款方式
     let i = -1
     for (const index in self.paytype) {
-      if (self.paytype[index].value == "系统余额透支"){
+      if (self.paytype[index].value == '系统余额透支') {
         i = index
         break
       }
     }
-    if (self.canOverdraftBalance()){
-      if (i == -1){
+    if (self.canOverdraftBalance()) {
+      if (i == -1) {
         self.paytype.push({
-          label: "系统余额透支",
-          value: "系统余额透支"
+          label: '系统余额透支',
+          value: '系统余额透支'
         })
       }
-    }else {
-      if (i != -1){
+    } else {
+      if (i != -1) {
         self.paytype.splice(i, 1)
       }
     }
@@ -470,7 +470,7 @@
             self.$dispatch('refresh', self.row)
           } else {
             self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {resolveMsg: '重新写卡成功', rejectMsg: '重新写卡失败'})
-            self.$dispatch('success')
+            self.$dispatch('success', '卡表收费')
           }
         } else {
           self.$dispatch('refresh', self.row)
@@ -635,9 +635,9 @@
       checkInvoiceMsg (flag) {
         // 校验是否超出最大透支余额
         if (this.model.f_payment == '系统余额透支') {
-          const maxOverdraftBalance = - (this.$appdata.getSingleValue("最大透支余额") - 0)
+          const maxOverdraftBalance = -(this.$appdata.getSingleValue('最大透支余额') - 0)
           const curSysBalance = (this.row.f_sys_balance - 0) - (this.model.f_totalcost - 0)
-          if (curSysBalance < maxOverdraftBalance){
+          if (curSysBalance < maxOverdraftBalance) {
             this.$showAlert('您的系统余额将超出最大透支余额，请使用别的付款方式！', 'danger', 5000)
             return
           }
@@ -695,7 +695,7 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.$dispatch('success', '卡表收费')
       },
       clean () {
         this.$info('取消操作')
@@ -712,7 +712,7 @@
             this.$CommonService.openEticket(this.row.id, '售气收费')
           }
         }
-        this.$dispatch('success')
+        this.$dispatch('success', '卡表收费')
       },
       pregas () {
         this.dymoney = 0
@@ -852,8 +852,8 @@
         }
       },
       // 判断当前用户是否可以使用系统余额透支
-      canOverdraftBalance(){
-        return this.config.overdraftBalance && this.row.f_user_type != "民用"
+      canOverdraftBalance () {
+        return this.config.overdraftBalance && this.row.f_user_type != '民用'
       }
     },
     computed: {

package/src/components/charge/business/IOTMeterCenter.vue

@@ -355,7 +355,7 @@
           // self.$dispatch('success')
         }
       } else {
-        self.$dispatch('success')
+        self.$dispatch('success', '物联网收费')
       }
     } catch (error) {
       if (error.status === 301) {
@@ -610,7 +610,7 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.$dispatch('success', '物联网收费')
       },
       async confirm () {
         let res = await this.$showMessage(`确定对客户${this.row.f_user_name}进行物联网表缴费吗？`, ['confirm', 'cancel'])
@@ -655,7 +655,7 @@
             this.$CommonService.openEticket(this.row.id, '售气收费')
           }
         }
-        this.$dispatch('success')
+        this.$dispatch('success', '物联网收费')
       },
       pregas () {
         this.dymoney = 0

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: {