From dfea113a5854958b05a74edb3df0c03e01254166 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Thu, 14 Apr 2022 09:49:50 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/checkPage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/login/checkPage.vue b/src/pages/login/checkPage.vue index 344b231c9..1b0d2b6d4 100644 --- a/src/pages/login/checkPage.vue +++ b/src/pages/login/checkPage.vue @@ -40,10 +40,10 @@ export default { this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.loading.close(); }); - this.$router.go(-1) + this.$router.push('login') this.$message.error(res.message) } else { - this.$router.go(-1) + this.$router.push('login') this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 this.loading.close(); }); From f2077307d9a12008160bbdb69edb70df730b17a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 10:02:47 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=89=8B=E6=9C=BA=E7=AB=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/qbzxdjhgk/step2.vue | 274 +++++------------- .../pages/phone/qbzxdjhgk/step3.vue | 256 +++++----------- .../pages/phone/qbzxdjhgk/step4.vue | 257 +++++----------- .../pages/phone/qbzxdjhgk/step5.vue | 259 +++++------------ 4 files changed, 284 insertions(+), 762 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue index f1d0a3166..88f533b92 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -3,103 +3,26 @@
- +
基础信息
审批历史
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - + + + + + + + + + + + + + + +
+ {{ item.name }} + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +
@@ -245,13 +93,6 @@ @submit="handleSubmit" > - { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 }) }, methods:{ + // 文件预览及下载 + handleFilePreview(file,type) { + let id = "" + let fileName = "" + if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){ + fileName = this.qbfsForm.esName+'-立项单.docx' + }else { + fileName = '立项单.docx' + } + if(file && file.id){ + id = file.id + }else { + id = file.response.data.id + } + if (type === 'down') { + if (id) { + window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else if(type === 'preview'){ + this.$onlinePreview(id) + }else { + this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.account,this.$store.getters.userInfo.userName) + } + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -344,9 +214,21 @@ export default { console.log(item); this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)) + this.qbfsForm.useLevelShow = '29l0zgltnq' ? 'IDT等同采用' : ('9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用') this.type = item.type + this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); }) }, + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i - +
基础信息
审批历史
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - + + + + + + + + + + + + + + +
+ {{ item.name }} + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +
@@ -289,6 +137,8 @@ export default { drawerTitle: '', detailData: [], BZList: [], + cbcdOptions: [], + standSortOptions: [], } }, mounted() { @@ -299,9 +149,37 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 }) }, methods:{ + // 文件预览及下载 + handleFilePreview(file,type) { + let id = "" + let fileName = "" + if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){ + fileName = this.qbfsForm.esName+'-立项单.docx' + }else { + fileName = '立项单.docx' + } + if(file && file.id){ + id = file.id + }else { + id = file.response.data.id + } + if (type === 'down') { + if (id) { + window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else if(type === 'preview'){ + this.$onlinePreview(id) + }else { + this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.account,this.$store.getters.userInfo.userName) + } + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -337,6 +215,8 @@ export default { this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)) this.type = item.type + this.qbfsForm.useLevelShow = '29l0zgltnq' ? 'IDT等同采用' : ('9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用') + this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); }) }, handleTabs(name){ diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue index 4c18301c9..8947abc82 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue @@ -3,103 +3,26 @@
- +
基础信息
审批历史
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - + + + + + + + + + + + + + + +
+ {{ item.name }} + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +
@@ -289,6 +137,8 @@ export default { drawerTitle: '', detailData: [], BZList: [], + cbcdOptions: [], + standSortOptions: [], } }, mounted() { @@ -299,9 +149,37 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 }) }, methods:{ + // 文件预览及下载 + handleFilePreview(file,type) { + let id = "" + let fileName = "" + if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){ + fileName = this.qbfsForm.esName+'-立项单.docx' + }else { + fileName = '立项单.docx' + } + if(file && file.id){ + id = file.id + }else { + id = file.response.data.id + } + if (type === 'down') { + if (id) { + window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else if(type === 'preview'){ + this.$onlinePreview(id) + }else { + this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.account,this.$store.getters.userInfo.userName) + } + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -333,10 +211,11 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item); this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)) this.type = item.type + this.qbfsForm.useLevelShow = '29l0zgltnq' ? 'IDT等同采用' : ('9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用') + this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); }) }, handleTabs(name){ diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue index e0180a976..751c14171 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue @@ -3,103 +3,26 @@
- +
基础信息
审批历史
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - + + + + + + + + + + + + + + +
+ {{ item.name }} + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +
@@ -289,6 +137,8 @@ export default { drawerTitle: '', detailData: [], BZList: [], + cbcdOptions: [], + standSortOptions: [], } }, mounted() { @@ -299,9 +149,37 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 }) }, methods:{ + // 文件预览及下载 + handleFilePreview(file,type) { + let id = "" + let fileName = "" + if(this.qbfsForm.esName && this.qbfsForm.esName !== ''){ + fileName = this.qbfsForm.esName+'-立项单.docx' + }else { + fileName = '立项单.docx' + } + if(file && file.id){ + id = file.id + }else { + id = file.response.data.id + } + if (type === 'down') { + if (id) { + window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else if(type === 'preview'){ + this.$onlinePreview(id) + }else { + this.$onlineEdit(id,'立项单',this.$store.getters.userInfo.account,this.$store.getters.userInfo.userName) + } + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -333,10 +211,11 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item); this.$nextTick(() => { this.qbfsForm = JSON.parse(JSON.stringify(item)) this.type = item.type + this.qbfsForm.useLevelShow = '29l0zgltnq' ? 'IDT等同采用' : ('9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用') + this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); }) }, handleTabs(name){ @@ -387,6 +266,8 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.bzfgbzFlag = '0' + this.qbfsForm.planStatus = '未开始' + this.qbfsForm.area = this.qbfsForm.area.join(',') this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { From 44ea95ce7502de3c9235e2298f8acae1a34802f7 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Thu, 14 Apr 2022 10:19:44 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.js b/src/main.js index b11025743..9c1f2aa36 100644 --- a/src/main.js +++ b/src/main.js @@ -65,6 +65,9 @@ import isMobile from "./store/isMobile"; // 路由拦截 router.beforeEach(function (to, from, next) { let toName = to.name + if (toName === 'CheckPage') { + next() + } let token = store.state.token let path = to.path; let requireAuth = to.meta.requireAuth; @@ -112,6 +115,7 @@ router.beforeEach(function (to, from, next) { localStorage.setItem('routerParam', param) } // 返回值为登录状态 + // 单点登录 /** 判断是不是在手机端操作 */ if (isMobile()) { if(toName === 'processCenter'){ From 8dd63ae16b04cfb017513cd2d51eb588ba94145e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 10:30:59 +0800 Subject: [PATCH 04/24] =?UTF-8?q?52577=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B--=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E5=A4=AA=E4=BD=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzrk/step2.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 29d878e6f..f7d04fd5c 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -359,9 +359,7 @@
-
-
Date: Thu, 14 Apr 2022 10:40:17 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/checkPage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/login/checkPage.vue b/src/pages/login/checkPage.vue index 1b0d2b6d4..4452395a0 100644 --- a/src/pages/login/checkPage.vue +++ b/src/pages/login/checkPage.vue @@ -26,9 +26,9 @@ export default { }, mounted() { let Base64 = require('js-base64').Base64 - const str = Base64.encode(this.$route.query.username) + const str = Base64.encode(this.$route.query.userName) const params = { - username: this.$route.query.username + username: this.$route.query.userName } checkPage(params).then(res => { if (res.ok) { From 857fd44f2ee24d21fa44a5f6627939dfe9c17a3a Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Thu, 14 Apr 2022 10:48:39 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052536=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=8B=86=E5=88=86-=E6=8B=86=E5=88=86-=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9D=A1/=E9=A1=B5?= =?UTF-8?q?=E4=B8=BA20=E6=9D=A1=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=9C=AC=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4=20=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=8F=AA=E8=83=BD=E5=88=A0=E9=99=A420=E6=9D=A1=20?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=88=A0=E9=99=A4=E7=9A=84=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=98=AF=E4=B9=B1=E7=9A=84=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B9=8B?= =?UTF-8?q?=E5=89=8D247=E6=9D=A1=E6=95=B0=E6=8D=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=20180=E6=9D=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 96974ace8..90abff80d 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1508,7 +1508,7 @@ export default { }, res => { if (res.data) { this.batchDeleteItem() - } else if(this.selectedList != null){ + } else if(this.selectedList === null){ this.$message.warning('请选择要删除的数据') } else { this.deleteItemsModal = true From 00e8f702056799ec49243aee5cb65672fe6e5a09 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Thu, 14 Apr 2022 10:57:33 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052536=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=8B=86=E5=88=86-=E6=8B=86=E5=88=86-=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=9D=A1/=E9=A1=B5?= =?UTF-8?q?=E4=B8=BA20=E6=9D=A1=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=9C=AC=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4=20=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E5=8F=AA=E8=83=BD=E5=88=A0=E9=99=A420=E6=9D=A1=20?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=88=A0=E9=99=A4=E7=9A=84=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=98=AF=E4=B9=B1=E7=9A=84=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B9=8B?= =?UTF-8?q?=E5=89=8D247=E6=9D=A1=E6=95=B0=E6=8D=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=20180=E6=9D=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 29a2cad08..f791bc3bc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1038,6 +1038,7 @@ export default { }*/ this.sarAccessInfo = formData this.sarAccessInfo.page = 1 + this.drawerPage = 1 this.showQueryMore = false this.seniorQueryFlag = true this.selectLawsStands(1) @@ -1106,6 +1107,7 @@ export default { this.seniorQueryFlag = false this.showTableFlag = false this.sarAccessInfo.page = 1 + this.drawerPage = 1 this.selectLawsStands() }, // 点击清空查询条件 按钮事件 From 6067676f7c782730f1ccdd93d15596a4ca1d31f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 10:58:53 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 90225c661..de60aaac3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -674,7 +674,7 @@ export default { this.roleForm = mes.roleForm this.commentText1 = mes.commentText1 || '' if (this.form.standId) { - this.$http.get('SarStandItems/sar-stand-items/getFileType', { + this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', { standId: this.form.standId }, {}, res => { this.textTypeList = res.data @@ -752,7 +752,7 @@ export default { this.form.standType = bringData[0].standType this.form.standId = bringData[0].id this.listModel = false; - this.$http.get('SarStandItems/sar-stand-items/getFileType', { + this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', { standId: bringData[0].id }, {}, res => { this.textTypeList = res.data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 18460cb17..a6f6510ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -733,7 +733,7 @@ export default { this.form.standType = bringData[0].standType this.form.standId = bringData[0].id this.listModel = false; - this.$http.get('SarStandItems/sar-stand-items/getFileType', { + this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', { standId: bringData[0].id }, {}, res => { this.textTypeList = res.data From c3886c467f2f95ddf1256885763284d60c9bbb4a Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Thu, 14 Apr 2022 10:59:30 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052576=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E9=A1=B9=E7=AE=A1=E6=8E=A7--=E6=8A=8A=E5=9C=88?= =?UTF-8?q?=E4=BD=8F=E7=9A=84=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyRegulation/problemControl/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/policyRegulation/problemControl/index.vue b/src/pages/policyRegulation/problemControl/index.vue index 2d0ce2e2c..46e2c122b 100644 --- a/src/pages/policyRegulation/problemControl/index.vue +++ b/src/pages/policyRegulation/problemControl/index.vue @@ -1,14 +1,14 @@ From 5a7bcdff827b68b11c70b83769a6c6381664f77d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 13:59:09 +0800 Subject: [PATCH 10/24] =?UTF-8?q?52522=20=E3=80=90=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E3=80=91=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E5=AE=A1=E5=AE=9A=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=E6=B5=85=EF=BC=8C=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=90=8D=E7=A7=B0=E6=94=B9=E6=88=90=E5=AE=A1=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/qbfz/step2.vue | 85 +------- .../processCenter/pages/phone/qbfz/step5.vue | 200 ++---------------- .../processCenter/pages/phone/qbfz/step6.vue | 200 ++---------------- .../processCenter/pages/phone/qbfz/step7.vue | 200 ++---------------- 4 files changed, 68 insertions(+), 617 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbfz/step2.vue b/src/pages/processCenter/pages/phone/qbfz/step2.vue index 818fbb7fb..aac4383fa 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step2.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step2.vue @@ -3,14 +3,14 @@
- +
基础信息
审批历史
-
+
@@ -19,78 +19,15 @@ :rules="formRules" class="label-input-form prc-content-border" label-width="150px"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + +
diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue index 20b9b9062..d40f4c2d2 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue @@ -2,16 +2,17 @@
- +
基础信息
审批历史
-
+
基础信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 隐藏基础信息 - 展开基础信息 - + + + 隐藏基础信息 + 展开基础信息
- + diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue index 1ed09ed7b..43c463069 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step6.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue @@ -2,16 +2,17 @@
- +
基础信息
审批历史
-
+
基础信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 隐藏基础信息 - 展开基础信息 - + + + 隐藏基础信息 + 展开基础信息
- + diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue index 8735e1b85..b5e818af0 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step7.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue @@ -2,16 +2,17 @@
- +
基础信息
审批历史
-
+
基础信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 隐藏基础信息 - 展开基础信息 - + + + 隐藏基础信息 + 展开基础信息
- + From 61c887f85b2730370fb5025f9079a74c48ca5b4b Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Thu, 14 Apr 2022 14:05:02 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.js b/src/main.js index 9c1f2aa36..cc2ff975b 100644 --- a/src/main.js +++ b/src/main.js @@ -67,6 +67,7 @@ router.beforeEach(function (to, from, next) { let toName = to.name if (toName === 'CheckPage') { next() + return } let token = store.state.token let path = to.path; From d6cdf051ae840bfe6cfa32bad35155f1a837814d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 14:08:56 +0800 Subject: [PATCH 12/24] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=AC=E5=BC=80=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20=E5=A4=96=E9=83=A8=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 +- src/api/process.js | 8 + src/main.js | 41 +- src/pages/loginVerifyNoEncryption/index.vue | 111 + .../pages/advancedSearchExternal.vue | 3145 +++++++++++++++++ .../searchCenter/pages/standardSearch.vue | 13 +- src/router/index.js | 16 + 7 files changed, 3328 insertions(+), 9 deletions(-) create mode 100644 src/pages/loginVerifyNoEncryption/index.vue create mode 100644 src/pages/searchCenter/pages/advancedSearchExternal.vue diff --git a/src/App.vue b/src/App.vue index f86104cae..b6aa9b9ea 100644 --- a/src/App.vue +++ b/src/App.vue @@ -216,7 +216,8 @@ export default { && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' - && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) { + && this.$route.name !== 'AdvancedSearchExternal' && this.$route.name !== 'LoginVerifyNoEncryption' + && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage') { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/api/process.js b/src/api/process.js index 3f8b1187b..c1dbff26f 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -561,6 +561,14 @@ export function loginIdm (data) { }) } +export function checkPageNoEncryption (data) { + return axios({ + url: '/api/checkPageNoEncryption', + method: 'get', + params: data + }) +} + // 流程委托接口 export function changeAssigneeNew (data) { return axios({ diff --git a/src/main.js b/src/main.js index 9c1f2aa36..38623a0d4 100644 --- a/src/main.js +++ b/src/main.js @@ -68,8 +68,20 @@ router.beforeEach(function (to, from, next) { if (toName === 'CheckPage') { next() } + + let fromName = from.name let token = store.state.token let path = to.path; + let userName = "" + if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName=") !== -1){ + userName = path.split("&")[1].split("=")[1] + window.sessionStorage.clear() + }else { + if(fromName === 'Home2'){ + localStorage.removeItem("external") + } + userName = to.query.userName + } let requireAuth = to.meta.requireAuth; let taskId = to.query.taskIds; let prcId = to.query.prcId; @@ -109,6 +121,7 @@ router.beforeEach(function (to, from, next) { } function extractedLocalStorage(url,param,param4) { + localStorage.removeItem("external") localStorage.removeItem("routerUrl") localStorage.setItem('routerUrl', url) localStorage.removeItem("routerParam") @@ -175,13 +188,23 @@ router.beforeEach(function (to, from, next) { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) }else { - if(path === '/standardSearch/All'){ - extractedLocalStorage('standardSearch/All',''); + if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1){ + extractedLocalStorage("standardSearch/All",userName) + localStorage.setItem('external', "external") + next('/LoginVerifyNoEncryption') }else { - extractedLocalStorage('home2',''); + if (toName === 'LoginVerifyNoEncryption') { + next() + }else { + if(path === '/standardSearch/All'){ + extractedLocalStorage('standardSearch/All',''); + }else { + extractedLocalStorage('home2',''); + } + // ssoLoginUrlDev 默认sso 地址 + window.location.href = ssoLoginUrlDev + } } - // ssoLoginUrlDev 默认sso 地址 - window.location.href = ssoLoginUrlDev } } }else if(webLoginType != null && webLoginType === 'dev'){ @@ -364,7 +387,13 @@ router.beforeEach(function (to, from, next) { next() } }else { - next() + if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1) { + extractedLocalStorage("standardSearch/All",userName) + localStorage.setItem('external', "external") + next('/LoginVerifyNoEncryption') + }else { + next() + } } } }) diff --git a/src/pages/loginVerifyNoEncryption/index.vue b/src/pages/loginVerifyNoEncryption/index.vue new file mode 100644 index 000000000..98db12ca3 --- /dev/null +++ b/src/pages/loginVerifyNoEncryption/index.vue @@ -0,0 +1,111 @@ + + + + + + diff --git a/src/pages/searchCenter/pages/advancedSearchExternal.vue b/src/pages/searchCenter/pages/advancedSearchExternal.vue new file mode 100644 index 000000000..e78dac512 --- /dev/null +++ b/src/pages/searchCenter/pages/advancedSearchExternal.vue @@ -0,0 +1,3145 @@ + + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index b76771f70..47ce8f26a 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -19,10 +19,14 @@
- + +
高级检索
 - + +
高级检索
+ +
首页
@@ -339,6 +343,7 @@ }, data () { return { + externalStatus:'', itermsConditionsTitle1: '', itermsConditionsTitle2: '', itermsConditionsFlag: false, @@ -2663,6 +2668,10 @@ } }, mounted () { + let external = localStorage.getItem("external"); + if(external !== undefined && external !== null){ + this.externalStatus = external + } let globalInputSearch = this.$route.params.searchValue if (globalInputSearch !== 'allvalue') { this.keywords = globalInputSearch diff --git a/src/router/index.js b/src/router/index.js index 0976349ab..66da2af04 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,6 +60,12 @@ const routes = [ component: () => import('@/pages/loginVerify') }, + { + path: '/loginVerifyNoEncryption', + name: 'LoginVerifyNoEncryption', + component: () => + import('@/pages/loginVerifyNoEncryption') + }, // 跳转刷新页面 { path: '/redirect', @@ -4065,6 +4071,16 @@ const routes = [ title: '高级检索', menuId: 'K9BAYUPZBC' } + },{ + path: '/advancedSearchExternal/:selectKey?/:searchValue?', + name: 'AdvancedSearchExternal', + component: () => + import('@/pages/searchCenter/pages/advancedSearchExternal'), + meta: { + requireAuth: true, + title: '高级检索', + menuId: 'K9BAYUPZBC' + } }, // { // path: '/advancedSearch', From bf5c62b186284eecca6acfb12247dd968d51481b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 14:13:17 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standContrast/pages/textComparison.vue | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/src/pages/localTool/standContrast/pages/textComparison.vue b/src/pages/localTool/standContrast/pages/textComparison.vue index dec89accd..2e0f16abc 100644 --- a/src/pages/localTool/standContrast/pages/textComparison.vue +++ b/src/pages/localTool/standContrast/pages/textComparison.vue @@ -163,30 +163,34 @@ export default { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - this.oldLeftId = '#left_' + this.saveItemId - this.oldRightId = '#right_' + this.saveItemIdRight - this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html() - this.oldRightContent = $('#itemsRightText_' + this.saveItemIdRight).html() - $('#itemsLeftText_' + this.saveItemId).html(res.data.leftString) - $('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString) - this.text = res.data.similarityDegree - if (parseFloat(res.data.similarityDegree) >= parseFloat('75%') && parseFloat(res.data.similarityDegree) !== parseFloat('100%')) { - this.textcontent = '相似' - } else if (parseFloat(res.data.similarityDegree) === parseFloat('100%')) { - this.textcontent = '相同' - } else if (parseFloat(res.data.similarityDegree) < parseFloat('75%')) { - this.textcontent = '不相似' - } - const treeNodeLeft = {} + if(res.data.error === '比对数据已删除'){ + this.spinShow = false + this.$message.error('比对数据已删除') + return + }else { + this.oldLeftId = '#left_' + this.saveItemId + this.oldRightId = '#right_' + this.saveItemIdRight + this.oldLeftContent = $('#itemsLeftText_' + this.saveItemId).html() + this.oldRightContent = $('#itemsRightText_' + this.saveItemIdRight).html() + $('#itemsLeftText_' + this.saveItemId).html(res.data.leftString) + $('#itemsRightText_' + this.saveItemIdRight).html(res.data.rightString) + this.text = res.data.similarityDegree + if (parseFloat(res.data.similarityDegree) >= parseFloat('75%') && parseFloat(res.data.similarityDegree) !== parseFloat('100%')) { + this.textcontent = '相似' + } else if (parseFloat(res.data.similarityDegree) === parseFloat('100%')) { + this.textcontent = '相同' + } else if (parseFloat(res.data.similarityDegree) < parseFloat('75%')) { + this.textcontent = '不相似' + } + const treeNodeLeft = {} treeNodeLeft.id = this.saveLeftId - const treeNodeRight = {} + const treeNodeRight = {} treeNodeRight.id = this.saveRightId - console.log(treeNodeLeft) - console.log(treeNodeRight) - this.handleLeftTreeClick("domesticTree1",treeNodeLeft) - this.handleRightTreeClick("domesticTree2",treeNodeRight) - // this.resultModal = true - this.spinShow = false + this.handleLeftTreeClick("domesticTree1",treeNodeLeft) + this.handleRightTreeClick("domesticTree2",treeNodeRight) + // this.resultModal = true + this.spinShow = false + } }, e => { }) }, From 28c3a38ed326968035ecbec033ea848df53035df Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 14:59:10 +0800 Subject: [PATCH 14/24] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=AC=E5=BC=80=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20=E5=A4=96=E9=83=A8=E8=AE=BF=E9=97=AE=20=3F=20and=20?= =?UTF-8?q?&?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.js b/src/main.js index 5f84d4ddd..3ed96e7dc 100644 --- a/src/main.js +++ b/src/main.js @@ -189,7 +189,7 @@ router.beforeEach(function (to, from, next) { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) }else { - if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1){ + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || path.indexOf("/standardSearch/All?userName") !== -1)){ extractedLocalStorage("standardSearch/All",userName) localStorage.setItem('external', "external") next('/LoginVerifyNoEncryption') @@ -388,7 +388,7 @@ router.beforeEach(function (to, from, next) { next() } }else { - if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName") !== -1) { + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || path.indexOf("/standardSearch/All?userName") !== -1)) { extractedLocalStorage("standardSearch/All",userName) localStorage.setItem('external', "external") next('/LoginVerifyNoEncryption') From 7914948c5132484c7af11542e593735b2a1d26b0 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 15:02:41 +0800 Subject: [PATCH 15/24] feat: There is no way the, bug #52583 --- src/pages/details/otherLawsStandDetails/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index 4c3b9b96d..b83f9b801 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -1679,6 +1679,8 @@ export default { } }) window.open(routeUrl.href, '_blank') + }else { + this.$message.error('政策号已不存在!') } }, e => { }) From e8a6bdbf9e72174f048bab8aa0f201a0e4d2b31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 15:08:37 +0800 Subject: [PATCH 16/24] =?UTF-8?q?52420=20=E6=A0=87=E5=87=86=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=8F=91=E5=B8=83/=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E9=80=89=E6=8B=A9=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/drawer.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/styles/drawer.less b/src/assets/styles/drawer.less index 49276d4e8..ca01dd517 100644 --- a/src/assets/styles/drawer.less +++ b/src/assets/styles/drawer.less @@ -14,7 +14,7 @@ } .el-drawer__body{ height: 100%; - overflow-y: auto; + //overflow-y: auto; display: flex; flex-direction: column; // 底部带 提交、取消按钮 From 4dd8db010563f547eca9631715eea274a7097ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 15:15:58 +0800 Subject: [PATCH 17/24] =?UTF-8?q?52443=20=E6=A0=87=E5=87=86=E5=90=88?= =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E5=87=86=E6=A1=86=E5=86=85=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E9=9C=80=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 108 +++++++++--------- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 2e5b490eb..69420fced 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -291,61 +291,63 @@
- + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
Date: Thu, 14 Apr 2022 15:22:37 +0800 Subject: [PATCH 18/24] feat: There is no way the, bug #52580 --- src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 635c706a3..cd8db8be6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -2446,27 +2446,23 @@ }, handle3(){ this.formTongGuo.approvalOpinion = 1 - this.form.fsRejectStatus = 1 - const json = JSON.stringify(this.form); - console.log(json) this.$refs['form'].validate((valid) => { if (valid) { + this.form.fsRejectStatus = 1 this.handleSubmit() } }) }, handle4(){ - const json = JSON.stringify(this.form); this.formTongGuo.approvalOpinion = 2 - this.form.fsRejectStatus = 2 this.$refs['form'].validate((valid) => { if (valid) { + this.form.fsRejectStatus = 2 this.handleSubmit() } }) }, handle2(){ - const json = JSON.stringify(this.form); this.formTongGuo.approvalOpinion = 0 this.$refs['form'].validate((valid) => { if (valid) { From b6bbbb969b612d3179819704256a3dfefc63daae Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 15:29:32 +0800 Subject: [PATCH 19/24] `feat: There is no way the, bug #52584 --- .../regulatoryRepository/foreignRegulationsDatabase/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 66467c3c5..2d5f01f0b 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -486,7 +486,7 @@ :key="opt.value" :value="opt.value === undefined ? '' :opt.value" :label="opt.label" > - {{ opt.label }}| + {{ opt.label }} From a7021c8212ec93089f03f18d440fceef060adb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 16:09:16 +0800 Subject: [PATCH 20/24] =?UTF-8?q?52582=20=E6=A0=87=E5=87=86=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E9=A9=B3=E5=9B=9E=E5=90=8E=20=E6=8A=A5?= =?UTF-8?q?=E6=89=B9=E8=8A=82=E7=82=B9=20=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step4-1.vue | 4 ++++ .../pages/creatProcess/bzzqyj/step4-2.vue | 4 ++++ .../processCenter/pages/creatProcess/bzzqyj/step4.vue | 10 +++++----- .../processCenter/pages/creatProcess/bzzqyj/step6.vue | 4 ++++ .../processCenter/pages/creatProcess/bzzqyj/step7.vue | 4 ++++ .../processCenter/pages/creatProcess/bzzqyj/step8.vue | 4 ++++ .../processCenter/pages/creatProcess/bzzqyj/step9.vue | 4 ++++ 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 2ced168e3..042368745 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -275,6 +275,7 @@ data() { return { commentText41: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -408,6 +409,7 @@ this.isSubmit = true let json = this.json json.info = this.data + json.onlyKey = this.onlyKey json.commentText = this.commentText41 json.bzfgId = this.form.bzfgId json.bzfgName = this.form.bzfgName @@ -432,6 +434,7 @@ if (this.commentText41) { var json = this.json json.spFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText41 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -455,6 +458,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index dfe399d15..fea0aa562 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -267,6 +267,7 @@ data() { return { commentText42: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -400,6 +401,7 @@ json.info = this.data json.commentText = this.commentText42 json.bzFlag = '0' + json.onlyKey = this.onlyKey this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -416,6 +418,7 @@ if (this.commentText42) { var json = this.json json.bzFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText42 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -440,6 +443,7 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.commentText42 = data.commentText42 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 51c43b171..5dc012984 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -707,11 +707,6 @@ export default { this.submitShow = true } this.commentText4 = data.commentText4 || '' - if(data.onlyKey){ - this.onlyKey = data.onlyKey - }else{ - this.onlyKey = data.form.onlyKey - } this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList @@ -727,6 +722,11 @@ export default { this.standId = data.standId this.getItemList(data.standId,data.textType) this.data = data.info || data.form.info + if(data.onlyKey){ + this.onlyKey = data.onlyKey + }else{ + this.onlyKey = data.form.onlyKey + } }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 94c00c6a9..301facbcf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -300,6 +300,7 @@ data() { return { data2: [], + onlyKey: '', commentText6: '', itermsConditionsFlag: false, itermsConditionsTitle: '', @@ -482,6 +483,7 @@ this.isSubmit = true; var json = this.json; json.hqFlag = '0'; + json.onlyKey = this.onlyKey json.commentText = this.commentText6; json.user7 = this.form.user7; json.user7Name = this.form.user7Name; @@ -506,6 +508,7 @@ this.isSubmit = true; var json = this.json; json.hqFlag = '1'; + json.onlyKey = this.onlyKey json.commentText = this.commentText6; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -530,6 +533,7 @@ }).then(res => { let data = JSON.parse(res.mesg); this.commentText6 = data.commentText6 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index dbd5afef8..0d6fb63fe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -286,6 +286,7 @@ export default { return { data2: [], commentText7: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -449,6 +450,7 @@ export default { this.isSubmit = true var json = this.json json.bdFlag = '0' + json.onlyKey = this.onlyKey json.commentText = this.commentText7 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -467,6 +469,7 @@ export default { this.isSubmit = true var json = this.json json.bdFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText7 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -491,6 +494,7 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText7 = data.commentText7 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 36b705625..5dab77961 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -286,6 +286,7 @@ export default { return { data2: [], commentText8: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -449,6 +450,7 @@ export default { this.isSubmit = true var json = this.json json.directorFlag = '0' + json.onlyKey = this.onlyKey json.commentText = this.commentText8 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -467,6 +469,7 @@ export default { this.isSubmit = true var json = this.json json.directorFlag = '1' + json.onlyKey = this.onlyKey json.commentText = this.commentText8 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -491,6 +494,7 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText8 = data.commentText8 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 9b62938e4..54fd7334a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -286,6 +286,7 @@ export default { return { data2: [], commentText9: '', + onlyKey: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -449,6 +450,7 @@ export default { this.isSubmit = true; var json = this.json; json.presidentFlag = '0'; + json.onlyKey = this.onlyKey json.commentText = this.commentText9; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -466,6 +468,7 @@ export default { if (this.commentText9) { this.isSubmit = true; var json = this.json; + json.onlyKey = this.onlyKey json.presidentFlag = '1'; json.commentText = this.commentText9; this.$http.post("lawss/activiti/completeTask", { @@ -491,6 +494,7 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText9 = data.commentText9 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList From a36f11039dddb72800c68baa5d67e3c0228ce1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 16:17:02 +0800 Subject: [PATCH 21/24] =?UTF-8?q?52586=20=E6=A0=87=E5=87=86=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=8F=91=E5=B8=83/=E6=9B=B4=E6=96=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E5=9C=A8=E5=B7=B2=E5=8F=91=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=8E=BB=E6=8E=89=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-4.vue | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index de5424936..661e3af97 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -123,21 +123,6 @@
-
- - -
- - -
- - -
From a69fc5120d5715346c99da176693683f2b45316f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 16:45:10 +0800 Subject: [PATCH 22/24] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=AC=E5=BC=80=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20=E5=A4=96=E9=83=A8=E8=AE=BF=E9=97=AE=20=3F=20and=20?= =?UTF-8?q?&?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 14 +++++++++----- .../searchCenter/pages/advancedSearchExternal.vue | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main.js b/src/main.js index 3ed96e7dc..f5a191c4c 100644 --- a/src/main.js +++ b/src/main.js @@ -64,6 +64,7 @@ import VConsole from 'vuex' import isMobile from "./store/isMobile"; // 路由拦截 router.beforeEach(function (to, from, next) { +debugger let toName = to.name if (toName === 'CheckPage') { next() @@ -74,14 +75,17 @@ router.beforeEach(function (to, from, next) { let token = store.state.token let path = to.path; let userName = "" - if((fromName === undefined || fromName === null) && path.indexOf("/standardSearch/All&userName=") !== -1){ - userName = path.split("&")[1].split("=")[1] + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName=") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined))){ + if((path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined)){ + userName = to.query.userName + }else { + userName = path.split("&")[1].split("=")[1] + } window.sessionStorage.clear() }else { if(fromName === 'Home2'){ localStorage.removeItem("external") } - userName = to.query.userName } let requireAuth = to.meta.requireAuth; let taskId = to.query.taskIds; @@ -189,7 +193,7 @@ router.beforeEach(function (to, from, next) { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) }else { - if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || path.indexOf("/standardSearch/All?userName") !== -1)){ + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))){ extractedLocalStorage("standardSearch/All",userName) localStorage.setItem('external', "external") next('/LoginVerifyNoEncryption') @@ -388,7 +392,7 @@ router.beforeEach(function (to, from, next) { next() } }else { - if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || path.indexOf("/standardSearch/All?userName") !== -1)) { + if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))) { extractedLocalStorage("standardSearch/All",userName) localStorage.setItem('external', "external") next('/LoginVerifyNoEncryption') diff --git a/src/pages/searchCenter/pages/advancedSearchExternal.vue b/src/pages/searchCenter/pages/advancedSearchExternal.vue index e78dac512..2dd3275ef 100644 --- a/src/pages/searchCenter/pages/advancedSearchExternal.vue +++ b/src/pages/searchCenter/pages/advancedSearchExternal.vue @@ -1830,8 +1830,7 @@ this.$router.push({ name: "StandardSearch", params: { - selectKey: "stand", - searchValue: "allvalue" + selectKey: "All" } }); }, From 60d7c3a5f874158aa082256125fe5c1b29773954 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 14 Apr 2022 17:20:49 +0800 Subject: [PATCH 23/24] feat: There is no way the, del debug --- src/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.js b/src/main.js index f5a191c4c..a2c5adf76 100644 --- a/src/main.js +++ b/src/main.js @@ -64,7 +64,6 @@ import VConsole from 'vuex' import isMobile from "./store/isMobile"; // 路由拦截 router.beforeEach(function (to, from, next) { -debugger let toName = to.name if (toName === 'CheckPage') { next() From edd905dcd1eacbfb6e45e0a96071afa8d0f07b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 14 Apr 2022 17:25:33 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=89=8B=E6=9C=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk-product/common/formEditList.vue | 114 +- .../phone/qbrk-product/common/formList.vue | 132 +- .../phone/qbrk-product/common/formListIn.vue | 92 +- .../pages/phone/qbrk-product/step10.vue | 95 +- .../pages/phone/qbrk-product/step12.vue | 95 +- .../pages/phone/qbrk-product/step13.vue | 309 ++-- .../pages/phone/qbrk-product/step4.vue | 183 ++- .../pages/phone/qbrk-product/step7.vue | 78 +- .../pages/phone/qbrk-product/step8.vue | 90 +- .../pages/phone/qbrk/common/formEditList.vue | 1372 +++++++++-------- .../pages/phone/qbrk/common/formList.vue | 134 +- .../pages/phone/qbrk/common/formListIn.vue | 69 +- .../processCenter/pages/phone/qbrk/step10.vue | 130 +- .../processCenter/pages/phone/qbrk/step11.vue | 135 +- .../processCenter/pages/phone/qbrk/step4.vue | 532 ++++++- .../processCenter/pages/phone/qbrk/step8.vue | 71 +- 16 files changed, 2337 insertions(+), 1294 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue index af7ede7dd..103c34cd5 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue @@ -9,9 +9,9 @@ @@ -36,12 +36,6 @@ value-format="yyyy-MM-dd" > - - - @@ -86,6 +80,16 @@ + + + + + + + + - - - - - @@ -144,12 +144,12 @@ v-model="form.FBGBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -172,12 +172,12 @@ v-model="form.LSBBBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -202,12 +202,12 @@ v-model="form.XGDName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -230,12 +230,12 @@ v-model="form.QTWJBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -361,7 +361,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" + @click="selectLaws('DTQBBHBUSS','代替企标编号')" >{{'手动查找'}} @@ -371,12 +371,12 @@ v-model="form.GLWJBUSSName" clearable > -
-
+
+
- {{ item.name }} - - + {{ item.name }} + +
@@ -433,7 +433,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('BDTQBBHBUSS'),config.attrName = '被代替企标编号'" + @click="selectLaws('BDTQBBHBUSS','被代替企标编号')" >{{'手动查找'}} @@ -663,6 +663,22 @@ default: false }, }, + filters: { + ellipsis (value) { + if (!value) return '' + if (value.length > 35) { + return value.slice(0,35) + '...' + } + return value + }, + ellipsis2 (value) { + if (!value) return '' + if (value.length > 12) { + return value.slice(0,12) + '...' + } + return value + } + }, data () { return { opinionsStand:[ @@ -797,7 +813,7 @@ }, e => { }) }, - selectLaws (type) { + selectLaws (type,title) { // if (this.standNumFlag === 1) { // this.$refs.selections.selectAll(false) // } @@ -805,7 +821,7 @@ this.replaceLawsNumModel = true this.replaceLawType = '' this.replaceLawType = type - this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType); + this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType,title); }, fileUpload (type) { // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表 @@ -963,5 +979,7 @@ diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue index 171e328b5..b3f630612 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue @@ -5,7 +5,7 @@
- + + + + - - - @@ -56,7 +55,34 @@ clearable> - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + @@ -107,12 +125,12 @@
- + -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -121,10 +139,10 @@ -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -133,12 +151,12 @@ - + -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -147,10 +165,10 @@ -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -166,7 +184,7 @@
- + @@ -200,7 +218,7 @@ - + @@ -241,7 +259,7 @@
- + -
- {{ item.name | ellipsis22 }} - - +
+ {{ item.name }} + +
@@ -273,7 +291,7 @@ - +