From fdd6dafe25f9d834fa9c8a71cdfd484d80e237eb Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 30 Jun 2026 14:34:38 +0800
Subject: [PATCH] Alpha

---
 .../modules/eam/eamDocumentTypeDefinition.vue |   12 +
 src/views/modules/eam/eamProjectInfo.vue      | 1177 +++++++++++------
 src/views/modules/eam/eamProjectPartInfo.vue  |   51 +
 src/views/modules/sys/user.vue                |   22 +-
 4 files changed, 848 insertions(+), 414 deletions(-)

diff --git a/src/views/modules/eam/eamDocumentTypeDefinition.vue b/src/views/modules/eam/eamDocumentTypeDefinition.vue
index b7a524a..2045316 100644
--- a/src/views/modules/eam/eamDocumentTypeDefinition.vue
+++ b/src/views/modules/eam/eamDocumentTypeDefinition.vue
@@ -12,6 +12,16 @@
       <el-form-item :label="'文档类型'">
         <el-input v-model="searchData.documentType" style="width: 120px" clearable></el-input>
       </el-form-item>
+      <el-form-item :label="'责任部门'">
+        <el-select v-model="searchData.responsibleDepartment" placeholder="请选择" clearable style="width: 140px">
+          <el-option
+            v-for = "i in responsibleDepartmentList"
+            :key = "i.roleNo"
+            :label = "i.roleDesc"
+            :value = "i.roleNo">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'在用'">
         <el-select filterable v-model="searchData.active" style="width: 130px">
           <el-option label="全部" value=""></el-option>
@@ -436,6 +446,7 @@
       this.favoriteIsOk()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getResponsibleDepartment()
       // 获取数据列表
       this.getDataList()
     },
@@ -714,6 +725,7 @@
         }
       },
       getResponsibleDepartment() {
+        this.responsibleDepartmentList = []
         this.modalData.site = this.$store.state.user.site
         getResponsibleDepartment(this.modalData).then(({data}) => {
           if (data.code === 0) {
diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue
index 3b31f0f..952a155 100644
--- a/src/views/modules/eam/eamProjectInfo.vue
+++ b/src/views/modules/eam/eamProjectInfo.vue
@@ -177,277 +177,422 @@
 
     <el-dialog title="项目" :close-on-click-modal="false" @close="closeClear" v-drag :visible.sync="modalFlag"
                width="948px" style="margin-top: 7px">
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="bu" :rules="rules.bu">
-          <template #label>
-            <span class="big-label">BU</span>
-          </template>
-          <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 151px" @change="modalBuChangeHandle">
-            <el-option
-              v-for = "i in userBuList"
-              :key = "i.buNo"
-              :label = "i.buDesc"
-              :value = "i.buNo">
-              <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
-                {{ i.buDesc }}
-              </span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="projectNo" :rules="rules.projectNo" style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">项目编码</span>
-          </template>
-          <el-input v-model="modalData.projectNo" :disabled="modalPartDisableFlag" style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item prop="projectDesc" v-if="!modalPartDisableFlag" :rules="rules.projectDesc" style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">项目名称</span>
-          </template>
-          <el-input v-model="modalData.projectDesc" :disabled="modalPartDisableFlag" style="width: 191px"></el-input>
-        </el-form-item>
-        <el-form-item prop="projectDesc" v-if="modalPartDisableFlag" :rules="rules.projectDesc" style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">项目名称</span>
-          </template>
-          <el-input v-model="modalData.projectDesc" :disabled="modalPartDisableFlag" style="width: 371px"></el-input>
-        </el-form-item>
-        <el-form-item prop="cProjectRegion" v-if="!modalPartDisableFlag" :rules="rules.cProjectRegion" style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">区域</span>
-          </template>
-          <el-select v-model="modalData.cProjectRegion" placeholder="请选择" :disabled="modalPartDisableFlag" clearable style="width: 151px">
-            <el-option
-              v-for = "i in cProjectRegionList"
-              :key = "i.cProjectRegion"
-              :label = "i.cProjectRegion"
-              :value = "i.cProjectRegion">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="priority" :rules="rules.priority" style="margin-left: 15px" v-if="this.modalData.flag ===
-         '2' || this.modalData.flag === '1'">
-          <template #label>
-            <span class="big-label">优先级</span>
-          </template>
-          <el-select v-model="modalData.priority" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for = "i in priorityList"
-              :key = "i.priority"
-              :label = "i.priority"
-              :value = "i.priority">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules"
-               style="margin-left: 7px;margin-top: 20px;">
-        <el-form-item prop="status" v-if="this.modalData.flag === '2'">
-          <template #label>
-            <span class="big-label">项目状态</span>
-          </template>
-          <el-select v-model="modalData.status" placeholder="请选择" style="width: 151px">
-            <el-option
-              v-for = "i in statusList"
-              :key = "i.status"
-              :label = "i.status"
-              :value = "i.status">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="customerNo" style="margin-left: 15px" v-if="this.modalData.flag === '2'">
-          <template #label>
-            <span slot="label" style="" class="big-label">
-              <a href="#" @click="getBaseList(509)">客户编码</a>
-              <a herf="#" @click="newCustomer">（新客户）</a>
-            </span>
-          </template>
-          <el-input v-model="modalData.customerNo" @blur="customerNoBlur" style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item prop="customerNo" v-else>
-          <template #label>
-            <span slot="label" style="" class="big-label">
-              <a href="#" @click="getBaseList(509)">客户编码</a>
-              <a herf="#" @click="newCustomer">（新客户）</a>
-            </span>
-          </template>
-          <el-input v-model="modalData.customerNo" @blur="customerNoBlur" style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item prop="customerDesc" style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">客户名称</span>
-          </template>
-          <el-input v-model="modalData.customerDesc" v-if="this.modalData.flag === '2'" disabled style="width: 191px"></el-input>
-          <el-input v-model="modalData.customerDesc" v-else disabled style="width: 371px"></el-input>
-        </el-form-item>
-        <el-form-item style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">立项日期</span>
-          </template>
-          <el-date-picker
-            style="width: 151px"
-            v-model="modalData.projectCreationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item style="margin-left: 15px" :rules="rules.needDate">
-          <template #label>
-            <span class="big-label">预计完成日期</span>
-          </template>
-          <el-date-picker
-            style="width: 150px"
-            v-model="modalData.needDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" v-if="this.modalData.flag !== '1' && this.modalData.flag !== '2'" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 20px;">
-        <el-form-item prop="testPartNo" :rules="rules.testPartNo" >
-          <template #label>
-            <span class="big-label">项目料号</span>
-          </template>
-          <el-input v-model="modalData.testPartNo" style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item prop="partDesc" :rules="rules.partDesc" style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">料号描述</span>
-          </template>
-          <el-input v-model="modalData.partDesc"  style="width: 371px"></el-input>
-        </el-form-item>
-        <el-form-item prop="partType" :rules="rules.partType" style="margin-left: 15px">
-          <template #label>
-            <span class="big-label">料号状态</span>
-          </template>
-          <el-select v-model="modalData.partType"  clearable style="width: 151px">
-            <el-option label = "Active" value = "Active"></el-option>
-            <el-option label = "On hold" value = "On hold"></el-option>
-            <el-option label = "Cancel" value = "Cancel"></el-option>
-            <el-option label = "EOL" value = "EOL"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="priority" :rules="rules.priority" style="margin-left: 15px" v-if="this.modalData.flag !==
-         '2' && this.modalData.flag !== '1'">
-          <template #label>
-            <span class="big-label">优先级</span>
-          </template>
-          <el-select v-model="modalData.priority" placeholder="请选择" clearable style="width: 150px">
-            <el-option
-              v-for = "i in priorityList"
-              :key = "i.priority"
-              :label = "i.priority"
-              :value = "i.priority">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 20px;">
-        <el-form-item prop="projectCategory" :rules="rules.projectCategory">
-          <template #label>
-            <span class="big-label">项目分类</span>
-          </template>
-          <el-select v-model="modalData.projectCategory" placeholder="请选择" clearable style="width: 151px">
-            <el-option
-              v-for = "i in projectCategoryList"
-              :key = "i.projectCategory"
-              :label = "i.projectCategory"
-              :value = "i.projectCategory">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="cQualityEngineer6Name" :rules="rules.cQualityEngineer6Name" style="margin-left: 15px">
-          <template>
-            <span slot="label" style="" class="big-label">
-              <a herf="#" @click="getBaseList(2008)">IQC</a>
-            </span>
-          </template>
-          <el-input v-model="modalData.cQualityEngineer6Name" disabled style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item label="IPQC-Lam/Pri/Etch/Slit" prop="cQualityEngineer1Name" :rules="rules.cQualityEngineer1Name" style="margin-left: 15px">
-          <span slot="label" style="" @click="engineerFlag = true" class="big-label"><a herf="#">IPQC-Lam/Pri/Etch/Slit</a></span>
-          <el-input v-model="modalData.cQualityEngineer1Name" disabled style="width: 191px"></el-input>
-        </el-form-item>
-        <el-form-item label="IPQC-Converting" prop="cQualityEngineer2Name" :rules="rules.cQualityEngineer2Name" style="margin-left: 15px">
-          <span slot="label" style="" @click="IPQCFlag = true" class="big-label"><a herf="#">IPQC-Converting</a></span>
-          <el-input v-model="modalData.cQualityEngineer2Name" disabled style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item label="PjM" prop="projectOwner" :rules="rules.projectOwner" style="margin-left: 15px">
-          <span slot="label" style="" @click="projectOwnerFlag = true" class="big-label"><a herf="#">PjM</a></span>
-          <el-input v-model="modalData.projectOwnerName" disabled style="width: 151px"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 20px;">
-        <el-form-item label="PM/Sales" prop="projectManagerName" :rules="rules.projectManagerName">
-          <span slot="label" style="" @click="projectManagerFlag = true " class="big-label"><a herf="#">PM/Sales</a></span>
-          <el-input v-model="modalData.projectManagerName" disabled style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item label="MFG" prop="cManufactureEngineerName" :rules="rules.cManufactureEngineerName" style="margin-left: 15px">
-          <span slot="label" style="" @click="MFGlag = true" class="big-label"><a herf="#">MFG</a></span>
-          <el-input v-model="modalData.cManufactureEngineerName" disabled style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item label="Engineer" prop="engineerName" :rules="rules.engineerName" style="margin-left: 15px">
-          <span slot="label" style="" @click="engineer6Flag = true" class="big-label"><a herf="#">Engineer</a></span>
-          <el-input v-model="modalData.engineerName" disabled style="width: 191px"></el-input>
-        </el-form-item>
-        <el-form-item label="文档工程师" prop="docEngineerName" :rules="rules.docEngineerName" style="margin-left: 15px">
-          <span slot="label" style="" @click="docEngineerFlag = true" class="big-label"><a herf="#">文档工程师</a></span>
-          <el-input v-model="modalData.docEngineerName" disabled style="width: 151px"></el-input>
-        </el-form-item>
-        <el-form-item label="文档工程师2" prop="docEngineer2Name" style="margin-left: 15px">
-          <span slot="label" style="" @click="docEngineer2Flag = true" class="big-label"><a herf="#">文档工程师2</a></span>
-          <el-input v-model="modalData.docEngineer2Name" disabled style="width: 151px"></el-input>
-        </el-form-item>
-      </el-form>
-    <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 20px;">
-      <el-form-item label="FQC1" prop="cQualityEngineer3Name" :rules="rules.cQualityEngineer3Name">
-        <span slot="label" style="" @click="FQC1Flag = true" class="big-label"><a herf="#">FQC1</a></span>
-        <el-input v-model="modalData.cQualityEngineer3Name" disabled style="width: 151px"></el-input>
-      </el-form-item>
-      <el-form-item prop="cQualityEngineer5Name" :rules="rules.cQualityEngineer5Name" style="margin-left: 15px">
-          <span slot="label" style="" class="big-label">
-            <a herf="#" @click="getBaseList(2007)">FQC2</a>
-          </span>
-        <el-input v-model="modalData.cQualityEngineer5Name" disabled style="width: 151px"></el-input>
-      </el-form-item>
-      <el-form-item prop="ipqcHardTagName" style="margin-left: 15px">
-            <span slot="label" style="" class="big-label">
-              <a herf="#" @click="getBaseList(2010)">IPQC-Hardtag</a>
-            </span>
-        <el-input v-model="modalData.ipqcHardTagName" disabled style="width: 191px"></el-input>
-      </el-form-item>
-      <el-form-item prop="cQualityEngineer4Name" :rules="rules.cQualityEngineer4Name" style="margin-left: 15px">
-          <span slot="label" style="" class="big-label">
-            <a herf="#" @click="getBaseList(2006)">SQE</a>
-          </span>
-        <el-input v-model="modalData.cQualityEngineer4Name" disabled style="width: 151px"></el-input>
-      </el-form-item>
-      <el-form-item prop="cQualityEngineer7Name" style="margin-left: 15px">
-        <template>
-            <span slot="label" style="" class="big-label">
-              <a herf="#" @click="getBaseList(2012)">前道工程师</a>
-            </span>
+      <el-form label-position="top" :model="modalData" :rules="rules" class="project-modal-form">
+        <el-row :gutter="12" class="project-modal-row">
+          <el-col :span="4">
+            <el-form-item prop="bu" :rules="rules.bu">
+              <template #label>
+                <span class="big-label">BU</span>
+              </template>
+              <el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" class="project-modal-input" @change="modalBuChangeHandle">
+                <el-option
+                  v-for = "i in userBuList"
+                  :key = "i.buNo"
+                  :label = "i.buDesc"
+                  :value = "i.buNo">
+
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="projectNo" :rules="rules.projectNo">
+              <template #label>
+                <span class="big-label">项目编码</span>
+              </template>
+              <el-input v-model="modalData.projectNo" :disabled="modalPartDisableFlag" class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="modalPartDisableFlag?12:8">
+            <el-form-item prop="projectDesc" :rules="rules.projectDesc">
+              <template #label>
+                <span class="big-label">项目名称</span>
+              </template>
+              <el-input v-model="modalData.projectDesc" :disabled="modalPartDisableFlag" class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2" v-if="!modalPartDisableFlag">
+            <el-form-item prop="cProjectRegion" :rules="rules.cProjectRegion" v-if="!modalPartDisableFlag">
+              <template #label>
+                <span class="big-label">区域</span>
+              </template>
+              <el-select v-model="modalData.cProjectRegion" placeholder="请选择" :disabled="modalPartDisableFlag" clearable class="project-modal-input">
+                <el-option
+                  v-for = "i in cProjectRegionList"
+                  :key = "i.cProjectRegion"
+                  :label = "i.cProjectRegion"
+                  :value = "i.cProjectRegion">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <div v-else class="project-modal-empty"></div>
+          </el-col>
+          <el-col :span="2" v-if="this.modalData.flag === '2' || this.modalData.flag === '1'">
+            <el-form-item prop="priority" :rules="rules.priority" >
+              <template #label>
+                <span class="big-label">优先级</span>
+              </template>
+              <el-select v-model="modalData.priority" placeholder="请选择" clearable class="project-modal-input">
+                <el-option
+                  v-for = "i in priorityList"
+                  :key = "i.priority"
+                  :label = "i.priority"
+                  :value = "i.priority">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="projectCategory" :rules="rules.projectCategory">
+              <template #label>
+                <span class="big-label">项目分类</span>
+              </template>
+              <el-select v-model="modalData.projectCategory" placeholder="请选择" clearable class="project-modal-input">
+                <el-option
+                  v-for = "i in projectCategoryList"
+                  :key = "i.projectCategory"
+                  :label = "i.projectCategory"
+                  :value = "i.projectCategory">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="12" class="project-modal-row" v-if="this.modalData.flag === '2'">
+          <el-col :span="4">
+            <el-form-item prop="status">
+              <template #label>
+                <span class="big-label">项目状态</span>
+              </template>
+              <el-select v-model="modalData.status" placeholder="请选择" class="project-modal-input">
+                <el-option
+                  v-for = "i in statusList"
+                  :key = "i.status"
+                  :label = "i.status"
+                  :value = "i.status">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="customerNo">
+              <template #label>
+                <span slot="label" class="big-label">
+                  <a href="#" @click="getBaseList(509)">客户编码</a>
+                  <a herf="#" @click="newCustomer">（新客户）</a>
+                </span>
+              </template>
+              <el-input v-model="modalData.customerNo" @blur="customerNoBlur" class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="customerDesc">
+              <template #label>
+                <span class="big-label">客户名称</span>
+              </template>
+              <el-input v-model="modalData.customerDesc" disabled class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="projectCreationDate" :rules="rules.projectCreationDate">
+              <template #label>
+                <span class="big-label">立项日期</span>
+              </template>
+              <el-date-picker
+                class="project-modal-input"
+                v-model="modalData.projectCreationDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="needDate" :rules="rules.needDate">
+              <template #label>
+                <span class="big-label">预计完成日期</span>
+              </template>
+              <el-date-picker
+                class="project-modal-input"
+                v-model="modalData.needDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="12" class="project-modal-row" v-else>
+          <el-col :span="4">
+            <el-form-item prop="customerNo">
+              <template #label>
+                <span slot="label" class="big-label">
+                  <a href="#" @click="getBaseList(509)">客户编码</a>
+                  <a herf="#" @click="newCustomer">（新客户）</a>
+                </span>
+              </template>
+              <el-input v-model="modalData.customerNo" @blur="customerNoBlur" class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="customerDesc">
+              <template #label>
+                <span class="big-label">客户名称</span>
+              </template>
+              <el-input v-model="modalData.customerDesc" disabled class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="projectCreationDate" :rules="rules.projectCreationDate">
+              <template #label>
+                <span class="big-label">立项日期</span>
+              </template>
+              <el-date-picker
+                class="project-modal-input"
+                v-model="modalData.projectCreationDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="needDate" :rules="rules.needDate">
+              <template #label>
+                <span class="big-label">预计完成日期</span>
+              </template>
+              <el-date-picker
+                class="project-modal-input"
+                v-model="modalData.needDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="project-modal-empty"></el-col>
+        </el-row>
+
+        <el-row :gutter="12" class="project-modal-row" v-if="this.modalData.flag !== '1' && this.modalData.flag !== '2'">
+          <el-col :span="4">
+            <el-form-item prop="testPartNo" :rules="rules.testPartNo">
+              <template #label>
+                <span class="big-label">项目料号</span>
+              </template>
+              <el-input v-model="modalData.testPartNo" class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item prop="partDesc" :rules="rules.partDesc">
+              <template #label>
+                <span class="big-label">料号描述</span>
+              </template>
+              <el-input v-model="modalData.partDesc" class="project-modal-input"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item prop="partType" :rules="rules.partType">
+              <template #label>
+                <span class="big-label">料号状态</span>
+              </template>
+              <el-select v-model="modalData.partType" clearable class="project-modal-input">
+                <el-option label = "Active" value = "Active"></el-option>
+                <el-option label = "On hold" value = "On hold"></el-option>
+                <el-option label = "Cancel" value = "Cancel"></el-option>
+                <el-option label = "EOL" value = "EOL"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" v-if="this.modalData.flag !== '2' && this.modalData.flag !== '1'">
+            <el-form-item prop="priority" :rules="rules.priority">
+              <template #label>
+                <span class="big-label">优先级</span>
+              </template>
+              <el-select v-model="modalData.priority" placeholder="请选择" clearable class="project-modal-input">
+                <el-option
+                  v-for = "i in priorityList"
+                  :key = "i.priority"
+                  :label = "i.priority"
+                  :value = "i.priority">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="project-modal-empty"></el-col>
+        </el-row>
+
+        <template v-if="!isAlphaOrAntennaBu">
+          <el-row :gutter="12" class="project-modal-row">
+            <el-col :span="4">
+              <el-form-item prop="cQualityEngineer6Name" :rules="rules.cQualityEngineer6Name">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(2008)">IQC</a></span>
+                <el-input v-model="modalData.cQualityEngineer6Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="cQualityEngineer1Name" :rules="rules.cQualityEngineer1Name">
+                <span slot="label" @click="engineerFlag = true" class="big-label"><a herf="#">IPQC-Lam/Pri/Etch/Slit</a></span>
+                <el-input v-model="modalData.cQualityEngineer1Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="cQualityEngineer2Name" :rules="rules.cQualityEngineer2Name">
+                <span slot="label" @click="IPQCFlag = true" class="big-label"><a herf="#">IPQC-Converting</a></span>
+                <el-input v-model="modalData.cQualityEngineer2Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="projectOwner" :rules="rules.projectOwner">
+                <span slot="label" @click="projectOwnerFlag = true" class="big-label"><a herf="#">PjM</a></span>
+                <el-input v-model="modalData.projectOwnerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="projectManagerName" :rules="rules.projectManagerName">
+                <span slot="label" @click="projectManagerFlag = true " class="big-label"><a herf="#">PM/Sales</a></span>
+                <el-input v-model="modalData.projectManagerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="cManufactureEngineerName" :rules="rules.cManufactureEngineerName">
+                <span slot="label" @click="MFGlag = true" class="big-label"><a herf="#">MFG</a></span>
+                <el-input v-model="modalData.cManufactureEngineerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="12" class="project-modal-row">
+            <el-col :span="4">
+              <el-form-item prop="engineerName" :rules="rules.engineerName">
+                <span slot="label" @click="engineer6Flag = true" class="big-label"><a herf="#">Engineer</a></span>
+                <el-input v-model="modalData.engineerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="docEngineerName" :rules="rules.docEngineerName">
+                <span slot="label" @click="docEngineerFlag = true" class="big-label"><a herf="#">文档工程师</a></span>
+                <el-input v-model="modalData.docEngineerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="docEngineer2Name">
+                <span slot="label" @click="docEngineer2Flag = true" class="big-label"><a herf="#">文档工程师2</a></span>
+                <el-input v-model="modalData.docEngineer2Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="cQualityEngineer3Name" :rules="rules.cQualityEngineer3Name">
+                <span slot="label" @click="FQC1Flag = true" class="big-label"><a herf="#">FQC1</a></span>
+                <el-input v-model="modalData.cQualityEngineer3Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="cQualityEngineer5Name" :rules="rules.cQualityEngineer5Name">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(2007)">FQC2</a></span>
+                <el-input v-model="modalData.cQualityEngineer5Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="ipqcHardTagName">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(2010)">IPQC-Hardtag</a></span>
+                <el-input v-model="modalData.ipqcHardTagName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="12" class="project-modal-row">
+            <el-col :span="4">
+              <el-form-item prop="cQualityEngineer4Name" :rules="rules.cQualityEngineer4Name">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(2006)">SQE</a></span>
+                <el-input v-model="modalData.cQualityEngineer4Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="cQualityEngineer7Name">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(2012)">前道工程师</a></span>
+                <el-input v-model="modalData.cQualityEngineer7Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+          </el-row>
         </template>
-        <el-input v-model="modalData.cQualityEngineer7Name" disabled style="width: 151px"></el-input>
-      </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 20px;">
-      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: 20px;">
-        <el-form-item prop="remark" :rules="rules.remark">
-          <template #label>
-            <span class="big-label">备注</span>
-          </template>
-          <el-input
-            type="textarea"
-            :rows="2"
-            v-model="modalData.remark"
-            style="width: 909px"
-            show-word-limit>
-          </el-input>
-        </el-form-item>
+
+        <template v-else>
+          <el-row :gutter="12" class="project-modal-row">
+            <el-col :span="4">
+              <el-form-item prop="projectOwner" :rules="rules.projectOwner">
+                <span slot="label" @click="projectOwnerFlag = true" class="big-label"><a herf="#">PjM</a></span>
+                <el-input v-model="modalData.projectOwnerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item>
+                <span slot="label" @click="projectManagerFlag = true " class="big-label"><a herf="#">PM/Sales</a></span>
+                <el-input v-model="modalData.projectManagerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item>
+                <span slot="label" @click="MFGlag = true" class="big-label"><a herf="#">MFG</a></span>
+                <el-input v-model="modalData.cManufactureEngineerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item>
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(2006)">SQE</a></span>
+                <el-input v-model="modalData.cQualityEngineer4Name" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="qcEngineerName">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(3001)">QC</a></span>
+                <el-input v-model="modalData.qcEngineerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item prop="peEngineerName">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(3002)">PE</a></span>
+                <el-input v-model="modalData.peEngineerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="12" class="project-modal-row" v-if="isAntennaBu">
+            <el-col :span="4">
+              <el-form-item prop="eeEngineerName">
+                <span slot="label" class="big-label"><a herf="#" @click="getBaseList(3003)">EE</a></span>
+                <el-input v-model="modalData.eeEngineerName" disabled class="project-modal-input"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+            <el-col :span="4" class="project-modal-empty"></el-col>
+          </el-row>
+        </template>
+
+        <el-row :gutter="12" class="project-modal-row">
+          <el-col :span="24">
+            <el-form-item prop="remark" :rules="rules.remark">
+              <template #label>
+                <span class="big-label">备注</span>
+              </template>
+              <el-input
+                type="textarea"
+                :rows="2"
+                v-model="modalData.remark"
+                class="project-modal-input"
+                show-word-limit>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <el-footer style="height:40px;margin-top: 35px;text-align:center">
         <el-button type="primary" v-if="clearButtonFlag" @click="clearModalFlag = true,clearRadioValue = ''">清空</el-button>
@@ -1052,6 +1197,33 @@ import {updateColumnSize} from "../../../api/table";
       engineersList() {
         return this.allPersonnelInfoList.filter(item => item.engineerId !== undefined);
       },
+      currentModalBuNo () {
+        return this.getBuNoByJoinedValue(this.modalData.bu)
+      },
+      currentModalBuDesc () {
+        let buNo = this.currentModalBuNo
+        if (!buNo) {
+          return ''
+        }
+        let currentBu = this.userBuList.find(item => this.getBuNoByJoinedValue(item.buNo) === buNo)
+        if (currentBu && currentBu.buDesc) {
+          return currentBu.buDesc
+        }
+        return this.modalData.buDesc || ''
+      },
+      isAlphaBu () {
+        let buNoText = this.normalizeBuText(this.currentModalBuNo)
+        let buDescText = this.normalizeBuText(this.currentModalBuDesc)
+        return buNoText.indexOf('05-ALPHA') > -1 || buNoText.indexOf('ALPHA') > -1 || buDescText.indexOf('ALPHA') > -1
+      },
+      isAntennaBu () {
+        let buNoText = this.normalizeBuText(this.currentModalBuNo)
+        let buDescText = this.normalizeBuText(this.currentModalBuDesc)
+        return buNoText === '04-MHM' || buNoText.indexOf('ANTENNA') > -1 || buDescText.indexOf('ANTENNA') > -1 || buDescText.indexOf('天线') > -1
+      },
+      isAlphaOrAntennaBu () {
+        return this.isAlphaBu || this.isAntennaBu
+      },
     },
     components: {
       Chooselist,
@@ -1193,6 +1365,12 @@ import {updateColumnSize} from "../../../api/table";
           ipqcHardTagName:'',
           cQualityEngineer7:'',
           cQualityEngineer7Name:'',
+          qcEngineer:'',
+          qcEngineerName:'',
+          peEngineer:'',
+          peEngineerName:'',
+          eeEngineer:'',
+          eeEngineerName:'',
           remark:'',
           //projectCreationDate为当前服务器的时间
           projectCreationDate: new Date(),
@@ -1341,7 +1519,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
+            columnWidth: 160,
           },
           {
             userId: this.$store.state.user.name,
@@ -1359,7 +1537,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100
+            columnWidth: 80
           },
           {
             userId: this.$store.state.user.name,
@@ -1377,7 +1555,7 @@ import {updateColumnSize} from "../../../api/table";
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 150
+            columnWidth: 120
           },
           {
             userId: this.$store.state.user.name,
@@ -2773,6 +2951,22 @@ import {updateColumnSize} from "../../../api/table";
     },
 
     methods: {
+      normalizeBuText (value) {
+        if (value === null || value === undefined) {
+          return ''
+        }
+        return String(value).trim().toUpperCase()
+      },
+      getUserDisplayName (value) {
+        if (value === null || value === undefined || value === '') {
+          return ''
+        }
+        let userParts = String(value).split('-')
+        if (userParts.length > 1) {
+          return userParts[1]
+        }
+        return ''
+      },
       handleColumnResize(newWidth, oldWidth, column, event){
         let inData= this.columnList.filter(item => item.columnProp === column.property)[0]
         inData.columnWidth=newWidth
@@ -2946,6 +3140,33 @@ import {updateColumnSize} from "../../../api/table";
             }
           })
         }
+        if (this.tagNo === 3001) {
+          this.modalData.qcEngineer = val.username + '-' + val.user_display
+          this.modalData.qcEngineerName = this.modalData.qcEngineer.split('-')[1]
+          searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
+            if (data && data.code === 0){
+              this.businessDataList7 = data.rows;
+            }
+          })
+        }
+        if (this.tagNo === 3002) {
+          this.modalData.peEngineer = val.username + '-' + val.user_display
+          this.modalData.peEngineerName = this.modalData.peEngineer.split('-')[1]
+          searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
+            if (data && data.code === 0){
+              this.businessDataList7 = data.rows;
+            }
+          })
+        }
+        if (this.tagNo === 3003) {
+          this.modalData.eeEngineer = val.username + '-' + val.user_display
+          this.modalData.eeEngineerName = this.modalData.eeEngineer.split('-')[1]
+          searchBusinessInfo7(this.searchBusinessData7).then(({data}) => {
+            if (data && data.code === 0){
+              this.businessDataList7 = data.rows;
+            }
+          })
+        }
       },
 
       newCustomer () {
@@ -3085,78 +3306,81 @@ import {updateColumnSize} from "../../../api/table";
         await eamProjectInfoSearch(this.searchData).then(({data}) => {
           this.exportList = data.page.list
           this.exportList.forEach((item) => {
-            item.projectManagerName = item.projectManager.split('-')[1];
-            item.projectOwnerName = item.projectOwner.split('-')[1];
-            item.engineerName = item.engineer.split('-')[1];
-            item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1];
-            item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1];
-            item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1];
-            item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1];
+            item.projectManagerName = this.getUserDisplayName(item.projectManager);
+            item.projectOwnerName = this.getUserDisplayName(item.projectOwner);
+            item.engineerName = this.getUserDisplayName(item.engineer);
+            item.cQualityEngineer1Name = this.getUserDisplayName(item.cQualityEngineer1);
+            item.cQualityEngineer2Name = this.getUserDisplayName(item.cQualityEngineer2);
+            item.cQualityEngineer3Name = this.getUserDisplayName(item.cQualityEngineer3);
+            item.cManufactureEngineerName = this.getUserDisplayName(item.cManufactureEngineer);
             if (item.cQualityEngineer4 !== null && item.cQualityEngineer4 !== '') {
-              item.cQualityEngineer4Name = item.cQualityEngineer4.split('-')[1];
+              item.cQualityEngineer4Name = this.getUserDisplayName(item.cQualityEngineer4);
             }
             if (item.docEngineer !== null && item.docEngineer !== '') {
-              item.docEngineerName = item.docEngineer.split('-')[1];
+              item.docEngineerName = this.getUserDisplayName(item.docEngineer);
             }
             if (item.docEngineer2 !== null && item.docEngineer2 !== '') {
-              item.docEngineer2Name = item.docEngineer2.split('-')[1];
+              item.docEngineer2Name = this.getUserDisplayName(item.docEngineer2);
             }
             if (item.cQualityEngineer5 !== null && item.cQualityEngineer5 !== '') {
-              item.cQualityEngineer5Name = item.cQualityEngineer5.split('-')[1];
+              item.cQualityEngineer5Name = this.getUserDisplayName(item.cQualityEngineer5);
             }
             if (item.cQualityEngineer6 !== null && item.cQualityEngineer6 !== '') {
-              item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1];
+              item.cQualityEngineer6Name = this.getUserDisplayName(item.cQualityEngineer6);
             }
             if (item.ipqcHardTag !== null && item.ipqcHardTag !== '') {
-              item.ipqcHardTagName = item.ipqcHardTag.split('-')[1];
+              item.ipqcHardTagName = this.getUserDisplayName(item.ipqcHardTag);
             }
             if (item.cQualityEngineer7 !== null && item.cQualityEngineer7 !== '') {
-              item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1];
+              item.cQualityEngineer7Name = this.getUserDisplayName(item.cQualityEngineer7);
             }
+            item.qcEngineerName = this.getUserDisplayName(item.qcEngineer);
+            item.peEngineerName = this.getUserDisplayName(item.peEngineer);
+            item.eeEngineerName = this.getUserDisplayName(item.eeEngineer);
           });
 
           for (let i = 0; i < this.exportList.length; i++) {
             if (this.exportList[i].responsibleDepartment === 'R001') {
-              this.exportList[i].projectLeader = this.exportList[i].projectManager.split("-")[1];
+              this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].projectManager);
             } else if (this.exportList[i].responsibleDepartment === 'R002') {
-              this.exportList[i].projectLeader = this.exportList[i].projectOwner.split("-")[1];
+              this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].projectOwner);
             } else if (this.exportList[i].responsibleDepartment === 'R004') {
-              this.exportList[i].projectLeader = this.exportList[i].engineer.split("-")[1];
+              this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].engineer);
             } else if (this.exportList[i].responsibleDepartment === 'R005') {
-              this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer1.split("-")[1];
+              this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cQualityEngineer1);
             } else if (this.exportList[i].responsibleDepartment === 'R007') {
-              this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer2.split("-")[1];
+              this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cQualityEngineer2);
             } else if (this.exportList[i].responsibleDepartment === 'R008') {
-              this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer3.split("-")[1];
+              this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cQualityEngineer3);
             } else if (this.exportList[i].responsibleDepartment === 'R009') {
-              this.exportList[i].projectLeader = this.exportList[i].cManufactureEngineer.split("-")[1];
+              this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cManufactureEngineer);
             } else if (this.exportList[i].responsibleDepartment === 'R012') {
               if (this.exportList[i].docEngineer !== null && this.exportList[i].docEngineer !== '') {
-                this.exportList[i].projectLeader = this.exportList[i].docEngineer.split("-")[1];
+                this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].docEngineer);
               }
             } else if (this.exportList[i].responsibleDepartment === 'R017') {
               if (this.exportList[i].docEngineer2 !== null && this.exportList[i].docEngineer2 !== '') {
-                this.exportList[i].projectLeader = this.exportList[i].docEngineer2.split("-")[1];
+                this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].docEngineer2);
               }
             } else if (this.exportList[i].responsibleDepartment === 'R011') {
               if (this.exportList[i].cQualityEngineer4 !== null && this.exportList[i].cQualityEngineer4 !== '') {
-                this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer4.split("-")[1];
+                this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cQualityEngineer4);
               }
             } else if (this.exportList[i].responsibleDepartment === 'R013') {
               if (this.exportList[i].cQualityEngineer5 !== null && this.exportList[i].cQualityEngineer5 !== '') {
-                this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer5.split("-")[1];
+                this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cQualityEngineer5);
               }
             } else if (this.exportList[i].responsibleDepartment === 'R014') {
               if (this.exportList[i].cQualityEngineer6 !== null && this.exportList[i].cQualityEngineer6 !== '') {
-                this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer6.split("-")[1];
+                this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cQualityEngineer6);
               }
             } else if (this.exportList[i].responsibleDepartment === 'R015') {
               if (this.exportList[i].ipqcHardTag !== null && this.exportList[i].ipqcHardTag !== '') {
-                this.exportList[i].projectLeader = this.exportList[i].ipqcHardTag.split("-")[1];
+                this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].ipqcHardTag);
               }
             } else if (this.exportList[i].responsibleDepartment === 'R016') {
               if (this.exportList[i].cQualityEngineer7 !== null && this.exportList[i].cQualityEngineer7 !== '') {
-                this.exportList[i].projectLeader = this.exportList[i].cQualityEngineer7.split("-")[1];
+                this.exportList[i].projectLeader = this.getUserDisplayName(this.exportList[i].cQualityEngineer7);
               }
             }
           }
@@ -3202,34 +3426,37 @@ import {updateColumnSize} from "../../../api/table";
               this.totalPage = data.page.totalCount
               // 遍历dataList
               this.dataList.forEach((item) => {
-                item.projectManagerName = item.projectManager.split('-')[1]
-                item.projectOwnerName = item.projectOwner.split('-')[1]
-                item.engineerName = item.engineer.split('-')[1]
-                item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1]
-                item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1]
-                item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1]
+                item.projectManagerName = this.getUserDisplayName(item.projectManager)
+                item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
+                item.engineerName = this.getUserDisplayName(item.engineer)
+                item.cQualityEngineer1Name = this.getUserDisplayName(item.cQualityEngineer1)
+                item.cQualityEngineer2Name = this.getUserDisplayName(item.cQualityEngineer2)
+                item.cQualityEngineer3Name = this.getUserDisplayName(item.cQualityEngineer3)
                 if (item.cQualityEngineer4 != null && item.cQualityEngineer4 !== ''){
-                  item.cQualityEngineer4Name = item.cQualityEngineer4.split('-')[1]
+                  item.cQualityEngineer4Name = this.getUserDisplayName(item.cQualityEngineer4)
                 }
                 if (item.cQualityEngineer5 != null && item.cQualityEngineer5 !== ''){
-                  item.cQualityEngineer5Name = item.cQualityEngineer5.split('-')[1]
+                  item.cQualityEngineer5Name = this.getUserDisplayName(item.cQualityEngineer5)
                 }
                 if (item.cQualityEngineer6 != null && item.cQualityEngineer6 !== ''){
-                  item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
+                  item.cQualityEngineer6Name = this.getUserDisplayName(item.cQualityEngineer6)
                 }
-                item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1]
+                item.cManufactureEngineerName = this.getUserDisplayName(item.cManufactureEngineer)
                 if (item.docEngineer != null && item.docEngineer !== ''){
-                  item.docEngineerName = item.docEngineer.split('-')[1]
+                  item.docEngineerName = this.getUserDisplayName(item.docEngineer)
                 }
                 if (item.docEngineer2 != null && item.docEngineer2 !== ''){
-                  item.docEngineer2Name = item.docEngineer2.split('-')[1]
+                  item.docEngineer2Name = this.getUserDisplayName(item.docEngineer2)
                 }
                 if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
-                  item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
+                  item.ipqcHardTagName = this.getUserDisplayName(item.ipqcHardTag)
                 }
                 if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
-                  item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
+                  item.cQualityEngineer7Name = this.getUserDisplayName(item.cQualityEngineer7)
                 }
+                item.qcEngineerName = this.getUserDisplayName(item.qcEngineer)
+                item.peEngineerName = this.getUserDisplayName(item.peEngineer)
+                item.eeEngineerName = this.getUserDisplayName(item.eeEngineer)
               })
 
               // 获取全部人员信息用于下拉框
@@ -3280,34 +3507,37 @@ import {updateColumnSize} from "../../../api/table";
             this.totalPage = data.page.totalCount
             // 遍历dataList
             this.dataList.forEach((item) => {
-              item.projectManagerName = item.projectManager.split('-')[1]
-              item.projectOwnerName = item.projectOwner.split('-')[1]
-              item.engineerName = item.engineer.split('-')[1]
-              item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1]
-              item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1]
-              item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1]
+              item.projectManagerName = this.getUserDisplayName(item.projectManager)
+              item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
+              item.engineerName = this.getUserDisplayName(item.engineer)
+              item.cQualityEngineer1Name = this.getUserDisplayName(item.cQualityEngineer1)
+              item.cQualityEngineer2Name = this.getUserDisplayName(item.cQualityEngineer2)
+              item.cQualityEngineer3Name = this.getUserDisplayName(item.cQualityEngineer3)
               if (item.cQualityEngineer4 != null && item.cQualityEngineer4 !== ''){
-                item.cQualityEngineer4Name = item.cQualityEngineer4.split('-')[1]
+                item.cQualityEngineer4Name = this.getUserDisplayName(item.cQualityEngineer4)
               }
               if (item.cQualityEngineer5 != null && item.cQualityEngineer5 !== ''){
-                item.cQualityEngineer5Name = item.cQualityEngineer5.split('-')[1]
+                item.cQualityEngineer5Name = this.getUserDisplayName(item.cQualityEngineer5)
               }
               if (item.cQualityEngineer6 != null && item.cQualityEngineer6 !== ''){
-                item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
+                item.cQualityEngineer6Name = this.getUserDisplayName(item.cQualityEngineer6)
               }
-              item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1]
+              item.cManufactureEngineerName = this.getUserDisplayName(item.cManufactureEngineer)
               if (item.docEngineer != null && item.docEngineer !== ''){
-                item.docEngineerName = item.docEngineer.split('-')[1]
+                item.docEngineerName = this.getUserDisplayName(item.docEngineer)
               }
               if (item.docEngineer2 != null && item.docEngineer2 !== ''){
-                item.docEngineer2Name = item.docEngineer2.split('-')[1]
+                item.docEngineer2Name = this.getUserDisplayName(item.docEngineer2)
               }
               if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
-                item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
+                item.ipqcHardTagName = this.getUserDisplayName(item.ipqcHardTag)
               }
               if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
-                item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
+                item.cQualityEngineer7Name = this.getUserDisplayName(item.cQualityEngineer7)
               }
+              item.qcEngineerName = this.getUserDisplayName(item.qcEngineer)
+              item.peEngineerName = this.getUserDisplayName(item.peEngineer)
+              item.eeEngineerName = this.getUserDisplayName(item.eeEngineer)
             })
 
             // 获取全部人员信息用于下拉框
@@ -3346,7 +3576,7 @@ import {updateColumnSize} from "../../../api/table";
             projectOwnersMap.set(item.projectOwner, {
               projectOwnerId,
               projectOwner: item.projectOwner,
-              projectOwnerName: item.projectOwner.split('-')[1]
+              projectOwnerName: this.getUserDisplayName(item.projectOwner)
             });
             allPersonnelList.push(projectOwnersMap.get(item.projectOwner));
           }
@@ -3357,7 +3587,7 @@ import {updateColumnSize} from "../../../api/table";
             projectManagersMap.set(item.projectManager, {
               projectManagerId,
               projectManager: item.projectManager,
-              projectManagerName: item.projectManager.split('-')[1]
+              projectManagerName: this.getUserDisplayName(item.projectManager)
             });
             allPersonnelList.push(projectManagersMap.get(item.projectManager));
           }
@@ -3368,7 +3598,7 @@ import {updateColumnSize} from "../../../api/table";
             engineersMap.set(item.engineer, {
               engineerId,
               engineer: item.engineer,
-              engineerName: item.engineer.split('-')[1]
+              engineerName: this.getUserDisplayName(item.engineer)
             });
             allPersonnelList.push(engineersMap.get(item.engineer));
           }
@@ -3461,6 +3691,12 @@ import {updateColumnSize} from "../../../api/table";
           ipqcHardTagName: '',
           cQualityEngineer7: '',
           cQualityEngineer7Name: '',
+          qcEngineer: '',
+          qcEngineerName: '',
+          peEngineer: '',
+          peEngineerName: '',
+          eeEngineer: '',
+          eeEngineerName: '',
           projectCreationDate:new Date(),
           createDate: '',
           remark: '',
@@ -3493,26 +3729,29 @@ import {updateColumnSize} from "../../../api/table";
           needDate: row.needDate,
           cProjectRegion: row.cProjectRegion,
           projectManager: row.projectManager,
-          projectManagerName: row.projectManager.split('-')[1], // 截取用户名
+          projectManagerName: this.getUserDisplayName(row.projectManager), // 截取用户名
           projectOwner: row.projectOwner,
-          projectOwnerName: row.projectOwner.split('-')[1], // 截取用户名
+          projectOwnerName: this.getUserDisplayName(row.projectOwner), // 截取用户名
           engineer: row.engineer,
-          engineerName: row.engineer.split('-')[1], // 截取用户名
+          engineerName: this.getUserDisplayName(row.engineer), // 截取用户名
           cQualityEngineer1: row.cQualityEngineer1,
-          cQualityEngineer1Name: row.cQualityEngineer1.split('-')[1], // 截取用户名
+          cQualityEngineer1Name: this.getUserDisplayName(row.cQualityEngineer1), // 截取用户名
           cQualityEngineer2: row.cQualityEngineer2,
-          cQualityEngineer2Name: row.cQualityEngineer2.split('-')[1], // 截取用户名
+          cQualityEngineer2Name: this.getUserDisplayName(row.cQualityEngineer2), // 截取用户名
           cQualityEngineer3: row.cQualityEngineer3,
-          cQualityEngineer3Name: row.cQualityEngineer3.split('-')[1], // 截取用户名
+          cQualityEngineer3Name: this.getUserDisplayName(row.cQualityEngineer3), // 截取用户名
           cQualityEngineer4: row.cQualityEngineer4,
           cQualityEngineer5: row.cQualityEngineer5,
           cQualityEngineer6: row.cQualityEngineer6,
           cManufactureEngineer: row.cManufactureEngineer,
-          cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
+          cManufactureEngineerName: this.getUserDisplayName(row.cManufactureEngineer), // 截取用户名
           docEngineer: row.docEngineer,
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           projectCreationDate: row.projectCreationDate,
           status: row.status,
           remark: row.remark,
@@ -3541,6 +3780,15 @@ import {updateColumnSize} from "../../../api/table";
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
           this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== ''){
+          this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== ''){
+          this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== ''){
+          this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
+        }
         let editBuNo = this.getBuNoByJoinedValue(this.modalData.bu)
         this.loadModalProjectCategory(editBuNo, this.modalData.projectCategory)
         this.modalDisableFlag = true
@@ -3603,6 +3851,8 @@ import {updateColumnSize} from "../../../api/table";
           this.modalData.customerNo = 'C0000'
           this.modalData.customerDesc = '无客户'
           this.modalData.finalCustomerId = this.modalData.customerNo
+        } else if (this.modalData.customerNo === 'C0000') {
+          this.modalData.customerDesc = '无客户'
         }
         if (this.modalData.customerDesc === '' || this.modalData.customerDesc == null) {
             this.$alert('该客户不存在，请重新输入客户编码或点击新客户添加客户!', '提示', {
@@ -3628,48 +3878,60 @@ import {updateColumnSize} from "../../../api/table";
           this.$message.warning('请选择BU！')
           return
         }
-        if (this.modalData.projectManager === '' || this.modalData.projectManager == null) {
-          this.$message.warning('请输入PM/Sales！')
-          return
-        }if (this.modalData.projectOwner === '' || this.modalData.projectOwner == null) {
+        if (this.modalData.projectOwner === '' || this.modalData.projectOwner == null) {
           this.$message.warning('请输入PjM！')
           return
         }
-        if (this.modalData.engineer === '' || this.modalData.engineer == null) {
-          this.$message.warning('请输入Engineer！')
-          return
-        }
-        if (this.modalData.cQualityEngineer1 === '' || this.modalData.cQualityEngineer1 == null) {
-          this.$message.warning('请输入IPQC-Lam/Pri/Etch/Slit！')
-          return
-        }
-        if (this.modalData.cQualityEngineer2 === '' || this.modalData.cQualityEngineer2 == null) {
-          this.$message.warning('请输入IPQC-Converting！')
-          return
-        }
-        if (this.modalData.cQualityEngineer3 === '' || this.modalData.cQualityEngineer3 == null) {
-          this.$message.warning('请输入FQC1！')
-          return
-        }
-        if (this.modalData.cQualityEngineer5 === '' || this.modalData.cQualityEngineer5 == null) {
-          this.$message.warning('请输入FQC2！')
-          return
-        }
-        if (this.modalData.cQualityEngineer6 === '' || this.modalData.cQualityEngineer6 == null) {
-          this.$message.warning('请输入IQC！')
-          return
-        }
-        if (this.modalData.cQualityEngineer4 === '' || this.modalData.cQualityEngineer4 == null) {
-          this.$message.warning('请输入SQE！')
-          return
-        }
-        if (this.modalData.cManufactureEngineer === '' || this.modalData.cManufactureEngineer == null) {
-          this.$message.warning('请输入MFG！')
-          return
-        }
-        if (this.modalData.docEngineer === '' || this.modalData.docEngineer == null) {
-          this.$message.warning('请输入文档工程师！')
-          return
+        if (this.isAlphaOrAntennaBu) {
+          if (this.modalData.qcEngineer === '' || this.modalData.qcEngineer == null) {
+            this.$message.warning('请输入QC！')
+            return
+          }
+          if (this.modalData.peEngineer === '' || this.modalData.peEngineer == null) {
+            this.$message.warning('请输入PE！')
+            return
+          }
+        } else {
+          if (this.modalData.projectManager === '' || this.modalData.projectManager == null) {
+            this.$message.warning('请输入PM/Sales！')
+            return
+          }
+          if (this.modalData.engineer === '' || this.modalData.engineer == null) {
+            this.$message.warning('请输入Engineer！')
+            return
+          }
+          if (this.modalData.cQualityEngineer1 === '' || this.modalData.cQualityEngineer1 == null) {
+            this.$message.warning('请输入IPQC-Lam/Pri/Etch/Slit！')
+            return
+          }
+          if (this.modalData.cQualityEngineer2 === '' || this.modalData.cQualityEngineer2 == null) {
+            this.$message.warning('请输入IPQC-Converting！')
+            return
+          }
+          if (this.modalData.cQualityEngineer3 === '' || this.modalData.cQualityEngineer3 == null) {
+            this.$message.warning('请输入FQC1！')
+            return
+          }
+          if (this.modalData.cQualityEngineer5 === '' || this.modalData.cQualityEngineer5 == null) {
+            this.$message.warning('请输入FQC2！')
+            return
+          }
+          if (this.modalData.cQualityEngineer6 === '' || this.modalData.cQualityEngineer6 == null) {
+            this.$message.warning('请输入IQC！')
+            return
+          }
+          if (this.modalData.cQualityEngineer4 === '' || this.modalData.cQualityEngineer4 == null) {
+            this.$message.warning('请输入SQE！')
+            return
+          }
+          if (this.modalData.cManufactureEngineer === '' || this.modalData.cManufactureEngineer == null) {
+            this.$message.warning('请输入MFG！')
+            return
+          }
+          if (this.modalData.docEngineer === '' || this.modalData.docEngineer == null) {
+            this.$message.warning('请输入文档工程师！')
+            return
+          }
         }
         // if (this.modalData.active === '' || this.modalData.active == null) {
         //   this.$message.warning('选择是否在用！')
@@ -3716,6 +3978,9 @@ import {updateColumnSize} from "../../../api/table";
                   docEngineer2: this.modalData.docEngineer2,
                   ipqcHardTag: this.modalData.ipqcHardTag,
                   cQualityEngineer7: this.modalData.cQualityEngineer7,
+                  qcEngineer: this.modalData.qcEngineer,
+                  peEngineer: this.modalData.peEngineer,
+                  eeEngineer: this.modalData.eeEngineer,
                   projectCreationDate: this.modalData.projectCreationDate,
                   createDate: this.modalData.createDate,
                   createBy: this.modalData.createBy,
@@ -3792,6 +4057,9 @@ import {updateColumnSize} from "../../../api/table";
                 docEngineer2: this.modalData.docEngineer2,
                 ipqcHardTag: this.modalData.ipqcHardTag,
                 cQualityEngineer7: this.modalData.cQualityEngineer7,
+                qcEngineer: this.modalData.qcEngineer,
+                peEngineer: this.modalData.peEngineer,
+                eeEngineer: this.modalData.eeEngineer,
                 projectCreationDate: this.modalData.projectCreationDate,
                 createDate: this.modalData.createDate,
                 createBy: this.modalData.createBy,
@@ -3872,6 +4140,9 @@ import {updateColumnSize} from "../../../api/table";
             docEngineer2: this.modalData.docEngineer2,
             ipqcHardTag: this.modalData.ipqcHardTag,
             cQualityEngineer7: this.modalData.cQualityEngineer7,
+            qcEngineer: this.modalData.qcEngineer,
+            peEngineer: this.modalData.peEngineer,
+            eeEngineer: this.modalData.eeEngineer,
             projectCreationDate: this.modalData.projectCreationDate,
             createDate: this.modalData.createDate,
             createBy: this.modalData.createBy,
@@ -4261,6 +4532,12 @@ import {updateColumnSize} from "../../../api/table";
         this.modalData.ipqcHardTagName = ''
         this.modalData.cQualityEngineer7 = ''
         this.modalData.cQualityEngineer7Name = ''
+        this.modalData.qcEngineer = ''
+        this.modalData.qcEngineerName = ''
+        this.modalData.peEngineer = ''
+        this.modalData.peEngineerName = ''
+        this.modalData.eeEngineer = ''
+        this.modalData.eeEngineerName = ''
         this.modalData.projectCreationDate = new Date()
         this.modalData.remark = ''
       },
@@ -4280,34 +4557,37 @@ import {updateColumnSize} from "../../../api/table";
             this.projectPartList = data.page.list
             // 遍历dataList
             this.projectPartList.forEach((item) => {
-              item.projectManagerName = item.projectManager.split('-')[1]
-              item.projectOwnerName = item.projectOwner.split('-')[1]
-              item.engineerName = item.engineer.split('-')[1]
-              item.cQualityEngineer1Name = item.cQualityEngineer1.split('-')[1]
-              item.cQualityEngineer2Name = item.cQualityEngineer2.split('-')[1]
-              item.cQualityEngineer3Name = item.cQualityEngineer3.split('-')[1]
+              item.projectManagerName = this.getUserDisplayName(item.projectManager)
+              item.projectOwnerName = this.getUserDisplayName(item.projectOwner)
+              item.engineerName = this.getUserDisplayName(item.engineer)
+              item.cQualityEngineer1Name = this.getUserDisplayName(item.cQualityEngineer1)
+              item.cQualityEngineer2Name = this.getUserDisplayName(item.cQualityEngineer2)
+              item.cQualityEngineer3Name = this.getUserDisplayName(item.cQualityEngineer3)
               if (item.cQualityEngineer4 != null && item.cQualityEngineer4 !== ''){
-                item.cQualityEngineer4Name = item.cQualityEngineer4.split('-')[1]
+                item.cQualityEngineer4Name = this.getUserDisplayName(item.cQualityEngineer4)
               }
               if (item.cQualityEngineer5 != null && item.cQualityEngineer5 !== ''){
-                item.cQualityEngineer5Name = item.cQualityEngineer5.split('-')[1]
+                item.cQualityEngineer5Name = this.getUserDisplayName(item.cQualityEngineer5)
               }
               if (item.cQualityEngineer6 != null && item.cQualityEngineer6 !== ''){
-                item.cQualityEngineer6Name = item.cQualityEngineer6.split('-')[1]
+                item.cQualityEngineer6Name = this.getUserDisplayName(item.cQualityEngineer6)
               }
-              item.cManufactureEngineerName = item.cManufactureEngineer.split('-')[1]
+              item.cManufactureEngineerName = this.getUserDisplayName(item.cManufactureEngineer)
               if (item.docEngineer != null && item.docEngineer !== ''){
-                item.docEngineerName = item.docEngineer.split('-')[1]
+                item.docEngineerName = this.getUserDisplayName(item.docEngineer)
               }
               if (item.docEngineer2 != null && item.docEngineer2 !== ''){
-                item.docEngineer2Name = item.docEngineer2.split('-')[1]
+                item.docEngineer2Name = this.getUserDisplayName(item.docEngineer2)
               }
               if (item.ipqcHardTag != null && item.ipqcHardTag !== ''){
-                item.ipqcHardTagName = item.ipqcHardTag.split('-')[1]
+                item.ipqcHardTagName = this.getUserDisplayName(item.ipqcHardTag)
               }
               if (item.cQualityEngineer7 != null && item.cQualityEngineer7 !== ''){
-                item.cQualityEngineer7Name = item.cQualityEngineer7.split('-')[1]
+                item.cQualityEngineer7Name = this.getUserDisplayName(item.cQualityEngineer7)
               }
+              item.qcEngineerName = this.getUserDisplayName(item.qcEngineer)
+              item.peEngineerName = this.getUserDisplayName(item.peEngineer)
+              item.eeEngineerName = this.getUserDisplayName(item.eeEngineer)
             })
           }
         })
@@ -4331,26 +4611,29 @@ import {updateColumnSize} from "../../../api/table";
           projectCloseDate: row.projectCloseDate,
           needDate: row.needDate,
           projectManager: row.projectManager,
-          projectManagerName: row.projectManager.split('-')[1], // 截取用户名
+          projectManagerName: this.getUserDisplayName(row.projectManager), // 截取用户名
           projectOwner: row.projectOwner,
-          projectOwnerName: row.projectOwner.split('-')[1], // 截取用户名
+          projectOwnerName: this.getUserDisplayName(row.projectOwner), // 截取用户名
           engineer: row.engineer,
-          engineerName: row.engineer.split('-')[1], // 截取用户名
+          engineerName: this.getUserDisplayName(row.engineer), // 截取用户名
           cQualityEngineer1: row.cQualityEngineer1,
-          cQualityEngineer1Name: row.cQualityEngineer1.split('-')[1], // 截取用户名
+          cQualityEngineer1Name: this.getUserDisplayName(row.cQualityEngineer1), // 截取用户名
           cQualityEngineer2: row.cQualityEngineer2,
-          cQualityEngineer2Name: row.cQualityEngineer2.split('-')[1], // 截取用户名
+          cQualityEngineer2Name: this.getUserDisplayName(row.cQualityEngineer2), // 截取用户名
           cQualityEngineer3: row.cQualityEngineer3,
-          cQualityEngineer3Name: row.cQualityEngineer3.split('-')[1], // 截取用户名
+          cQualityEngineer3Name: this.getUserDisplayName(row.cQualityEngineer3), // 截取用户名
           cQualityEngineer4: row.cQualityEngineer4,
           cQualityEngineer5: row.cQualityEngineer5,
           cQualityEngineer6: row.cQualityEngineer6,
           cManufactureEngineer: row.cManufactureEngineer,
-          cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
+          cManufactureEngineerName: this.getUserDisplayName(row.cManufactureEngineer), // 截取用户名
           docEngineer: row.docEngineer,
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           projectCreationDate: row.projectCreationDate,
           status: '草稿',
           partType: 'Active',
@@ -4394,6 +4677,21 @@ import {updateColumnSize} from "../../../api/table";
         } else {
           this.modalData.cQualityEngineer7 = ''
         }
+        if (row.qcEngineer != null && row.qcEngineer !== ''){
+          this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
+        } else {
+          this.modalData.qcEngineer = ''
+        }
+        if (row.peEngineer != null && row.peEngineer !== ''){
+          this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
+        } else {
+          this.modalData.peEngineer = ''
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== ''){
+          this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
+        } else {
+          this.modalData.eeEngineer = ''
+        }
         this.modalDisableFlag = true
         this.modalPartDisableFlag = true
         this.modalFlag = true
@@ -4417,26 +4715,29 @@ import {updateColumnSize} from "../../../api/table";
           projectCloseDate: row.closeDate,
           needDate: row.needDate,
           projectManager: row.projectManager,
-          projectManagerName: row.projectManager.split('-')[1], // 截取用户名
+          projectManagerName: this.getUserDisplayName(row.projectManager), // 截取用户名
           projectOwner: row.projectOwner,
-          projectOwnerName: row.projectOwner.split('-')[1], // 截取用户名
+          projectOwnerName: this.getUserDisplayName(row.projectOwner), // 截取用户名
           engineer: row.engineer,
-          engineerName: row.engineer.split('-')[1], // 截取用户名
+          engineerName: this.getUserDisplayName(row.engineer), // 截取用户名
           cQualityEngineer1: row.cQualityEngineer1,
-          cQualityEngineer1Name: row.cQualityEngineer1.split('-')[1], // 截取用户名
+          cQualityEngineer1Name: this.getUserDisplayName(row.cQualityEngineer1), // 截取用户名
           cQualityEngineer2: row.cQualityEngineer2,
-          cQualityEngineer2Name: row.cQualityEngineer2.split('-')[1], // 截取用户名
+          cQualityEngineer2Name: this.getUserDisplayName(row.cQualityEngineer2), // 截取用户名
           cQualityEngineer3: row.cQualityEngineer3,
-          cQualityEngineer3Name: row.cQualityEngineer3.split('-')[1], // 截取用户名
+          cQualityEngineer3Name: this.getUserDisplayName(row.cQualityEngineer3), // 截取用户名
           cQualityEngineer4: row.cQualityEngineer4,
           cQualityEngineer5: row.cQualityEngineer5,
           cQualityEngineer6: row.cQualityEngineer6,
           cManufactureEngineer: row.cManufactureEngineer,
-          cManufactureEngineerName: row.cManufactureEngineer.split('-')[1], // 截取用户名
+          cManufactureEngineerName: this.getUserDisplayName(row.cManufactureEngineer), // 截取用户名
           docEngineer: row.docEngineer,
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           projectCreationDate: row.buildDate,
           status: row.status,
           partType: row.partType,
@@ -4466,6 +4767,15 @@ import {updateColumnSize} from "../../../api/table";
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
           this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== ''){
+          this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== ''){
+          this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== ''){
+          this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
+        }
         this.modalDisableFlag = true
         this.modalPartDisableFlag = true
         this.clearButtonFlag = true
@@ -4636,8 +4946,60 @@ import {updateColumnSize} from "../../../api/table";
   margin-bottom: 10px;
 }
 
+.project-modal-form {
+  margin-top: -4px;
+  padding: 0 8px;
+}
+
+.project-modal-row {
+  margin-bottom: 0;
+}
+
+.project-modal-row /deep/ .el-form-item {
+  margin-bottom: 8px;
+}
+
+.project-modal-input {
+  width: 100%;
+}
+
+.project-modal-empty {
+  min-height: 1px;
+}
+
+.project-modal-form /deep/ .el-form-item__label {
+  line-height: 18px;
+  padding-bottom: 4px;
+}
+
+.project-modal-form /deep/ .el-input__inner {
+  height: 30px;
+  line-height: 30px;
+}
+
+.project-modal-form /deep/ .el-date-editor.el-input,
+.project-modal-form /deep/ .el-date-editor.el-input__inner {
+  width: 100%;
+}
+
+.project-modal-form /deep/ .el-textarea__inner {
+  min-height: 60px;
+}
+
 .big-label {
-  font-size: medium; /* 调整字号 */
+  font-size: 13px;
+  font-weight: 500;
+  color: #2c3e50;
+  white-space: nowrap;
+}
+
+.big-label a {
+  color: #1d9a8a;
+  text-decoration: none;
+}
+
+.big-label a:hover {
+  text-decoration: underline;
 }
 </style>
 
@@ -4647,4 +5009,3 @@ import {updateColumnSize} from "../../../api/table";
   line-height: 1.5;
 }
 </style>
-```
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index 679b6f1..463521e 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -2022,6 +2022,12 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           ipqcHardTagName:'',
           cQualityEngineer7:'',
           cQualityEngineer7Name:'',
+          qcEngineer:'',
+          qcEngineerName:'',
+          peEngineer:'',
+          peEngineerName:'',
+          eeEngineer:'',
+          eeEngineerName:'',
           //projectCreationDate为当前服务器的时间
           projectCreationDate: new Date(),
           finalPartNo:'',
@@ -4481,6 +4487,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           finalPartNo: row.finalPartNo,
           finalPartDesc: row.finalPartDesc,
           // active: row.active,
@@ -4508,6 +4517,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== ''){
           this.modalData.cQualityEngineer7Name= row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== ''){
+          this.modalData.qcEngineerName= row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== ''){
+          this.modalData.peEngineerName= row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== ''){
+          this.modalData.eeEngineerName= row.eeEngineer.split('-')[1] // 截取用户名
+        }
         this.getFinalPartDesc()
         this.formalPartNoFlag = true
       },
@@ -4540,6 +4558,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           remark: '',
           planStartDate : new Date(),
           proofingNo: '',
@@ -4672,6 +4693,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           buildDate: row.buildDate,
           status: row.status,
           partType: row.partType,
@@ -4700,6 +4724,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== '') {
           this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== '') {
+          this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== '') {
+          this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== '') {
+          this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
+        }
         if (row.status === '草稿') {
           if (row.projectOwner.split('-')[0] === this.$store.state.user.name) {
             this.modalData.status = '进行中'
@@ -4866,6 +4899,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
           docEngineer2: row.docEngineer2,
           ipqcHardTag: row.ipqcHardTag,
           cQualityEngineer7: row.cQualityEngineer7,
+          qcEngineer: row.qcEngineer,
+          peEngineer: row.peEngineer,
+          eeEngineer: row.eeEngineer,
           buildDate: row.buildDate,
           status: row.status,
           partType: row.partType,
@@ -4894,6 +4930,15 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
         if (row.cQualityEngineer7 != null && row.cQualityEngineer7 !== '') {
           this.modalData.cQualityEngineer7Name = row.cQualityEngineer7.split('-')[1] // 截取用户名
         }
+        if (row.qcEngineer != null && row.qcEngineer !== '') {
+          this.modalData.qcEngineerName = row.qcEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.peEngineer != null && row.peEngineer !== '') {
+          this.modalData.peEngineerName = row.peEngineer.split('-')[1] // 截取用户名
+        }
+        if (row.eeEngineer != null && row.eeEngineer !== '') {
+          this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名
+        }
         if (row.status === '已量产') {
           this.modalData.status = '进行中'
           this.modalData.closeDate = ''
@@ -4947,6 +4992,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
             docEngineer2: this.proofingCurrentRow.docEngineer2,
             ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
             cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
+            qcEngineer: this.proofingCurrentRow.qcEngineer,
+            peEngineer: this.proofingCurrentRow.peEngineer,
+            eeEngineer: this.proofingCurrentRow.eeEngineer,
             // username:this.$store.state.user.name,
             page: 1,
             limit: 1000
@@ -4985,6 +5033,9 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
             docEngineer2: this.proofingCurrentRow.docEngineer2,
             ipqcHardTag: this.proofingCurrentRow.ipqcHardTag,
             cQualityEngineer7: this.proofingCurrentRow.cQualityEngineer7,
+            qcEngineer: this.proofingCurrentRow.qcEngineer,
+            peEngineer: this.proofingCurrentRow.peEngineer,
+            eeEngineer: this.proofingCurrentRow.eeEngineer,
             // username:this.$store.state.user.name,
             page: 1,
             limit: 1000
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 47c0f94..2ba5a71 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -551,11 +551,14 @@
     <el-dialog title="角色" :close-on-click-modal="false" v-drag :visible.sync="businessRoleAddModal" width="900px">
       <div style="font-size: 12px">
         <el-form :inline="true" label-position="top" :model="businessRoleData">
+          <el-form-item :label="'工厂编码'">
+            <el-input v-model="businessRoleData.site" clearable style="width: 80px"></el-input>
+          </el-form-item>
           <el-form-item :label="'角色编码'">
-            <el-input v-model="businessRoleData.roleNo" clearable style="width: 120px"></el-input>
+            <el-input v-model="businessRoleData.roleNo" clearable style="width: 80px"></el-input>
           </el-form-item>
           <el-form-item :label="'角色名称'">
-            <el-input v-model="businessRoleData.roleDesc" clearable style="width: 200px"></el-input>
+            <el-input v-model="businessRoleData.roleDesc" clearable style="width: 160px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="getBusinessRole()">查询</el-button>
@@ -581,18 +584,25 @@
               :selectable="selectFlag"
               width="50">
             </el-table-column>
+            <el-table-column
+              prop="site"
+              header-align="center"
+              align="center"
+              min-width="50"
+              label="工厂编码">
+            </el-table-column>
             <el-table-column
               prop="roleNo"
               header-align="center"
               align="center"
-              min-width="80"
+              min-width="50"
               label="角色编码">
             </el-table-column>
             <el-table-column
               prop="roleDesc"
               header-align="center"
               align="center"
-              min-width="120"
+              min-width="100"
               label="角色名称">
             </el-table-column>
           </el-table>
@@ -1253,11 +1263,11 @@ export default {
         roleNo: '',
         roleDesc: '',
         active: '',
-        username: ''
+        username: this.selectUser.username
       }
       this.businessRoleSelections1 = null
       this.businessRoleSelections2 = null
-      getBusinessRoleList(this.selectUser).then(({data}) => {
+      getBusinessRoleList(this.businessRoleData).then(({data}) => {
         this.businessRoleList1 = data.row1
         this.businessRoleList2 = data.row2
       })