From 7ad79a46deaddd2754e8395e073295bb2d9b3c8a Mon Sep 17 00:00:00 2001
From: jinna <jinna123>
Date: Fri, 23 Jan 2026 15:13:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/processMainte/partDetails.vue     | 16 ++++++++--------
 .../processMainte/reworkProcessPlanning.vue      |  2 +-
 src/views/processManagement/procepssPlanning.vue | 13 ++++++++++++-
 src/views/processManagement/taskProcessing.vue   |  6 ++++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/processManagement/components/processMainte/partDetails.vue b/src/views/processManagement/components/processMainte/partDetails.vue
index 3daadb8..fdd232e 100644
--- a/src/views/processManagement/components/processMainte/partDetails.vue
+++ b/src/views/processManagement/components/processMainte/partDetails.vue
@@ -404,9 +404,9 @@
             </el-table-column>
           </el-table>
           <el-table :data="form2.tableData2" style="width: 100%" v-if="activeName == '2'" border>
-            <el-table-column prop="processNo" label="工序号"></el-table-column>
+            <el-table-column prop="trialNo" label="工序号"></el-table-column>
             <el-table-column prop="projectName" label="检验项目">
-              <template #default="scope">
+              <!-- <template #default="scope">
                 <el-select
                   v-model="scope.row.projectName"
                   placeholder="请选择"
@@ -420,10 +420,10 @@
                     :value="item.id"
                   ></el-option>
                 </el-select>
-              </template>
+              </template> -->
             </el-table-column>
-            <el-table-column prop="projectStandard" label="检验标准">
-              <template #default="scope">
+            <el-table-column prop="projectStandardName" label="检验标准">
+              <!-- <template #default="scope">
                 <el-select
                   v-model="scope.row.projectStandard"
                   placeholder="请选择"
@@ -437,13 +437,13 @@
                     :value="item.id"
                   ></el-option>
                 </el-select>
-              </template>
+              </template> -->
             </el-table-column>
             <el-table-column prop="proHours" label="定额工时(分钟)"> </el-table-column>
             <el-table-column prop="prepareHours" label="准备工时(分钟)"></el-table-column>
           </el-table>
           <el-table :data="form3.tableData3" style="width: 100%" v-if="activeName == '3'" border>
-            <el-table-column prop="processNo" label="工序号"></el-table-column>
+            <el-table-column prop="trialNo" label="工序号"></el-table-column>
             <el-table-column prop="testType" label="镀前镀后">
               <template #default="scope">
                 {{ scope.row.testType == 1 ? '镀前' : '镀后' }}
@@ -454,7 +454,7 @@
             <el-table-column prop="toolInfo" label="图纸尺寸"></el-table-column>
           </el-table>
           <el-table :data="form4.tableData4" style="width: 100%" v-if="activeName == '4'" border>
-            <el-table-column prop="processNo" label="工序号"></el-table-column>
+            <el-table-column prop="trialNo" label="工序号"></el-table-column>
             <el-table-column prop="moldCode" label="对应工装"> </el-table-column>
             <el-table-column prop="moldName" label="工装名称"></el-table-column>
             <el-table-column prop="isPrint" label="是否印字"></el-table-column>
diff --git a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
index bc280ae..e7848e2 100644
--- a/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
+++ b/src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
@@ -668,7 +668,7 @@ export default {
     },
     // 获取零件信息详情数据
     getDetails() {
-      getProcessAuthorized({ partId: this.partId, taskId: this.updateRow.id }).then(res => {
+      getProcessAuthorized({ partId: this.partId, taskId: this.updateRow.id, version:this.updateRow.version }).then(res => {
         this.data = this.transformCraftTree(res.data.data);
         this.partInfoData = res.data.data;
       });
diff --git a/src/views/processManagement/procepssPlanning.vue b/src/views/processManagement/procepssPlanning.vue
index 7840d35..15eca70 100644
--- a/src/views/processManagement/procepssPlanning.vue
+++ b/src/views/processManagement/procepssPlanning.vue
@@ -255,7 +255,7 @@ export default {
           },
           {
             label: '零件类型',
-            prop: 'sinTerType',
+            prop: 'isSintering',
             sortable: true,
             search: false,
             overHidden: true,
@@ -286,6 +286,17 @@ export default {
             headerAlign: 'center',
             align: 'center',
           },
+          
+          {
+            label: '版本号',
+            prop: 'partVersion',
+            sortable: true,
+            search: false,
+            overHidden: true,
+            headerAlign: 'center',
+            align: 'center',
+             width: 120,
+          },
           // {
           //     label: '状态',
           //     prop: 'status',
diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue
index 6862498..773ba46 100644
--- a/src/views/processManagement/taskProcessing.vue
+++ b/src/views/processManagement/taskProcessing.vue
@@ -37,7 +37,8 @@
           type="primary"
           link
           @click="receiveFn(scope.row)"
-          v-if="scope.row.taskStatus == 1"
+          v-if="(scope.row.taskStatus == 1)&&
+            (!scope.row.completed )"
           >接收</el-button
         >
         <el-button
@@ -54,7 +55,8 @@
           type="primary"
           link
           @click="setBathCrew(scope.row)"
-          v-if="scope.row.taskStatus == 1"
+          v-if="(scope.row.taskStatus == 1)&&
+            (!scope.row.completed )"
           >转派</el-button
         >
       </template>