From 5538b467653d7ea4806b63eb6137df9bd4a924c9 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 6 Mar 2026 17:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=91=98=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/erf/components/expApplyForm.vue   | 14 +++++++++-
 src/views/modules/erf/expApplyList.vue        | 26 ++++++++++++-------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/erf/components/expApplyForm.vue b/src/views/modules/erf/components/expApplyForm.vue
index 0e57e0f..b710361 100644
--- a/src/views/modules/erf/components/expApplyForm.vue
+++ b/src/views/modules/erf/components/expApplyForm.vue
@@ -127,7 +127,19 @@
           </el-form-item>
         </el-col>
       </el-row>
-
+      <el-row :gutter="20" style="margin-top: 45px">
+        <el-col :span="24">
+          <el-form-item label="工序">
+            <el-input
+              v-model="saveHeaderData.processRequirement"
+              :readonly="readonly"
+              type="textarea"
+              :rows="3"
+              placeholder="工序">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 <!--      <el-row :gutter="20">
 
 
diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue
index 897c5c7..0061eed 100644
--- a/src/views/modules/erf/expApplyList.vue
+++ b/src/views/modules/erf/expApplyList.vue
@@ -225,7 +225,7 @@
       <el-table-column
         prop="creatorName"
         label="申请人"
-        width="80"
+        width="100"
         align="center"
         header-align="center">
       </el-table-column>
@@ -602,9 +602,10 @@
         <!-- 计划员 -->
         <el-form-item label="计划员" required>
           <el-select class="manager-select"
-            v-model="submitData.plannerId"
-            placeholder="请选择计划员"
+            v-model="submitData.plannerIds"
+            placeholder="请选择计划员（可多选）"
             style="width: 100%"
+            multiple
             clearable>
             <el-option
               v-for="planner in plannerList"
@@ -614,7 +615,7 @@
             </el-option>
           </el-select>
           <div style="margin-top: 1px; color: #909399; font-size: 12px">
-            经理审批全部通过后，将由选定的计划员负责排产
+            经理审批全部通过后，任意选定的计划员均可排产
           </div>
         </el-form-item>
       </el-form>
@@ -704,7 +705,7 @@ export default {
         techManagerName: '',
         prodManagerIds: [],
         qualityManagerIds: [],
-        plannerId: null
+        plannerIds: []
       },
       prodManagerList: [], // 生产经理候选列表
       qualityManagerList: [], // 质量经理候选列表
@@ -1008,7 +1009,14 @@ export default {
             techManagerName: data.techManager.managerName,
             prodManagerIds: defaultProdManagerIds,
             qualityManagerIds: defaultQualityManagerIds,
-            plannerId: this.plannerList.length === 1 ? this.plannerList[0].userId : null
+            plannerIds: (() => {
+            // 默认选中Joyce；若无Joyce则单人列表时默认全选
+            const joyce = this.plannerList.find(p =>
+              p.userDisplay && p.userDisplay.toLowerCase().includes('joyce')
+            )
+            if (joyce) return [joyce.userId]
+            return this.plannerList.length === 1 ? [this.plannerList[0].userId] : []
+          })()
           }
 
           // 显示弹窗
@@ -1038,8 +1046,8 @@ export default {
         this.$message.warning('请至少选择一位质量经理')
         return
       }
-      if (!this.submitData.plannerId) {
-        this.$message.warning('请选择计划员')
+      if (!this.submitData.plannerIds || this.submitData.plannerIds.length === 0) {
+        this.$message.warning('请至少选择一位计划员')
         return
       }
 
@@ -1051,7 +1059,7 @@ export default {
         techManagerId: this.submitData.techManagerId,
         prodManagerIds: this.submitData.prodManagerIds,
         qualityManagerIds: this.submitData.qualityManagerIds,
-        plannerUserId: this.submitData.plannerId
+        plannerUserIds: this.submitData.plannerIds
       }).then(({data}) => {
         this.submitLoading = false
         if (data && data.code === 0) {