From b8ce17a1fd2713eda2b5c6812f5dc7f0504faaa1 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Thu, 18 Jan 2024 10:01:28 +0800 Subject: [PATCH] =?UTF-8?q?2024-1-18=20=E6=B5=8B=E8=AF=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=89=93=E6=A0=B7=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/projectInfo/projectInfo.vue | 1 + .../modules/proofing/requestForProofing.vue | 105 ++++++++++++++--- .../modules/quotation/requestForQuote.vue | 17 +-- src/views/modules/test/requestForTest.vue | 108 ++++++++++++++---- 4 files changed, 182 insertions(+), 49 deletions(-) diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 780327b..020d53c 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -1541,6 +1541,7 @@ activated() { if (this.$route.params.projectId){ this.searchData.projectId = this.$route.params.projectId + this.search(); } this.getTableUserColumn(this.$route.meta.menuId+'table1',1) }, diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index a81044e..be80772 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -50,12 +50,7 @@ - - - - - - + @@ -171,11 +166,7 @@ - - - - - + @@ -195,7 +186,7 @@ - 项目编码 + 项目编码 @@ -409,6 +400,36 @@ + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + @@ -832,15 +853,18 @@ saveCustomerResponse, // 保存客户回复 getProjectPartList, // 获取产品列表 getProjectInformation, // 获取项目信息 - getCustomerInformation // 获取客户信息 + getCustomerInformation, // 获取客户信息 } from '@/api/proofing/proofingInformation.js' import { - downLoadQuotationFile // 文件下载 + downLoadQuotationFile, // 文件下载 + searchProjectInfoList, } from '@/api/quotation/quotationInformation.js' import Chooselist from '@/views/modules/common/Chooselist' import proofingUploadFile from "./proofing_upload_file" + import DictDataSelect from "../sys/dict-data-select.vue"; export default { components: { + DictDataSelect, Chooselist, proofingUploadFile }, @@ -1671,7 +1695,17 @@ enterResultModalFlag: false, submitResultModalFlag: false, customerResponseModalFlag: false, - projectPartModelFlag: false + // 选择项目弹框开关 + chooseProjectListFlag: false, + //项目搜索条件 + searchProjectData:{ + site:this.$store.state.user.site, + projectId:undefined, + projectName:undefined, + customerId:undefined, + }, + // 项目集合 + projectList:[], } }, mounted () { @@ -1710,8 +1744,10 @@ * @param row */ projectPartClickRow (row) { - this.$refs.projectPartTable.toggleRowSelection(row); - this.confirmProjectPart(); + if(this.modalData.flag === '1'){ + this.$refs.projectPartTable.toggleRowSelection(row); + this.confirmProjectPart(); + } }, /** * 多选 @@ -2614,8 +2650,14 @@ getBaseData (val) { if (this.tagNo === 102) { if(this.tagNo1 === 1) { + if (val.Customer_no === this.modalData.customerNo) { + return + } this.modalData.customerNo = val.Customer_no this.modalData.customerDesc = val.Customer_desc + this.modalData.projectId = undefined + this.modalData.projectName = undefined + this.projectPartList = [] } } if (this.tagNo === 103) { @@ -2715,6 +2757,35 @@ return false } }, + projectClickRow(row){ + this.modalData.projectId = row.projectId + this.modalData.projectName = row.projectName + this.getProjectPartList() + this.chooseProjectListFlag = false + }, + // 查询searchProjectInfoList + searchProjectInfoList(){ + this.projectList = []; + this.searchProjectData.customerId = this.modalData.customerNo + searchProjectInfoList(this.searchProjectData).then(({data})=>{ + if (data && data.code === 0) { + this.projectList = data.rows + } else { + this.projectList = [] + } + }).catch((error)=>{ + this.$message.error('查询项目信息失败') + }) + }, + closeProjectInfoDialog(){ + this.$refs.closeProjectInfoForm.resetFields(); + this.searchProjectData={ + site:this.$store.state.user.site, + projectId:undefined, + projectName:undefined, + customerId:undefined, + } + }, } } diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index a49801f..596de72 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -52,16 +52,11 @@ - + - - - - - - + @@ -199,11 +194,7 @@ - - - - - + @@ -851,8 +842,10 @@ } from '@/api/quotation/quotationInformation.js' import Chooselist from '@/views/modules/common/Chooselist' import quotationUploadFile from "./quotation_upload_file" + import DictDataSelect from "../sys/dict-data-select.vue"; export default { components: { + DictDataSelect, Chooselist, quotationUploadFile }, diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index c0dec11..c08c695 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -50,12 +50,7 @@ - - - - - - + @@ -171,11 +166,7 @@ - - - - - + @@ -195,7 +186,7 @@ - 项目编码 + 项目编码 @@ -409,6 +400,36 @@ + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + @@ -833,12 +854,15 @@ getCustomerInformation // 获取客户信息 } from '@/api/test/testInformation.js' import { - downLoadQuotationFile // 文件下载 + downLoadQuotationFile, // 文件下载 + searchProjectInfoList } from '@/api/quotation/quotationInformation.js' import Chooselist from '@/views/modules/common/Chooselist' import testUploadFile from "./test_upload_file" + import DictDataSelect from "../sys/dict-data-select.vue"; export default { components: { + DictDataSelect, Chooselist, testUploadFile }, @@ -1669,7 +1693,18 @@ enterResultModalFlag: false, submitResultModalFlag: false, customerResponseModalFlag: false, - projectPartModelFlag: false + projectPartModelFlag: false, + // 选择项目弹框开关 + chooseProjectListFlag: false, + //项目搜索条件 + searchProjectData:{ + site:this.$store.state.user.site, + projectId:undefined, + projectName:undefined, + customerId:undefined, + }, + // 项目集合 + projectList:[], } }, mounted () { @@ -1708,8 +1743,10 @@ * @param row */ projectPartClickRow (row) { - this.$refs.projectPartTable.toggleRowSelection(row); - this.confirmProjectPart(); + if (this.modalData.flag === '1'){ + this.$refs.projectPartTable.toggleRowSelection(row); + this.confirmProjectPart(); + } }, /** * 多选 @@ -1948,10 +1985,6 @@ * 确认多选项目物料 */ confirmProjectPart () { - if(this.projectPartListSelections.length === 0){ - this.$message.warning('请勾选项目物料！') - return - } this.modalData.testPartNo = '' this.modalData.partName = '' for (let i = 0; i < this.projectPartListSelections.length; i++) { @@ -2419,8 +2452,14 @@ getBaseData (val) { if (this.tagNo === 102) { if(this.tagNo1 === 1) { + if (val.Customer_no === this.modalData.customerNo) { + return + } this.modalData.customerNo = val.Customer_no this.modalData.customerDesc = val.Customer_desc + this.modalData.projectId = '' + this.modalData.projectName = '' + this.projectPartList = []; } } if (this.tagNo === 103) { @@ -2523,6 +2562,35 @@ return false } }, + projectClickRow(row){ + this.modalData.projectId = row.projectId + this.modalData.projectName = row.projectName + this.getProjectPartList() + this.chooseProjectListFlag = false + }, + // 查询searchProjectInfoList + searchProjectInfoList(){ + this.projectList = []; + this.searchProjectData.customerId = this.modalData.customerNo + searchProjectInfoList(this.searchProjectData).then(({data})=>{ + if (data && data.code === 0) { + this.projectList = data.rows + } else { + this.projectList = [] + } + }).catch((error)=>{ + this.$message.error('查询项目信息失败') + }) + }, + closeProjectInfoDialog(){ + this.$refs.closeProjectInfoForm.resetFields(); + this.searchProjectData={ + site:this.$store.state.user.site, + projectId:undefined, + projectName:undefined, + customerId:undefined, + } + }, } }