From 59d685b0120d4dc005376a0f99d4b27a9c7fb19c Mon Sep 17 00:00:00 2001
From: jinna <jinna123>
Date: Fri, 30 Jan 2026 15:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addTemplateDialog.vue          |  28 +++--
 .../processMainte/dsPartBasicInfo.vue         |  62 +++++++++-
 .../processMainte/processPlanning.vue         | 116 +++++++++---------
 .../processMainte/reworkProcessPlanning.vue   |  11 +-
 src/views/processManagement/taskDispatch.vue  |  24 +++-
 .../processManagement/taskProcessing.vue      |   4 +-
 6 files changed, 169 insertions(+), 76 deletions(-)

diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue
index 222b9e2..bce5940 100644
--- a/src/views/processManagement/components/addTemplateDialog.vue
+++ b/src/views/processManagement/components/addTemplateDialog.vue
@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="模板名称:" prop="name">
-            <el-input v-model="ruleForm.name" @change="nameChange"></el-input>
+            <el-input v-model="ruleForm.name"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -100,9 +100,9 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column prop="processCode" label="工序代码" align="left">
+        <el-table-column prop="processCode" label="工序名称" align="left">
           <template #header>
-            <span><i style="color: red">*</i>工序代码</span>
+            <span><i style="color: red">*</i>工序名称</span>
           </template>
           <template #default="scope">
             <el-form-item
@@ -117,17 +117,17 @@
                 clearable
                 filterable
               >
-                <el-option v-for="(item, index) in processList" :label="item.code" :value="item.id">
+                <el-option v-for="(item, index) in processList" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column prop="processName" label="工序名称" align="left">
+        <!-- <el-table-column prop="processName" label="工序名称" align="left">
           <template #default="scope">
             <span>{{ scope.row.processName }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="craftCode" label="工艺能力" align="left">
           <template #header>
             <span><i style="color: red">*</i>工艺能力</span>
@@ -201,7 +201,7 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit" :loading="formLoading">确 定</el-button>
       </span>
     </template>
   </el-dialog>
@@ -239,6 +239,7 @@ export default {
   },
   data() {
     return {
+      formLoading:false,
       craftCodeList: [], //工艺能力列表
       formError: '', // 全局错误提示
       processTemplateList: [],
@@ -383,33 +384,42 @@ export default {
     submit() {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
+          this.formLoading = true
           const pinyinArr = pinyin(this.ruleForm.name, {
             style: pinyin.STYLE_NORMAL, // 无声调（STYLE_TONE 带声调）
             heteronym: false, // 不考虑多音字
           });
           let query = {
-            ...this.ruleForm,
-            modelNameStr: pinyinArr.flat().join(''),
+            promodel: {
+              ...this.ruleForm,
+              modelNameStr: pinyinArr.flat().join(''),
+            },
             tableData: this.ruleForm.tableData,
           };
 
           // 修改
           if (!this.moldAddMore) {
             update(query).then(res => {
+              this.formLoading = false
               this.$message({
                 type: 'success',
                 message: '操作成功!',
               });
               this.$emit('closeDialog');
+            }).catch(err=>{
+              this.formLoading = false
             });
           } else {
             // 新增
             add(query).then(res => {
+              this.formLoading = false
               this.$message({
                 type: 'success',
                 message: '操作成功!',
               });
               this.$emit('closeDialog');
+            }).catch(err=>{
+              this.formLoading = false
             });
           }
         } else {
diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
index 1f7929a..9083215 100644
--- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
+++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
@@ -117,7 +117,7 @@
               >
                 <el-option
                   v-for="item in plateList"
-                   :label="item.plating"
+                  :label="item.plating"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -516,10 +516,38 @@ export default {
             search: false,
             sortable: true,
             overHidden: true,
+            cell: true,
+            rules: [
+              {
+                required: true,
+                message: '请输入面积',
+                trigger: 'blur',
+              },
+              {
+                validator: (rule, value, callback) => {
+                  const row = rule.$row; // avue 支持 $row 获取当前行数据
+                  const type = row.sinTerType;
+                  const area = parseFloat(value);
+                  if (type !== 2) {
+                    // 非壳体
+                    if (isNaN(area) || area > 1) {
+                      callback(new Error('非壳体面积不能大于1'));
+                    } else {
+                      callback();
+                    }
+                  } else {
+                    callback(); // 壳体不限制
+                  }
+                },
+                trigger: 'blur',
+              },
+            ],
           },
+
           {
             label: '总面积',
             prop: 'totalArea',
+            cell: true,
             search: false,
             sortable: true,
             overHidden: true,
@@ -557,6 +585,23 @@ export default {
               },
             ],
           },
+          {
+            label: '是否电镀',
+            prop: 'isElectroplating',
+            cell: true,
+            search: false,
+            sortable: true,
+            overHidden: true,
+            type: 'select', // 使用下拉选择
+            dicData: [
+              { label: '是', value: '是' },
+              { label: '否', value: '否' },
+            ],
+            // 控制是否可编辑：仅当 partCode 包含 A1 且 sinTerType === 1 时可编辑
+            editDisplay: row => {
+              return row.sinTerType === 1 && row.partCode && /A1/.test(row.partCode);
+            },
+          },
           {
             label: '修改人',
             prop: 'updateUser',
@@ -722,9 +767,24 @@ export default {
               return this.$message.warning('一级路线包含涂色，请填写涂色数据');
             }
           }
+          for (const item of this.data) {
+            if (item.sinTerType === 1 && item.partCode && /A1/.test(item.partCode)) {
+              if (!item.isElectroplating) {
+                this.$message.warning(`子件【${item.partName}】为A1插针，必须填写“是否电镀”`);
+                this.submitLoading = false;
+                return;
+              }
+            }
+          }
           this.formData.childPage = this.childPage;
           this.formData.psId = this.psId;
 
+          // 判断单个面积是不是大于1 A1配置码的不能为空
+          // this.data.forEach(item=>{
+          //   if(item.type=='2'){
+
+          //   }
+          // })
           authorizedAccomplish({ dsPart: this.formData, partList: this.data }).then(res => {
             this.$message.success('操作成功');
             this.cancel(flag, res.data);
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index 801df68..821b864 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -97,7 +97,7 @@
             style="width: 220px; margin-right: 12px"
             clearable
             filterable
-            :filter-method="handleFilter" 
+            :filter-method="handleFilter"
           >
             <el-option
               v-for="(item, index) in filteredList"
@@ -392,10 +392,10 @@
             <template #default="scope">
               <el-form-item :prop="`tableData3[${scope.$index}].tool`" :rules="formRules3.tool">
                 <el-input
-                v-model="scope.row.tool"
-                placeholder="请输入"
-                style="width: 100%"
-              ></el-input>
+                  v-model="scope.row.tool"
+                  placeholder="请输入"
+                  style="width: 100%"
+                ></el-input>
                 <!-- <el-select v-model="scope.row.tool" placeholder="请选择" clearable filterable>
                   <el-option label="是" value="1"></el-option>
                   <el-option label="否" value="2"></el-option>
@@ -544,7 +544,7 @@ export default {
   },
   data() {
     return {
-      craftLoading:false,
+      craftLoading: false,
       rank: '2',
       processLevel: '2',
       data: [],
@@ -624,9 +624,8 @@ export default {
       tempId: 0,
       projectOptions: [], //检验项目列表
       standardList: [], //检验标准列表
-      filteredList:[],
-      dictionaryData:[],
-      
+      filteredList: [],
+      dictionaryData: [],
     };
   },
 
@@ -639,22 +638,22 @@ export default {
     this.getPqList();
     this.getProject();
     this.getStandardList();
-    this.getDictionary()
+    this.getDictionary();
   },
   methods: {
     // 获取涂色标、涂色带、涂箭头的系数
-    getDictionary(){
-      getDictionary({code:'part_info'}).then(res=>{
-        this.dictionaryData = res.data.data
-      })
+    getDictionary() {
+      getDictionary({ code: 'part_info' }).then(res => {
+        this.dictionaryData = res.data.data;
+      });
     },
     // 获取检验项目名字
-    projectChange(row,index) {
+    projectChange(row, index) {
       let selectName = this.projectOptions.find(item => item.id == row.projectCode);
       this.form2.tableData2[index].projectName = selectName.name;
     },
     // 获取检验标准名字
-    standardChange(row,index) {
+    standardChange(row, index) {
       let selectName = this.standardList.find(item => item.id == row.projectStandard);
       this.form2.tableData2[index].projectStandardName = selectName.name;
     },
@@ -672,24 +671,24 @@ export default {
     processChange(row, index) {
       let selectName = this.processSetOption.find(item => item.id == row.processCode);
       this.form1.tableData1[index].processName = selectName.name;
-      if(this.form1.tableData1[index].processName.indexOf('涂色标') > -1){
-        console.log(this.partInfoData,this.dictionaryData,'this.partInfoData'); 
+      if (this.form1.tableData1[index].processName.indexOf('涂色标') > -1) {
+        console.log(this.partInfoData, this.dictionaryData, 'this.partInfoData');
         // tsbNum 涂色标个数  tsdNum 涂色带个数   涂箭头个数
-        let sum_ = 0
-        if(this.partInfoData.tsbNum){
-          let tsb=this.dictionaryData.find(item => item.dictValue == '涂色标')
-          sum_ += parseInt(this.partInfoData.tsbNum)*tsb.dictKey
+        let sum_ = 0;
+        if (this.partInfoData.tsbNum) {
+          let tsb = this.dictionaryData.find(item => item.dictValue == '涂色标');
+          sum_ += parseInt(this.partInfoData.tsbNum) * tsb.dictKey;
         }
-        if(this.partInfoData.tsdNum){
-          let tsd=this.dictionaryData.find(item => item.dictValue == '涂色带')
-          sum_ += parseInt(this.partInfoData.tsdNum)*tsd.dictKey
+        if (this.partInfoData.tsdNum) {
+          let tsd = this.dictionaryData.find(item => item.dictValue == '涂色带');
+          sum_ += parseInt(this.partInfoData.tsdNum) * tsd.dictKey;
         }
-        if(this.partInfoData.tsjNum){
-          let tsj=this.dictionaryData.find(item => item.dictValue == '涂箭头')
-          sum_ += parseInt(this.partInfoData.tsjNum)*tsj.dictKey
+        if (this.partInfoData.tsjNum) {
+          let tsj = this.dictionaryData.find(item => item.dictValue == '涂箭头');
+          sum_ += parseInt(this.partInfoData.tsjNum) * tsj.dictKey;
         }
-        console.log(sum_,'sum_');
-        this.form1.tableData1[index].proHours = sum_
+        console.log(sum_, 'sum_');
+        this.form1.tableData1[index].proHours = sum_;
       }
     },
     // 获取工艺能力名字
@@ -703,31 +702,31 @@ export default {
         this.rankList = res.data.data;
       });
     },
-    handleFilter(keyword){
+    handleFilter(keyword) {
       // 1. 无关键词时，显示全部数据
       if (!keyword) {
-        this.filteredList = [...this.originList]
-        return
+        this.filteredList = [...this.modelOption];
+        return;
       }
 
       // 2. 统一转为小写，实现不区分大小写过滤
-      const lowerKeyword = keyword.toLowerCase()
+      const lowerKeyword = keyword;
 
       // 3. 同时匹配两个字段：name 或 pinyin 包含关键词即保留
-      this.filteredList = this.originList.filter(item => {
+      this.filteredList = this.modelOption.filter(item => {
         // 字段1：姓名（转小写）
-        const matchName = item.name.toLowerCase().includes(lowerKeyword)
+        const matchName = item.name.includes(lowerKeyword);
         // 字段2：拼音（转小写）
-        const matchPinyin = item.modelNameStr.toLowerCase().includes(lowerKeyword)
+        const matchPinyin = item.modelNameStr.includes(lowerKeyword);
         // 只要有一个字段匹配，就保留该选项
-        return matchName || matchPinyin
-      })
+        return matchName || matchPinyin;
+      });
     },
     // 工艺模板列表
     async getModelList() {
       await getModelList().then(res => {
         this.modelOption = res.data.data;
-         this.filteredList = [...this.modelOption]
+        this.filteredList = [...this.modelOption];
       });
     },
     // 工序列表查询
@@ -777,7 +776,7 @@ export default {
         partId: this.partId,
         taskId: this.updateRow.id,
         rank: this.rank,
-        version:this.updateRow.version
+        version: this.updateRow.version,
       }).then(res => {
         this.data = this.transformCraftTree(res.data.data);
         this.partInfoData = res.data.data.partInfo;
@@ -856,7 +855,7 @@ export default {
       this.form2.deleteIds = [];
       this.form3.deleteIds = [];
       this.form4.deleteIds = [];
-      
+
       // 根据节点层级切换标签页
       if (this.treeLeave === 2) {
         this.activeName = '1';
@@ -1042,7 +1041,6 @@ export default {
       }
     },
     saveInfo() {
-
       if (this.activeName == '1') {
         // 调用单个 Form 的校验方法
         this.$refs.tableForm1.validate(async (isValid, invalidFields) => {
@@ -1081,7 +1079,7 @@ export default {
             if (isReturn == 1) {
               return this.$message.warning('涂色标的工时定额必须大于0,请修改！');
             }
-            console.log(898989,this.partInfoData)
+            console.log(898989, this.partInfoData);
             // const res = await getPartDetail(this.partId);
             // console.log(res);
             let dsCraftMold = this.partInfoData;
@@ -1231,7 +1229,7 @@ export default {
             //     });
             //   }
             // }
-            this.craftLoading = true
+            this.craftLoading = true;
 
             // 处理传参
             if (this.treeNodes.rawData.qualityGradeCode) {
@@ -1247,20 +1245,22 @@ export default {
               deleteIds: this.form1.deleteIds, //删除ids
             };
 
-            authorizedAccomplish2(query_).then(res => {
-              this.$message.success('保存成功');
-              this.craftLoading = false
-              this.getDetails();
-            }).catch(err=>{
-               this.craftLoading = false
-            });
+            authorizedAccomplish2(query_)
+              .then(res => {
+                this.$message.success('保存成功');
+                this.craftLoading = false;
+                this.getDetails();
+              })
+              .catch(err => {
+                this.craftLoading = false;
+              });
           }
         });
       }
       if (this.activeName == '2') {
         this.$refs.tableForm2.validate((isValid, invalidFields) => {
           if (isValid) {
-            this.craftLoading = true
+            this.craftLoading = true;
             let query_ = {
               processEntity: this.treeNodes.rawData.processInfo, //工序
               processProjectEntityList: this.form2.tableData2, //项目
@@ -1269,7 +1269,7 @@ export default {
 
             saveProcessProjectSave(query_).then(res => {
               this.$message.success('保存成功');
-              this.craftLoading = false
+              this.craftLoading = false;
               this.getDetails();
             });
           }
@@ -1278,7 +1278,7 @@ export default {
       if (this.activeName == '3') {
         this.$refs.tableForm3.validate((isValid, invalidFields) => {
           if (isValid) {
-            this.craftLoading = true
+            this.craftLoading = true;
             let query_ = {
               processEntity: this.treeNodes.rawData.processInfo, //工序
               processMeasuringToolEntities: this.form3.tableData3, //尺寸量具
@@ -1286,7 +1286,7 @@ export default {
             };
             saveProcessMeasuringTool(query_).then(res => {
               this.$message.success('保存成功');
-              this.craftLoading = false
+              this.craftLoading = false;
               this.getDetails();
             });
           }
@@ -1295,7 +1295,7 @@ export default {
       if (this.activeName == '4') {
         this.$refs.tableForm4.validate((isValid, invalidFields) => {
           if (isValid) {
-             this.craftLoading = true
+            this.craftLoading = true;
             let query_ = {
               processEntity: this.treeNodes.rawData.processInfo, //工序
               processMoldToolEntities: this.form4.tableData4, //尺寸量具
@@ -1303,7 +1303,7 @@ export default {
             };
             saveProcessMoldTool(query_).then(res => {
               this.$message.success('保存成功');
-               this.craftLoading = false
+              this.craftLoading = false;
               this.getDetails();
             });
           }
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index f97fb08..985de62 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -755,24 +755,25 @@ export default {
     getModelList() {
       getModelList().then(res => {
         this.modelOption = res.data.data;
+        this.filteredList = [...this.modelOption];
       });
     },
     handleFilter(keyword) {
       // 1. 无关键词时，显示全部数据
       if (!keyword) {
-        this.filteredList = [...this.originList];
+        this.filteredList = [...this.modelOption];
         return;
       }
 
       // 2. 统一转为小写，实现不区分大小写过滤
-      const lowerKeyword = keyword.toLowerCase();
+      const lowerKeyword = keyword;
 
       // 3. 同时匹配两个字段：name 或 pinyin 包含关键词即保留
-      this.filteredList = this.originList.filter(item => {
+      this.filteredList = this.modelOption.filter(item => {
         // 字段1：姓名（转小写）
-        const matchName = item.name.toLowerCase().includes(lowerKeyword);
+        const matchName = item.name.includes(lowerKeyword);
         // 字段2：拼音（转小写）
-        const matchPinyin = item.modelNameStr.toLowerCase().includes(lowerKeyword);
+        const matchPinyin = item.modelNameStr.includes(lowerKeyword);
         // 只要有一个字段匹配，就保留该选项
         return matchName || matchPinyin;
       });
diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue
index 594b89c..32bec61 100644
--- a/src/views/processManagement/taskDispatch.vue
+++ b/src/views/processManagement/taskDispatch.vue
@@ -22,7 +22,9 @@
 
       <template #menu-right="{ size }"> </template>
       <template #menu="scope">
-        <el-button type="primary" link @click="setCrew(scope.row)">分派</el-button>
+        <el-button v-if="scope.row.children" type="primary" link @click="setCrew(scope.row)"
+          >分派</el-button
+        >
       </template>
       <template #bsWorkType.wtName="scope">
         <span>
@@ -85,6 +87,7 @@ export default {
         border: true,
         index: true,
         selection: true,
+        selectable: (row, index) => row.children,
         viewBtn: false,
         delBtn: false,
         editBtn: false,
@@ -220,12 +223,26 @@ export default {
         return;
       }
       this.updateRow = this.selectionList;
+      this.selectionList.forEach(item => {
+        if (item.children && item.children.length > 0) {
+          item.children.forEach(element => {
+            this.updateRow.push(element);
+          });
+        }
+      });
+      // console.log(5555, this.updateRow);
       this.setCrewOpen = true;
       this.title = '批量分派';
     },
     // 设置班组人员
     setCrew(row) {
       this.updateRow = [row];
+      if (row.children.length > 0) {
+        row.children.forEach(element => {
+          this.updateRow.push(element);
+        });
+      }
+      // console.log(999999, this.updateRow);
       this.setCrewOpen = true;
       this.title = '分派';
     },
@@ -288,3 +305,8 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+  :deep(.el-checkbox .is-disabled){
+    display: none;
+  }
+</style>
diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue
index 2b07a55..3d94370 100644
--- a/src/views/processManagement/taskProcessing.vue
+++ b/src/views/processManagement/taskProcessing.vue
@@ -25,12 +25,12 @@
         <el-button type="primary" link @click="viewDetails(scope.row.partId, scope.row)"
           >详情</el-button
         >
-        <!-- 0 待分派  1 待接收 2 进行中 3 已完成  v-if="scope.row.taskStatus == 2" -->
+        <!-- 0 待分派  1 待接收 2 进行中 3 已完成  " -->
         <el-button
           type="primary"
           link
           @click="organization(scope.row.partId, scope.row)"
-          
+          v-if="scope.row.taskStatus == 2"
           >编制</el-button
         >
         <!-- <el-button