From 5d2a0e272b8d19e77b7bc90a341b9a2e4a9f7776 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 8 Nov 2024 17:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ma/typeConfigKeeper.js                |  17 +-
 src/views/material/basic/siteConfig/index.vue | 129 ++---
 src/views/material/ma/partType/index.vue      |  17 +-
 .../material/ma/typeConfigKeeper/index.vue    |   2 +-
 .../material/ma/typeConfigRepair/index.vue    | 442 +++++++++---------
 5 files changed, 331 insertions(+), 276 deletions(-)

diff --git a/src/api/ma/typeConfigKeeper.js b/src/api/ma/typeConfigKeeper.js
index 96e58079..01884b52 100644
--- a/src/api/ma/typeConfigKeeper.js
+++ b/src/api/ma/typeConfigKeeper.js
@@ -30,9 +30,9 @@ export function bindKeeper(data) {
 // 库管员管理--绑定
 export function noBindKeeper(data) {
   return request({
-      url: '/material/ma_type_keeper',
-      method: 'delete',
-      data: data,
+    url: '/material/ma_type_keeper',
+    method: 'delete',
+    data: data,
   })
 }
 
@@ -41,6 +41,15 @@ export function getKeeperIds(itemName) {
   return request({
     url: '/material/bm_config/list/',
     method: 'get',
-    params:{"itemName":itemName},
+    params: { "itemName": itemName },
+  })
+}
+
+//修改库管员树的角色数组
+export function updateBmConfig(data) {
+  return request({
+    url: '/material/bm_config',
+    method: 'post',
+    data: data,
   })
 }
\ No newline at end of file
diff --git a/src/views/material/basic/siteConfig/index.vue b/src/views/material/basic/siteConfig/index.vue
index 4fa25567..e543f902 100644
--- a/src/views/material/basic/siteConfig/index.vue
+++ b/src/views/material/basic/siteConfig/index.vue
@@ -4,52 +4,60 @@
       <div class="section">
         <el-header>库管员配置</el-header>
         <el-main>
-          <el-button
-            type="success"
-            icon="el-icon-plus"
-            size="small"
-            @click="handleSaveKeeper"
-            >保存库管员配置</el-button
-          >
-          <el-checkbox-group v-model="selectedValues" class="checkbox-group">
-            <el-checkbox
-              v-for="item in options"
-              :key="item.roleId"
-              :label="item.roleId"
-              :value="item.roleId"
-              :checked="item.check"
-              class="checkbox-item"
+          <el-row>
+            <el-checkbox-group v-model="selectedValues" class="checkbox-group">
+              <el-checkbox
+                v-for="item in options"
+                :key="item.roleId"
+                :label="item.roleId"
+                :value="item.roleId"
+                :checked="item.check"
+                class="checkbox-item"
+              >
+                {{ item.roleName }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-row>
+          <div style="display: flex; justify-content: left">
+            <el-button
+              type="success"
+              icon="el-icon-plus"
+              size="small"
+              @click="handleSaveKeeper"
+              >保存库管员配置</el-button
             >
-              {{ item.roleKey }}
-            </el-checkbox>
-          </el-checkbox-group>
+          </div>
         </el-main>
       </div>
       <div class="section">
         <el-header>维修员配置</el-header>
         <el-main>
-          <el-button
-            type="success"
-            icon="el-icon-plus"
-            size="small"
-            @click="handleSaveRepair"
-            >保存维修员配置</el-button
-          >
-          <el-checkbox-group
-            v-model="selectedValuesRepair"
-            class="checkbox-group"
-          >
-            <el-checkbox
-              v-for="item in optionsRepair"
-              :key="item.roleId"
-              :label="item.roleId"
-              :value="item.roleId"
-              :checked="item.check"
-              class="checkbox-item"
+          <el-row>
+            <el-checkbox-group
+              v-model="selectedValuesRepair"
+              class="checkbox-group"
             >
-              {{ item.roleKey }}
-            </el-checkbox>
-          </el-checkbox-group>
+              <el-checkbox
+                v-for="item in optionsRepair"
+                :key="item.roleId"
+                :label="item.roleId"
+                :value="item.roleId"
+                :checked="item.check"
+                class="checkbox-item"
+              >
+                {{ item.roleName }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-row>
+          <div style="display: flex; justify-content: left">
+            <el-button
+              type="success"
+              icon="el-icon-plus"
+              size="small"
+              @click="handleSaveRepair"
+              >保存维修员配置</el-button
+            >
+          </div>
         </el-main>
       </div>
     </el-tab-pane>
@@ -103,7 +111,7 @@
 
 <script>
 import { listRole } from "@/api/system/role";
-import { getKeeperIds } from "@/api/ma/typeConfigKeeper";
+import { getKeeperIds, updateBmConfig } from "@/api/ma/typeConfigKeeper";
 export default {
   name: "siteConfig",
   data() {
@@ -141,7 +149,7 @@ export default {
       const itemName = "ku_guan_role_ids";
       //获取已有绑定的库管员
       await getKeeperIds(itemName).then((response) => {
-        const roleIds = response.rows[0].itemValue
+        const roleIds = response.rows[response.rows.length - 1].itemValue
           .split(",")
           .map((item) => Number(item));
         this.roleIdsKeeper = roleIds;
@@ -159,7 +167,7 @@ export default {
       const itemName = "wei_xiu_role_ids";
       //获取已有绑定的维修员
       await getKeeperIds(itemName).then((response) => {
-        const roleIds = response.rows[0].itemValue
+        const roleIds = response.rows[response.rows.length - 1].itemValue
           .split(",")
           .map((item) => Number(item));
         this.roleIdsRepair = roleIds;
@@ -172,10 +180,26 @@ export default {
       });
     },
     handleSaveKeeper() {
-      console.log(this.selectedValues);
+      const itemValue = this.selectedValues.join(",");
+      const itemName = "ku_guan_role_ids";
+      updateBmConfig({ itemName: itemName, itemValue: itemValue }).then(
+        (response) => {
+          this.$message.success("保存成功！");
+          this.getList();
+          this.getListRepair();
+        }
+      );
     },
     handleSaveRepair() {
-      console.log(this.selectedValuesRepair);
+      const itemValue = this.selectedValuesRepair.join(",");
+      const itemName = "wei_xiu_role_ids";
+      updateBmConfig({ itemName: itemName, itemValue: itemValue }).then(
+        (response) => {
+          this.$message.success("保存成功！");
+          this.getList();
+          this.getListRepair();
+        }
+      );
     },
     handleClick(tab, event) {
       if (tab.name == "first") {
@@ -200,7 +224,7 @@ export default {
   background-color: #f8f8f9;
   color: #333;
   text-align: left;
-  width: 80%;
+  width: 100%;
   line-height: 60px;
   border: 1px solid #dfe6ec;
 }
@@ -209,7 +233,7 @@ export default {
   background-color: white;
   color: black;
   text-align: left;
-  width: 80%;
+  width: 100%;
   height: 300px;
   border-radius: 2px;
   border: 1px solid #dfe6ec;
@@ -239,18 +263,19 @@ export default {
 /* 调整checkbox的样式 */
 ::v-deep .checkbox-group {
   display: flex;
-  width: 80%;
+  width: 100%;
   flex-wrap: wrap; /* 使复选框换行 */
-  gap: 1px; /* 间距 */
+  gap: 5px; /* 间距 */
   margin-top: 0px;
-  margin-bottom: 0px;
+  margin-bottom: 80px;
 }
 
 ::v-deep .checkbox-item {
   display: inline-block;
-  width: calc(13% - 1px); /* 每个复选框的宽度，去除间距 */
+  height: 15px;
+  width: calc(16% - 5px); /* 每个复选框的宽度，去除间距 */
   vertical-align: top; /* 顶部对齐 */
-  margin-bottom: 2px;
-  margin-top: 2px;
+  margin-bottom: 0px;
+  margin-top: 0px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/material/ma/partType/index.vue b/src/views/material/ma/partType/index.vue
index 915415fc..784eb51e 100644
--- a/src/views/material/ma/partType/index.vue
+++ b/src/views/material/ma/partType/index.vue
@@ -216,17 +216,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
-    <!-- <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      /> -->
-
     <!-- 新增或修改弹窗 -->
     <el-dialog
       :title="title"
@@ -486,7 +485,7 @@ export default {
       this.loading = true;
       getListByPartType(this.queryParams).then((response) => {
         this.typeList = response.data.rows;
-
+        this.total = response.data.total;
         this.loading = false;
       });
     },
diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue
index 8d6d0832..aea9faca 100644
--- a/src/views/material/ma/typeConfigKeeper/index.vue
+++ b/src/views/material/ma/typeConfigKeeper/index.vue
@@ -444,7 +444,7 @@ export default {
     async getTreeData() {
       const itemName = "ku_guan_role_ids";
       await getKeeperIds(itemName).then((response) => {
-        const roleIds = response.rows[0].itemValue
+        const roleIds = response.rows[response.rows.length - 1].itemValue
           .split(",")
           .map((item) => Number(item));
         this.roleIdsTemp = roleIds;
diff --git a/src/views/material/ma/typeConfigRepair/index.vue b/src/views/material/ma/typeConfigRepair/index.vue
index 5726791d..a0ce34a9 100644
--- a/src/views/material/ma/typeConfigRepair/index.vue
+++ b/src/views/material/ma/typeConfigRepair/index.vue
@@ -16,7 +16,7 @@
           />
         </div>
         <div class="head-container" style>
-             <div class="grid-content bg-purple-dark" align="left">组织人员树</div>
+          <div class="grid-content bg-purple-dark" align="left">组织人员树</div>
           <el-tree
             style="height: 700px; overflow: scroll"
             :data="treeOptions"
@@ -47,7 +47,7 @@
           />
         </div>
         <div class="head-container" style>
-            <div class="grid-content bg-purple-dark" align="left">物资类型树</div>
+          <div class="grid-content bg-purple-dark" align="left">物资类型树</div>
           <el-tree
             style="height: 700px; overflow: scroll"
             :data="treeOptionsTwo"
@@ -142,9 +142,9 @@
           ref="multipleTable"
           row-key="typeId"
           default-expand-all
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
           @selection-change="handleSelectionChange"
-          @select="handlerSelect" 
+          @select="handlerSelect"
           @select-all="handlerSelectAll"
         >
           <el-table-column
@@ -167,30 +167,30 @@
             align="center"
             show-overflow-tooltip
             prop="itemType"
-            >
-           </el-table-column>
+          >
+          </el-table-column>
           <el-table-column
             label="物资类型"
             align="center"
             show-overflow-tooltip
             width="100"
             prop="materialType"
-            >
-           </el-table-column>
+          >
+          </el-table-column>
           <el-table-column
             label="物资名称"
             align="center"
             show-overflow-tooltip
             prop="materialName"
-            >
-           </el-table-column>
+          >
+          </el-table-column>
           <el-table-column
             label="规格型号"
             align="center"
             show-overflow-tooltip
             prop="typeName"
-            >
-           </el-table-column>
+          >
+          </el-table-column>
           <el-table-column
             label="维修员"
             align="center"
@@ -222,13 +222,13 @@
           </el-table-column>
         </el-table>
 
-       <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
   </div>
@@ -248,7 +248,7 @@ import {
 import {
   bindKeeper,
   noBindKeeper,
-  getRepairIds
+  getRepairIds,
 } from "@/api/ma/typeConfigRepair";
 import { getUserList } from "@/api/basic/basic";
 import { getInfo } from "@/api/login";
@@ -270,16 +270,16 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      totalTemp:0,
+      totalTemp: 0,
       countTemp: 1,
-      totalAll:0,
+      totalAll: 0,
       // 库管员用户数据
       keeperList: null,
       keeperDataRange: [],
       keeperProRange: [],
       keeperMatRange: [],
       keeperNameRange: [],
-      roleIdsTemp:[],
+      roleIdsTemp: [],
       //维修员用户数据
       repairUserList: null,
       //资产类型数据
@@ -319,20 +319,19 @@ export default {
         children: "children",
         label: "label",
       },
-      userList:[],
-      userNoList:[],
+      userList: [],
+      userNoList: [],
       userIdTemp: -1,
       typeIdTemp: -1,
-      maxLength:100,//已选列表上限，防止数据过多请求报错
+      maxLength: 100, //已选列表上限，防止数据过多请求报错
       // 查询参数
       queryParams: {
         typeName: "",
         level: 0,
         pageNum: 1,
         pageSize: 10,
-        displayBindRelationship:true,
-        houseId:"",
-
+        displayBindRelationship: true,
+        houseId: "",
       },
 
       configOpen: false,
@@ -341,8 +340,8 @@ export default {
         afterPrice: "",
         useDate: "",
       },
-      isAllSelect:false,
-      selectionRows:[],
+      isAllSelect: false,
+      selectionRows: [],
     };
   },
   // mounted(){
@@ -359,32 +358,30 @@ export default {
     },
   },
   created() {
-   this.getTreeData();
-   this.getTreeDataTwo();
+    this.getTreeData();
+    this.getTreeDataTwo();
     // this.getKeeperDataList();
     // setTimeout(()=>{
     //     this.getList();
     // },200)
-
   },
   methods: {
+    selectFirstNode() {
+      const firstNode = this.$refs.treeTwo.getNode(1);
+      if (firstNode) {
+        this.queryParams.typeId = firstNode.id;
+        this.queryParams.level = 0;
+        this.queryParams.houseId = firstNode.id;
+        this.$refs.treeTwo.setChecked(firstNode, true);
+      }
+    },
 
-      selectFirstNode(){
-        const firstNode = this.$refs.treeTwo.getNode(1);
-        if(firstNode){
-          this.queryParams.typeId = firstNode.id
-          this.queryParams.level = 0
-          this.queryParams.houseId = firstNode.id
-          this.$refs.treeTwo.setChecked(firstNode,true);
-        }
-      },
-
-      renderConent(h, { node }) {
-      let iconClass = '';
+    renderConent(h, { node }) {
+      let iconClass = "";
       // 根据 node 的类型判断图标
       if (node.data.level == 99) {
-        iconClass = 'el-icon-user-solid';
-      } 
+        iconClass = "el-icon-user-solid";
+      }
       // else if (node.type === 'file') {
       //   iconClass = 'el-icon-document';
       // }
@@ -394,43 +391,46 @@ export default {
           <i class={iconClass}></i> {node.label}
         </span>
       );
-    
     },
 
     /** 查询新增页面-上级类型下拉树结构 */
-   async getTreeData() {
-   const itemName = 'wei_xiu_role_ids'
-      await getRepairIds(itemName).then((response) =>{
-          const roleIds = response.rows[0].itemValue.split(',').map(item => Number(item))
-          this.roleIdsTemp = roleIds
-      })
-     await getUserList({ roleIds: this.roleIdsTemp}).then(response => {
-        this.treeOptions = response.data
+    async getTreeData() {
+      const itemName = "wei_xiu_role_ids";
+      await getRepairIds(itemName).then((response) => {
+        const roleIds = response.rows[response.rows.length - 1].itemValue
+          .split(",")
+          .map((item) => Number(item));
+        this.roleIdsTemp = roleIds;
+      });
+      await getUserList({ roleIds: this.roleIdsTemp }).then((response) => {
+        this.treeOptions = response.data;
       });
     },
     /** 查询新增页面-上级类型下拉树结构 */
-   async getTreeDataTwo() {
-        getMaTypeList().then((response) => {
-            this.treeOptionsTwo = response.data
-            if(this.treeOptionsTwo.length>0 && this.treeOptionsTwo[0].children.length>0){
-              const firstNode = this.treeOptionsTwo[0].children[0];
-              this.queryParams.typeId = firstNode.id
-              this.queryParams.level = 1
-              this.queryParams.houseId = firstNode.houseId
-              this.getList();
-            }
-        })
-       
+    async getTreeDataTwo() {
+      getMaTypeList().then((response) => {
+        this.treeOptionsTwo = response.data;
+        if (
+          this.treeOptionsTwo.length > 0 &&
+          this.treeOptionsTwo[0].children.length > 0
+        ) {
+          const firstNode = this.treeOptionsTwo[0].children[0];
+          this.queryParams.typeId = firstNode.id;
+          this.queryParams.level = 1;
+          this.queryParams.houseId = firstNode.houseId;
+          this.getList();
+        }
+      });
     },
     /** 查询列表 */
-   async getList() {
-        this.loading = true
-        this.queryParams.displayBindRelationship="true";
-       await getListByMaType(this.queryParams).then((response) => {
-            this.typeList = response.data.rows
-            this.total = response.data.total
-            this.loading = false
-        })
+    async getList() {
+      this.loading = true;
+      this.queryParams.displayBindRelationship = "true";
+      await getListByMaType(this.queryParams).then((response) => {
+        this.typeList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
     // 筛选节点 - 左侧树
     filterNode(value, data) {
@@ -446,22 +446,22 @@ export default {
     },
     // 筛选节点 - 左侧树
     filterNodeTwo(value, data) {
-          if (!value) return true
-          return data.label.indexOf(value) !== -1
-      },
-      // 节点单击事件 - 左侧树
-    async  handleNodeClickTwo(data,node) {
-          if(data.level==0){
-          this.queryParams.typeId = data.id
-          this.queryParams.level = data.level
-          this.queryParams.houseId = data.id
-          }else{
-          this.queryParams.typeId = data.id
-          this.queryParams.level = data.level
-          this.queryParams.houseId = data.houseId
-          }
-          this.handleQuery()
-      },
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件 - 左侧树
+    async handleNodeClickTwo(data, node) {
+      if (data.level == 0) {
+        this.queryParams.typeId = data.id;
+        this.queryParams.level = data.level;
+        this.queryParams.houseId = data.id;
+      } else {
+        this.queryParams.typeId = data.id;
+        this.queryParams.level = data.level;
+        this.queryParams.houseId = data.houseId;
+      }
+      this.handleQuery();
+    },
 
     // 取消按钮
     cancel() {
@@ -498,108 +498,131 @@ export default {
       this.handleQuery();
     },
 
-
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.userList=[];
-      this.userNoList=[];
-      this.selectionRows = selection,
-      this.ids = selection.map((item) =>item.typeId);
+      this.userList = [];
+      this.userNoList = [];
+      (this.selectionRows = selection),
+        (this.ids = selection.map((item) => item.typeId));
 
-      selection.forEach(item=>{
-          this.userList.push({'typeId':item.typeId,'userId':this.userIdTemp})
-      })
-      selection.forEach(item=>{
-        if(item.repairUserId!=null){
-        this.userNoList.push({'typeId':item.typeId,'userId':item.repairUserId})
+      selection.forEach((item) => {
+        this.userList.push({ typeId: item.typeId, userId: this.userIdTemp });
+      });
+      selection.forEach((item) => {
+        if (item.repairUserId != null) {
+          this.userNoList.push({
+            typeId: item.typeId,
+            userId: item.repairUserId,
+          });
         }
-        
-      })
+      });
       this.single = selection.length != 1;
       this.multiple = !selection.length;
-
     },
 
-      //单选操作-跨页
-      handlerSelect(val, row) {
-        const index = this.userList.findIndex(item=>item.typeId===row.typeId);
-        if(this.ids.indexOf(row.typeId) === -1){
-          this.userList.push({'typeId':row.typeId,'userId':this.userIdTemp})
-        }else if(index!== -1){
-            this.userList.splice(index,1);
-        }
-        const indexNo = this.userNoList.findIndex(item=>item.typeId===row.typeId);
-        if(this.ids.indexOf(row.typeId) === -1){
-          this.userNoList.push({'typeId':row.typeId,'userId':row.repairUserId})
-        }else if(indexNo!== -1){
-            this.userNoList.splice(indexNo,1);
-        }
-      },
+    //单选操作-跨页
+    handlerSelect(val, row) {
+      const index = this.userList.findIndex(
+        (item) => item.typeId === row.typeId
+      );
+      if (this.ids.indexOf(row.typeId) === -1) {
+        this.userList.push({ typeId: row.typeId, userId: this.userIdTemp });
+      } else if (index !== -1) {
+        this.userList.splice(index, 1);
+      }
+      const indexNo = this.userNoList.findIndex(
+        (item) => item.typeId === row.typeId
+      );
+      if (this.ids.indexOf(row.typeId) === -1) {
+        this.userNoList.push({ typeId: row.typeId, userId: row.repairUserId });
+      } else if (indexNo !== -1) {
+        this.userNoList.splice(indexNo, 1);
+      }
+    },
 
-        //全选操作-跨页
-        handlerSelectAll(val) {
-          if (val.length) {
-            // 进来此处说明:
-            // 1 当前页的全选 2 其他页有数据然后当前页的取消全选
-            // 比较全选或者取消全选与当前页的数据，得到差集
-            // 如果tableData中的数据在val中不存在，则说明是取消全选，需要从currentSelection中移除
-            // 如果tableData中所有的数据都在val中存在，则说明是全选，需要将差集添加到currentSelection中
-            const isAllSelect = this.tableData.every(item =>
-            val.some(valItem => valItem.typeId === item.typeId)
-            )
-            if (isAllSelect) {
-              // 全选中新增的差集
-              const diff = val.filter(
-              item => !this.userList.some(user => user.typeId === item.typeId)
-            )
-            if (this.userList.length + diff.length > this.maxLength) {
-              const spaceLeft = this.maxLength - this.userList.length
-              const toAdd = diff.slice(0,spaceLeft)
-                this.userList = this.userList.concat(toAdd.map(item =>({
-                  typeId:item.typeId,
-                  userId:this.userIdTemp
-                })));
-                diff.slice(spaceLeft).forEach(item => this.$refs.multipleTable.toggleRowSelection(item, false))
-            } else {
-                this.userList = this.userList.concat(diff.map(item=>({
-                  typeId:item.typeId,
-                  userId:this.userIdTemp
-                })))
-            }
-
-                          // 全选中新增的差集
-              const diffNo = val.filter(
-              item => !this.userNoList.some(user => user.typeId === item.typeId)
-            )
-            if (this.userNoList.length + diff.length > this.maxLength) {
-              const spaceLeft = this.maxLength - this.userNoList.length
-              const toAdd = diff.slice(0,spaceLeft)
-                this.userNoList = this.userNoList.concat(toAdd.map(item =>({
-                  typeId:item.typeId,
-                  userId:item.userId
-                })));
-                diff.slice(spaceLeft).forEach(item => this.$refs.multipleTable.toggleRowSelection(item, false))
-            } else {
-                this.userNoList = this.userNoList.concat(diff.map(item=>({
-                  typeId:item.typeId,
-                  userId:item.userId
-                })))
-            }
-            } else {
-                this.userList = this.userList.filter(
-                  user => !this.tableData.some(item => item.typeId === user.typeId)
-                )
-                this.userNoList = this.userNoList.filter(
-                  user => !this.tableData.some(item => item.typeId === user.typeId)
-                )
-              }
+    //全选操作-跨页
+    handlerSelectAll(val) {
+      if (val.length) {
+        // 进来此处说明:
+        // 1 当前页的全选 2 其他页有数据然后当前页的取消全选
+        // 比较全选或者取消全选与当前页的数据，得到差集
+        // 如果tableData中的数据在val中不存在，则说明是取消全选，需要从currentSelection中移除
+        // 如果tableData中所有的数据都在val中存在，则说明是全选，需要将差集添加到currentSelection中
+        const isAllSelect = this.tableData.every((item) =>
+          val.some((valItem) => valItem.typeId === item.typeId)
+        );
+        if (isAllSelect) {
+          // 全选中新增的差集
+          const diff = val.filter(
+            (item) => !this.userList.some((user) => user.typeId === item.typeId)
+          );
+          if (this.userList.length + diff.length > this.maxLength) {
+            const spaceLeft = this.maxLength - this.userList.length;
+            const toAdd = diff.slice(0, spaceLeft);
+            this.userList = this.userList.concat(
+              toAdd.map((item) => ({
+                typeId: item.typeId,
+                userId: this.userIdTemp,
+              }))
+            );
+            diff
+              .slice(spaceLeft)
+              .forEach((item) =>
+                this.$refs.multipleTable.toggleRowSelection(item, false)
+              );
           } else {
-            // 进来此处说明:
-            // 其他页并无勾选数据，且当前页取消勾选
-            this.userList = []
-            this.userNoList = []
+            this.userList = this.userList.concat(
+              diff.map((item) => ({
+                typeId: item.typeId,
+                userId: this.userIdTemp,
+              }))
+            );
           }
-        },
+
+          // 全选中新增的差集
+          const diffNo = val.filter(
+            (item) =>
+              !this.userNoList.some((user) => user.typeId === item.typeId)
+          );
+          if (this.userNoList.length + diff.length > this.maxLength) {
+            const spaceLeft = this.maxLength - this.userNoList.length;
+            const toAdd = diff.slice(0, spaceLeft);
+            this.userNoList = this.userNoList.concat(
+              toAdd.map((item) => ({
+                typeId: item.typeId,
+                userId: item.userId,
+              }))
+            );
+            diff
+              .slice(spaceLeft)
+              .forEach((item) =>
+                this.$refs.multipleTable.toggleRowSelection(item, false)
+              );
+          } else {
+            this.userNoList = this.userNoList.concat(
+              diff.map((item) => ({
+                typeId: item.typeId,
+                userId: item.userId,
+              }))
+            );
+          }
+        } else {
+          this.userList = this.userList.filter(
+            (user) =>
+              !this.tableData.some((item) => item.typeId === user.typeId)
+          );
+          this.userNoList = this.userNoList.filter(
+            (user) =>
+              !this.tableData.some((item) => item.typeId === user.typeId)
+          );
+        }
+      } else {
+        // 进来此处说明:
+        // 其他页并无勾选数据，且当前页取消勾选
+        this.userList = [];
+        this.userNoList = [];
+      }
+    },
 
     /** 绑定按钮操作 */
     handleBind() {
@@ -610,20 +633,20 @@ export default {
         });
         return;
       }
-        if (this.ids.length == 0) {
-          this.$alert("未进行勾选相关物资，无法绑定", "提示", {
-            type: "warning",
-            confirmButtonText: "确定",
-          });
-          return;
-        } else {
-          const ids = this.ids.join(",");
-        }
+      if (this.ids.length == 0) {
+        this.$alert("未进行勾选相关物资，无法绑定", "提示", {
+          type: "warning",
+          confirmButtonText: "确定",
+        });
+        return;
+      } else {
+        const ids = this.ids.join(",");
+      }
       bindKeeper(this.userList).then((response) => {
         this.$modal.msgSuccess("绑定成功");
         this.ids = null;
         this.userList = null;
-        this.userIdTemp = -1
+        this.userIdTemp = -1;
         this.getTreeData();
         this.getList();
         this.$refs.multipleTable.clearSelection();
@@ -638,16 +661,16 @@ export default {
           confirmButtonText: "确定",
         });
         return;
-      }else{
-      noBindKeeper(this.userNoList).then((response) => {
-        this.$modal.msgSuccess("解绑成功");
-        this.ids = null;
-        this.userList = null;
-        this.userNoList= null;
-        this.getTreeData();
-        this.getList();
-        this.$refs.multipleTable.clearSelection();
-      });
+      } else {
+        noBindKeeper(this.userNoList).then((response) => {
+          this.$modal.msgSuccess("解绑成功");
+          this.ids = null;
+          this.userList = null;
+          this.userNoList = null;
+          this.getTreeData();
+          this.getList();
+          this.$refs.multipleTable.clearSelection();
+        });
       }
     },
     /** 修改按钮操作 */
@@ -670,7 +693,7 @@ export default {
       userTwo.push({
         typeId: typeId,
         userId: userId,
-      })
+      });
       noBindKeeper(userTwo).then((response) => {
         this.$modal.msgSuccess("解绑成功");
         this.getList();
@@ -680,7 +703,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       let queryTemp = this.queryParams;
-        queryTemp.level = 0;
+      queryTemp.level = 0;
       this.download(
         "/material/ma_type/export4Repair",
         {
@@ -689,7 +712,6 @@ export default {
         `物资类型信息_${new Date().getTime()}.xlsx`
       );
     },
-  
   },
 };
 </script>
@@ -711,11 +733,11 @@ export default {
   }
 }
 .grid-content {
-    border-radius: 4px;
-    min-height: 24px;
+  border-radius: 4px;
+  min-height: 24px;
 }
 .bg-purple-dark {
-    background: #e5e9f2;
+  background: #e5e9f2;
 }
 
 ::v-deep .el-tree .el-tree-node__expand-icon.expanded {