manage-client 3.3.132 → 3.3.133

package/package.json

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

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -154,6 +154,15 @@
                           style="width:60%"
                           v-model="model.f_instruct_title"></v-select>
               </div>
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">操&nbsp;作&nbsp;人</label>
+                <v-select :options='$parent.$parent.operators' :value.sync="model.f_operator" close-on-select
+                          condition="recordinfo.f_operator='{}'"
+                          placeholder='操作人'
+                          style="width:60%"
+                          v-model="model.f_operator"></v-select>
+              </div>
             </div>
           </div>
         </criteria>
@@ -319,6 +328,7 @@
 
   let readyGen = async function (self) {
     await self.$MagLoadParams.loadParam()
+    await self.$MagGetSaleParam.initinputtor()
     self.initQueryParam()
     self.getinstructtype()
     self.getinstructtitle()
@@ -326,6 +336,7 @@
     await self.$getConfig(self, 'NewQueryInstruct')
     console.log('指令查看config', self.config)
     self.getfield = self.config.excelHeaders
+    self.getOperators(self.$login.f.orgid)
     // self.reflash()
   }
   export default {
@@ -339,6 +350,7 @@
         criteriaShow:false,
         Gasproperties:[],
         meterbrand: [],
+        operators:[],
         userType:[],
         instructtype:[],
         instructstate:[],
@@ -425,6 +437,21 @@
         })
         this.meterbrand = [{label: '全部', value: ''}, ...arr]
       },
+      //获取资源数据
+       getOperators(orgid) {
+        this.operators = []
+         this.$MagGetSaleParam.inputtors.forEach((res) => {
+          if(res.rolestr != null &&  res.rolestr!='' ){
+            if(res.rolestr.indexOf("营业员")>-1 && res.f_orgid == orgid) {
+              let temp = {
+                label :res.name,
+                value:res.name,
+              }
+              this.operators.push(temp)
+            }
+          }
+        })
+      },
       getinstructtype(){
         this.instructtype=[]
         let load = new HttpResetClass()

package/src/filiale/qianneng/ArrearsQuery.vue

@@ -773,16 +773,25 @@
         await this.$MagLoadParams.loadParam(this.f_filialeid)
         this.inputtores = [];
         this.inputtores.push({label: "全部", value: ""})
-
-        let orgs = val.match(/'(.+?)'/g)
-        let allorgid = this.allorgid = orgs != null && orgs.length > 0 ? orgs.toString().replace(/(|)/g,'').split(',').map(item => item.replace(/'/g,'')) : []
-        if(allorgid != null && allorgid.length > 0){
-          allorgid.forEach((res)=>{
-            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
-          })
-        } else {
-          this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(this.f_filialeid));
+        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
+            }
+            this.inputtores.push(temp)
+          }
         }
+        //
+        // let orgs = val.match(/'(.+?)'/g)
+        // let allorgid = this.allorgid = orgs != null && orgs.length > 0 ? orgs.toString().replace(/(|)/g,'').split(',').map(item => item.replace(/'/g,'')) : []
+        // if(allorgid != null && allorgid.length > 0){
+        //   allorgid.forEach((res)=>{
+        //     this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
+        //   })
+        // } else {
+        //   this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(this.f_filialeid));
+        // }
         this.initParams()
       },
     },

package/src/filiale/qianneng/ChargeQuery.vue

@@ -34,7 +34,7 @@
                 <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_user_name"
-                         condition="f_user_name = '{}'" placeholder="客户名称">
+                          placeholder="客户名称">
                 </div>
 <!--                <div class="col-sm-2 form-group">-->
 <!--                  <label class="font_normal_body" title="旧客户编号">档案编号</label>-->
@@ -853,7 +853,7 @@
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'id asc'`,startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'id asc'`,startDate: 'this.model.startDate', endDate: 'this.model.endDate',f_user_name:'this.model.f_user_name'},{
           f_pregas: 0,
           f_delaypay: 0,
           fee:0,