From b3f8e04de935f126d846c1f4426c4fb3946519c2 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:33:35 +0800 Subject: [PATCH] =?UTF-8?q?2024.7.1=20=E4=BA=A7=E5=93=81=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/eamProject.js | 1 + src/api/factory/site.js | 2 + .../modules/eam/com_project_proof_record.vue | 358 ++++++++++++--- .../eam/eamBuDocumentListDefinition.vue | 12 +- src/views/modules/eam/eamProjectInfo.vue | 426 +++++++++++++----- 5 files changed, 626 insertions(+), 173 deletions(-) diff --git a/src/api/eam/eamProject.js b/src/api/eam/eamProject.js index ac6fd1e..5534d46 100644 --- a/src/api/eam/eamProject.js +++ b/src/api/eam/eamProject.js @@ -5,3 +5,4 @@ export const eamProjectInfoSave= data => createAPI(`/pms/eamProject/eamProjectIn export const eamProjectInfoEdit= data => createAPI(`/pms/eamProject/eamProjectInfoEdit`,'post',data) export const eamProjectInfoDelete= data => createAPI(`/pms/eamProject/eamProjectInfoDelete`,'post',data) export const saveFormalPartNo= data => createAPI(`/pms/eamProject/saveFormalPartNo`,'post',data) +export const getTestPartNo= data => createAPI(`/pms/eamProject/getTestPartNo`,'post',data) diff --git a/src/api/factory/site.js b/src/api/factory/site.js index 51f4ce7..faf073e 100644 --- a/src/api/factory/site.js +++ b/src/api/factory/site.js @@ -44,3 +44,5 @@ export const searchBusinessInfo3 = data => createAPI(`/site/searchBusinessInfo3` export const searchBusinessInfo4 = data => createAPI(`/site/searchBusinessInfo4`,'post',data) export const searchBusinessInfo5 = data => createAPI(`/site/searchBusinessInfo5`,'post',data) + +export const searchBusinessInfo6 = data => createAPI(`/site/searchBusinessInfo6`,'post',data) diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue index e67c8a9..298286c 100644 --- a/src/views/modules/eam/com_project_proof_record.vue +++ b/src/views/modules/eam/com_project_proof_record.vue @@ -2,13 +2,13 @@
- +

打样记录

 - + 上传其他文档 - + - + + + + + + - + - + - - - - + @@ -133,10 +135,35 @@ + + + + + + - + + + + + + + + + + + - + - - + + +
@@ -225,30 +258,32 @@
- + - + + + + + + - + - + - - - - + @@ -262,14 +297,51 @@ - - + + + + + + + + - - + + + - - + + + + + + + + + + + + +
@@ -278,8 +350,8 @@
- - + + @@ -353,8 +425,12 @@ import {proofingInformationSearch,proofingDocumentNEW,getExtraDocumentList,editProofingRecord,proofingInformationSave,getProofDocument,getDocumentList,deleteDocumentType,proofingDocumentSave} from "@/api/eam/eamProofing.js"; import row from "element-ui/packages/row"; import UploadFileList1 from "../common/uploadFileList1.vue"; + import he from "element-ui/src/locale/lang/he"; export default { computed: { + he() { + return he + }, row() { return row } @@ -395,6 +471,7 @@ proofingRecordVisible: false, addDocumentTypeFlag: false, isEditable: false, + height: 200, currentRow:'', fileContentList:[], proofDocumentList:[], @@ -422,6 +499,12 @@ {cProjectTypeDb: 'High Risk'}, ], + projectPhaseList: [ + {projectPhase: 'Prototype'}, + {projectPhase: 'Alpha'}, + {projectPhase: 'Beta'}, + {projectPhase: 'Pre-launch'}, + ], activeName: 'proofDocument', modalData: { projectId: '', @@ -433,8 +516,11 @@ bu: '', buNo: '', cProjectTypeDb: '', + projectPhase: '', proofingNo: '', + planStartDate: '', requiredDeliveryDate: '', + actualityDeliveryDate: '', proofingNumber: '', createDate: '', createBy: '' @@ -478,17 +564,16 @@ updateBy: this.$store.state.user.name, }, columnList: [ - //日期requiredDeliveryDate { userId: this.$store.state.user.name, functionId: 103001, serialNumber: '103001Table1RequiredDeliveryDate', tableId: '103001Table1', tableName: '打样记录表', - columnProp: 'requiredDeliveryDate', + columnProp: 'planStartDate', headerAlign: 'center', align: 'center', - columnLabel: '打样日期', + columnLabel: '打样开始日期', columnHidden: false, columnImage: false, columnSortable: false, @@ -551,6 +636,62 @@ fixed: '', columnWidth: 80, }, + { + userId: this.$store.state.user.name, + functionId: 101001014, + serialNumber: '101001014Table1CProjectPhase', + tableId: "101001014Table1", + tableName: "项目信息表", + columnProp: 'projectPhase', + headerAlign: "center", + align: "left", + columnLabel: '项目阶段', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80, + }, + //日期requiredDeliveryDate + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1RequiredDeliveryDate', + tableId: '103001Table1', + tableName: '打样记录表', + columnProp: 'requiredDeliveryDate', + headerAlign: 'center', + align: 'center', + columnLabel: '预计完成日期', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + //日期requiredDeliveryDate + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1ActualityDeliveryDate', + tableId: '103001Table1', + tableName: '打样记录表', + columnProp: 'actualityDeliveryDate', + headerAlign: 'center', + align: 'center', + columnLabel: '实际完成日期', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, { userId: this.$store.state.user.name, functionId: 103001, @@ -567,7 +708,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 120 }, { userId: this.$store.state.user.name, @@ -757,18 +898,55 @@ } ], rules: { + projectCategory: [ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], + projectPhase: [ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], proofingNo: [ - { required: true, message: '请输入打样单号', trigger: 'blur' } + { + required: true, + message: ' ', + trigger: ['blur','change'] + } + ], + planStartDate: [ + { + required: true, + message: ' ', + trigger: ['blur','change'] + } ], requiredDeliveryDate: [ - { required: true, message: '请选择打样日期', trigger: 'blur' } + { + required: true, + message: ' ', + trigger: ['blur','change'] + } ], proofingNumber: [ - { required: true, message: '请输入数量', trigger: 'blur' } + { + required: true, + message: ' ', + trigger: ['blur','change'] + } ], //请选择项目分类 cProjectTypeDb: [ - { required: true, message: '请选择项目分类', trigger: 'blur' } + { + required: true, + message: ' ', + trigger: ['blur','change'] + } ] }, // 导出 start @@ -822,13 +1000,56 @@ }); }, init1(inData1) { - + inData1.planStartDate = new Date(); + inData1.createDate = ''; this.visible = true //初始化参数 this.modalData = JSON.parse(JSON.stringify(inData1)); this.searchProofData = JSON.parse(JSON.stringify(inData1)); }, newProofingRecord() { + if (this.modalData.cProjectTypeDb === '' || this.modalData.cProjectTypeDb === null || this.modalData.cProjectTypeDb === undefined) { + this.$message({ + message: '项目分类不能为空', + type: 'warning' + }) + return + } + if (this.modalData.projectPhase === '' || this.modalData.projectPhase === null || this.modalData.projectPhase === undefined) { + this.$message({ + message: '项目阶段不能为空', + type: 'warning' + }) + return + } + if (this.modalData.proofingNo === '' || this.modalData.proofingNo === null || this.modalData.proofingNo === undefined) { + this.$message({ + message: '打样单号不能为空', + type: 'warning' + }) + return + } + if (this.modalData.proofingNumber === '' || this.modalData.proofingNumber === null || this.modalData.proofingNumber === undefined) { + this.$message({ + message: '数量不能为空', + type: 'warning' + }) + return + } + if (this.modalData.planStartDate === '' || this.modalData.planStartDate === null || this.modalData.planStartDate === undefined) { + this.$message({ + message: '打样开始日期不能为空', + type: 'warning' + }) + return + } + if (this.modalData.requiredDeliveryDate === '' || this.modalData.requiredDeliveryDate === null || this.modalData.requiredDeliveryDate === undefined) { + this.$message({ + message: '预计完成日期不能为空', + type: 'warning' + }) + return + } proofingInformationSave(this.modalData).then(({data}) => { //区分请求成功和失败的状况 if (data && data.code === 0) { @@ -836,6 +1057,7 @@ message: '新增成功', type: 'success' }) + this.newProofingDocument() this.visible = false //刷新表格 this.getProofingInformation() @@ -847,7 +1069,6 @@ }) } }) - this.newProofingDocument() }, getProofingInformation() { let tempData = { @@ -958,7 +1179,9 @@ buNo: row.buNo, site: row.site, cProjectTypeDb: row.cProjectTypeDb, + projectPhase: row.projectPhase, proofingNo: row.proofingNo, + planStartDate: row.planStartDate, requiredDeliveryDate: row.requiredDeliveryDate, proofingNumber: row.proofingNumber, createDate: row.createDate, @@ -966,31 +1189,45 @@ } }, saveProofingRecord() { - if (this.modalData.proofingNo === '' || this.modalData.proofingNo === null || this.modalData.proofingNo === undefined) { + if (this.modalData.cProjectTypeDb === '' || this.modalData.cProjectTypeDb === null || this.modalData.cProjectTypeDb === undefined) { this.$message({ - message: '打样单号不能为空', - type: 'error' + message: '项目分类不能为空', + type: 'warning' }) return } - if (this.modalData.requiredDeliveryDate === '' || this.modalData.requiredDeliveryDate === null || this.modalData.requiredDeliveryDate === undefined) { + if (this.modalData.projectPhase === '' || this.modalData.projectPhase === null || this.modalData.projectPhase === undefined) { this.$message({ - message: '交付日期不能为空', - type: 'error' + message: '项目阶段不能为空', + type: 'warning' + }) + return + } + if (this.modalData.proofingNo === '' || this.modalData.proofingNo === null || this.modalData.proofingNo === undefined) { + this.$message({ + message: '打样单号不能为空', + type: 'warning' }) return } if (this.modalData.proofingNumber === '' || this.modalData.proofingNumber === null || this.modalData.proofingNumber === undefined) { this.$message({ message: '数量不能为空', - type: 'error' + type: 'warning' }) return } - if (this.modalData.cProjectTypeDb === '' || this.modalData.cProjectTypeDb === null || this.modalData.cProjectTypeDb === undefined) { + if (this.modalData.planStartDate === '' || this.modalData.planStartDate === null || this.modalData.planStartDate === undefined) { this.$message({ - message: '项目分类不能为空', - type: 'error' + message: '打样开始日期不能为空', + type: 'warning' + }) + return + } + if (this.modalData.requiredDeliveryDate === '' || this.modalData.requiredDeliveryDate === null || this.modalData.requiredDeliveryDate === undefined) { + this.$message({ + message: '预计完成日期不能为空', + type: 'warning' }) return } @@ -1247,17 +1484,14 @@ display: flex; } -.left-section { +/deep/ .left-section { flex: 1; /* 左边部分占据剩余空间 */ - width: 860px; - margin-right: 15px; /* 右边与左边之间的间隔 */ -} - -.right-section { - width: 761px; /* 右边部分固定宽度 */ + width: 50%; + margin-right: 10px; /* 右边与左边之间的间隔 */ } -.upload-demo { - display: inline-block; +/deep/ .right-section { + width: 48%; /* 右边部分宽度占满剩余空间 */ + margin-right: 5px; } diff --git a/src/views/modules/eam/eamBuDocumentListDefinition.vue b/src/views/modules/eam/eamBuDocumentListDefinition.vue index d1341bc..7f82034 100644 --- a/src/views/modules/eam/eamBuDocumentListDefinition.vue +++ b/src/views/modules/eam/eamBuDocumentListDefinition.vue @@ -38,7 +38,8 @@ - + 文档类型ID + @@ -129,7 +130,7 @@ - + - - - ➞ - - + - - + @@ -213,15 +209,15 @@ - + - + @@ -244,25 +240,17 @@ PjM - - - - - - - - - - - - - - IPQC-Lam/Pri/Etch/Slit - + + Engineer + + + IPQC-Lam/Pri/Etch/Slit + + IPQC-Converting @@ -273,7 +261,7 @@ MFG - + @@ -285,10 +273,10 @@ - - + + - + @@ -302,7 +290,7 @@ + label="用户账号"> + label="用户名"> - - + + - + @@ -359,7 +347,7 @@ + label="用户账号"> + label="用户名"> + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + 确定 + 关闭 + + + + - - + + - + @@ -417,7 +464,7 @@ + label="用户账号"> + label="用户名"> - - + + - + @@ -476,7 +523,7 @@ + label="用户账号"> + label="用户名"> - - + + - + @@ -533,7 +580,7 @@ + label="用户账号"> + label="用户名"> - - + + - + @@ -590,7 +637,7 @@ + label="用户账号"> + label="用户名"> - + @@ -692,7 +739,7 @@