From b552e40582408a2034d4a1322b5607546c9982b4 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 25 Dec 2023 15:22:42 +0800 Subject: [PATCH] =?UTF-8?q?plm=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com_technical-add-or-update.vue | 64 ++- .../com_bm_inkMixing.vue | 402 ++++++++++++++++++ .../technicalSpecificationDetail.vue | 30 +- .../technicalSpecificationList.vue | 2 +- 4 files changed, 473 insertions(+), 25 deletions(-) create mode 100644 src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index 8a1bb6f..eb725b4 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -6,21 +6,22 @@ :close-on-click-modal="false" :visible.sync="visible"> - + 打样单号 - - + + 项目料号 + - - + + @@ -148,7 +149,7 @@ label="测试料号"> 0){ row=data.rows[0] @@ -409,13 +411,13 @@ this.dataForm.proofingNo=row.proofingNo this.dataForm.projectId=row.projectId this.dataForm.testPartNo=row.testPartNo - this.dataForm.partName=row.partName + this.dataForm.partDesc=row.partDesc this.proofingModelFlag=false }, changeProofingNo(row){ this.dataForm.projectId=row.projectId this.dataForm.testPartNo=row.testPartNo - this.dataForm.partName=row.partName + this.dataForm.partDesc=row.partDesc this.proofingModelFlag=false }, quotationOfficerChooseModal(){ @@ -490,6 +492,18 @@ // 表单提交 dataFormSubmit () { + if(this.dataForm.testPartNo===''){ + this.$alert('请输入测试料号!', '错误', { + confirmButtonText: '确定' + }) + return false + } + if(this.dataForm.revNo===''){ + this.$alert('请输入版本号!', '错误', { + confirmButtonText: '确定' + }) + return false + } saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功') @@ -502,6 +516,7 @@ }, changeTestDesc(){ + this.dataForm.proofingNo=""; let inData={ site:this.$store.state.user.site, testPartNo: this.dataForm.testPartNo @@ -510,14 +525,33 @@ if (data && data.code === 0) { if(data.row!=null){ this.dataForm.projectId=data.row.projectId - this.dataForm.partName=data.row.partName + this.dataForm.partDesc=data.row.partDesc }else { this.dataForm.projectId='' - this.dataForm.partName='' + this.dataForm.partDesc='' } + } }) }, + // changeTestPartNo(){ + // let inData={ + // site:this.dataForm.site, + // username:this.$store.state.user.name, + // testPartNo:this.dataForm.testPartNo, + // } + // getTestPartChangeData(inData).then(({data}) => { + // let row={ + // projectId:'', + // testPartNo:'', + // partDesc:'', + // } + // if(data.rows.length>0){ + // row=data.rows[0] + // } + // this.changeProofingNo(row) + // }) + // }, }, } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue new file mode 100644 index 0000000..5e02fb1 --- /dev/null +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue @@ -0,0 +1,402 @@ + + + + + diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue index bc22422..083e2e6 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue @@ -1,11 +1,11 @@