修改备货多个角色不能选择

src/views/distribution/stockup/distributionStockup.vue

@@ -602,49 +602,25 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        // console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
-     await this.getStorageArea();
-     await this.getTeam();
+      await this.getStorageArea();
+      await this.getTeam();
 
     },
     //查询班组

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -729,47 +729,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -229,7 +229,6 @@
 
 <script>
 import { getList, getDetail, add, update, remove,getListUser,addAssign } from "@/api/distribution/distributionStockup";
-import { getPostList } from '@/api/system/post';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getListOwn,getUser } from '@/api/system/user';
 import option from "@/option/distribution/distributionStockup";
@@ -237,6 +236,8 @@ import { mapGetters } from "vuex";
 import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 import dayjs from 'dayjs';
 import { getDictionaryBiz } from '@/api/system/dict';
+import { getRoleTree } from '@/api/system/role';
+import { getPostList } from '@/api/system/post';
 
 export default {
   data () {
@@ -668,47 +669,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();
@@ -770,8 +746,8 @@ export default {
       if(!a){
         this.num = '3';
         this.dialogFormCustomer = true;
-        this.getFork();
-        this.getTeam();
+        this.getFork(); //查询叉车人员
+        this.getTeam();//查询班组
       }else{
         this.$message.warning("已指派，请勿重复指派！！！")
       }

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -667,47 +667,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        console.log("当前人信息res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",res.data.data);
-        res.data.data.forEach(i =>{
-          if(i.postName == "叉车"){
-            ide = i;
-          }
-        })
-      })
-      // console.log("ied>>>>>",ide);
-      let params={
-        // postId: ide.id, //岗位
-        deptId: this.deptId, //部门
-        // roleId: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();