From ea6b9a83eb6c2b5e100098e13b5443ef870be1e0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 18 Aug 2021 16:48:42 +0800 Subject: [PATCH 1/3] commit --- .../pages/creatProcess/bzzqyj/step3.vue | 50 ++++++++++---- .../pages/creatProcess/bzzqyj/step4.vue | 16 +++++ .../pages/creatProcess/bzzqyj/step5.vue | 65 +++++++++++++----- .../pages/creatProcess/bzzqyj/step6.vue | 66 +++++++++---------- .../pages/creatProcess/bzzqyj/step7.vue | 66 +++++++++---------- .../pages/creatProcess/bzzqyj/step8.vue | 66 +++++++++---------- .../pages/creatProcess/bzzqyj/step9.vue | 66 +++++++++---------- 7 files changed, 225 insertions(+), 170 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e30b056fb..1d19fe428 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -96,17 +96,40 @@ + label="章节名称" + width="170px"> - + + + + + + + + + @@ -288,6 +311,9 @@ chapterNumber: '', chapterName: '', commentText: '', + oldText: '', + newText: '', + reason: '', id: id, responUserName: this.$store.getters.userInfo.userName, responUser: this.$store.getters.userInfo.userId, @@ -305,7 +331,7 @@ } else { var a = 0 var b = 0 - var c = 0 + // var c = 0 for (let s1 = 0; s1 < this.data.length; s1++) { if (!this.data[s1].chapterNumber) { a++ @@ -313,17 +339,19 @@ if (!this.data[s1].chapterName) { b++ } - if (!this.data[s1].commentText) { - c++ - } + // if (!this.data[s1].commentText) { + // c++ + // } } if (a > 0) { this.$message.warning('请输入章节编号') } else if (b > 0) { this.$message.warning('请输入章节名称') - } else if (c > 0) { - this.$message.warning('请输入意见内容') - } else { + } + // else if (c > 0) { + // this.$message.warning('请输入意见内容') + // } + else { this.isSubmit = true var json = this.json json.commentText = this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 02bd944af..4e3e3e5b3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -80,8 +80,24 @@ label="章节名称"> + + + + + + - + + + + + + + + + 0) { this.$message.warning('请输入章节编号') } else if (b > 0) { this.$message.warning('请输入章节名称') - } else if (c > 0) { - this.$message.warning('请输入意见内容') - } else { + } + // else if (c > 0) { + // this.$message.warning('请输入意见内容') + // } + else { this.isSubmit = true var json = this.json json.oldinfo = this.oldData @@ -320,6 +354,7 @@ this.form.cid = data.cid this.form.endTime = data.endTime this.form.cname = data.cname + console.log(data); this.oldData = JSON.parse(JSON.stringify(data.summaryList)) data.summaryList.forEach( item => { if (item.state) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 4b9137935..e59a2bec0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -91,7 +91,23 @@ + + + + + + { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') } - if (!this.data[s1].chapterName) { - b++ - } - if (!this.data[s1].commentText) { - c++ - } - } - if (a > 0) { - this.$message.warning('请输入章节编号') - } else if (b > 0) { - this.$message.warning('请输入章节名称') - } else if (c > 0) { - this.$message.warning('请输入意见内容') - } else { - this.isSubmit = true - var json = this.json - json.actionFlag = 0 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } + this.isSubmit = false + }) } }, handleSubmitNo() { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index d24b55f8d..813827b12 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -90,8 +90,24 @@ label="章节名称"> + + + + + + { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') } - if (!this.data[s1].chapterName) { - b++ - } - if (!this.data[s1].commentText) { - c++ - } - } - if (a > 0) { - this.$message.warning('请输入章节编号') - } else if (b > 0) { - this.$message.warning('请输入章节名称') - } else if (c > 0) { - this.$message.warning('请输入意见内容') - } else { - this.isSubmit = true - var json = this.json - json.actionFlag = 0 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } + this.isSubmit = false + }) } }, handleSubmitNo() { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index f97564089..1144cfc97 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -91,7 +91,23 @@ + + + + + + { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') } - if (!this.data[s1].chapterName) { - b++ - } - if (!this.data[s1].commentText) { - c++ - } - } - if (a > 0) { - this.$message.warning('请输入章节编号') - } else if (b > 0) { - this.$message.warning('请输入章节名称') - } else if (c > 0) { - this.$message.warning('请输入意见内容') - } else { - this.isSubmit = true - var json = this.json - json.actionFlag = 0 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } + this.isSubmit = false + }) } }, handleSubmitNo() { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 92fcf5d36..72dfadb99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -90,8 +90,24 @@ label="章节名称"> + + + + + + { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') } - if (!this.data[s1].chapterName) { - b++ - } - if (!this.data[s1].commentText) { - c++ - } - } - if (a > 0) { - this.$message.warning('请输入章节编号') - } else if (b > 0) { - this.$message.warning('请输入章节名称') - } else if (c > 0) { - this.$message.warning('请输入意见内容') - } else { - this.isSubmit = true - var json = this.json - json.actionFlag = 0 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } + this.isSubmit = false + }) } }, handleSubmitNo() { From 86b418663558157626079c4a2daf1834e5b3008e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 18 Aug 2021 17:56:12 +0800 Subject: [PATCH 2/3] feat: There is no way the --- .../domesticStandardsAndRegulations/index.vue | 7 ++++--- .../foreignStandardsAndRegulations/index.vue | 12 ++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index ff7742bf9..b66fc9787 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2983,7 +2983,8 @@ export default { // 查询二级菜单 selectMenu() { this.$http.get('sarResource/ts-resource/getList', { - sorDivide: 'INLAND_STAND' + sorDivide: 'INLAND_STAND', + userId: this.$store.getters.userInfo.userId }, {}, res => { if (res.ok) { this.treeList = res.data @@ -3207,7 +3208,7 @@ export default { const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + - 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId window.open(exportURL) this.$message.success('导出信息成功') this.exportLoading = false @@ -3238,7 +3239,7 @@ export default { // this.$message.success('导出信息成功') // window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + - 'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) + 'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId) this.$message.success('导出信息成功') this.exportLoading = false } diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 7f3bea503..ff90ae8a6 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2691,7 +2691,8 @@ export default { // 查询二级菜单 selectMenu () { this.$http.get('sarResource/ts-resource/getList', { - sorDivide: 'FOREIGN_STAND' + sorDivide: 'FOREIGN_STAND', + userId: this.$store.getters.userInfo.userId }, {}, res => { if (res.ok) { this.treeList = res.data @@ -2841,14 +2842,14 @@ export default { if (this.saveExportType === 'apart') { if (this.selectedList != null && this.selectedList !== '') { const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + - 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId window.open(exportURL) this.$message.success('导出信息成功') } } else if (this.saveExportType === 'all') { let exportEOStr = JSON.stringify(this.SarExportSearchEo) - window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) + window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType+ '&userId=' + this.$store.getters.userInfo.userId) this.$message.success('导出信息成功') } this.exportModelFlag = false @@ -3302,11 +3303,6 @@ export default { } formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); - console.log("======") - console.log(formData.advanceSearchVOStr); - - - this.SarExportSearchEo = formData this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { From 9ad9cbc6811148793a41b2019e7d039784fe417c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 18 Aug 2021 21:54:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E7=9A=84=20=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=88=96=E8=80=85=E5=9C=B0=E5=8C=BA=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E5=BB=BA=E7=AB=8B=E4=B8=80=E6=AC=A1=E6=B8=85=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E5=81=9A=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 38 ++++++++++++++++--- .../pages/projectAddEit.vue | 14 ++++--- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 5355d49b4..08adba748 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1302,11 +1302,39 @@ export default { }, res => { if (this.sarAccessInfoList.length !== 0) { if (res.ok) { - this.$message.success('新增成功') - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) + if (res.data === "数据库为空，添加成功"){ + this.$message.success('新增成功') + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + else if (res.data === "其他清单添加成功"){ + this.$message.success('新增成功') + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + else if (res.data === "车型类别清单添加成功"){ + this.$message.success('新增成功') + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + }else if(res.data === "车型类别清单添加失败"){ + this.$message.error('已存在此车型类别清单，新增失败') + } + else if (res.data === "国家/地区清单添加成功"){ + this.$message.success('新增成功') + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + }else if(res.data === "国家/地区清单添加失败"){ + this.$message.error('已存在此国家/地区清单，新增失败') + } + } } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 1ebf4635e..09c194e31 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1250,11 +1250,15 @@ export default { }, res => { if (this.sarAccessInfoList.length !== 0) { if (res.ok) { - this.$message.success('新增成功') - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) + if (res.data === "车型类别清单添加成功") { + this.$message.success('新增成功') + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + }else{ + this.$message.error('已存在此车型类别清单，新增失败') + } } }else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')