manage-client 3.2.168 → 3.2.170

package/src/filiale/liaoyuan/RecordInfoQuery.vue

@@ -288,7 +288,8 @@
                               :options='$parent.$parent.meterbooks' placeholder='请选择'
                               style="width:60%"
                               close-on-select
-                              condition="f_meter_book_num = '{}'"></v-select>
+                              condition="f_meter_book_num = '{}'">
+                    </v-select>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">房屋类型</label>
@@ -698,6 +699,9 @@
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
     // await self.$LoadParams.loadParam(self.f_filialeid)
+    await self.bookAll()
+    //加载抄表册
+    await self.initmeterbook()
     self.initParams()
     self.getPricenames();
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -756,7 +760,10 @@
         bookSlice:[{label: '全部',value: ''}],
         pricenames:[],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
-        useDate:[{label:"8年以内",value:"8年以内"},{label:"8年以上",value:"8年以上"}]
+        useDate:[{label:"8年以内",value:"8年以内"},{label:"8年以上",value:"8年以上"}],
+        meterbooks:[{label: '全部',value: ''}],  //抄表册
+        booksAllData: [],
+        allorgid:[],
       }
     },
     ready(){
@@ -768,6 +775,21 @@
       })
     },
     methods: {
+      async bookAll () {
+        let param={
+          items:'*',
+          tablename:'t_meter_book',
+          condition:` 1=1 and f_book_state='有效'`,
+          orderitem:'id'
+        }
+        await this.$resetpost('rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+            .then(item => {
+              this.booksAllData = item.data
+              this.booksAll = item.data.map(x => {
+                return {id: x.id,f_book_code: x.f_book_code}
+              })
+            })
+      },
       ReadIDCard(){
         this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
           console.log('======',msg)
@@ -986,45 +1008,31 @@
       },
       //表册片区和抄表册关联
       async inputtorchange(){
-        this.$set('$refs.paged.$refs.cri.model.f_meter_book',[]);
-        /*let val1=this.$refs.paged.$refs.cri.model.f_meter_book*/
-        let val2=this.$refs.paged.$refs.cri.model.f_book_slice_area
-        if((val2.length>0)){
-          let condition = ` 1=1 and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `
-          /*if (val1[0]){
-            condition = condition+ ` and f_meter_book = '${val1[0]}' `
-          }*/
-          if(val2[0]) {
-            condition = condition + ` and f_book_slice_area = '${val2}' `
-          }
-          let param={
-            items:'*',
-            tablename:'t_meter_book',
-            condition:condition,
-            orderitem:'id'
-          }
-          let getMeterBooks = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-          if (getMeterBooks.data) {
-            if(getMeterBooks.data.length >0){
-              let rs = [];
-              getMeterBooks.data.forEach((item)=>{
-                let temp = {
-                  label:item.f_book_name,
-                  value:item.id
-                };
-                rs.push(temp);
-
-              })
-              this.meterbooks = [{label: '全部',value: ''}, ...rs];
-            }else{
-              this.meterbooks = [{label: '全部',value: ''}];
+        let val = this.$refs.paged.$refs.cri.model.f_inputtor;
+        if(val != null && val != ""){
+          let bookData = this.booksAllData.filter(item => val.includes(item.f_inputtor) && this.allorgid.includes(item.f_orgid))
+          let rs = bookData.map(x => {
+            return {
+              label: `[${x.f_book_code}]-${x.f_book_name}`,
+              value: x.id
             }
-          }
+          })
+          this.meterbooks = [{label: '全部',value: ''}, ...rs];
+          this.$set('$refs.paged.$refs.cri.model.f_meter_book',[bookData[0] ? bookData[0].id : '']);
         }else{
-          this.meterbooks = [{label: '全部',value: ''}];
+          this.$set('$refs.paged.$refs.cri.model.f_meter_book','');
           this.initmeterbook();
         }
       },
+      async initmeterbook(){
+        let bs = this.booksAllData.filter(item => this.allorgid.includes(item.f_orgid)).map(x => {
+          return {
+            label: `${x.f_book_name}`,
+            value: x.id
+          }
+        })
+        this.meterbooks = [{label: '全部', value: ''}, ...bs]
+      },
     },
     watch:{
       'model.rows.length' () {
@@ -1063,6 +1071,10 @@
           }
           this.updateParams()
         }
+        this.$refs.paged.$refs.cri.model.f_book_slice_area=[]
+        this.$refs.paged.$refs.cri.model.f_meter_book = []
+        this.meterbooks = [{label: '全部',value: ''}]
+        this.initmeterbook()
       },
     },
     computed:{
@@ -1088,9 +1100,9 @@
       positions() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
       },
-      meterbooks(){
-        return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-      },
+      // meterbooks(){
+      //   return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+      // },
       // gasproperties() {
       //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
       // },