sale-client 3.6.365 → 3.6.366

package/build/dev-server.js

@@ -29,12 +29,12 @@ var devConfig = {
       '/invoice/rs/logic/getInvoice': {
         target: serverRul
       },
-      '/rs/sql/filemanage_getUserfies':{
-        target: 'http://127.0.0.1:8080/'
-      },
-      '/rs/logic/importNetworkValve':{
-        target: 'http://127.0.0.1:8080/'
-      },
+      // '/rs/sql/filemanage_getUserfies':{
+      //   target: 'http://127.0.0.1:8080/'
+      // },
+      // '/rs/logic/importNetworkValve':{
+      //   target: 'http://127.0.0.1:8080/'
+      // },
       '/rs/file': {
         target: localUrl
       },

package/package.json

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

package/src/components/FilesManage/Edit.vue

@@ -7,11 +7,11 @@
 </template>
 
 <script>
-import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+import HttpResetClass from 'vue-client/src/plugins/HttpResetClass'
 
 export default {
   title: 'App',
-  data() {
+  data () {
     return {
       inputText: '',
       showSketchPage: false,
@@ -19,28 +19,50 @@ export default {
       sketchId: '',
       title: '',
       paperMessage: ''
-    };
+    }
   },
   props: {
     row: ''
   },
-  async ready() {
+  ready () {
     if (this.row) {
-      await new HttpResetClass().load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+      new HttpResetClass().load('POST', 'rs/sql/tel_singleTable_OrderBy', {
         data: {
           items: 'blob', tablename: 't_blob_sketch', condition: `id  = '${this.row}'`, orderitem: 'id'
         }
-      }).then(res => {
+      }).then(async res => {
         if (res.data.length === 0) {
           this.handleClick()
           return
         }
+        let resDataUserfiles = await new HttpResetClass().load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+          data: {
+            items: '*', tablename: 't_userfiles', condition: `f_userinfo_id = '${this.row}'`, orderitem: ' f_userfiles_id desc '
+          }
+        })
+        var userfilesJson = {}
+        if (resDataUserfiles.data.length > 0) {
+          resDataUserfiles.data.forEach(v => {
+            userfilesJson[v.f_meternumber] = {
+              cardNo: v.f_card_id,
+              meterType: v.f_meter_classify,
+              meterGasnums: v.f_total_gas,
+              meterBalance: v.f_balance == 0 ? v.f_balance_amount : v.f_balance,
+              meterTolal: v.f_total_fee
+            }
+          })
+        }
         try {
-          let hex = Buffer.from(res.data[0].blob, 'hex').toString('utf8');
+          let hex = Buffer.from(res.data[0].blob, 'hex').toString('utf8')
           if (!hex.includes('{')) {
-            this.inputText = Buffer.from(hex, 'hex').toString('utf8');
+            let jsonstr = Buffer.from(hex, 'hex').toString('utf8')
+            let json = JSON.parse(jsonstr)
+            json['AddParams4NewSys'] = userfilesJson
+            this.inputText = json
           } else {
-            this.inputText = hex;
+            let json = JSON.parse(hex)
+            json['AddParams4NewSys'] = userfilesJson
+            this.inputText = json
           }
         } catch (e) {
           this.$showMessage('网络异常请联系管理员')
@@ -51,17 +73,17 @@ export default {
   },
   methods: {
     handleClick() {
-      this.showSketchPage = true;
+      this.showSketchPage = true
       this.$nextTick(() => {
-        const sketchIframe = document.getElementById('aaaa2');
+        const sketchIframe = document.getElementById('aaaa2')
 
         window.addEventListener('message', (event) => {
           if (JSON.parse(event.data.param).gadgets.length > 0) {
-            this.paperMessage = event.data.param;
+            this.paperMessage = event.data.param
           }
-        });
-
-        sketchIframe.contentWindow.postMessage(this.inputText, '*');
+        })
+        console.log(JSON.stringify(this.inputText))
+        sketchIframe.contentWindow.postMessage(JSON.stringify(this.inputText), '*')
       })
     },
     savePaper() {
@@ -76,7 +98,7 @@ export default {
       }
       let gadgets = param.gadgets
       if (gadgets.length > 0) {
-        var jsonString = JSON.stringify(param);
+        var jsonString = JSON.stringify(param)
         var reqdata = {
           blob: Buffer.from(jsonString, 'utf8').toString('hex'),
           orgid: this.$login.f.orgid,
@@ -94,33 +116,34 @@ export default {
       }
     },
     hexToBytes(hex) {
-      for (var bytes = [], c = 0; c < hex.length; c += 2)
-        bytes.push(parseInt(hex.substring(c, 2), 16));
-      return new Uint8Array(bytes);
+      for (var bytes = [], c = 0; c < hex.length; c += 2) {
+        bytes.push(parseInt(hex.substring(c, 2), 16))
+      }
+      return new Uint8Array(bytes)
     },
     decodeHexStringToJSON(hexString) {
       // 去除前缀 "0x"
-      var cleanHexString = hexString.slice(2);
+      var cleanHexString = hexString.slice(2)
 
       // 将十六进制字符串转换为字节数组
-      var byteArray = this.hexToBytes(cleanHexString);
+      var byteArray = this.hexToBytes(cleanHexString)
 
       // 创建 Blob 对象
-      var blob = new Blob([byteArray], {type: 'application/json'});
+      var blob = new Blob([byteArray], {type: 'application/json'})
 
       // 读取 Blob 为文本
       return new Promise(function (resolve, reject) {
-        var reader = new FileReader();
+        var reader = new FileReader()
         reader.onloadend = function () {
-          resolve(reader.result);
-        };
+          resolve(reader.result)
+        }
         reader.onerror = function () {
-          reject(reader.error);
-        };
-        reader.readAsText(blob, 'UTF-8');
-      });
+          reject(reader.error)
+        }
+        reader.readAsText(blob, 'UTF-8')
+      })
     }
-  },
+  }
   // beforeDestroy() {
   //   this.savePaper()
   // }

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -330,7 +330,6 @@ export default {
       // 将小区信息转化为综合信息的格式
       await this.areainfoInUser(this.areainfo)
     }
-    console.log('this.blodid------------>', this.blodid)
   },
   watch: {
     async 'row' (val) {