manage-client 3.2.60 → 3.2.64

package/src/filiale/WEINAN/SiteManager.vue

@@ -13,7 +13,7 @@ import {HttpResetClass } from 'vue-client'
 let getData = function * (self) {
   let load = new HttpResetClass()
   load.load('POST','rs/sql/getPregas',
-  {data: {startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59',f_orgid: `f_orgid = ${self.orgid}`}},
+  {data: {startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59',f_orgid: `f_orgid = ${self.orgid}`,condition: '1=1'}},
   {resolveMsg: null, rejectMsg: null})
   .then((res) => {
     let data = res.data

package/src/filiale/WEINAN/config/tableConfig.js

@@ -1,20 +1,20 @@
-export default{
-  //查询页面的字段名和中文对应
-  ReportDataQuery:
-    {
-      "用户编号":"f_userinfo_code",
-      "用户名称":"f_user_name",
-      "气表品牌":"f_meter_brand",
-      "气表编号":"f_meternumber",
-      "上次抄表底数":"f_last_tablebase",
-      "本次抄表底数":"f_tablebase",
-      "单价":"f_price",
-      "用气量":"f_oughtamount",
-      "用气金额":"f_oughtfee",
-      "表内剩余余额":"f_jval",
-      "抄表日期":"f_insert_date",
-      "上次抄表日期":"f_last_insertdate",
-      "阀门开启状态":"f_valvestate"
-    }
-
-}
+export default{
+  //查询页面的字段名和中文对应
+  ReportDataQuery:
+    {
+      "用户编号":"f_userinfo_code",
+      "用户名称":"f_user_name",
+      "气表品牌":"f_meter_brand",
+      "气表编号":"f_meternumber",
+      "上次抄表底数":"f_last_tablebase",
+      "本次抄表底数":"f_tablebase",
+      "单价":"f_price",
+      "用气量":"f_oughtamount",
+      "用气金额":"f_oughtfee",
+      "表内剩余余额":"f_jval",
+      "抄表日期":"f_insert_date",
+      "上次抄表日期":"f_last_insertdate",
+      "阀门开启状态":"f_valvestate"
+    }
+
+}

package/src/filiale/WEINAN/reportManage.js

@@ -3,6 +3,7 @@ let specialComp = {
   // 收费查询
   'echarts-box': (resolve) => { require(['./EchartsBox'], resolve) },
   'site-manager': (resolve) => { require(['./SiteManager'], resolve) },
+  'bank-manager': (resolve) => { require(['./BankManager'], resolve) }
 
 }
 exports.specialComp = specialComp

package/src/filiale/jingwei/RecordInfoQuery.vue

@@ -303,6 +303,14 @@
                               condition="f_devices_type = '{}'"
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="f_adjustable" class="font_normal_body">&nbsp;&nbsp;&nbsp;调压箱</label>
+                    <v-select id="f_adjustable" :value.sync="model.f_adjustable_id"
+                              :options='$parent.$parent.adjustables' placeholder='调压箱' close-on-select
+                              v-model='model.f_adjustable_id'
+                              condition="f_adjustable_id = '{}'"
+                              :search='true'></v-select>
+                  </div>
                 </div>
 
               </div>
@@ -621,7 +629,8 @@
     await self.$MagLoadParams.loadParam()
     // await self.$LoadParams.loadParam(self.f_filialeid)
     self.initParams()
-    self.getPricenames();
+    self.getPricenames()
+    self.adjustable()
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
     // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
@@ -682,6 +691,7 @@
           dep:[],
           user:[],
         },
+        adjustables: [],
         // 合计数据
         sumsmodel: {},
         //表册片区
@@ -747,6 +757,7 @@
         // this.footer.push(footerData);
         this.other.push(otherInData);
       },
+
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -918,6 +929,19 @@
           })
         }
       },
+      adjustable () {
+        let arr = []
+        let filter = this.$login.f.orgid
+        console.log('xcx', this.$login.f.orgid, this.$MagGetSaleParam.getAdjustable(filter))
+        this.$MagGetSaleParam.getAdjustable(filter).forEach((item) => {
+          console.log('vvvv', item)
+          let temp = {}
+          temp.label = `[${item.value.f_adjustable_id}]-${item.label}`
+          temp.value = item.value.id
+          arr.push(temp)
+        })
+        this.adjustables = [{label: '全部', value: ''}, ...arr]
+      },
       //表册片区和抄表册关联
       async inputtorchange(){
         this.$set('$refs.paged.$refs.cri.model.f_meter_book',[]);
@@ -949,14 +973,13 @@
                 rs.push(temp);
 
               })
-              this.meterbooks = [{label: '全部',value: ''}, ...rs];
+              this.meterbooks = [{label: '全部',value: ''}, ...rs]
             }else{
-              this.meterbooks = [{label: '全部',value: ''}];
+              this.meterbooks = [{label: '全部',value: ''}]
             }
           }
         }else{
-          this.meterbooks = [{label: '全部',value: ''}];
-          this.initmeterbook();
+          this.meterbooks = [{label: '全部',value: ''}]
         }
       },
         sort (field, rule) {
@@ -1032,9 +1055,7 @@
       TableStates () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },
-      // gasproperties(){
-      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      // },
+
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },

package/src/filiale/pingxiang/sale.js

@@ -1,9 +1,9 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  'changeuser-query': (resolve) => { require(['./ChangeUserQuery'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  'changeuser-query': (resolve) => { require(['./ChangeUserQuery'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/qingtongxia/sale.js

@@ -1,13 +1,13 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
-  'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) },
-  'sell-people-query': (resolve) => { require(['./SellPeopleQuery'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
+  'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) },
+  'sell-people-query': (resolve) => { require(['./SellPeopleQuery'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+