工艺管理接口联调

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="检验标准">
+            <el-table-column prop="projectStandardName" label="检验标准">
-              <template #default="scope">
+              <!-- <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>

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;
       });

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',

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>