From 5ba28b273cad287077b7041ee3e02c7fe8bb770d Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Mon, 4 Sep 2023 11:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/team/basicdataTeamGroup.vue     | 403 ++++++++++--------
 1 file changed, 214 insertions(+), 189 deletions(-)

diff --git a/src/views/basicdata/team/basicdataTeamGroup.vue b/src/views/basicdata/team/basicdataTeamGroup.vue
index d70b4f4a..ae61302a 100644
--- a/src/views/basicdata/team/basicdataTeamGroup.vue
+++ b/src/views/basicdata/team/basicdataTeamGroup.vue
@@ -1,12 +1,12 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row v-if="!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.warehouseName" placeholder="请输入仓库名称"></el-input>-->
+          <!--          </el-form-item>-->
           <el-form-item label="班组名称:">
             <el-input v-model="query.groupName" placeholder="请输入班组名称"></el-input>
           </el-form-item>
@@ -22,7 +22,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">
@@ -44,69 +46,100 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text>
-              <el-text type="primary" text icon="el-icon-view" @click="handleList(slotProps.scope.row)">人员列表</el-text>
-              <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
-              <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleView(slotProps.scope.row)"
+              >查看</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleList(slotProps.scope.row)"
+              >人员列表</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="handleEdit(slotProps.scope.row)"
+              >编辑</el-text
+            >
+            <el-text type="primary" text icon="el-icon-delete" @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="[30, 50,80, 120]"
-                         :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="[30, 50, 80, 120]"
+            :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" :model="form" :rules="rules" label-width="80px">
           <!-- 表单字段 -->
-<!--          <el-form-item label="归属部门" prop="department">-->
-<!--            <el-select v-model="form.department" clearable placeholder="请选择归属部门" @change="clickDept($event)">-->
-<!--              <el-option-->
-<!--                v-for="item in departmentData"-->
-<!--                :key="item.id"-->
-<!--                :label="item.deptName"-->
-<!--                :value="item.id">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="归属部门" prop="department">-->
+          <!--            <el-select v-model="form.department" clearable placeholder="请选择归属部门" @change="clickDept($event)">-->
+          <!--              <el-option-->
+          <!--                v-for="item in departmentData"-->
+          <!--                :key="item.id"-->
+          <!--                :label="item.deptName"-->
+          <!--                :value="item.id">-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-form-item>-->
           <el-form-item label="组名" prop="groupName">
-            <el-input v-model="form.groupName" placeholder="请输入组名"/>
+            <el-input v-model="form.groupName" placeholder="请输入组名" />
           </el-form-item>
-<!--          <el-form-item label="仓库" prop="belongTo">-->
-<!--&lt;!&ndash;            <el-input v-model="form.belongTo" placeholder="请输入仓库"/>&ndash;&gt;-->
-<!--            <el-select v-model="form.belongTo" clearable placeholder="请选择仓库" style="width: 80%"  @change="clickWarehouse($event)">-->
-<!--              <el-option-->
-<!--                v-for="item in warehouseList"-->
-<!--                :key="item.id"-->
-<!--                :label="item.name"-->
-<!--                :value="item.id">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
+          <!--          <el-form-item label="仓库" prop="belongTo">-->
+          <!--&lt;!&ndash;            <el-input v-model="form.belongTo" placeholder="请输入仓库"/>&ndash;&gt;-->
+          <!--            <el-select v-model="form.belongTo" clearable placeholder="请选择仓库" style="width: 80%"  @change="clickWarehouse($event)">-->
+          <!--              <el-option-->
+          <!--                v-for="item in warehouseList"-->
+          <!--                :key="item.id"-->
+          <!--                :label="item.name"-->
+          <!--                :value="item.id">-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
 
-<!--          </el-form-item>-->
+          <!--          </el-form-item>-->
           <el-form-item label="班组类型" prop="groupTypes">
-<!--            <el-input v-model="form.groupType" placeholder="请输入班组类型"/>-->
-            <el-select v-model="form.groupTypes" multiple  clearable placeholder="请选择班组类型" style="width: 80%">
+            <!--            <el-input v-model="form.groupType" placeholder="请输入班组类型"/>-->
+            <el-select
+              v-model="form.groupTypes"
+              multiple
+              clearable
+              placeholder="请选择班组类型"
+              style="width: 80%"
+            >
               <el-option
                 v-for="item in teamType"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -114,7 +147,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>
@@ -124,17 +159,17 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataTeamGroup";
-import option from "@/option/basicdata/basicdataTeamGroup";
-import { mapGetters } from "vuex";
+import { getList, getDetail, add, update, remove } from '@/api/basicdata/basicdataTeamGroup';
+import option from '@/option/basicdata/basicdataTeamGroup';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getListUser } from '@/api/distribution/distributionStockup';
-import { getDept,getLazyList } from '@/api/system/dept';
+import { getDept, getLazyList } from '@/api/system/dept';
 import { getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse';
 import { getUserDetail } from '@/api/system/user';
 
 export default {
-  data () {
+  data() {
     return {
       columnList: [
         {
@@ -217,7 +252,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -232,34 +267,26 @@ export default {
       // 表单列表
       data: [],
       rules: {
-        groupName: [
-          { required: true, message: '请输入班组名称', trigger: 'blur' },
-        ],
-        groupTypes: [
-          { required: true, message: '请选择班组类型', trigger: 'change' }
-        ],
-        department: [
-          {  required: true, message: '请选择班组', trigger: 'change' }
-        ],
-        belongTo: [
-          {  required: true, message: '请选择仓库', trigger: 'change' }
-        ],
-      }
-    }
+        groupName: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
+        groupTypes: [{ required: true, message: '请选择班组类型', trigger: 'change' }],
+        department: [{ required: true, message: '请选择班组', trigger: 'change' }],
+        belongTo: [{ required: true, message: '请选择仓库', trigger: 'change' }],
+      },
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
   },
   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) {
@@ -290,49 +317,48 @@ export default {
       console.log(index, row);
     },
     selectsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
     timesc(index, row) {
-      if (!!index){
+      if (!!index) {
         index = dayjs(index).format('YYYY-MM-DD');
       }
-      this.query[row.prop] =  index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
     inputsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
     //点击仓库
-    clickWarehouse(row){
+    clickWarehouse(row) {
       // console.log("进发了仓库",row);
-     let a = this.warehouseList.find(i => i.id == row);
-     if(!!a){
-       this.form.warehouseName = a.name;
-       this.form.belongTo = a.id;
-     }
+      let a = this.warehouseList.find(i => i.id == row);
+      if (!!a) {
+        this.form.warehouseName = a.name;
+        this.form.belongTo = a.id;
+      }
     },
     //点击部门
-    clickDept(row){
+    clickDept(row) {
       // console.log("进发了部门",row);
-     let a = this.departmentData.find(i => i.id == row);
-     if(!!a){
-       this.form.departmentName = a.deptName;
-       this.form.department = a.id;
-     }
-
+      let a = this.departmentData.find(i => i.id == row);
+      if (!!a) {
+        this.form.departmentName = a.deptName;
+        this.form.department = a.id;
+      }
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('team_type').then(res => {
         this.teamType = res.data.data;
@@ -343,19 +369,19 @@ export default {
         // });
       });
     },
-    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) {
             this.form.groupType = this.form.groupTypes.join(',');
@@ -364,8 +390,8 @@ export default {
               this.box = false;
               this.onLoad(this.page);
               this.$message({
-                type: "success",
-                message: "操作成功!"
+                type: 'success',
+                message: '操作成功!',
               });
             });
           } else {
@@ -374,109 +400,105 @@ export default {
               this.box = false;
               this.onLoad(this.page);
               this.$message({
-                type: "success",
-                message: "操作成功!"
+                type: 'success',
+                message: '操作成功!',
               });
-            })
+            });
           }
-        }else {
+        } else {
           console.log('error submit!!');
           return false;
         }
       });
-
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
       this.box = true;
       //查询仓库信息
       this.getWarehouseList();
     },
-    async getWarehouseList(){
-      let userDept =  await getListUser();
-      console.log("<><><>",userDept.data.data);
-       let sole = await getUserDetail(userDept.data.data.userId);
-      console.log(",....t=用户信息s",sole);
-       if(sole.data.data.roleName == '管理员'){
-         // let dept =  await getDept();
-         let  parentId = 0;
+    async getWarehouseList() {
+      let userDept = await getListUser();
+      console.log('<><><>', userDept.data.data);
+      let sole = await getUserDetail(userDept.data.data.userId);
+      console.log(',....t=用户信息s', sole);
+      if (sole.data.data.roleName == '管理员') {
+        // let dept =  await getDept();
+        let parentId = 0;
 
-         let lis = await getLazyList(parentId);
-         console.log("全部部门",lis);
-         this.departmentData = lis.data.data;
-          //总部门
-         let deptW = await getDeptWarehouse({tenantId: userDept.data.data.tenantId});
-         console.log("仓库数据",deptW.data.data);
-         this.warehouseList = deptW.data.data;
-       }else{
-         //有部门
-         let dept =  await getDept(userDept.data.data.deptId);
-         console.log("<><><>",dept.data.data);
-         // let a = {
-         //   id:dept.data.data.id,
-         //   deptName: dept.data.data.deptName
-         // }
+        let lis = await getLazyList(parentId);
+        console.log('全部部门', lis);
+        this.departmentData = lis.data.data;
+        //总部门
+        let deptW = await getDeptWarehouse({ tenantId: userDept.data.data.tenantId });
+        console.log('仓库数据', deptW.data.data);
+        this.warehouseList = deptW.data.data;
+      } else {
+        //有部门
+        let dept = await getDept(userDept.data.data.deptId);
+        console.log('<><><>', dept.data.data);
+        // let a = {
+        //   id:dept.data.data.id,
+        //   deptName: dept.data.data.deptName
+        // }
         /* this.departmentData = [];
          this.form.department = a.id;
          this.form.departmentName = a.deptName;
          this.departmentData.push(a);*/
-         const da = dept.data.data;
-         if(!!da.parentId && da.parentId != '0'){
-           //有部门的信息 查询仓库
-           let deptW = await getDeptWarehouse({department: da.id});
-           this.warehouseList = deptW.data.data;
-           console.log("123123123123",deptW);
-         }
-       }
-
+        const da = dept.data.data;
+        if (!!da.parentId && da.parentId != '0') {
+          //有部门的信息 查询仓库
+          let deptW = await getDeptWarehouse({ department: da.id });
+          this.warehouseList = deptW.data.data;
+          console.log('123123123123', deptW);
+        }
+      }
     },
     //人员列表
-    handleList(row){
-
-      console.log("班组信息",row);
+    handleList(row) {
+      console.log('班组信息', row);
       this.$router.push({
         path: '/basicdata/team/basicdataTeamStaff',
         query: {
           id: row.id,
           name: '班组人员 - ' + row.groupName,
-          type: '2'
-        }
+          type: '2',
+        },
       });
-
     },
-   async handleEdit (row) {
+    async handleEdit(row) {
       //查询仓库信息
       await this.getWarehouseList();
-      this.title = '编辑'
-      this.box = true
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
-        console.log("编码》》》",res.data.data.groupType);
+        console.log('编码》》》', res.data.data.groupType);
         this.form = res.data.data;
-        this.form.groupTypes = this.form.groupType.split(",");
-        console.log("<><><>",this.form);
+        this.form.groupTypes = this.form.groupType.split(',');
+        console.log('<><><>', this.form);
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       //查询仓库信息
       this.getWarehouseList();
       getDetail(row.id).then(res => {
         this.form = res.data.data;
-        this.form.groupTypes = this.form.groupType.split(",");
+        this.form.groupTypes = this.form.groupType.split(',');
       });
     },
-    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);
@@ -485,16 +507,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);
@@ -502,32 +524,32 @@ 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;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
@@ -550,17 +572,20 @@ export default {
 
         this.data.forEach(e => {
           let a = e.groupType.split(',');
-          let f = a.map((i, index) => {
-            let s = this.teamType.find(l => l.dictKey === i);
-            return s ? s.dictValue : '';
-          }).filter(Boolean).join(' | ');
+          let f = a
+            .map((i, index) => {
+              let s = this.teamType.find(l => l.dictKey === i);
+              return s ? s.dictValue : '';
+            })
+            .filter(Boolean)
+            .join(' | ');
           e.groupTypeName = f;
         });
 
         this.loading = false;
         this.selectionClear();
       });
-    }
-  }
+    },
+  },
 };
 </script>