From eb7eac2800a74c3ea09ed8d6b4eac5758bbfd57c Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Fri, 6 Feb 2026 15:30:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/processMainte/processPlanning.vue       |  9 +++++----
 .../components/processMainte/reworkProcessPlanning.vue | 10 +++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index 98365a8..7e3d7e8 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -679,7 +679,8 @@ export default {
     projectChange(row, index) {
       let selectName = this.projectOptions.find(item => item.id == row.projectCode);
       this.form2.tableData2[index].projectName = selectName.name;
-      this.form2.tableData2[index].proHours = selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0;
+      this.form2.tableData2[index].proHours =
+        selectName.standardWorkMinute != -1 ? selectName.standardWorkMinute : 0;
     },
     // 获取检验标准名字
     standardChange(row, index) {
@@ -774,7 +775,7 @@ export default {
     modelLevelChange() {
       this.modelLevelLoading = true;
       getModelDetailList({ Id: this.modelLevel }).then(res => {
-        const templateData = res.data.data;
+        const templateData = res.data.data.proDetailVOList;
         const existing = [...this.form1.tableData1];
         // 将模板中的工序数据映射为表格所需格式
         const mappedData = templateData.map((item, index) => {
@@ -782,11 +783,11 @@ export default {
           return {
             id: null, // 新增时通常设为 null
             processNo: this.getProcessNo(this.form1.tableData1), // 自动生成工序号
-            ppsId: item.ppsId || item.id, // 假设模板中有 ppsId 或 id
+            ppsId: item.ppsId, // 假设模板中有 ppsId 或 id
             processName: item.processName,
             caId: item.caId,
             craftName: item.craftName,
-            proDes: item.proDes || item.description,
+            proDes: item.proDes,
             proHours: item.proHours || '',
             setoutHours: item.setoutHours || '',
             isMain: item.isMain || '0',
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index 5f4c421..d4cf561 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -777,7 +777,7 @@ export default {
     // 导入模板
     modelLevelChange() {
       getModelDetailList({ Id: this.modelLevel }).then(res => {
-        const templateData = res.data.data;
+        const templateData = res.data.data.proDetailVOList;
         const existing = [...this.form1.tableData1];
         // 将模板中的工序数据映射为表格所需格式
         const mappedData = templateData.map((item, index) => {
@@ -786,11 +786,11 @@ export default {
             processInfo: {
               id: null, // 新增时通常设为 null
               processNo: this.getProcessNo(this.form1.tableData1), // 自动生成工序号
-              processCode: item.processCode || item.id, // 假设模板中有 processCode 或 id
+              processCode: item.processCode, // 假设模板中有 processCode 或 id
               processName: item.processName,
               craftCode: item.craftCode,
               craftName: item.craftName,
-              proDes: item.proDes || item.description,
+              proDes: item.proDes,
               proHours: item.proHours || '',
               setoutHours: item.setoutHours || '',
               isMain: item.isMain || '0',
@@ -801,6 +801,10 @@ export default {
         // 赋值（方式1）或追加（方式2）
         this.form1.tableData1 = [...existing, ...mappedData]; // 追加模式
 
+        // 先保存工序信息
+        this.saveProcessInfo().then(() => { 
+        });
+
         this.$message.success('模板导入成功');
       });
     },