From a16f0524daf14092a54b08689e2e490e57e7fa48 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 18:05:18 +0800 Subject: [PATCH 1/3] commit --- .../pages/standInvolveProjectDetail.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 04bb340e5..0d07c9321 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -371,13 +371,13 @@ export default { loading: 'loading' }, res => { if (res.ok) { - res.data.records.forEach((item)=>{ - for(let key in item){ - if(item[key] == null){ - item[key]='无' - } - } - }) + // res.data.records.forEach((item)=>{ + // for(let key in item){ + // if(item[key] == null){ + // item[key]='无' + // } + // } + // }) this.sarProStateListDatas = res.data.records this.sarProStateTotal = res.data.total } From b4c5441f9958d0336e36de1694b891d95146435c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 9 Aug 2021 19:31:17 +0800 Subject: [PATCH 2/3] commit --- .../pages/creatProcess/xmpg/step1-1.vue | 2 ++ .../pages/creatProcess/xmpg/step1.vue | 2 ++ .../pages/creatProcess/xmpg/step3.vue | 12 ++++++++-- .../pages/creatProcess/xmpg2/step1.vue | 24 ++++++++++++------- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 5e3894f7f..454d4c8bc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -409,6 +409,7 @@ export default { // 查询相关参数 searching: false, commentText:'', + fileType: 'FBGBJBD', standardSearch: { standType: "", standName: "" @@ -847,6 +848,7 @@ export default { this.$http.post("SarStandItems/sar-stand-items/findStand", { page: this.page, size: this.pageSize, + fileType: this.fileType, ...this.standardSearch }, { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index ad4acb396..1d9ea32d5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -396,6 +396,7 @@ export default { drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, + fileType: 'FBGBJBD', standardSearch: { standType: "", standName: "" @@ -822,6 +823,7 @@ export default { this.$http.post("SarStandItems/sar-stand-items/findStand", { page: this.page, size: this.pageSize, + fileType: this.fileType, ...this.standardSearch }, { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index ca623d269..a675eae98 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -369,6 +369,16 @@ export default { this.listForm.breakdownList = []; for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { + if(item.pepdtos[i].xCXSSRQ === null){ + this.listForm.breakdownList.xCXSSRQ = "" + } else { + this.listForm.breakdownList.xCXSSRQ = item.pepdtos[i].xCXSSRQ + } + if(item.pepdtos[i].zCCSSRQ === null){ + this.listForm.breakdownList.zCCSSRQ = "" + } else { + this.listForm.breakdownList.zCCSSRQ = item.pepdtos[i].zCCSSRQ + } this.listForm.breakdownList.push({ itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemNum: item.pepdtos[i].breakdownList[j].itemsNum, @@ -386,8 +396,6 @@ export default { qualityEngineerName: item.pepdtos[i].qualityEngineerName, standNumber: item.pepdtos[i].standNumber, standName: item.pepdtos[i].standName, - xCXSSRQ: item.pepdtos[i].xCXSSRQ, - zCCSSRQ: item.pepdtos[i].zCCSSRQ }); } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 307ab4a7b..7923603a6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -68,8 +68,10 @@ label="标准号" > { + console.log(res.data.records); this.listForm.dataList = res.data.records; this.dataList = res.data.records; this.listForm.dataList.forEach(item => { @@ -517,7 +520,12 @@ export default { { _this: this }, res => { - this.listForm.breakdownList = res.data; + if (!res.data.length) { + this.dataList = [] + this.$message.warning("请选择带有分解单的标准"); + } else { + this.listForm.breakdownList = res.data; + } }); }, //标准的多选框改变 @@ -595,15 +603,15 @@ export default { }); }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let routeUrl = this.$router.resolve({ - name: 'OtherStandardDetails', + name: "OtherStandardDetails", params: { id: item.standId, - pageType: 'INLAND_STAND' + pageType: "INLAND_STAND" } - }) - window.open(routeUrl.href, '_blank') + }); + window.open(routeUrl.href, "_blank"); }, choiceZRR(type, title, id) { this.nodeList = []; From 2a828a8746369987085a9102e9463bde8c489fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 9 Aug 2021 20:41:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 440 +++++++++--------- 1 file changed, 231 insertions(+), 209 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 0d07c9321..9a29bb58f 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -15,10 +15,14 @@ clearable> - 查询 + 查询 + - 清空 + 清空 + @@ -27,24 +31,24 @@
+ type="selection" + width="55" + align="center">