From 69b9ba800c131507f1f2ef89e99f164e67f2f6bb Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 20 May 2025 10:07:39 +0800
Subject: [PATCH] 2025-05-20

---
 .../modules/changeManagement/changeRecord.vue | 16 +++++++++-----
 src/views/modules/part/routingManagement.vue  |  2 +-
 .../processManagement/processFlowInfo.vue     | 22 +++++++++++++++++--
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index ae59064..a922d6b 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -291,7 +291,7 @@
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
             <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
               <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
               </template>
               <template v-if="authReject">
                 <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
@@ -398,7 +398,7 @@
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
             <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
               <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
               </template>
               <template v-if="authReject">
                 <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
@@ -556,7 +556,7 @@
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
             <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
               <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
               </template>
               <template v-if="authReject">
                 <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
@@ -618,7 +618,7 @@
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
             <template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
               <template v-if="authSubmit">
-                <el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
+                <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
               </template>
               <template v-if="authReject">
                 <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
@@ -1555,7 +1555,9 @@
           rejectOpinion: '',
           nodeId: '',
           buNo: '',
-          createBy2: ''
+          createBy2: '',
+          tpProcessControl: '',
+          csProcessControl: ''
         },
         costImpactData: {
           site: this.$store.state.user.site,
@@ -3583,7 +3585,9 @@
           userName: this.$store.state.user.name,
           nodeId: row.nodeId,
           buNo: row.buNo,
-          createBy2: row.createBy2
+          createBy2: row.createBy2,
+          tpProcessControl: row.tpProcessControl,
+          csProcessControl: row.csProcessControl
         }
         this.changeTitle = '变更申请-' + this.modalData.changeNo
         // 查选择的ECN种类
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index aa2889d..ef8a1d8 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -3709,7 +3709,7 @@ export default {
       //   return
       // }
       if (this.checkedDetail.length === 0) {
-        this.$message.warning('请选择要删除子物料！')
+        this.$message.warning('请选择要删除工序！')
         return
       } else {
         this.$confirm("请是否确认删除该子明细记录?", "提示", {
diff --git a/src/views/modules/processManagement/processFlowInfo.vue b/src/views/modules/processManagement/processFlowInfo.vue
index 4572516..54f4b31 100644
--- a/src/views/modules/processManagement/processFlowInfo.vue
+++ b/src/views/modules/processManagement/processFlowInfo.vue
@@ -147,10 +147,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 109002,
-          serialNumber: '109002Table1DocumentNo',
+          serialNumber: '109002Table1DisplayNo',
           tableId: "109002Table1",
           tableName: "流程流转信息表",
-          columnProp: 'documentNo',
+          columnProp: 'displayNo',
           headerAlign: "center",
           align: "left",
           columnLabel: '单据号',
@@ -162,6 +162,24 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 109002,
+          serialNumber: '109002Table1RevisionNo',
+          tableId: "109002Table1",
+          tableName: "流程流转信息表",
+          columnProp: 'revisionNo',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '版本号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 109002,