sale-client 3.5.176 → 3.5.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.176",
+  "version": "3.5.179",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -17,6 +17,7 @@
     "url": "https://gitee.com/aote/product.git"
   },
   "dependencies": {
+    "crypto-js": "^4.1.1",
     "examples": "^0.1.0",
     "js-file-download": "0.4.12",
     "less-loader": "^2.2.3",

package/src/components/UserFiles/HighMeterCard.vue

@@ -380,33 +380,33 @@ export default {
         this.iswaiting = false
       })
     },
-    // 设置自动裁边开启
-    SetAutoCutOn () {
-      console.log('设置自动采编')
-      if (this.iswaiting) return
-      this.iswaiting = true
-      this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open: 1}, (msg) => {
-        if (msg.err !== 0) {
-          this.iswaiting = false
-          return
-        }
-        this.output('设置自动裁边 : open=' + 1)
-        this.iswaiting = false
-      })
-    },
+    //// 设置自动裁边开启
+    //SetAutoCutOn () {
+    //  console.log('设置自动采编')
+    //  if (this.iswaiting) return
+    //  this.iswaiting = true
+    //  this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open: 1}, (msg) => {
+    //    if (msg.err !== 0) {
+    //      this.iswaiting = false
+    //      return
+    //    }
+    //    this.output('设置自动裁边 : open=' + 1)
+    //    this.iswaiting = false
+    //  })
+    //},
     // 设置自动裁边关闭
-    SetAutoCutOff () {
-      if (this.iswaiting) return
-      this.iswaiting = true
-      this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open: 0}, (msg) => {
-        if (msg.err !== 0) {
-          this.iswaiting = false
-          return
-        }
-        this.output('设置自动裁边 : open=' + 0)
-        this.iswaiting = false
-      })
-    },
+    // SetAutoCutOff () {
+    //   if (this.iswaiting) return
+    //   this.iswaiting = true
+    //   this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open: 0}, (msg) => {
+    //     if (msg.err !== 0) {
+    //       this.iswaiting = false
+    //       return
+    //     }
+    //     this.output('设置自动裁边 : open=' + 0)
+    //     this.iswaiting = false
+    //   })
+    // },
     // //设置预设框选
     // SetBox(){
     //   if(this.iswaiting) return

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

@@ -148,7 +148,7 @@
     },
     props: ['row'],
     ready () {
-      this.row = this.data
+      this.row = this.data ? this.data : this.row
       this.blodid = this.row.f_userinfo_id
       this.gasproperties = this.$appdata.getParam(this.row.f_user_type)
       if (this.row.f_gasproperties) {

package/src/filiale/gehua/HighMeterIdCard.vue

@@ -350,7 +350,6 @@
 
           this.isopen = true
           this.iswaiting = false
-          this.SetAutoCutOff()
         })
       },
       //关闭视频
@@ -550,31 +549,30 @@
         })
       },
       //设置自动裁边开启
-      SetAutoCutOn(){
-        console.log("设置自动裁边")
-        if(this.iswaiting) return
-        this.iswaiting = true
-        this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open:1,autocutoffset:-3},(msg) => {
-          if(msg.err !== 0) {
-            this.iswaiting = false
-            return
-          }
-          this.output("设置自动裁边 : open=" + 1)
-          this.iswaiting = false
-        })
-      },
+      // SetAutoCutOn(){
+      //   console.log("设置自动裁边")
+      //   if(this.iswaiting) return
+      //   this.iswaiting = true
+      //   this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open:1,autocutoffset:-3},(msg) => {
+      //     if(msg.err !== 0) {
+      //       this.iswaiting = false
+      //       return
+      //     }
+      //     this.iswaiting = false
+      //   })
+      // },
       //设置自动裁边关闭
-      SetAutoCutOff(){
-        if(this.iswaiting) return
-        this.iswaiting = true
-        this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open:0,autocutoffset:-3},(msg) => {
-          if(msg.err !== 0) {
-            this.iswaiting = false;
-            return;}
-          this.output("设置自动裁边 : open=" + 0);
-          this.iswaiting = false;
-        });
-      },
+      // SetAutoCutOff(){
+      //   if(this.iswaiting) return
+      //   this.iswaiting = true
+      //   this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open:0,autocutoffset:-3},(msg) => {
+      //     if(msg.err !== 0) {
+      //       this.iswaiting = false;
+      //       return;}
+      //     this.output("设置自动裁边 : open=" + 0);
+      //     this.iswaiting = false;
+      //   });
+      // },
       // //设置预设框选
       // SetBox(){
       //   if(this.iswaiting) return

package/src/filiale/huayin/CardMeterCenter.vue

@@ -372,7 +372,7 @@
           }
         }
       } else {
-        self.$dispatch('success')
+        self.$dispatch('success', '卡表收费')
       }
       self.clickConfirm = false
     } catch (error) {
@@ -469,7 +469,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)
@@ -696,7 +696,7 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.$dispatch('success', '卡表收费')
       },
       clean () {
         this.$info('取消操作')
@@ -713,7 +713,7 @@
             this.$CommonService.openEticket(this.row.id, '售气收费')
           }
         }
-        this.$dispatch('success')
+        this.$dispatch('success', '卡表收费')
       },
       pregas () {
         this.dymoney = 0

package/src/filiale/huayin/IOTMeterCenter.vue

@@ -351,10 +351,10 @@
           await self.$refs.eticketbill.openETicket([res.data.id], self.row, self.invoice_show_gas, self.invoice_is_pax, '物联网收费')
 
           // self.$CommonService.openEticket(res.data.id, '其他收费')
-          // self.$dispatch('success')
+          // self.$dispatch('success', '物联网收费')
         }
       } else {
-        self.$dispatch('success')
+        self.$dispatch('success', '物联网收费')
       }
     } catch (error) {
       if (error.status === 301) {
@@ -611,7 +611,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'])
@@ -656,7 +656,7 @@
             this.$CommonService.openEticket(this.row.id, '售气收费')
           }
         }
-        this.$dispatch('success')
+        this.$dispatch('success', '物联网收费')
       },
       pregas () {
         this.dymoney = 0