sale-client 4.2.145 → 4.2.146

package/src/filiale/meihekou/MeterOperatemain.vue

@@ -280,6 +280,11 @@ var data
     methods: {
       initoperator () {
         this.foperator = []
+        // If a department is selected, fetch operators for that department from server
+        if (this.model && this.model.f_depid) {
+          this.fetchOperatorsByDep(this.model.f_depid)
+          return
+        }
         console.log('this.$login', this.$login, this.oldmodel, this.$GetSaleParam.inputtors)
         let arr = this.$GetSaleParam.inputtors.filter((res) => {
           if (res.rolestr != null && res.rolestr !== '') {
@@ -290,6 +295,50 @@ var data
           this.foperator.push({label: res.name, value: res.id})
         })
       },
+      // Fetch operators by department id from server, fallback to local inputtors
+      fetchOperatorsByDep (depid) {
+        if (!depid) return
+        let http = new HttpResetClass()
+        http.load('POST', 'api/af-revenue/sql/saleSingleTable',
+          { data: {tablename: 't_user', condition: `parentid = '${depid}' or f_department_id = '${depid}'`}},
+          {resolveMsg: null, rejectMsg: null}).then((res) => {
+            if (res.data && res.data.length > 0) {
+              this.foperator = []
+              res.data.forEach((row) => {
+                this.foperator.push({ label: row.name, value: row.id })
+              })
+              // keep current operator if present, else clear
+              if (this.model && this.model.f_operatorid) {
+                const exists = this.foperator.some(op => op.value === this.model.f_operatorid)
+                if (!exists) {
+                  this.model.f_operatorid = ''
+                  this.model.f_operator = ''
+                }
+              }
+            } else {
+              // fallback to local inputtors
+              this.foperator = []
+              if (this.$GetSaleParam && this.$GetSaleParam.inputtors) {
+                this.$GetSaleParam.inputtors.forEach((res) => {
+                  if (res.rolestr && res.rolestr.indexOf('营业员') > -1
+                    && (res.parentid === depid || res.f_department_id === depid)) {
+                    this.foperator.push({ label: res.name, value: res.id })
+                  }
+                })
+              }
+            }
+          }).catch(() => {
+            this.foperator = []
+            if (this.$GetSaleParam && this.$GetSaleParam.inputtors) {
+              this.$GetSaleParam.inputtors.forEach((res) => {
+                if (res.rolestr && res.rolestr.indexOf('营业员') > -1
+                  && (res.parentid === depid || res.f_department_id === depid)) {
+                  this.foperator.push({ label: res.name, value: res.id })
+                }
+              })
+            }
+          })
+      },
       initdep () {
         this.fdep = []
         // 确保 inputtors 已加载
@@ -363,6 +412,8 @@ var data
                 this.model.f_depid = ''
                 this.$showAlert('部门信息未找到', 'warning', 2000)
               }
+              // fetch operators for selected department
+              this.fetchOperatorsByDep(id)
             })
       },
       onDepSelect (resIds, labels) {
@@ -374,7 +425,12 @@ var data
           this.model.f_depid = ''
           this.model.f_depname = ''
         }
-        // 保持向后兼容：若需要继续使用原 selectdep 逻辑，可补充调用
+        // fetch operators for the newly selected department
+        if (this.model.f_depid) {
+          this.fetchOperatorsByDep(this.model.f_depid)
+        } else {
+          this.initoperator()
+        }
       },
       selectoperator () {
         let id = this.model.f_operatorid
@@ -426,8 +482,8 @@ var data
                 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)
             }