manage-client 3.3.1 → 3.3.3

package/src/filiale/wenxi/HandplanQuery.vue

@@ -133,16 +133,16 @@
 <!--                              condition="f_audit_date >= '{}'">-->
 <!--                  </datepicker>-->
 <!--                </div>-->
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <datepicker id="f_audit_date" placeholder="结束日期" style="width:60%"
-                              v-model="model.auditEndDate"
-                              :value.sync="model.auditEndDate"
-                              :format="'yyyy-MM-dd 23:59:59'"
-                              :show-reset-button="true"
-                              condition="f_audit_date <= '{}'">
-                  </datepicker>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>-->
+<!--                  <datepicker id="f_audit_date" placeholder="结束日期" style="width:60%"-->
+<!--                              v-model="model.auditEndDate"-->
+<!--                              :value.sync="model.auditEndDate"-->
+<!--                              :format="'yyyy-MM-dd 23:59:59'"-->
+<!--                              :show-reset-button="true"-->
+<!--                              condition="f_audit_date <= '{}'">-->
+<!--                  </datepicker>-->
+<!--                </div>-->
 
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>

package/src/filiale/wenxi/MeterQuery.vue

@@ -452,7 +452,7 @@
 </template>
 
 <script>
-import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
 import exportConfig from './config/exportConfig'
 
 let cardBtnGen = async function (self, val) {
@@ -480,9 +480,6 @@ let cardBtnGen = async function (self, val) {
 }
 
 let readySomething = async function (self) {
-  self.$MagGetSaleParam.initinputtor();
-  self.getinputtores();
-  self.initmeterbook();
   // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
   // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
   // await self.$refs.paged.$refs.cri.search()
@@ -535,14 +532,14 @@ export default {
       pricenames: [],
       gasproperties: [],
       inputtouPerson: [],
-      meterbooks: [{label: '全部', value: ''}],  //抄表册
+      meterbooks: [],  //抄表册
       prices: [],
       //合计数据
       sumsmodel: {},
       //表册片区
       bookSlice: [{label: '全部', value: ''}],
       inputtores: [{label: '全部', value: ''}],  //抄表员
-      f_filialeid: this.$login.f.f_orgid,
+      f_filialeid: this.$login.f.orgid,
       allorgid: [],
       tempfalg: false,
       lastorgstr: '',
@@ -557,6 +554,7 @@ export default {
   ready() {
     console.log("===========", this.$filialeInfo)
     this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null ? true : this.$appdata.getSingleValue('是否显示筛选框')
+    this.loadMeterBooks()
     readySomething(this).then(() => {
       this.$emit('ready')
     }).catch((error) => {
@@ -583,29 +581,15 @@ export default {
       // this.clear()
       cardBtnGen(this, val)
     },
-    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 getinputtores() {
-      // 获取抄表员
-      let rs = []
-      if (this.$login.f.f_gasman.length > 0) {
-        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
-          let temp = {
-            label: this.$login.f.f_gasman[i].name,
-            value: this.$login.f.f_gasman[i].name
-          }
-          rs.push(temp)
-        }
-      }
-      this.inputtores = [{label: '全部', value: ''}, ...rs]
+    loadMeterBooks () {
+      let http = new HttpResetClass()
+      this.$resetpost('rs/logic/sale_getMeterBooksData', {data: {f_orgid: this.f_filialeid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'}).then(res=>{
+        let arr = []
+        res.data.meterbooks.forEach((item, index) => {
+          arr.push({label: item.f_book_name, value: item.id})
+        })
+        this.meterbooks = [{label: '全部', value: ''}, ...arr]
+      })
     },
     getotherfooter() {
       // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
@@ -635,17 +619,6 @@ export default {
       this.show = true
     },
     selfSearch(args) {
-      //抄表员查询条件
-      this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-      if (this.inputtouPerson.length !== 0) {
-        let str = JSON.stringify(this.inputtouPerson)
-        str = str.replace(/"/g, `'`)
-        str = str.replace(/\[/g, ``)
-        str = str.replace(/\]/g, ``)
-        console.log("=====抄表员model22222222222绑定====", str)
-        //查询多个抄表员时条件
-        args.condition += ` and f_inputtor in  ( ${str} )`
-      }
       if (!this.orgCondtionStr) {
         args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
       } else {
@@ -805,35 +778,35 @@ export default {
     },
     'modelval.length'() {
       this.put()
-    },
-    async 'orgCondtionStr'(val) {
-      //更新抄表册
-      this.meterbooks = [{label: '全部', value: ''}];
-      if (this.lastorgstr != val) {
-        this.tempfalg = true;
-        this.lastorgstr = val;
-      }
-      if (this.tempfalg && val != null && val != '' && val.indexOf("(") > -1) {
-        this.tempfalg = false;
-        let a = val.substring(val.indexOf("(") + 2)
-        await this.initmeterbook(a.substring(0, a.indexOf(")") - 1));
-      }
-      let res = val.match(/'(.*?)'/)
-      console.log('正则提取:', res && res[1])
-      if (res) {
-        this.f_filialeid = res[1]
-        if (res.input != null) {
-          let resorgid = res.input.substring(res.input.indexOf("'"));
-          if (resorgid != null && resorgid != '') {
-            resorgid = resorgid.substring(0, resorgid.lastIndexOf("'") + 1);
-            // resorgid = resorgid.replaceAll("'","");
-            resorgid = resorgid.replace(/'/g, "");
-            this.allorgid = resorgid.split(",")
-          }
-        }
-        this.updateParams()
-      }
     }
+    // async 'orgCondtionStr'(val) {
+    //   //更新抄表册
+    //   this.meterbooks = [{label: '全部', value: ''}];
+    //   if (this.lastorgstr != val) {
+    //     this.tempfalg = true;
+    //     this.lastorgstr = val;
+    //   }
+    //   if (this.tempfalg && val != null && val != '' && val.indexOf("(") > -1) {
+    //     this.tempfalg = false;
+    //     let a = val.substring(val.indexOf("(") + 2)
+    //     await this.initmeterbook(a.substring(0, a.indexOf(")") - 1));
+    //   }
+    //   let res = val.match(/'(.*?)'/)
+    //   console.log('正则提取:', res && res[1])
+    //   if (res) {
+    //     this.f_filialeid = res[1]
+    //     if (res.input != null) {
+    //       let resorgid = res.input.substring(res.input.indexOf("'"));
+    //       if (resorgid != null && resorgid != '') {
+    //         resorgid = resorgid.substring(0, resorgid.lastIndexOf("'") + 1);
+    //         // resorgid = resorgid.replaceAll("'","");
+    //         resorgid = resorgid.replace(/'/g, "");
+    //         this.allorgid = resorgid.split(",")
+    //       }
+    //     }
+    //     this.updateParams()
+    //   }
+    // }
   },
   computed: {
     authArr() {