From 1648fed9a1470542f0b0bbf3491d1d65ab4b31ea Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Mon, 8 Sep 2025 15:04:25 +0800
Subject: [PATCH] =?UTF-8?q?2025.09.08=20=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamProjectInfo.vue     | 260 +++++++++++--------
 src/views/modules/eam/eamProjectPartInfo.vue |  18 ++
 2 files changed, 175 insertions(+), 103 deletions(-)

diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue
index 522ef23..470857c 100644
--- a/src/views/modules/eam/eamProjectInfo.vue
+++ b/src/views/modules/eam/eamProjectInfo.vue
@@ -175,15 +175,8 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog title="项目" :close-on-click-modal="false" @close="closeClear" v-drag :visible.sync="modalFlag" width="768px" 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 label="是否在用" prop="active" :rules="rules.activeType">-->
-<!--          <el-select filterable v-model="modalData.active" style="width: 140px">-->
-<!--            <el-option label="是" value="Y"></el-option>-->
-<!--            <el-option label="否" value="N"></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
+    <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>
@@ -232,6 +225,20 @@
             </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;">
@@ -273,18 +280,29 @@
           <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 prop="priority" :rules="rules.priority" style="margin-left: 15px">
+        <el-form-item style="margin-left: 15px">
           <template #label>
-            <span class="big-label">优先级</span>
+            <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-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;">
@@ -311,9 +329,36 @@
             <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="cQualityEngineer6Name" :rules="rules.cQualityEngineer6Name">
+        <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>
@@ -321,71 +366,40 @@
           </template>
           <el-input v-model="modalData.cQualityEngineer6Name" disabled style="width: 151px"></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 prop="projectCategory" :rules="rules.projectCategory" style="margin-left: 15px">
-            <template #label>
-              <span class="big-label">项目分类</span>
-            </template>
-            <el-select v-model="modalData.projectCategory" placeholder="请选择" clearable style="width: 191px">
-              <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 style="margin-left: 15px" :rules="rules.needDate">
-          <template #label>
-            <span class="big-label">预计完成日期</span>
-          </template>
-          <el-date-picker
-            style="width: 151px"
-            v-model="modalData.needDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+        <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-item label="文档类型ID" prop="documentTypeId" :rules="rules.documentTypeIdType">-->
-<!--          <el-input v-model="modalData.documentTypeId" style="width: 230px"></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 prop="projectManager" :rules="rules.projectManager">-->
-<!--          <el-input v-model="modalData.projectManager" disabled style="width: 151px"></el-input>-->
-<!--        </el-form-item>-->
-
         <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="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 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="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 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="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 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-item prop="cQualityEngineer2" :rules="rules.cQualityEngineer2">-->
-<!--          <el-input v-model="modalData.cQualityEngineer2" 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">
@@ -398,32 +412,18 @@
           </span>
         <el-input v-model="modalData.cQualityEngineer5Name" 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="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>
-    <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 20px;">
-        <el-form-item prop="cQualityEngineer4Name" :rules="rules.cQualityEngineer4Name">
-          <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 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 prop="ipqcHardTagName" style="margin-left: 15px">
+      <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-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">
@@ -432,14 +432,24 @@
         </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 label="文档工程师2" prop="docEngineer2Name">
-          <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 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>
       </el-form>
-      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+      <el-footer style="height:40px;margin-top: 35px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button @click="modalFlag = false">关闭</el-button>
       </el-footer>
@@ -1167,7 +1177,7 @@ import {updateColumnSize} from "../../../api/table";
           ipqcHardTagName:'',
           cQualityEngineer7:'',
           cQualityEngineer7Name:'',
-
+          remark:'',
           //projectCreationDate为当前服务器的时间
           projectCreationDate: new Date(),
           finalPartNo:'',
@@ -1732,6 +1742,24 @@ import {updateColumnSize} from "../../../api/table";
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 401003,
+            serialNumber: '401003Table1Remark',
+            tableId: "401003Table1",
+            tableName: "项目信息表",
+            columnProp: 'remark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 401003,
@@ -2274,6 +2302,24 @@ import {updateColumnSize} from "../../../api/table";
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 401003,
+            serialNumber: '401003Table2Remark',
+            tableId: "401003Table2",
+            tableName: "项目信息物料表",
+            columnProp: 'remark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 401003,
@@ -3332,6 +3378,7 @@ import {updateColumnSize} from "../../../api/table";
           cQualityEngineer7Name: '',
           projectCreationDate:new Date(),
           createDate: '',
+          remark: '',
           // active: 'Y',
           createBy: this.$store.state.user.name,
           updateBy: this.$store.state.user.name,
@@ -3380,6 +3427,7 @@ import {updateColumnSize} from "../../../api/table";
           cQualityEngineer7: row.cQualityEngineer7,
           projectCreationDate: row.projectCreationDate,
           status: row.status,
+          remark: row.remark,
           // active: row.active,
           createBy: this.$store.state.user.name,
           updateBy: this.$store.state.user.name,
@@ -3579,6 +3627,7 @@ import {updateColumnSize} from "../../../api/table";
                   testPartNo: 'P000000',
                   partDesc: '无物料',
                   partType: 'Active',
+                  remark: this.modalData.remark,
                 }
                 eamProjectInfoSave(this.modalData).then(({data}) => {
                   if (data && data.code === '0') {
@@ -3654,6 +3703,7 @@ import {updateColumnSize} from "../../../api/table";
                 testPartNo: 'P000000',
                 partDesc: '无物料',
                 partType: 'Active',
+                remark: this.modalData.remark,
               }
               eamProjectInfoSave(this.modalData).then(({data}) => {
                 if (data && data.code === '0') {
@@ -3733,6 +3783,7 @@ import {updateColumnSize} from "../../../api/table";
             testPartNo: 'P000000',
             partDesc: '无物料',
             status: this.modalData.status,
+            remark: this.modalData.remark,
           }
           if (new Date(this.modalData.needDate).getTime() < new Date().getTime()) {
             this.$confirm('预计完成日期小于当前日期，确定继续保存？', '提示', {
@@ -4106,6 +4157,7 @@ import {updateColumnSize} from "../../../api/table";
         this.modalData.cQualityEngineer7 = ''
         this.modalData.cQualityEngineer7Name = ''
         this.modalData.projectCreationDate = new Date()
+        this.modalData.remark = ''
       },
 
       getProjectPartInfo () {
@@ -4197,6 +4249,7 @@ import {updateColumnSize} from "../../../api/table";
           projectCreationDate: row.projectCreationDate,
           status: '草稿',
           partType: 'Active',
+          remark: row.remark,
           // active: row.active,
           createBy: this.$store.state.user.name,
           updateBy: this.$store.state.user.name,
@@ -4282,6 +4335,7 @@ import {updateColumnSize} from "../../../api/table";
           projectCreationDate: row.buildDate,
           status: row.status,
           partType: row.partType,
+          remark: row.remark,
           // active: row.active,
           createBy: this.$store.state.user.name,
           updateBy: this.$store.state.user.name,
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index 352b4d3..c246df4 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -2704,6 +2704,24 @@ import {uploadFileList} from '@/api/base/baseFunction.js';
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 401004,
+            serialNumber: '401004Table1Remark',
+            tableId: "401004Table1",
+            tableName: "项目物料表",
+            columnProp: 'remark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 401004,