sale-client 3.6.116 → 3.6.118

package/package.json

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

package/src/components/charge/ChargeManage.vue

@@ -262,6 +262,9 @@ export default {
       'resflushvalue' () {
         this.$refs.info.$refs.valueaddinfo.reflush()
       },
+      'resflushrowdata' () {
+        this.toBusiness(this.row)
+      },
       'refreshrow' (val) {
         console.log(val)
         this.row = val

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -852,7 +852,8 @@ export default {
               if (this.row.f_meter_type.includes('物联网表')) {
                 this.$dispatch('refresh')
               } else {
-                this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+                this.$dispatch('resflushrowdata')
+                // this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
               }
             })
           }

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -319,6 +319,24 @@ export default {
       this.$dispatch('success', '换表', this.row)
     },
     async confirmbefore () {
+      if (this.model.metermessage.f_meter_type[0] === '物联网表') {
+        let param = {
+          f_userfiles_id: this.row.f_userfiles_id,
+          f_meternumber: this.model.metermessage.f_meternumber,
+          f_gasbrand_id: this.model.metermessage.gasbrand[0].id
+        }
+
+        let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
+          resolveMsg: null,
+          rejectMsg: '表号验证失败！！'
+        })
+        console.log('标号验证返回：', res)
+        if (res.data) {
+          this.metermessage.f_meternumber = ''
+          this.$showAlert('表号已存在！！', 'warning', 3000)
+          return
+        }
+      }
       if (this.model.metermessage.f_meter_type[0] != '机表') {
         console.log('进来了')
         if (this.books.data.length > 0) {

package/src/filiale/liaoyuan/comprehen/StairPrice/GasPriceList.vue

@@ -97,6 +97,9 @@
             <th>
               <nobr>气价编号</nobr>
             </th>
+            <th>
+              <nobr>气价ID</nobr>
+            </th>
             <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
               <nobr>气价名称</nobr>
             </th>
@@ -139,6 +142,7 @@
           <tr>
             <td style="text-align:center">{{$index + 1}}</td>
             <td style="text-align:center">{{row.f_price_id}}</td>
+            <td style="text-align:center">{{row.id}}</td>
             <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)"><nobr>{{row.f_price_name}}</nobr></td>
             <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_user_type}}</td>
             <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_gasproperties}}</td>