From e14730c0a675dbef6c8ce70e7d77ac49ba41321a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 14:14:54 +0800 Subject: [PATCH 01/25] commit --- .../pages/creatProcess/bzdy/step2.vue | 31 ++++++++++++---- .../pages/creatProcess/bzdy/step3.vue | 35 ++++++++++++++----- .../pages/creatProcess/bzdy/step4.vue | 15 ++++---- .../pages/creatProcess/bzdy/step5.vue | 29 +++++++++++---- .../pages/creatProcess/bzdy/step6.vue | 12 +++---- .../pages/creatProcess/bzdy/step7.vue | 12 +++---- .../pages/creatProcess/bzdy/step8.vue | 12 +++---- .../pages/creatProcess/bzdy/step9.vue | 12 +++---- .../pages/creatProcess/bzjd/step2.vue | 1 - 9 files changed, 104 insertions(+), 55 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 1c406b205..842b3a8d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -135,6 +135,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -261,11 +276,13 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index e4b8d0b87..e3f635c75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -147,6 +147,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -305,13 +320,15 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.model = data.model - this.form.modelName = data.modelName - this.form.fileName = data.fileName || '' - this.form.fileId = data.fileId || '' + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName + this.form.responUserList = data.form.responUserList + this.form.responUserListName = data.form.responUserListName + this.form.fileName = data.form.fileName || data.fileName || '' + this.form.fileId = data.form.fileId || data.fileId || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 8cc57135e..d991f2dac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -252,13 +252,14 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.form.file = data.fileId - this.form.fileName = data.fileName - this.form.model = data.model - this.form.modelName = data.modelName + console.log(data); + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.file = data.fileId || data.form.fileId + this.form.fileName = data.fileName || data.form.fileName + this.form.model = data.model || data.form.model + this.form.modelName = data.modelName || data.form.modelName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index a590d8ece..011d29d6d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -174,6 +174,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { @@ -327,12 +342,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileId = data.hzfileId - this.form.hzfileName = data.hzfileName + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index b55d1e585..3e33eac63 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 953b1085a..2d7c2e343 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 2efa1dc5c..2942c2ccb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 7339115b3..41e534615 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -341,12 +341,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.title = data.title - this.form.date = data.date - this.json = data - this.tableData = data.responUserList - this.form.hzfileName = data.hzfileName - this.form.hzfileId = data.hzfileId + this.form.title = data.title || data.form.title + this.form.date = data.date || data.form.date + this.json = data || data.form + this.tableData = data.responUserList || data.form.responUserList + this.form.hzfileId = data.hzfileId || data.form.hzfileId + this.form.hzfileName = data.hzfileName || data.form.hzfileName }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 69682b390..9838e9e60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -321,7 +321,6 @@ this.active = name }, handleSave() { - this.saveLoading = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) From 181d58e9f0eb854d12f4dd66a3310f580c339c09 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 9 Aug 2021 14:34:45 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?Id=EF=BC=8C=E6=A0=87=E5=87=86=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1.vue | 3 ++ .../pags/consultationDetails.vue | 43 +++++++++++-------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 74b330f0a..c38825090 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -282,6 +282,7 @@ export default { endTime: '', // 结束日期 cname: '', // 名称 standType: '', + standId: '', }, formRules: { cid: [ @@ -299,6 +300,7 @@ export default { standSort: '', standNumber: '', standType: '', + standId: '', page: 1, pageSize: this.$store.getters.userInfo.configContent }, @@ -456,6 +458,7 @@ export default { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber } this.form.standType = bringData[0].standType + this.form.standId = bringData[0].id this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 23cc1cb95..a704c9847 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -11,19 +11,27 @@

- {{ $route.query.item.cid }} + + {{ this.$route.query.item.cid }} +

- {{ $route.query.item.cname || '-' }} + + {{ this.$route.query.item.cname || '-' }} +

- {{ $route.query.item.endTime || '-' }} + {{ this.$route.query.item.endTime || '-' }}

- {{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}} + {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}} -

@@ -120,6 +128,7 @@ name: 'consultationDetails', data () { return { + itemData: this.$route.query.item, id: '', // 选中id type: '', // 选中状态 spinShow: false, @@ -152,6 +161,17 @@ } }, methods: { + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'INLAND_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, exportAll () { window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid) }, @@ -166,21 +186,6 @@ } }) }, - - //点击查看 - handlePreview(data) { - console.log(data); - return - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: data.id, - pageType: data.standType - } - }); - window.open(routeUrl.href, "_blank"); - }, - // 获取详情信息列表 getList() { this.spinShow = true From 52c5ecae016e5b45930110e44296fa659f733d6c Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 9 Aug 2021 15:56:57 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 84fe9f31a..c26c24ebd 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -135,11 +135,11 @@ export default { // // // title: '本地产品/项目库', // // // path: '/localProductsOrProjectLibrary' // // // }, - { + /*{ title: '企业标准库', path: '/enterpriseStandardDatabase', menuId: '01ed8f752748227777b3572d56ee9ab5' - }, + },*/ // { // title: '企标制修订计划', // path: '/enterBSysRevPlanManaLib', From ef0242e7b69bde260abbb135f6f42a18ffadbe62 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 16:06:56 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step3.vue | 18 ++-- .../pages/creatProcess/xmpg/step3.vue | 80 ++++++++++------- .../pages/creatProcess/xmpg/step4.vue | 69 ++++++++++----- .../pages/creatProcess/xmpg2/step3.vue | 39 +++++++-- .../pages/creatProcess/xmpg2/step4.vue | 39 +++++++-- .../pages/creatProcess/xmpg2/step5.vue | 85 ++++++++++++------- .../pages/creatProcess/xmpg2/step6.vue | 35 ++++++-- 7 files changed, 244 insertions(+), 121 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 187975a72..3fc280f48 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -678,7 +678,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg) this.getFormFieldList(processForm) @@ -718,22 +717,19 @@ export default { this.saveLoading = true; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); - _formData.append("createUser", this.$store.getters.userInfo.userId); - _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); _formData.append('taskIds', this.taskIds) _formData.append("json", JSON.stringify({ form: this.listForm, commentText: this.commentText })); - - // saveTaskForPub(_formData).then(res => { - // this.saveLoading = false; - // this.$message.success("保存成功"); - // this.bpnId = res.result; - // }).catch(e => { - // this.saveLoading = false; - // }); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index d1cd30610..ca623d269 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -222,7 +222,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpgStep3", @@ -348,7 +348,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -362,36 +361,41 @@ export default { */ getFormFieldList(item) { this.listForm = JSON.parse(JSON.stringify(item)); - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0])); - this.listForm.breakdownList = []; - for (let i = 0; i < item.pepdtos.length; i++) { - for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { - this.listForm.breakdownList.push({ - itemsName: item.pepdtos[i].breakdownList[j].itemsName, - itemNum: item.pepdtos[i].breakdownList[j].itemsNum, - responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, - responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit, - productLine: item.pepdtos[i].sarStandProjectLibraries.productLine, - projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber, - projectName: item.pepdtos[i].sarStandProjectLibraries.projectName, - implementer: item.pepdtos[i].breakdownList[j].implementer || null, - distributePerson: item.pepdtos[i].distributePerson, - distributePersonId: item.pepdtos[i].distributePersonId, - uname: item.pepdtos[i].uname, - projectManager: item.pepdtos[i].projectManager, - certifiedEngineerName: item.pepdtos[i].certifiedEngineerName, - 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 - }); + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0])); + this.listForm.breakdownList = []; + for (let i = 0; i < item.pepdtos.length; i++) { + for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { + this.listForm.breakdownList.push({ + itemsName: item.pepdtos[i].breakdownList[j].itemsName, + itemNum: item.pepdtos[i].breakdownList[j].itemsNum, + responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, + responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit, + productLine: item.pepdtos[i].sarStandProjectLibraries.productLine, + projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber, + projectName: item.pepdtos[i].sarStandProjectLibraries.projectName, + implementer: item.pepdtos[i].breakdownList[j].implementer || null, + distributePerson: item.pepdtos[i].distributePerson, + distributePersonId: item.pepdtos[i].distributePersonId, + uname: item.pepdtos[i].uname, + projectManager: item.pepdtos[i].projectManager, + certifiedEngineerName: item.pepdtos[i].certifiedEngineerName, + 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 + }); + } } + } else { + this.listForm = item.form + this.listForm.breakdownList = item.form.breakdownList } - console.log(this.listForm.breakdownList); + }, checkedRole (data) { if (this.type === 1) { @@ -441,6 +445,22 @@ export default { //保存事件 handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "5"); + _formData.append('taskIds', this.taskIds) + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 6b7dfb9d1..abc960d8d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -347,7 +347,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpgStep4", @@ -454,36 +454,59 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - if (item.fenFlag === undefined ) { - item.step3DTOS.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId - item.implementer = this.$store.getters.userInfo.userName - }) - this.dataList = item.step3DTOS; + if(item.form === undefined){ + if (item.fenFlag === undefined ) { + item.step3DTOS.forEach(item => { + item.implementerId = this.$store.getters.userInfo.userId + item.implementer = this.$store.getters.userInfo.userName + }) + this.dataList = item.step3DTOS; + } else { + this.dataList = item.dataList; + this.dataList.forEach(item => { + item.implementerId = this.$store.getters.userInfo.userId + item.implementer = this.$store.getters.userInfo.userName + }) + } + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.standName = item.step3DTOS[0].standName; + this.listForm.standNumber = item.step3DTOS[0].standNumber; + this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName; + this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName; + this.listForm.itemsName = item.step3DTOS[0].itemsName; + this.listForm.itemNum = item.step3DTOS[0].itemNum; + this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit; + this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer; } else { - this.dataList = item.dataList; - this.dataList.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId - item.implementer = this.$store.getters.userInfo.userName - }) + this.listForm = item.form + this.dataList = item.form.dataList } - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.standName = item.step3DTOS[0].standName; - this.listForm.standNumber = item.step3DTOS[0].standNumber; - this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName; - this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName; - this.listForm.itemsName = item.step3DTOS[0].itemsName; - this.listForm.itemNum = item.step3DTOS[0].itemNum; - this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit; - this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer; + }); }, //保存事件 handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + this.listForm.dataList = this.dataList; + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "5"); + _formData.append('taskIds', this.taskIds) + _formData.append("json", JSON.stringify({ + form:this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 81f1b0667..fa7f50d83 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -219,7 +219,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpg2Step3", @@ -339,18 +339,39 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + if (item.form === undefined) { + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.dataList = item.dataList; + this.dataList = item.dataList; + this.dataList.distributePerson = item.dataList[0].distributePerson; + this.listForm.breakdownList = item.breakdownList; + } else { + this.listForm = item.form + this.dataList = item.form.dataList + } + }); }, //保存事件 handleSave() { - + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "6"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 8f1fdd0e5..a00511c26 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -225,7 +225,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpg2Step4", @@ -333,6 +333,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -345,18 +346,38 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - // this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.dataList = item.dataList; + this.dataList = item.dataList; + this.listForm.breakdownList = item.breakdownList; + } else { + this.listForm = item.form + this.dataList = item.form.dataList + } + }); }, //保存事件 handleSave() { - + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "6"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 2911fb832..e051dc45f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -208,7 +208,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpg2Step5", @@ -328,43 +328,64 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear - let children = []; - item.breakdownList.forEach( - item => { - let aa = { - key: item.standId, - id: item.id, - standId: item.itemsNum, - itemsNum: item.itemsNum, - itemsName: item.itemsName, - workPeople: "请选择责任人" - }; - children.push(aa); - } - ); - this.dataList.forEach(key => { - key["children"] = []; - children.forEach(breakDown => { - if (key.standId === breakDown.key) { - key["children"].push(breakDown); + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.listForm.dataList = item.dataList; + this.dataList = item.dataList; + // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear + let children = []; + item.breakdownList.forEach( + item => { + let aa = { + key: item.standId, + id: item.id, + standId: item.itemsNum, + itemsNum: item.itemsNum, + itemsName: item.itemsName, + workPeople: "请选择责任人" + }; + children.push(aa); + } + ); + this.dataList.forEach(key => { + key["children"] = []; + children.forEach(breakDown => { + if (key.standId === breakDown.key) { + key["children"].push(breakDown); + } + }); + if (key["children"].length === 0) { + delete key["children"]; } }); - if (key["children"].length === 0) { - delete key["children"]; - } - }); - this.listForm.children = children; + this.listForm.children = children; + } else { + this.listForm = item.form + this.dataList = item.form.dataList + } + }); }, //保存事件 handleSave() { - + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "6"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 603619f15..7b2faee4d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -338,7 +338,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "xmpg2Step6", @@ -470,16 +470,37 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - // this.listForm.dataList = item.dataList; - this.dataList = this.listForm.dataList; + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + // this.listForm.dataList = item.dataList; + this.dataList = this.listForm.dataList; + } else { + this.listForm = item.form + this.dataList = item.form.dataList + } + }); }, //保存事件 handleSave() { - + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "6"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.listForm, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, //提交事件 handleSubmit() { From 14d24538f97b965b7778acb8f3b80449e795f633 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 9 Aug 2021 16:10:14 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E5=BA=93=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index cbbff74d1..d44b0a32d 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -641,7 +641,7 @@ - + From d763d3718cd4a1c9058e4f294e88d39d1018433d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 16:46:11 +0800 Subject: [PATCH 06/25] commit --- .../processCenter/pages/creatProcess/bzjd/step1-1.vue | 9 +++++++++ .../processCenter/pages/creatProcess/bzjd/step2.vue | 9 +++++++++ .../processCenter/pages/creatProcess/bzjd/step3.vue | 9 +++++++++ .../processCenter/pages/creatProcess/bzjd/step4.vue | 9 +++++++++ .../processCenter/pages/creatProcess/bzjd/step5.vue | 9 +++++++++ .../processCenter/pages/creatProcess/bzjd/step6.vue | 9 +++++++++ 6 files changed, 54 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 719b13749..a59cea2ed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -358,6 +358,15 @@ @checkedRole="saveUserInfo" :nodeList="nodeList" > + +
+
+ 关闭 +
+ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 9838e9e60..c89b69426 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -218,6 +218,15 @@ :nodeList="nodeList2" > 加载中... + +
+
+ 关闭 +
+ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index e5d7f7e21..e953869f4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -360,6 +360,15 @@ 取消 + +
+
+ 关闭 +
+ 加载中... diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index f646d40d7..6b90b2415 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -265,6 +265,15 @@ submitBTNText="同意" > + +
+
+ 关闭 +
+ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 2b6f9324c..834bc18af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -264,6 +264,15 @@ submitBTNText="同意" > + +
+
+ 关闭 +
+ 加载中... diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 414ab7eb8..67a6dabe4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -263,6 +263,15 @@ submitBTNText="同意" > + +
+
+ 关闭 +
+ 加载中... From 8bc236381c8fcac1e52837109820aba04c0d6b90 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 16:56:11 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E9=83=A8=E9=97=A8=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/rectificationDatabase.vue | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 22cb60d74..8850b9076 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -458,8 +458,22 @@ export default { _this: this }, res => { this.myLoading.loadData = false - this.nonList = res.data.records this.total = res.data.total + this.nonList = res.data.records + this.nonList.forEach(item => { + // 责任部门转换 + if (item.responsibleUnit !== null || item.responsibleUnit !== "") { + let k = (item.responsibleUnit || "").split(","); + for (let i in this.zrbmOptions) { + for (let m = 0; m < k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label; + } + item.responsibleUnit = k.join(","); + } + } + } + }); }, e => { this.myLoading.loadData = false }) @@ -665,18 +679,15 @@ export default { }, }, mounted () { + // 从数据库中查询各下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - this.allSelectOptions = res.data || {} this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.getGzzOption() - this.setMap(this.standStateOptions) + this.getTableByPage() }, e => { }) - this.getTableByPage() // 加载所有的部门 this.getOrgTreeSource() } From b0e77dc12bbd87c90e8cd22a7a926aa2c5044727 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 17:15:16 +0800 Subject: [PATCH 08/25] commit --- .../standardForComments/pags/consultationDetails.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index a704c9847..51d0a516a 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -277,10 +277,10 @@ cid: this.$route.query.item.cid, content: this.opinionContent.content, partCode: this.opinionContent.partCode, - userId: this.$store.getters.userInfo.userId, - userName: this.$store.getters.userInfo.account, - deptName: this.$store.getters.userInfo.orgName, - deptId: this.$store.getters.userInfo.orgId + userId: this.$store.getters.userInfo.userId || '', + userName: this.$store.getters.userInfo.userName || '', + deptName: this.$store.getters.userInfo.orgName || '', + deptId: this.$store.getters.userInfo.orgId || '' } if (this.type === 'edit') { form.id = this.id From 6c9c2debef237d7e5f70886719315110efe5f9d8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 17:15:50 +0800 Subject: [PATCH 09/25] commit --- .../standardForComments/pags/consultationDetails.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 51d0a516a..0ec0f90a7 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -193,7 +193,6 @@ _this: this }, res => { this.standinfoList = res.data.records - console.log(this.standinfoList); this.total = res.data.total this.spinShow = false }, e => { From b51e16288586f78852088e690f827d45d66a47e0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 17:24:22 +0800 Subject: [PATCH 10/25] commit --- .../standardForComments/pags/consultationDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 0ec0f90a7..864bd9717 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -27,7 +27,7 @@

- {{ this.$route.query.item.endTime || '-' }} + {{ this.$route.query.item.startTime || '-' }}

From bb04c9b13bbbb4ffe203b5cfbae40bf9b6ab0f40 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 17:33:49 +0800 Subject: [PATCH 11/25] feat: There is no way the --- src/pages/searchCenter/pages/advancedSearch.vue | 4 ++-- src/pages/searchCenter/pages/standardSearch.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index ffcef1be5..9b3694721 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -938,7 +938,7 @@ 查看 取消收藏 - 分享 + @@ -962,7 +962,7 @@

取消收藏 收藏 - 分享 +
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 3b70f1a4a..15040c34f 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -215,7 +215,7 @@
-
发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }}
+
发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }}
@@ -2531,7 +2531,7 @@ //display: -webkit-box; //-webkit-line-clamp: 3; -webkit-box-orient: vertical; - max-height: 60px; + max-height: 78px; } .AllTime { margin-top: 15px; From a67e4ea1fb11b23180953f5739d85cf0e715206e Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 9 Aug 2021 17:39:16 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=83=A8=E9=97=A8=E8=BD=AC=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step1.vue | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index de2138c64..d3f760def 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -345,21 +345,33 @@ export default { addList() { dicTypeData().then(res => { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - }) - standUnqualified(this.queryUnqualidiedData).then(res => { - this.unqualidiedData = res.data.records - this.unqualidiedData.forEach(item => { - this.$set(item,'engineer','') - this.$set(item,'engineerId','') - this.$set(item,'dutyPeopleInfo','') - this.$set(item,'dutyPeople','') - this.$set(item,'dutyPeopleInfoId','') - this.$set(item,'dutyPeopleId','') - this.$set(item,'fileText',[]) - this.$set(item,'fileTextId',[]) - this.$set(item,'fileTextPath',[]) + standUnqualified(this.queryUnqualidiedData).then(res => { + this.unqualidiedData = res.data.records + this.unqualidiedData.forEach(item => { + // 责任部门转换 + if (item.responsibleUnit !== null || item.responsibleUnit !== "") { + let k = (item.responsibleUnit || "").split(',') + for (let i in this.zrbmOptions) { + for (let m = 0; m< k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label + } + item.responsibleUnit = k.join(',') + } + } + } + this.$set(item,'engineer','') + this.$set(item,'engineerId','') + this.$set(item,'dutyPeopleInfo','') + this.$set(item,'dutyPeople','') + this.$set(item,'dutyPeopleInfoId','') + this.$set(item,'dutyPeopleId','') + this.$set(item,'fileText',[]) + this.$set(item,'fileTextId',[]) + this.$set(item,'fileTextPath',[]) + }) + this.total = res.data.total }) - this.total = res.data.total }) this.standModel = true; }, From 29c631ce57cbbf638d260be16de1495fbe4bdf30 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 18:00:56 +0800 Subject: [PATCH 13/25] feat: There is no way the --- src/pages/searchCenter/pages/advancedSearch.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 9b3694721..a4b482228 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -324,8 +324,8 @@ - - + From 499520bc4dbf3ad59d12ae04aa15e677c466669d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 9 Aug 2021 18:01:25 +0800 Subject: [PATCH 14/25] feat: There is no way the --- src/pages/searchCenter/pages/advancedSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index a4b482228..d3bdaaeb9 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -324,7 +324,7 @@ - + From a16f0524daf14092a54b08689e2e490e57e7fa48 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 9 Aug 2021 18:05:18 +0800 Subject: [PATCH 15/25] 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 16/25] 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 17/25] =?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">