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 @@
-
+
-
+
-
-
+
+
-
+
{{ scope.row.testType == 1 ? '镀前' : '镀后' }}
@@ -454,7 +454,7 @@
-
+
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 )"
>接收
转派