manage-client 3.2.197 → 3.2.198

package/build/dev-server.js

@@ -16,7 +16,7 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
-var bendi = 'http://219.138.226.181:8401'
+var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
 var system = 'http://192.168.50.4:8400'
@@ -27,18 +27,18 @@ var proxyTable = {
   '/rs/logic/exportfile': {
     target: bendi
   },
-  '/rs/sql/otherChargeQuery': {
-    target: 'http://localhost:8080/'
-  },
-  '/rs/sql/BusinessType': {
-    target: 'http://localhost:8080/'
-  },
-  '/rs/logic/getBatchOperaPro': {
-    target: 'http://localhost:8080/'
-  },
-  '/rs/customExport/areaChargeExportExcel': {
-    target: 'http://localhost:8080/'
-  },
+  // '/rs/sql/otherChargeQuery': {
+  //   target: 'http://localhost:8080/'
+  // },
+  // '/rs/sql/BusinessType': {
+  //   target: 'http://localhost:8080/'
+  // },
+  // '/rs/logic/getBatchOperaPro': {
+  //   target: 'http://localhost:8080/'
+  // },
+  // '/rs/customExport/areaChargeExportExcel': {
+  //   target: 'http://localhost:8080/'
+  // },
   '/files': {
     target: bendi
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.197",
+  "version": "3.2.198",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/filiale/qianneng/ArrearsQuery.vue

@@ -100,13 +100,6 @@
                             condition="f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_type" multiple
-                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
-                            condition="f_meter_type in {}"
-                            close-on-select></v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户证号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_book_no"
@@ -736,14 +729,14 @@
         } else {
           //小区查询条件
           let f_orgstr = this.orgCondtionStr
-          let str='1=1 '
+          let str=`1=1 `
           if(this.$refs.paged.$refs.cri.model.inputstartDate !== ''){
             str += `and f_input_date>='${this.$refs.paged.$refs.cri.model.inputstartDate}'`
           }
           if(this.$refs.paged.$refs.cri.model.inputendDate !== ''){
             str += `and f_input_date<='${this.$refs.paged.$refs.cri.model.inputendDate}'`
           }
-          args.condition = `${args.condition} ` + f_orgstr
+          args.condition = `${args.condition} ` + f_orgstr + ` and f_meter_type = '机表'`
           this.model.search(args.condition, args.model,str)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         }
@@ -852,7 +845,7 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr + ` and f_meter_type = '机表'`,
           condValue: `${this.model.condValue}`
         }
       },
@@ -862,9 +855,6 @@
       usertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
       chargetype() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费类型')]
       }

package/src/filiale/qianneng/HandplanQuery.vue

@@ -232,13 +232,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber = '{}' " placeholder="表号">
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_classify" multiple
-                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
-                            condition="f_meter_classify in {}"
-                            close-on-select></v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
                   <v-select :value.sync="model.f_meter_brand" multiple
@@ -787,8 +780,6 @@
     self.$MagGetSaleParam.initinputtor();
     self.getinputtores();
     self.initmeterbook();
-   // await self.$LoadParams.loadMeterBook(self.f_filialeid)
-   // self.loadMeterBooks()
    //  self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
    //  self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
     // self.$refs.paged.$refs.cri.model.handStartDate = self.$login.toStandardDateString() + ' 00:00:00'
@@ -798,12 +789,10 @@
 
     // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
     // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
-    // await self.$refs.paged.$refs.cri.search()
-    await self.$getConfig(self, 'HandplanQuery')
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     await self.$MagLoadParams.loadParam()
-    // await self.$MagLoadParams.loadParam()
-    self.initParams()
+    await self.initParams()
+    await self.$getConfig(self, 'HandplanQuery')
     console.log('开始查询')
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
@@ -912,16 +901,6 @@
           clearInterval(this.timer);
         }
       },
-      async initmeterbook(orgstr){
-        if(orgstr == null ){
-          orgstr = this.f_filialeid;
-        }
-        //获取新的抄表册,先去清理所有的抄表册
-        this.$GetSaleParam.meterbooks = [];
-        //开始加载新的抄表册
-        await this.$LoadParams.loadMeterBook(orgstr)
-        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-      },
       //初始化片区
       async initSlice (val) {
         if (val) {
@@ -1028,19 +1007,21 @@
         this.imgfilename = `rs/image/file/`+val
         this.imgshow = true
       },
-      initParams() {
+      async initParams() {
         // 初始化气表品牌
         let brandArr = []
-        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          temp.label = item.label
-          temp.value = item.value.f_meter_brand
-          brandArr.push(temp)
+        await this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          if (item.value.f_meter_type === '机表'){
+            let temp = {}
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            brandArr.push(temp)
+          }
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
         //初始化气价
         let result = []
-        this.$MagGetSaleParam.prices.forEach((item) => {
+        await this.$MagGetSaleParam.prices.forEach((item) => {
           if (item.f_state === '有效' && this.$login.f.orgid == item.f_filialeid) {
             let value = {
               label: item.f_price_name,
@@ -1128,7 +1109,7 @@
           args.condition += ` and f_inputtor in  ( ${str} )`
         }
 
-        args.condition = `${args.condition} ` + this.orgCondtionStr
+        args.condition = `${args.condition} ` + this.orgCondtionStr + ` and f_meter_classify = '机表'`
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
@@ -1141,7 +1122,6 @@
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
           this.$refs.paged.$refs.cri.model[key] = []
         })
-        this.$refs.paged.$refs.cri.model.f_meter_classify = []
       },
       show() {
         this.criteriaShow = true
@@ -1262,9 +1242,6 @@
     },
     computed: {
 
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
       banklist() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('银行名称')]
       },
@@ -1272,7 +1249,7 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr + ` and f_meter_classify = '机表'` }
       },
       getfield() {
         return exportConfig.handplanConfig

package/src/filiale/wuhai/ChargeQuery.vue

@@ -811,7 +811,7 @@
 
         footer:[],
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_pregas', 'f_collection', 'f_stairamount1', 'f_stair2amount', 'f_stair3amount','f_operate_date']
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_pregas', 'f_collection', 'f_stairamount1', 'f_stair2amount', 'f_stair3amount','f_operate_date','f_address','f_pregas','fee','f_payment','f_depname']
         },
         //排序
         orderitem:'f_operate_date desc',