sale-client 3.6.365 → 3.6.367

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.367",
   "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) {

package/src/filiale/kelai/MeterinfoTest.vue

@@ -188,18 +188,20 @@
             <input type="number" class="input_search" style="width:60%" v-model="fireinfo.f_use_limit"
                    placeholder='表具使用年限' >
           </div>
+
           <div class="col-sm-4 form-group" :class="[$m.f_gas_person.required ? 'has-error col' : '']">
+            <input type="text" style="width:60%" v-model="$refs.f_gas_person.value" v-show="false" v-validate:f_gas_person='{required: true }'>
             <label for="f_gas_person" class="font_normal_body">&ensp;通&ensp;气&ensp;人</label>
             <v-select
               :value.sync="row.f_gas_person"
               v-model="row.f_gas_person"
               :options='gasperson'
               placeholder='通气人'
+              v-ref:f_gas_person
               close-on-select
-              v-validate:f_gas_person='{ required: true }'
-              :class="{ 'is-invalid': errors.has('f_gas_person') }"
             ></v-select>
           </div>
+
           <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error col' : '']">
             <input type="text" v-model="$refs.f_gas_date.value" v-show="false"  v-validate:f_gas_date='{required: true }'>
             <label for="f_gas_date" class="font_normal_body">&ensp;通气日期</label>
@@ -555,6 +557,7 @@
         usestate: this.$appdata.getParam('使用状态'),
         aroundmeters: this.$appdata.getParam('左右表'),
         garbagefee: this.$appdata.getParam('垃圾费'),
+        gasperson: this.$appdata.getParam('通气人员'),
         valvestate: this.$appdata.getParam('阀门状态'),
         usertypes: this.$appdata.getParam('用户类型'),
         handmonth: [{label: '单月', value: '单月'}, {label: '双月', value: '双月'}],
@@ -900,9 +903,6 @@
       usestate () {
         return this.$appdata.getParam('使用状态')
       },
-      gasperson () {
-        return this.$appdata.getParam('通气人员')
-      },
       gongyetype () {
         return this.$appdata.getParam('工业备注')
       },

package/src/filiale/liaoyuan/Overduetax.vue

@@ -254,6 +254,7 @@
           dep: [],
           user: []
         },
+        query: false,
         orgCondtionStr: '',
         criteriaShow: false,
         model: new PagedList('rs/sql/getSearchOverdue', 20),
@@ -408,14 +409,18 @@
         }
       },
       search (args) {
-        console.log('===>', args)
-        console.log('=this.model==>', this.model)
-        if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        if (this.query) {
+          console.log('===>', args)
+          console.log('=this.model==>', this.model)
+          if (!this.orgCondtionStr) {
+            args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+          } else {
+            args.condition = `${args.condition}` + this.orgCondtionStr
+          }
+          this.model.search(args.condition)
         } else {
-          args.condition = `${args.condition}` + this.orgCondtionStr
+          this.query = true
         }
-        this.model.search(args.condition)
       },
       // 批量减免按钮
       async batchtax () {

package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue

@@ -42,7 +42,7 @@
             <label for="gasbrand" class="font_normal_body">气表品牌</label>
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
-            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
+            <v-select :value.sync="row.gasbrand" :options='meterbrands' :menu-width='menuWidth'  :min-width='menuWidth'  placeholder='气表品牌' close-on-select
                       search @change='brandChange' v-model='row.gasbrand' v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
@@ -524,6 +524,7 @@
           overduesetShow: false,
           open_way: '指令开户'
         },
+        menuWidth: '200%',
         mapShow: false,
         viewsee: false,
         row: this.meter,
@@ -559,6 +560,7 @@
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id','overdueset'],
     ready () {
+      // console.log('this.minWidththis.minWidth--userfiles',this.menuWidth)
       console.log('看看meter里面的数据', this.meter, this.row)
       this.row = Object.assign(this.row, this.meter, {})
       this.oldrow = this.row

package/src/filiale/qianneng/FilesManageNew/MeterinfoTest.vue

@@ -33,7 +33,7 @@
             <label for="gasbrand" class="font_normal_body">*气表品牌</label>
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
-            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
+            <v-select :value.sync="row.gasbrand" :options='meterbrands' :menu-width='menuWidth'  :min-width='menuWidth' placeholder='气表品牌' close-on-select
                       search @change='brandChange' v-model='row.gasbrand' v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
@@ -340,6 +340,7 @@ let meterBookGen = function * (self) {
     data () {
       return {
         viewsee: false,
+        menuWidth: '200%',
         row: this.meter,
         show: false,
         field: '',