From aaad6afceda5a6641f424de67e7cc33d8bc32a44 Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Wed, 30 Aug 2023 16:08:07 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 905bffef83461cceb5fc9c2ebac4a3991a1e70d1
Merge: f40f2ec 08b1e3c
Author: big-y <804609860@qq.com>
Date:   Wed Aug 30 15:12:10 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit f40f2ec43ba0999162cfd9e611b3973590dde25a
Author: big-y <804609860@qq.com>
Date:   Wed Aug 30 15:11:51 2023 +0800

    产品包配置回显问题已调整完成

commit 08b1e3c3697512f4f56440465a5a450a8dd6074c
Merge: bdcb96d 1db8162
Author: caoyizhong <1270296080@qq.com>
Date:   Wed Aug 30 14:35:59 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit bdcb96d90c0b79220f0f7700f49646b10ab2586c
Author: caoyizhong <1270296080@qq.com>
Date:   Wed Aug 30 14:35:52 2023 +0800

    添加全部订单记录

commit 1db8162b7e6640a4aba841b05f60598403c3050f
Author: 0.0 <1092404103.qq.com>
Date:   Wed Aug 30 11:04:35 2023 +0800

    1.仓库权限

commit e20a7de5dbfc234999041a47a2a4539a163c1049
Author: pref_mail@163.com <123456>
Date:   Tue Aug 29 22:30:16 2023 +0800

    修复预约

commit ec972fcd59457fe3377d586607eba86dcc6d1ecb
Author: kilo <wan.ren@foxmail.com>
Date:   Tue Aug 29 21:41:01 2023 +0800

    页面调整

commit 357d9cebd7e9ceb84362a66868b372085008618f
Author: caoyizhong <1270296080@qq.com>
Date:   Tue Aug 29 17:31:04 2023 +0800

    添加订单可空格查询

commit 7d75a1cf641a411515fc058cc52966782c335bff
Author: pref_mail@163.com <123456>
Date:   Tue Aug 29 17:14:26 2023 +0800

    修改运单显示字段

commit 21771e869973256019140c434959d9268bd20f5e
Author: 0.0 <1092404103.qq.com>
Date:   Tue Aug 29 17:08:25 2023 +0800

    1.禁用

commit d52dccc92791c7c26a25092fe0f0181a6c456cd8
Merge: 42ee206 ea10e1c
Author: caoyizhong <1270296080@qq.com>
Date:   Tue Aug 29 11:15:07 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 42ee2067e0a24a25d01f404895b7135f9ced5aa2
Author: caoyizhong <1270296080@qq.com>
Date:   Tue Aug 29 11:14:32 2023 +0800

    修改班组人员添加

# Conflicts:
#	src/views/basicdata/team/basicdataTeamStaff.vue
---
 .../basicdata/team/basicdataTeamStaff.vue     | 662 ++++++++++--------
 1 file changed, 352 insertions(+), 310 deletions(-)

diff --git a/src/views/basicdata/team/basicdataTeamStaff.vue b/src/views/basicdata/team/basicdataTeamStaff.vue
index d9d2cbdc..ac076ca9 100644
--- a/src/views/basicdata/team/basicdataTeamStaff.vue
+++ b/src/views/basicdata/team/basicdataTeamStaff.vue
@@ -1,14 +1,14 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row :hidden="!search" style="padding:6px 18px">
+      <el-row :hidden="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="仓库名称:">
-            <el-input v-model="query.warehouseName" placeholder="请输入仓库名称"></el-input>
-          </el-form-item>
-          <el-form-item label="班组名称:">
-            <el-input v-model="query.teamGroupName" placeholder="请输入班组名称"></el-input>
+          <!--          <el-form-item label="仓库名称:">-->
+          <!--            <el-input v-model="query.warehouseName" placeholder="请输入仓库名称"></el-input>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="人员名称:">
+            <el-input v-model="query.name" placeholder="请输入人员名称"></el-input>
           </el-form-item>
 
           <!-- 查询按钮 -->
@@ -23,7 +23,9 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
+              >删 除</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -35,46 +37,50 @@
       <el-row>
         <!-- 列表模块 -->
         <tablecmt
-                        :columnList="columnList"
-                        :tableData="data"
-                        :loading="loading"
-                        @inputTxt="inputsc"
-                        @timeCheck="timesc"
-                        @btnCheck="btnsc"
-                        @selectCheck="selectsc"
-                        @selection="selectionsc"
-                >
-                    <template #default="slotProps">
-                      <el-text @click="handleView(slotProps.scope.row)">查 看</el-text>
-                      <el-text @click="handleEdit(slotProps.scope.row)">编 辑</el-text>
-                      <el-text @click="rowDel(slotProps.scope.row)">删 除</el-text>
-                    </template>
-                </tablecmt>
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionsc"
+        >
+          <template #default="slotProps">
+            <el-text @click="handleView(slotProps.scope.row)">查 看</el-text>
+            <el-text @click="handleEdit(slotProps.scope.row)">编 辑</el-text>
+            <el-text @click="rowDel(slotProps.scope.row)">删 除</el-text>
+          </template>
+        </tablecmt>
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page.currentPage"
-                         :page-sizes="[10, 20, 30, 40, 50, 100]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[10, 20, 30, 40, 50, 100]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
           </el-pagination>
         </div>
       </el-row>
       <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="40%"
-                 :before-close="beforeClose"
-                 append-to-body>
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="40%"
+        :before-close="beforeClose"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :rules="rules" :model="form" label-width="80px">
-           <el-form-item label="仓库" prop="warehouseId">
-<!--             <el-input v-model="form.staffId" placeholder="请输入员工表ID"/>-->
+          <!--<el-form-item label="仓库" prop="warehouseId">
+&lt;!&ndash;             <el-input v-model="form.staffId" placeholder="请输入员工表ID"/>&ndash;&gt;
              <el-select v-model="form.warehouseId" clearable placeholder="请选择仓库" @change="clickDept($event)" style="width: 80%">
                <el-option
                  v-for="item in warehouseList"
@@ -84,10 +90,10 @@
                </el-option>
              </el-select>
 
-           </el-form-item>
+           </el-form-item>-->
           <!-- 表单字段 -->
-          <el-form-item label="班组" prop="teamGroupId">
-<!--            <el-input v-model="form.teamGroupId" placeholder="请输入班组ID"/>-->
+          <!--  <el-form-item label="班组" prop="teamGroupId">
+&lt;!&ndash;            <el-input v-model="form.teamGroupId" placeholder="请输入班组ID"/>&ndash;&gt;
             <el-select v-model="form.teamGroupId" clearable placeholder="请选择班组" @change="clickTeamGroup($event,1)" style="width: 80%">
               <el-option
                 v-for="item in teamGroupList"
@@ -97,15 +103,22 @@
               </el-option>
             </el-select>
 
-          </el-form-item>
-          <el-form-item label="人员" prop="staffId">
-<!--            <el-input v-model="form.staffId" placeholder="请输入姓名"/>-->
-            <el-select v-model="form.staffId" clearable placeholder="请选择人员" @change="clickTeamGroup($event,2)" style="width: 80%">
+          </el-form-item>-->
+          <el-form-item label="人员" prop="staffIds">
+            <!--            <el-input v-model="form.staffId" placeholder="请输入姓名"/>-->
+            <el-select
+              v-model="form.staffIds"
+              multiple
+              clearable
+              placeholder="请选择人员"
+              style="width: 80%"
+            >
               <el-option
                 v-for="item in staffList"
                 :key="item.id"
                 :label="item.name"
-                :value="item.id">
+                :value="item.id"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -113,7 +126,9 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
@@ -121,17 +136,18 @@
     </div>
   </basic-container>
   <edittablehead
-            @setcolum="setnewcolum"
-            @closce="showdrawer"
-            :drawerShow="drawerShow"
-            :columnList="columnList"
-    ></edittablehead>
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataTeamStaff";
-import option from "@/option/basicdata/basicdataTeamStaff";
-import { mapGetters } from "vuex";
+import { getList, getDetail, add, update, remove } from '@/api/basicdata/basicdataTeamStaff';
+import { getDetail as getDetailGroup } from '@/api/basicdata/basicdataTeamGroup';
+import option from '@/option/basicdata/basicdataTeamStaff';
+import { mapGetters } from 'vuex';
 import { getListUser } from '@/api/distribution/distributionStockup';
 import { getUserDetail } from '@/api/system/user';
 import { getDept, getLazyList } from '@/api/system/dept';
@@ -140,73 +156,73 @@ import { getTeamGroupList } from '@/api/basicdata/basicdataTeamGroup';
 import { getListOwn } from '@/api/system/user';
 
 export default {
-  data () {
+  data() {
     return {
       columnList: [
-          {
-            prop: '',
-            label: '序号',
-            type: 0,
-            values: '',
-            width: 55,
-            checkarr: [],
-            fixed: true,
-          },
-          {
-            prop: 'name',
-            label: '姓名',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-            // head: true,
-          },
-          {
-            prop: 'teamGroupName',
-            label: '班组名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-            // head: true,
-          },
-          {
-            prop: 'departmentName',
-            label: '所属部门名称',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'warehouseName',
-            label: '仓库名称',
-            type: 2,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          
-          {
-            prop: '',
-            label: '操作',
-            type: 6,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: 'right',
-            sortable: false
-          }
-          // 更多列的配置...
-        ],
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'name',
+          label: '姓名',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'teamGroupName',
+          label: '班组名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'departmentName',
+          label: '所属部门名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'warehouseName',
+          label: '仓库名称',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: 'right',
+          sortable: false,
+        },
+        // 更多列的配置...
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -224,7 +240,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -240,135 +256,141 @@ export default {
       deptId: '',
       warehouId: '',
       rules: {
-        warehouseId: [
-          { required: true, message: '请选择仓库', trigger: 'change' }
-        ],
-        teamGroupId: [
-          {  required: true, message: '请选择班组', trigger: 'change' }
-        ],
-        staffId: [
-          {  required: true, message: '请选择人员', trigger: 'change' }
-        ],
-      }
-    }
+        warehouseId: [{ required: true, message: '请选择仓库', trigger: 'change' }],
+        teamGroupId: [{ required: true, message: '请选择班组', trigger: 'change' }],
+        staffIds: [{ required: true, message: '请选择人员', trigger: 'change' }],
+      },
+      groupEntity: {},
+    };
+  },
+  watch: {
+    '$route.query.id': {
+      handler(newVal, oldVal) {
+        console.log(newVal, oldVal);
+        if (!!this.$route.query.id) {
+          this.onLoad(this.page);
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
     /**
-       * 初始化获取本地缓存的编辑隐藏的列表
-       *  固定搭配，不能更改
-       */
-       let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
-      let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
-      let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
-      if (checkListnewarr) {
-        this.columnList.map(item => {
-          item.head = false;
-        });
-        checkListnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              item.head = true;
-            }
-          });
-        });
-      } else {
-        let arr = [];
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
+    if (checkListnewarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      checkListnewarr.map(ite => {
         this.columnList.map(item => {
-          if (item.head) {
-            arr.push(item.label);
+          if (ite == item.label) {
+            item.head = true;
           }
         });
-        this.$functions.setStorage(window.location.pathname + 'checkList', arr);
-      }
-      if (flexListnewarr) {
+      });
+    } else {
+      let arr = [];
+      this.columnList.map(item => {
+        if (item.head) {
+          arr.push(item.label);
+        }
+      });
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
+    }
+    if (flexListnewarr) {
+      this.columnList.map(item => {
+        item.fixed = false;
+      });
+      flexListnewarr.map(ite => {
         this.columnList.map(item => {
-          item.fixed = false;
-        });
-        flexListnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              if (item.type == 6) {
-                item.fixed = 'right';
-              } else {
-                item.fixed = true;
-              }
+          if (ite == item.label) {
+            if (item.type == 6) {
+              item.fixed = 'right';
+            } else {
+              item.fixed = true;
             }
-          });
-        });
-      } else {
-        let arr = [];
-        this.columnList.map(item => {
-          if (item.fixed) {
-            arr.push(item.label);
           }
         });
-        this.$functions.setStorage(window.location.pathname + 'flexList', arr);
-      }
-      if (sortlistnewarr) {
-        this.columnList.map(item => {
-          item.sortable = false;
-        });
-        sortlistnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              item.sortable = true;
-            }
-          });
-        });
-      } else {
-        let arr = [];
+      });
+    } else {
+      let arr = [];
+      this.columnList.map(item => {
+        if (item.fixed) {
+          arr.push(item.label);
+        }
+      });
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
+    }
+    if (sortlistnewarr) {
+      this.columnList.map(item => {
+        item.sortable = false;
+      });
+      sortlistnewarr.map(ite => {
         this.columnList.map(item => {
-          if (item.sortable) {
-            arr.push(item.label);
+          if (ite == item.label) {
+            item.sortable = true;
           }
         });
-        this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
-      }
+      });
+    } else {
+      let arr = [];
+      this.columnList.map(item => {
+        if (item.sortable) {
+          arr.push(item.label);
+        }
+      });
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
+    }
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
     showdrawer(value) {
-        this.drawerShow = value;
-      },
-      /**
-       * 弹窗的勾选回调，用于更改头部数组
-       * 固定搭配，只需要更换   columnList
-       */
-      setnewcolum(newarr, headarr, type) {
-        // console.log(newarr,'+++++++++++')
-        if (type == 1) {
-          this.columnList = newarr;
-          this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
-        } else if (type == 2) {
-          this.columnList = newarr;
-          this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
-        } else if (type == 3) {
-          this.columnList = newarr;
-          this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
-        }
-
-      },
-      selectionsc(value) {
-        console.log('进来了>>>>>>>>>>>>>', value);
-        this.selectionList = value;
-      },
+      this.drawerShow = value;
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr, type) {
+      // console.log(newarr,'+++++++++++')
+      if (type == 1) {
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+      } else if (type == 2) {
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
+      }
+    },
+    selectionsc(value) {
+      console.log('进来了>>>>>>>>>>>>>', value);
+      this.selectionList = value;
+    },
     //点击部门
-    async clickDept(row){
-      // console.log("进发了部门",row);
-      if(this.form.warehouId != row){
-        let id = "";
-        if(!!this.form.id){
+    async clickDept(row) {
+      console.log('进发了部门', row);
+      if (this.form.warehouId != row) {
+        let id = '';
+        if (!!this.form.id) {
           id = this.form.id;
         }
         this.form = {};
@@ -376,145 +398,164 @@ export default {
       }
       let a = this.warehouseList.find(i => i.id == row);
       // console.log("aaa",a.department);
-      if(!!a){
+      if (!!a) {
         this.form.warehouseName = a.name;
         this.form.warehouseId = a.id;
         this.warehouId = a.id;
         //查询班组
-        let sd = await getTeamGroupList(this.page.currentPage,this.page.pageSize,{belongTo: a.id});
+        let sd = await getTeamGroupList(this.page.currentPage, this.page.pageSize, {
+          belongTo: a.id,
+        });
         // console.log("sdsd班组",sd);
         this.teamGroupList = sd.data.data.records;
         //查询人员
-        let user = await getListOwn({deptId:a.department});
+        let user = await getListOwn({ deptId: a.department });
         // console.log("查询人员》》》",user);
         this.staffList = user.data.data;
       }
     },
     //点击班组
-    clickTeamGroup(row,num){
-      switch (num){
+    clickTeamGroup(row, num) {
+      switch (num) {
         case 1:
           //班组
           let a = this.teamGroupList.find(i => i.id == row);
-          console.log("aa",a);
-          this.form.teamGroupName = a.groupName ;
+          console.log('aa', a);
+          this.form.teamGroupName = a.groupName;
           break;
         case 2:
           //人员
           let b = this.staffList.find(i => i.id == row);
-          this.form.name = b.name ;
-          console.log("bb",b);
+          this.form.name = b.name;
+          console.log('bb', b);
           break;
       }
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit (formName) {
-      this.$refs[formName].validate((valid) => {
+    handleSubmit(formName) {
+      this.$refs[formName].validate(valid => {
         if (valid) {
           if (!this.form.id) {
-            console.log("添加",this.form);
+            this.form.department = this.groupEntity.department;
+            this.form.departmentName = this.groupEntity.departmentName;
+            this.form.teamGroupId = this.$route.query.id;
+            this.form.teamGroupName = this.groupEntity.groupName;
+            this.form.warehouseId = this.groupEntity.belongTo;
+            this.form.warehouseName = this.groupEntity.warehouseName;
+            console.log('添加', this.form);
             add(this.form).then(() => {
               this.box = false;
               this.onLoad(this.page);
               this.$message({
-                type: "success",
-                message: "操作成功!"
+                type: 'success',
+                message: '操作成功!',
               });
             });
           } else {
-            console.log("修改",this.form);
+            console.log('修改', this.form);
             update(this.form).then(() => {
               this.box = false;
               this.onLoad(this.page);
               this.$message({
-                type: "success",
-                message: "操作成功!"
+                type: 'success',
+                message: '操作成功!',
               });
-            })
+            });
           }
         }
-      })
-
-
+      });
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
       this.box = true;
       this.getWarehouseList();
     },
-    async getWarehouseList(){
-      let userDept =  await getListUser();
-      this.deptId = userDept.data.data.deptId;
-      let sole = await getUserDetail(userDept.data.data.userId);
-      // console.log("名称11",sole.data.data.roleName);
-      if(sole.data.data.roleName == '管理员'){
-        let deptW = await getDeptWarehouse({tenantId: userDept.data.data.tenantId });
-        // console.log("全部仓库",deptW);
-        this.warehouseList = deptW.data.data;
-      }else{
-        //有部门
-        let dept =  await getDept(this.deptId);
-        const da = dept.data.data;
-        if(!!da.parentId && da.parentId != '0'){
-        //有部门的信息 查询仓库
-        let deptW = await getDeptWarehouse({department: da.id});
-        this.warehouseList = deptW.data.data;
-       }
-      }
+    async getWarehouseList() {
+      let group = await getDetailGroup(this.$route.query.id);
+      console.log('_+_+_+_+_+', group.data.data.department);
+      this.groupEntity = group.data.data;
+      //查询人员
+      this.staffList = [];
+      let user = await getListOwn({ deptId: this.groupEntity.department });
+      // console.log("查询人员》》》",user);
+      this.staffList = user.data.data;
+
+      // let userDept =  await getListUser();
+      // this.deptId = userDept.data.data.deptId;
+      // let sole = await getUserDetail(userDept.data.data.userId);
+      // // console.log("名称11",sole.data.data.roleName);
+      // if(sole.data.data.roleName == '管理员'){
+      //   let deptW = await getDeptWarehouse({tenantId: userDept.data.data.tenantId });
+      //   // console.log("全部仓库",deptW);
+      //   this.warehouseList = deptW.data.data;
+      // }else{
+      //   //有部门
+      //   let dept =  await getDept(this.deptId);
+      //   const da = dept.data.data;
+      //   if(!!da.parentId && da.parentId != '0'){
+      //   //有部门的信息 查询仓库
+      //   let deptW = await getDeptWarehouse({department: da.id});
+      //   this.warehouseList = deptW.data.data;
+      //  }
+      // }
     },
-    async handleEdit (row) {
-     await this.getWarehouseList();
-      this.title = '编辑'
-      this.box = true
+    async handleEdit(row) {
+      await this.getWarehouseList();
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(async res => {
         this.form = res.data.data;
-        console.log("返回数据。。。",this.form);
+        console.log('返回数据。。。', this.form);
         //查询班组
-        let sd = await getTeamGroupList(this.page.currentPage,this.page.pageSize,{belongTo: res.data.data.warehouseId});
+        let sd = await getTeamGroupList(this.page.currentPage, this.page.pageSize, {
+          belongTo: res.data.data.warehouseId,
+        });
         this.teamGroupList = sd.data.data.records;
         //查询人员
-        let user = await getListOwn({deptId:this.deptId});
+        let user = await getListOwn({ deptId: this.deptId });
         this.staffList = user.data.data;
       });
     },
-   async handleView (row) {
-     await this.getWarehouseList();
-      this.title = '查看'
+    async handleView(row) {
+      await this.getWarehouseList();
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(async res => {
         this.form = res.data.data;
         //查询班组
-        let sd = await getTeamGroupList(this.page.currentPage,this.page.pageSize,{belongTo: res.data.data.warehouseId});
+        let sd = await getTeamGroupList(this.page.currentPage, this.page.pageSize, {
+          belongTo: res.data.data.warehouseId,
+        });
         this.teamGroupList = sd.data.data.records;
         //查询人员
-        let user = await getListOwn({deptId:this.deptId});
+        let user = await getListOwn({ deptId: this.deptId });
         this.staffList = user.data.data;
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -523,16 +564,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -540,33 +581,34 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
+      this.query.teamGroupId = this.$route.query.id;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -574,7 +616,7 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
-    }
-  }
+    },
+  },
 };
 </script>