sale-client 4.2.101 → 4.2.102

package/src/filiale/meihekou/handOperate.vue

@@ -158,7 +158,13 @@
         <div class="row">
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">所属部门</label>
-            <input type="text" v-model="model.f_depname" disabled=disabled style="width: 60%" class="input_search">
+            <res-select restype="department"
+                        :is-mul="false"
+                        :disabled="!editdep"
+                        :parentresid="model.f_orgid ? [model.f_orgid] : ($login && $login.f && $login.f.orgid ? [$login.f.orgid] : [])"
+                        :initresid="model.f_depid ? [model.f_depid] : []"
+                        @res-select="onDepSelect">
+            </res-select>
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">所属公司</label>
@@ -211,8 +217,9 @@ import {HttpResetClass} from 'vue-client'
 import * as Util from "../../components/../Util";
 var data
 let readyGen = async function (self) {
-  await  self.$LoadParams.loadParam(self.f_filialeid)
-  await    self.$GetSaleParam.initinputtor()
+  await self.$LoadParams.loadParam(self.f_filialeid)
+  await self.$GetSaleParam.initinputtor()
+  await self.initdep()
   await self.initperson()
 }
 export default {
@@ -226,6 +233,8 @@ export default {
       priceSplit: false,
       recordList: [],
       person:[],
+      fdep: [],
+      editdep: false,
       fileNameSet: {
         'f_meter_state': '抄表状态',
         'f_hand_state': '抄表单状态',
@@ -258,12 +267,47 @@ export default {
     if (this.$login.r.includes('维护银行转账信息')) {
       this.editbank = true
     }
+    if (this.$login.r.includes('抄表记录维护部门权限')) {
+      this.editdep = true
+    }
     this.oldmodel = JSON.parse(JSON.stringify(this.model))
     readyGen(this)
   },
   created () {
   },
   methods: {
+    onDepSelect (resIds, labels) {
+      if (resIds && resIds.length > 0) {
+        this.model.f_depid = resIds[0]
+        this.model.f_depname = labels && labels.length > 0 ? labels[0] : ''
+      } else {
+        this.model.f_depid = ''
+        this.model.f_depname = ''
+      }
+      // 选部门后刷新人员列表
+      this.initperson()
+    },
+    initdep () {
+      this.fdep = []
+      if (!this.$GetSaleParam || !this.$GetSaleParam.inputtors) {
+        return
+      }
+      const inputtors = this.$GetSaleParam.inputtors
+      const orgId = this.model.f_orgid || (this.$login && this.$login.f && this.$login.f.orgid)
+      const filterdep = inputtors.filter((res) => {
+        const hasRole = res.rolestr && res.rolestr.indexOf('营业员') > -1
+        const orgMatch = res.f_organization_id === orgId || res.f_orgid === orgId
+        return hasRole && orgMatch
+      })
+      filterdep.forEach((res) => {
+        if (res.parentid && res.f_department_name && !this.fdep.some((d) => d.value === res.parentid)) {
+          this.fdep.push({label: res.f_department_name, value: res.parentid})
+        }
+      })
+      if (this.model.f_depid && !this.fdep.some((d) => d.value === this.model.f_depid)) {
+        this.fdep.push({label: this.model.f_depname || this.model.f_depid, value: this.model.f_depid})
+      }
+    },
     initperson () {
       this.person = []
       let arr = this.$GetSaleParam.inputtors.filter((res) => {
@@ -275,6 +319,20 @@ export default {
         this.person.push({label: res.name, value: res.name})
       })
     },
+    selectdep () {
+      const id = this.model.f_depid
+      if (!id) {
+        this.model.f_depname = ''
+        this.initperson()
+        return
+      }
+      const hit = this.$GetSaleParam.inputtors.find((res) => res.parentid === id || res.f_department_id === id)
+      if (hit && hit.f_department_name) {
+        this.model.f_depname = hit.f_department_name
+      }
+      // 选部门后刷新人员列表
+      this.initperson()
+    },
     fileterprice (row) {
       this.priceSplit = true
       console.log('row==>', row)
@@ -387,6 +445,7 @@ export default {
       }
     },
     'model' () {
+      this.initdep()
       this.initperson()
     }
   }

package/src/filiale/meihekou/replacementSingleInfoOperation.vue

@@ -103,7 +103,13 @@
         <div class="row">
           <div class="col-sm-4">
             <label class="font_normal_body">部&nbsp;&nbsp;&nbsp;门&nbsp;&nbsp;&nbsp;</label>
-            <input type="text" v-model="model.f_depname" disabled=disabled  style="width: 60%" class="input_search">
+            <res-select restype="department"
+                        :is-mul="false"
+                        :disabled="!editdep"
+                        :parentresid="model.f_orgid ? [model.f_orgid] : ($login && $login.f && $login.f.orgid ? [$login.f.orgid] : [])"
+                        :initresid="model.f_depid ? [model.f_depid] : []"
+                        @res-select="onDepSelect">
+            </res-select>
           </div>
           <div class="col-sm-4 ">
             <label class="font_normal_body" title="参数:操作人员查询">操作人员</label>
@@ -142,8 +148,9 @@
   import * as Util from "../../Util";
   var data
   let readyGen = async function (self) {
-    await  self.$LoadParams.loadParam(self.f_filialeid)
-    await    self.$GetSaleParam.initinputtor()
+    await self.$LoadParams.loadParam(self.f_filialeid)
+    await self.$GetSaleParam.initinputtor()
+    await self.initdep()
     await self.initoperator()
   }
   export default {
@@ -159,6 +166,8 @@
         showfiles: false,
         recordList: [],
         foperator:[],
+        fdep: [],
+        editdep: false,
         fileNameSet: {
           // 要更改字段的中文名
           'f_cardfees': '卡费',
@@ -180,6 +189,9 @@
       if (this.$login.r.includes('维护补卡信息')) {
         this.editbank = true
       }
+    if (this.$login.r.includes('补卡记录维护部门权限')) {
+      this.editdep = true
+    }
       this.oldmodel = JSON.parse(JSON.stringify(this.model))
       this.model.f_bill_state = [this.oldmodel]
       readyGen(this)
@@ -206,6 +218,50 @@
           }
         }
       },
+      initdep () {
+        this.fdep = []
+        if (!this.$GetSaleParam || !this.$GetSaleParam.inputtors) {
+          return
+        }
+        const inputtors = this.$GetSaleParam.inputtors
+        const orgId = this.model.f_orgid || (this.$login && this.$login.f && this.$login.f.orgid)
+        const filterdep = inputtors.filter((res) => {
+          const hasRole = res.rolestr && res.rolestr.indexOf('营业员') > -1
+          const orgMatch = res.f_organization_id === orgId || res.f_orgid === orgId
+          return hasRole && orgMatch
+        })
+        filterdep.forEach((res) => {
+          if (res.parentid && res.f_department_name && !this.fdep.some((d) => d.value === res.parentid)) {
+            this.fdep.push({label: res.f_department_name, value: res.parentid})
+          }
+        })
+        if (this.model.f_depid && !this.fdep.some((d) => d.value === this.model.f_depid)) {
+          this.fdep.push({label: this.model.f_depname || this.model.f_depid, value: this.model.f_depid})
+        }
+      },
+      selectdep () {
+        const id = this.model.f_depid
+        if (!id) {
+          this.model.f_depname = ''
+          return
+        }
+        const hit = this.$GetSaleParam.inputtors.find((res) => res.parentid === id || res.f_department_id === id)
+        if (hit && hit.f_department_name) {
+          this.model.f_depname = hit.f_department_name
+        }
+        // 选部门后刷新操作员列表
+        this.initoperator()
+      },
+      onDepSelect (resIds, labels) {
+        if (resIds && resIds.length > 0) {
+          this.model.f_depid = resIds[0]
+          this.model.f_depname = labels && labels.length > 0 ? labels[0] : ''
+        } else {
+          this.model.f_depid = ''
+          this.model.f_depname = ''
+        }
+        this.initoperator()
+      },
       selectoperator () {
         let id = this.model.f_operatorid
         if(!this.model.f_operatorid){
@@ -226,6 +282,17 @@
           console.log('this.f_operatorid', this.model.f_operator)
         })
       },
+    onDepSelect (resIds, labels) {
+      if (resIds && resIds.length > 0) {
+        this.model.f_depid = resIds[0]
+        this.model.f_depname = labels && labels.length > 0 ? labels[0] : ''
+      } else {
+        this.model.f_depid = ''
+        this.model.f_depname = ''
+      }
+      // 选部门后刷新操作员列表
+      this.initoperator()
+    },
       cancel () {
         this.$dispatch('close')
       },
@@ -267,8 +334,8 @@
               f_operatorid : this.$login.f.id,
               f_orgid : this.$login.f.orgid,
               f_orgname : this.$login.f.orgs,
-              f_depid : this.$login.f.depids,
-              f_depname : this.$login.f.deps
+              f_depid : this.model.f_depid,
+              f_depname : this.model.f_depname
             }
             this.recordList.push(car)
             // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
@@ -288,10 +355,11 @@
     computed: {
       fillcard_state () {
         return [...this.$appdata.getParam('补卡状态')]
-      },
+      }
     },
     watch: {
       'model'(){
+        this.initdep()
         this.initoperator()
       }
     }

package/src/filiale/meihekou/sale.js

@@ -75,4 +75,6 @@ export default function () {
   Vue.component('replacement-single-info-operation', (resolve) => { require(['./replacementSingleInfoOperation'], resolve) })
   // 单户调价
   Vue.component('user-pricechange-manage', (resolve) => { require(['./UserPriceChangeManage'], resolve) })
+  // 交费具体信息金额
+  Vue.component('meter-operate-maintain', (resolve) => { require(['./MeterOperatemain'], resolve) })
 }

package/.npmignore

@@ -1,12 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/
-examples/
-gradle/
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-lib/**/lib

package/src/.npmignore

@@ -1 +0,0 @@
-