diff --git a/src/views/basicData/ruleMaintenance.vue b/src/views/basicData/ruleMaintenance.vue
index e185c37..5567b9a 100644
--- a/src/views/basicData/ruleMaintenance.vue
+++ b/src/views/basicData/ruleMaintenance.vue
@@ -109,6 +109,7 @@ export default {
                         filter: true,
                         span: 12,
                         search: true,
+                        filterable: true,
                         dicUrl:"/blade-desk/BA/craftAbility/findList",
                         props:{
                             label:"caName",
diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue
index b662bb3..9612bfa 100644
--- a/src/views/basicData/teamManagement.vue
+++ b/src/views/basicData/teamManagement.vue
@@ -509,14 +509,25 @@ export default {
         this.$message.error('请至少选择一条数据')
         return
       }
-      deleteTeam({
-        ids: this.selectionList.map(item => item.id).join(',')
-      }).then(res =>{
-        if(res.data.code == 200){
-          this.$message.success('删除成功')
-          this.onLoad()
-        }
-      })
+      const count = this.selectionList.length;
+      this.$confirm(`确定要删除选中的 ${count} 条班组数据吗？此操作不可恢复！`, '删除确认', {
+        confirmButtonText: '确定删除',
+        cancelButtonText: '取消',
+        type: 'warning',
+        confirmButtonClass: 'el-button--danger',
+      }).then(() => {
+        deleteTeam({
+          ids: this.selectionList.map(item => item.id).join(',')
+        }).then(res =>{
+          if(res.data.code == 200){
+            this.$message.success('删除成功')
+            this.selectionList = [];
+            this.onLoad()
+          }
+        })
+      }).catch(() => {
+        // 用户点击取消
+      });
     },
     // 多选
     selectionChange(list) {
diff --git a/src/views/basicData/workCenter.vue b/src/views/basicData/workCenter.vue
index 8c6ce35..0697064 100644
--- a/src/views/basicData/workCenter.vue
+++ b/src/views/basicData/workCenter.vue
@@ -18,22 +18,6 @@
       @on-load="onLoad"
       :beforeOpen="beforeOpen"
     >
-      <template #leaderUser-form="{ type, disabled }">
-        <el-select v-if="type == 'add' || type == 'edit'" placeholder="请选择 主管工艺员"
-        filterable
-        remote
-        :remote-method="getLeaderUser"
-        v-model="form.leaderUser">
-          <el-option
-            v-for="item in leaderUsers"
-            :key="item.id"
-            :label="item.realName"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </template>
-      <!-- <template #userName="{ row }">{{ row.leaderUser.userName }}</template>
-      <template #jcName="{ row }">{{ row.bsJfCenter.jcName }}</template> -->
       <template #menu-left>
         <el-button type="danger" icon="el-icon-delete" @click="handleDelete"
           >删除</el-button
@@ -77,10 +61,16 @@
           @select="selectChange"
         >
           <el-table-column type="selection" width="55px"></el-table-column>
-          <el-table-column align="center" label="工艺能力" prop="id">
+          <el-table-column align="center" label="*工艺能力" prop="id">
             <template #default="scope">
-              <el-select v-model="scope.row.id">
-                <el-option v-for="item in abilityList" :key="item.id" :label="item.caName" :value="item.id"></el-option>
+              <el-select v-model="scope.row.id" filterable @change="handleAbilityChange">
+                <el-option
+                  v-for="item in abilityList"
+                  :key="item.id"
+                  :label="item.caName"
+                  :value="item.id"
+                  :disabled="isAbilitySelected(item.id, scope.$index)">
+                </el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -265,7 +255,7 @@ export default {
             type: "select",
             span: 24,
             overflow: true,
-            search: true,
+            // search: true,
             addDisplay:false,
             editDisplay:false,
             rules: [
@@ -278,6 +268,7 @@ export default {
             filterable:true,
             remote:true,
             dicUrl:"/api/blade-system/user/page?current=1&size=9999&realName={{key}}",
+            //  dicUrl:"/blade-system/user/page?size=999999&current=1",
             props: {
               label: "realName",
               value: "id",
@@ -301,7 +292,10 @@ export default {
             ],
             filterable:true,
             remote:true,
-            dicUrl:"/api/blade-system/user/page?current=1&size=300&realName={{key}}",
+              dicUrl:"/api/blade-system/user/page?current=1&size=9999&realName={{key}}",
+           
+            // dicUrl:"/blade-system/user/page?size=999999&current=1",
+            
             props: {
               label: "realName",
               value: "id",
@@ -420,28 +414,7 @@ export default {
     this.getAbilityData()
   },
   methods: {
-    getLeaderUser(query){
-      console.log('query------------',query)
-      console.log('leaderUsers------------',this.leaderUsers.length)
-      if(query == ''){
-        console.log('111111111111111111111')
-        if(this.leaderUsers.length == 0){
-          getAllUser({
-            current:1,size:300
-          }).then(res =>{
-            this.leaderUsers = res.data.data.records
-          })
-        }
-        
-      }else{
-        getAllUser({
-          current:1,size:300,
-          realName:query
-        }).then(res =>{
-          this.leaderUsers = res.data.data.records
-        })
-      }
-    },
+
     searchChange(params, done){
       this.query = params;
       this.page.currentPage = 1;
@@ -466,7 +439,6 @@ export default {
         this.form.checkout = this.form.checkout == 1 ? [1] : []
         this.form.bigBatch = this.form.bigBatch == 1 ? [1] : []
         this.form.whetherPlate = this.form.whetherPlate == 1 ? [1] : []
-        // this.getLeaderUser(this.form.leaderUserName)
         getAllUser({current:1,size:300}).then(res => {
           this.leaderUsers = res.data.data.records
           let tmp = this.leaderUsers.find(item => item.id == this.form.leaderUser)
@@ -550,6 +522,12 @@ export default {
         this.$message.error('请至少填写一条数据')
         return
       }
+      // 校验工艺能力是否必选
+      const emptyAbility = this.capacityList.find(item => !item.id);
+      if(emptyAbility){
+        this.$message.error('工艺能力为必选项，请选择工艺能力')
+        return
+      }
       // console.log('this.capacityList-----------',this.capacityList)
       // 校验通过：准备提交数据（过滤无用字段）
         const submitData = this.capacityList.map(row => {
@@ -587,6 +565,16 @@ export default {
       const record = { _select: false };
       this.capacityList.push(record);
     },
+    // 判断工艺能力是否已被其他行选中
+    isAbilitySelected(abilityId, currentIndex) {
+      return this.capacityList.some((item, index) => {
+        return index !== currentIndex && item.id === abilityId;
+      });
+    },
+    // 处理工艺能力选择变化
+    handleAbilityChange() {
+      // 可以在这里添加额外的逻辑，比如清空其他字段
+    },
     selectChange(list, row) {
       row._select = !row._select;
     },
diff --git a/src/views/oem/oemCustomer/index.vue b/src/views/oem/oemCustomer/index.vue
index a9e19c9..264e20c 100644
--- a/src/views/oem/oemCustomer/index.vue
+++ b/src/views/oem/oemCustomer/index.vue
@@ -23,9 +23,9 @@
         <el-button type="primary" link @click="setCraftAbility(scope.row)"
           >设置工艺能力</el-button
         >
-        <el-button type="primary" link @click="changePWD(scope.row)"
+        <!-- <el-button type="primary" link @click="changePWD(scope.row)"
           >设置密码</el-button
-        >
+        > -->
       </template>
       <template #virtualMac="scope">
         <span>
@@ -173,7 +173,7 @@ export default {
             label: "外协简称",
             prop: "abbreviation",
             sortable: true,
-            search: true,
+            search: false,
             overHidden: true,
             hide: true,
             width: 120,
@@ -284,14 +284,14 @@ export default {
             overHidden: true,
             width: 120,
           },
-          {
-            label: "密码",
-            prop: "oemPassword",
-            sortable: true,
-            search: false,
-            overHidden: true,
-            width: 120,
-          },
+          // {
+          //   label: "密码",
+          //   prop: "oemPassword",
+          //   sortable: true,
+          //   search: false,
+          //   overHidden: true,
+          //   width: 120,
+          // },
         ],
       },
       data: [],
diff --git a/src/views/oem/outsourcingAssignmentControl/index.vue b/src/views/oem/outsourcingAssignmentControl/index.vue
index 7c34194..21caebf 100644
--- a/src/views/oem/outsourcingAssignmentControl/index.vue
+++ b/src/views/oem/outsourcingAssignmentControl/index.vue
@@ -26,7 +26,7 @@
         </el-select>
       </template>
       <template #platingId="scope">
-        <el-select v-model="scope.row.platingId">
+        <el-select v-model="scope.row.platingId" filterable>
           <el-option v-for="item in abilityData" :key="item.id" :label="item.caName" :value="item.id"></el-option>
         </el-select>
       </template>
@@ -150,6 +150,7 @@ export default {
             span: 24,
             type: "select",
             search: true,
+            filterable: true,
             // cell: true,
             // type: "select",
             dicUrl:"/api/blade-desk/BA/craftAbility/findList",
diff --git a/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue b/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
index 3d3e5c1..e28ee93 100644
--- a/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue
@@ -7,6 +7,7 @@
       v-model:page="page"
       v-model="form"
       ref="crud"
+      :before-open="beforeOpen"
       @row-update="rowUpdate"
       @row-save="rowSave"
       @row-del="rowDel"
@@ -22,7 +23,7 @@
         <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除 </el-button>
         <el-button type="success" icon="el-icon-upload" @click="handleImport">导入 </el-button>
       </template>
-      <template #status-desc="{type, row}">
+      <template #status-desc="{type}">
         <p v-if="type == 'edit'" style="color:red">注：作业槽停用将停止下发槽液任务</p>
       </template>
       <template #status="{ row }">
@@ -121,6 +122,7 @@ export default {
             filter: true,
             span: 24,
             search: true,
+            filterable: true,
             rules: [
               {
                 required: true,
@@ -248,6 +250,15 @@ export default {
   },
   mounted() {},
   methods: {
+    beforeOpen(done, type) {
+      if(type === 'edit') {
+        // 将 workstationId 转换为字符串以匹配下拉框的 value 类型
+        if(this.form.workstationId) {
+          this.form.workstationId = this.form.workstationId + ''
+        }
+      }
+      done()
+    },
    // 点击导入按钮
     handleImport() {
       this.isShowImport = true
@@ -288,6 +299,10 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     rowUpdate(row, index, done, loading) {
+      // 将 workstationId 转回数字类型
+      if(row.workstationId) {
+        row.workstationId = parseInt(row.workstationId)
+      }
       updateWorkTank(row).then(res =>{
         if(res.data.code == 200){
           this.$message.success('修改成功')
@@ -301,6 +316,10 @@ export default {
     rowSave(row, done, loading) {
       console.log('row-------------------',row)
       row.status = row.status == "" ? 0 : row.status
+      // 将 workstationId 转为数字类型
+      if(row.workstationId) {
+        row.workstationId = parseInt(row.workstationId)
+      }
       addWorkTank(row).then(res =>{
         if(res.data.code == 200){
           this.$message.success('新增成功')