From 92ac7eed371be2ecc8d1c0c2b6ddd5ab5a09e423 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 15 Sep 2026 11:33:30 +0800
Subject: [PATCH] =?UTF-8?q?2026-09-15=20Routing=E6=96=B0=E5=A2=9E=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7Parallel=20Operation=EF=BC=8C=E5=B9=B6=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5IFS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/part/routingManagement.vue  | 53 ++++++++++++++++++-
 .../com_projectInfo-add-or-update.vue         |  4 +-
 .../project/projectInfo/projectInfo.vue       |  6 +--
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 570325c..3b77e16 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -533,7 +533,13 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
-        <el-form-item :label="'调机过程中人数'" style="margin-left: 235px" prop="setupCrewSize" :rules="componentRules.setupCrewSize">
+        <el-form-item :label="'并行操作'" prop="parallelOperation" :rules="componentRules.parallelOperation">
+          <el-select v-model="componentData.parallelOperation" style="width: 221px">
+            <el-option label="Parallel" value="Parallel"></el-option>
+            <el-option label="Not parallel" value="Not parallel"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'调机过程中人数'" prop="setupCrewSize" :rules="componentRules.setupCrewSize">
           <el-input-number :controls="false" :step="1"  v-model="componentData.setupCrewSize" style="width: 221px"></el-input-number>
         </el-form-item>
       </el-form>
@@ -1431,6 +1437,7 @@ export default {
         laborSetupTime: '',
         crewSize: '',
         setupCrewSize: '',
+        parallelOperation: 'Not parallel',
         outsideOpItem: '',
         machineNo: '',
         workCenterNo: '',
@@ -2108,6 +2115,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 104003,
+          serialNumber: '104003Table2ParallelOperation',
+          tableId: '104003Table2',
+          tableName: 'Routing工序表',
+          columnProp: 'parallelOperation',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '并行操作',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 104003,
@@ -2928,6 +2953,19 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          columnProp: 'parallelOperation',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '并行操作',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
         {
           columnProp: 'outsideOpItem',
           headerAlign: 'center',
@@ -3131,6 +3169,13 @@ export default {
             trigger: ['blur', 'change']
           }
         ],
+        parallelOperation: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change']
+          }
+        ],
         machRunFactor: [
           {
             required: true,
@@ -3856,6 +3901,7 @@ export default {
         laborSetupTime: '',
         crewSize: 1,
         setupCrewSize: 1,
+        parallelOperation: 'Not parallel',
         outsideOpItem: '',
         machineNo: '',
         workCenterNo: '',
@@ -3909,6 +3955,7 @@ export default {
         laborSetupTime: row.laborSetupTime,
         crewSize: row.crewSize,
         setupCrewSize: row.setupCrewSize,
+        parallelOperation: row.parallelOperation || 'Not parallel',
         outsideOpItem: row.outsideOpItem,
         machineNo: row.machineNo,
         workCenterNo: row.workCenterNo,
@@ -4546,6 +4593,10 @@ export default {
         this.$message.warning('请填写调机过程中人数！')
         return
       }
+      if (this.componentData.parallelOperation === '' || this.componentData.parallelOperation == null) {
+        this.$message.warning('请选择并行操作！')
+        return
+      }
       if (this.componentData.machRunFactor === '' || this.componentData.machRunFactor == null) {
         this.$message.warning('请填写机器单位产出！')
         return
diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index a832a27..3e95192 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -71,7 +71,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="项目年销售额">
+            <el-form-item label="项目年销售额CNY(K)">
               <el-input v-model="dataForm.projectAmount" :disabled="isProjectFieldDisabled('projectAmount')" @input="dataForm.projectAmount = dataForm.projectAmount.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace(/^(\d+\.\d{1,6}).*$/, '$1')"></el-input>
             </el-form-item>
           </el-col>
@@ -1075,7 +1075,7 @@
         }
         const missing = []
         if (this.dataForm.projectAmount === null || this.dataForm.projectAmount === undefined || String(this.dataForm.projectAmount).trim() === '') {
-          missing.push('项目年销售额')
+          missing.push('项目年销售额CNY(K)')
         }
         if (!this.dataForm.finalCustomerId || String(this.dataForm.finalCustomerId).trim() === '') {
           missing.push('直接客户')
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index c041a56..8657cf2 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -84,7 +84,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="addOrUpdateHandle(scope.row.projectId)">新增</a>
-          <a type="text" size="small" @click="UpdateHandle(scope.row)">修改</a>
+          <a type="text" size="small" @click="UpdateHandle(scope.row)">{{ scope.row.status === '审批中' ? '审批' : '修改' }}</a>
           <a type="text" size="small" @click="deleteProjectInfo(scope.row)">删除</a>
           <a v-if="authIssue && scope.row.status === '草稿'" type="text" size="small" @click="issueModal(scope.row)">下达</a>
         </template>
@@ -148,7 +148,7 @@
               </el-form-item>
             </div></el-col>
             <el-col :span="4"><div class="grid-content bg-purple">
-              <el-form-item :label="'项目年销售额'">
+              <el-form-item :label="'项目年销售额CNY(K)'">
                 <el-input v-model="projectData.projectAmount" readonly style=""></el-input>
               </el-form-item>
             </div></el-col>
@@ -2293,7 +2293,7 @@
         }
         const missing = []
         if (source.projectAmount === null || source.projectAmount === undefined || String(source.projectAmount).trim() === '') {
-          missing.push('项目年销售额')
+          missing.push('项目年销售额CNY(K)')
         }
         if (!source.finalCustomerId || String(source.finalCustomerId).trim() === '') {
           missing.push('直接客户')