From e19628dca131a80024d30c6edcd3ba78a7f0913b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 30 Jul 2021 13:52:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 6 +- .../pages/creatProcess/bzqdfb/step1.vue | 6 +- .../pages/creatProcess/xmpg/step1-1.vue | 949 ++++++++++++++++++ .../pages/creatProcess/xmpg/step1.vue | 66 +- .../pages/creatProcess/xmpg/step2.vue | 3 +- .../pages/creatProcess/xmpg/step3.vue | 1 + .../pages/creatProcess/xmpg2/step1-1.vue | 657 ++++++++++++ .../tabComponents/taskDraft/index.vue | 20 + src/router/index.js | 18 + 9 files changed, 1686 insertions(+), 40 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index e1c72c47a..fdee3c148 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1269,10 +1269,10 @@ export default { { id: bringData[0].id, page: this.page, Size: this.pageSize }, { _this: this }, res => { - if (res.data == null) { - res.data = []; + if (res.data.records == null) { + res.data.records = []; } - this.dataList = res.data; + this.dataList = res.data.records; this.dataList.forEach(item => { if (item.xcxssrqgj === null){ this.$set(item, "XCXSSRQ", ''); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 09c935c54..5b66cb677 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1243,10 +1243,10 @@ export default { { id: bringData[0].id, page: this.page, Size: this.pageSize }, { _this: this }, res => { - if (res.data == null) { - res.data = []; + if (res.data.records == null) { + res.data.records = []; } - this.dataList = res.data; + this.dataList = res.data.records; this.dataList.forEach(item => { if (item.xcxssrqgj === null){ this.$set(item, "XCXSSRQ", ''); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue new file mode 100644 index 000000000..48849b845 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -0,0 +1,949 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 41331f01f..52482ca58 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -94,22 +94,9 @@ prop="distributePerson" label="分发责任人"> - - - - - - - - @@ -250,10 +237,10 @@ > + @@ -500,7 +490,8 @@ export default { }] }, choiceForm: {}, //选择标准清单列表 - showColumn: true + showColumn: true, + textStatusMap: {}// 文本状态id与name对应 }; }, methods: { @@ -642,16 +633,14 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append("prcType", "5"); _formData.append("json", JSON.stringify({ - prcForm: this.prcForm, - sarAccessInfoList: this.sarAccessInfoList, - sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, - bzqdForm: this.bzqdForm, - listInfo: this.listInfo, - id: this.id + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText })); saveTaskFirst(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); + this.$router.push("/processCenter"); }).catch(e => { this.saveLoading = false; }); @@ -666,7 +655,6 @@ export default { this.$message.warning("请选择分发责任人"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json); this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { @@ -821,18 +809,32 @@ export default { standType: "" }; this.getStandData(); - } + }, + // 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label); + }); + }, }, computed: {}, watch: { - dataList: { - deep: true, - handler (val) { - console.log('dataList update', val) - } - } + // dataList: { + // deep: true, + // handler (val) { + // console.log('dataList update', val) + // } + // } }, mounted() { + //从数据库中查询下拉框数据 + this.$http.get("sys/dictype/getDicTypeListCode", {}, { + _this: this + }, res => { + this.countryOptions = res.data.COUNTRY; + this.standStateOptions = res.data.WBZTCLASS; // 文本状态 + this.setMap(this.standStateOptions); + }); this.getTree(); this.getProductData(); this.getStandData(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 3acb8e4a7..688712f47 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -314,6 +314,7 @@ export default { */ getFormFieldList (item) { this.$nextTick(() => { + console.log(item); this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName @@ -352,10 +353,8 @@ export default { this.$router.push('/processCenter') } }, e => { - }); } - }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 439803ab4..283e74541 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -346,6 +346,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue new file mode 100644 index 000000000..74b4b3417 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -0,0 +1,657 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index f42b51d7a..fd95d9787 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -271,6 +271,26 @@ export default { } }) break + case '5': + this.$router.push({ + name: 'xmpgStep1-1', + query: { + type: '5', + processName: '项目合规评估流程-标准', + bpnId: id + } + }) + break + case '6': + this.$router.push({ + name: 'xmpg2Step1-1', + query: { + type: '6', + processName: '项目合规评估流程-项目', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index d46cfc24f..b437ec15b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -294,6 +294,15 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/xmpgStep1-1', + name: 'xmpgStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/xmpgStep2', name: 'xmpgStep2', @@ -357,6 +366,15 @@ const routes = [ title: '项目合规评估流程-项目' } }, + { + path: '/xmpg2Step1-1', + name: 'xmpg2Step1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/xmpg2Step2', name: 'xmpg2Step2', From e87f612475b710361e77d86d65de3bdc5868ef8b Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Fri, 30 Jul 2021 15:54:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?45883=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=A4=B1=E8=B4=A5=EF=BC=8C?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=82=B9=E5=87=BB=E5=90=8E=E6=89=8D?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 2e94c804e..3cca8d9fc 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -611,8 +611,8 @@ export default { } const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id - console.log(exportURL) - window.open(exportURL) + console.log(exportURL,'_self') + window.open(exportURL,'_self') this.$message.success('导出信息成功') } } else if (this.saveExportType === 'all') { @@ -629,8 +629,8 @@ export default { } const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id - console.log(exportURL) - window.open(exportURL) + console.log(exportURL,'_self') + window.open(exportURL,'_self') this.$message.success('导出信息成功') } } From 30336bab2e23334c4fbebcaf165804bb4187d734 Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Fri, 30 Jul 2021 15:58:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?45887=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=EF=BC=8C=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E5=87=86=E5=8F=B7=E5=9B=9E=E6=98=BE=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E9=83=A8=E5=88=86=E6=A0=87=E5=87=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9C=AA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 3cca8d9fc..c6b031fc6 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -60,7 +60,7 @@ @@ -580,7 +580,7 @@ export default { this.active = -1 } } - // 考虑如果没有当前时间， 颜色怎么设置 + // 考虑如果没有当前时间，颜色怎么设置 }) this.selectTableDataList() }, From 1b7b0480a75d315116b965db6b1a4b22aec1e072 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 30 Jul 2021 16:32:44 +0800 Subject: [PATCH 4/5] commit --- .../pages/creatProcess/bzjd/step1.vue | 68 ++++++++++--------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 1d54e3fdc..4ab746639 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -233,20 +233,20 @@ label="标准号/政策号" width="170" align="center"> - + + + + - + + + + @@ -287,20 +287,20 @@ label="标准号/政策号" width="170" align="center"> - + + + + - + + + + @@ -374,7 +374,7 @@ page: 1, pageSize: this.$store.getters.userInfo.configContent, result: '1', - sarType: 'INLAND' + standType: 'INLAND' }, spinShow: false, standInfoList: [], @@ -513,15 +513,17 @@ for (let i = 0; i < this.selectedList.length; i++) { bringData.push(deposit.get(this.selectedList[i])); } - if (bringData[0].splitStatus === '0') { - this.form.itemsNum = bringData[0].standNumSplit - this.form.itemsName = bringData[0].standNameSplit - } else { - this.form.itemsNum = bringData[0].showNumber - this.form.itemsName = bringData[0].standName - } + this.form.itemsNum = bringData[0].showNumber + this.form.itemsName = bringData[0].standName + // if (bringData[0].splitStatus === '0') { + // this.form.itemsNum = bringData[0].standNumSplit + // this.form.itemsName = bringData[0].standNameSplit + // } else { + // this.form.itemsNum = bringData[0].showNumber + // this.form.itemsName = bringData[0].standName + // } this.form.standId = bringData[0].id - this.sarType = bringData[0].sarType + this.sarType = bringData[0].standType this.standId = bringData[0].standId this.listModel = false; this.listModel2 = true @@ -560,13 +562,15 @@ for (let i = 0; i < this.selectedList2.length; i++) { bringData.push(deposit.get(this.selectedList2[i])); } - if (bringData[0].splitStatus === '0') { - this.form.itemsNum1 = bringData[0].standNumSplit - this.form.itemsName1 = bringData[0].standNameSplit - } else { - this.form.itemsNum1 = bringData[0].showNumber - this.form.itemsName1 = bringData[0].standName - } + // if (bringData[0].splitStatus === '0') { + // this.form.itemsNum1 = bringData[0].standNumSplit + // this.form.itemsName1 = bringData[0].standNameSplit + // } else { + // this.form.itemsNum1 = bringData[0].showNumber + // this.form.itemsName1 = bringData[0].standName + // } + this.form.itemsNum1 = bringData[0].showNumber + this.form.itemsName1 = bringData[0].standName this.form.oldNumber = bringData[0].id this.listModel2 = false } else if (this.selectedList2.length > 1) { From 40c43b55a85697d02ea62eda0aec271941125697 Mon Sep 17 00:00:00 2001 From: liuhuaizhi Date: Fri, 30 Jul 2021 17:03:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=BA=94=E5=90=8E=E5=8F=B0=E7=8E=8B?= =?UTF-8?q?=E6=B4=AA=E8=A6=81=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 0dfe97778..9bab53613 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -119,7 +119,7 @@ align="center"> @@ -128,7 +128,7 @@