manage-client 3.3.120 → 3.3.121-cs

package/src/filiale/lixianV3/GasAnalysisQuery.vue

@@ -68,7 +68,7 @@
                          condition="f_gasdiff >= '{}' " placeholder="大于等于">
                   <input type="text" style="width:30%" class="input_search" title="小于等于"
                          v-model="model.f_gasdiff_big"
-                         condition="f_gasdiff >= '{}' " placeholder="小于等于">
+                         condition="f_gasdiff <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
@@ -173,7 +173,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date >= '{} 00:00:00'">
+                              condition="f_gas_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group" >
@@ -183,7 +183,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date <= '{} 23:59:59'">
+                              condition="f_gas_date <= '{} 23:59:59'">
                   </datepicker>
                 </div>
               </div>
@@ -274,6 +274,11 @@ import exportConfig from './config/exportConfig'
 let readySomething = async function (self) {
   await self.$MagLoadParams.loadParam()
   self.initParams()
+  //获取新的抄表册,先去清理所有的抄表册
+  self.$GetSaleParam.meterbooks = [];
+  //开始加载新的抄表册
+  await self.$LoadParams.loadMeterBook(self.f_filialeid)
+  self.initmeterbook()
 }
 export default {
   props: ['data'],
@@ -293,6 +298,7 @@ export default {
         org: [this.$login.f.orgid]
       },
       meterbrands: [],
+      meterbooks:[],
       gasproperties : [],
       inputtores: [{label: '全部',value: ''}],
       criteriaShow: false,
@@ -317,6 +323,9 @@ export default {
     })
   },
   methods: {
+    async initmeterbook(){
+      this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+    },
     getotherfooter () {
       // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
       // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
@@ -433,9 +442,6 @@ export default {
     meterStyle () {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('燃气表型号')]
     },
-    meterbooks(){
-      return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-    },
 
 
   }