From 37db267069919dbd23ddb51fe5068ca57897ee3a Mon Sep 17 00:00:00 2001 From: chenxiaoxi Date: Mon, 9 Aug 2021 14:09:01 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index f4040b04f..608a2a1c7 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -4,8 +4,8 @@ * @date: 2018-09-04 17:47:46 */ // 后台地址 -const devIp = '192.168.10.145' -const devInterfacePORT = '9999' +const devIp = '39.98.140.126' +const devInterfacePORT = '10005' // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' From 433c084d2c6bb343b4802b0b424b34a5991559e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 25 Jan 2022 20:36:48 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step5.vue | 147 ++++++++++-------- 1 file changed, 80 insertions(+), 67 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index 82d9cc9c1..188779b39 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -158,25 +158,26 @@ align="center"> + min-width="180" + prop="projectGroup" + label="项目群"> @@ -187,6 +188,17 @@ align="center" label="条款名称"> + + + @@ -420,6 +432,15 @@ @checkedRole="checkedTransferRole" :nodeList="nodeList" > + +
+
+ 关闭 +
+ { + this.itermsConditionsTitle = res.data[0].termsConditions.replace(/''/g, '\'') + }) + this.itermsConditionsFlag = true + }, //点击查看详情 handlePreview(item){ let routeUrl = this.$router.resolve({ @@ -722,44 +760,14 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); 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.commentText = '' - this.dataList = item.step3DTOS; - this.dataList.forEach(item => { - this.$set(item,'complianceReasons', '') - this.$set(item,'noCompliance', '') - this.$set(item,'countermeasures', '') - this.$set(item,'completionTime', '') - }) - } else { - this.dataList = item.dataList; - // this.commentText = '' - this.dataList.forEach(item => { - item.implementerId = this.$store.getters.userInfo.userId; - item.implementer = this.$store.getters.userInfo.userName; - }); - } - // this.getLocalTime() - 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.id = item.step3DTOS[0].id; - 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; + this.fileType = item.fileType + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.dataList = item.dataList } else { this.listForm = item.form; this.dataList = item.form.dataList; @@ -827,27 +835,32 @@ export default { this.$message.warning('请填写完整的不符合项信息') this.comFlag = 0 }else{ - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - this.listForm.dataList = this.dataList; - const json = JSON.stringify(this.listForm); - this.isSubmit = true - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { + this.$confirm("请确认表单数据是否填写完整", "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.listForm.commentText = this.commentText; + this.listForm.dataList = this.dataList; + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + }).catch(() => { }); } } @@ -872,7 +885,7 @@ export default { saveBatchEditForm() { this.dataList.forEach(item => { this.selectList.forEach(items => { - if (item.itemNum === items.itemNum && item.projectName === items.projectName) { + if (item.itemsNum === items.itemsNum && item.projectName === items.projectName) { item.complianceReasons = this.batchEditForm.complianceReasons; //不合规 item.noCompliance = this.batchEditForm.noCompliance; @@ -904,7 +917,7 @@ export default { this.searchData(); }, pageSizeChange(pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent; + this.pageSize = pageSize; this.searchData(); } }, From f78f9ea60b92193365f30ba8bb6cc4beaf507118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 26 Jan 2022 10:54:27 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step6.vue | 736 +++++++++++++++++- .../pages/creatProcess/bzpg/step7.vue | 726 ++++++++++++++++- .../pages/creatProcess/bzpg/step8.vue | 726 ++++++++++++++++- 3 files changed, 2182 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index face62e72..080d38a15 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -1,13 +1,745 @@ + - diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index f5307e9a6..31ef4c729 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -1,13 +1,735 @@ + - diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index 1ad204b53..369406c68 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -1,13 +1,735 @@ + - From dea008076ef4fea728876296adacf16a739b3776 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 26 Jan 2022 10:55:15 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 3 ++- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d07f72008..0c86eb228 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2274,7 +2274,8 @@ export default { getListTree(bringData) { this.$http.get('sarResource/ts-resource/getListStand', { sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND', - userId: this.$store.getters.userInfo.userId + userId: this.$store.getters.userInfo.userId, + isFlow: 'flow' }, {}, res => { if (res.ok) { this.treeListOptions = res.data diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 50b17a121..e5f5eaa95 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2597,7 +2597,8 @@ export default { getListTree(bringData) { this.$http.get('sarResource/ts-resource/getListStand', { sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND', - userId: this.$store.getters.userInfo.userId + userId: this.$store.getters.userInfo.userId, + isFlow: 'flow' }, {}, res => { if (res.ok) { this.treeListOptions = res.data From 8a542b9435a9474b66b1c3cf30d839dc9aece4ef Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 26 Jan 2022 11:03:43 +0800 Subject: [PATCH 05/14] commit --- .../standardForComments/pags/AddFileDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue index 72f75e6e7..55764abd8 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue @@ -101,6 +101,7 @@ _this: this }, res => { if (res.respCode === '200') { + // 储存变量监听刷新页面 localStorage.setItem('freshClueNum', new Date().getTime()) this.isSubmit = false this.opinionContent.partCode = '' From b903cda5ce66c96568e03ebbcf460170b1073f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 26 Jan 2022 11:09:32 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step6.vue | 33 +++++++++++++++---- .../pages/creatProcess/bzpg/step7.vue | 12 ++++--- .../pages/creatProcess/bzpg/step8.vue | 12 ++++--- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index 080d38a15..86e5cb9a8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -217,7 +217,7 @@ label="在产车实施日期"> @@ -225,25 +225,27 @@ + { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); } }, //提交事件 handleSubmit() { this.listForm.dataList = this.dataList + this.listForm.passFlag = '0' this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true @@ -620,7 +642,6 @@ export default { this.isSubmit = false }, e => { }); - }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 31ef4c729..471af52e5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -217,7 +217,7 @@ label="在产车实施日期"> @@ -225,25 +225,27 @@ + @@ -225,25 +225,27 @@ + Date: Wed, 26 Jan 2022 15:23:38 +0800 Subject: [PATCH 07/14] commit --- .../pags/AddFileDetails.vue | 1 - .../pags/consultationDetails.vue | 905 +++++++++--------- 2 files changed, 453 insertions(+), 453 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue index 55764abd8..e2ff755b6 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue @@ -125,7 +125,6 @@ }, }, mounted() { - console.log(this.$route.query); this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { standId: this.$route.query.standId, fileType: this.$route.query.fileType, diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 92bdf4bd1..f88060a74 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -17,31 +17,31 @@ {{ this.$route.query.item.cid }}

- - - - - - - - + + + + + + + +
-
- {{ file.name }} - -
+
+ {{ file.name }} + +
- @@ -87,25 +87,25 @@
+ type="index" + label="序号" + align="center" + width="50"> + prop="partCode" + label="章节编号" + sortable + align="center" + width="120"> @@ -149,17 +149,17 @@ > @@ -182,18 +182,18 @@
+ style="position: static;width: 100%;" + :page="form.page" + :total="total" + @pageChange="handlePageChange" + @pageSizeChange="handlePageSizeChange">
@@ -246,449 +246,450 @@ From 7f66222a6c3a5fe0eab3f38261d3afbd2716e86c Mon Sep 17 00:00:00 2001 From: chenxiaoxi Date: Wed, 26 Jan 2022 17:09:36 +0800 Subject: [PATCH 08/14] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E8=AF=A6=E6=83=85=E9=A1=B5=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=9B=9E=E5=88=B0=E7=99=BB=E5=BD=95=E9=A1=B5=E7=9A=84BUG=202.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E7=AA=97=E5=8F=A3=E9=80=9A=E4=BF=A1?= =?UTF-8?q?=E5=88=B7=E6=96=B0BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardForComments/index.vue | 2 +- .../pags/AddFileDetails.vue | 2 + .../pags/consultationDetails.vue | 96 ++++++++++++++----- src/router/index.js | 2 +- src/store/getters/index.js | 3 + src/store/mutations/index.js | 6 ++ src/store/state/index.js | 5 +- src/sysConfig/index.js | 6 +- 8 files changed, 90 insertions(+), 32 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 128f670dc..39b63a38b 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -137,7 +137,7 @@ export default { this.$router.push({ name: "consultationDetails", query: { - item: item + item: JSON.stringify(item) } }); }, diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue index e2ff755b6..331766662 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue @@ -80,6 +80,8 @@ }, methods: { saveUserInfo () { + this.$store.commit('SET_REFRESH_FLAG', true) + return false this.$refs['formAdd'].validate((valid) => { if (valid) { this.isSubmit = true diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index f88060a74..e15616a25 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -14,7 +14,7 @@ - {{ this.$route.query.item.cid }} + {{ this.lawsStand.cid }}

@@ -22,7 +22,7 @@ - +
@@ -69,11 +69,11 @@

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

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

@@ -234,9 +234,9 @@ 数据加载中…… + title="查看修改前内容" + :visible.sync="itermsConditionsFlag" + width="800px">
关闭 @@ -246,6 +246,7 @@ diff --git a/src/router/index.js b/src/router/index.js index 2be48c1b8..6e4ee771c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3753,7 +3753,7 @@ const routes = [ // 详情页 // ************************** 其他详情页 ******************************* // { - path: '/consultationDetails/:id/:pageType', + path: '/consultationDetails/:id?/:pageType?', name: 'consultationDetails', component: () => import('@/pages/regulatoryRepository/standardForComments/pags/consultationDetails'), diff --git a/src/store/getters/index.js b/src/store/getters/index.js index 1d90d8ad3..fbf6e9278 100644 --- a/src/store/getters/index.js +++ b/src/store/getters/index.js @@ -179,5 +179,8 @@ export default { } else { return JSON.parse(state.accessStandRegRows) } + }, + refreshFlag: state => { + return state.refreshFlag } } diff --git a/src/store/mutations/index.js b/src/store/mutations/index.js index e326e7cee..3503672c8 100644 --- a/src/store/mutations/index.js +++ b/src/store/mutations/index.js @@ -296,5 +296,11 @@ export default { state.accessStandRegTabName = '' sessionStorage.removeItem('accessStandRegTabName') } + }, + SET_REFRESH_FLAG(state, flag) { + state.refreshFlag = flag + try { + localStorage.setItem('refreshFlag', flag) + } catch (e) {} } } diff --git a/src/store/state/index.js b/src/store/state/index.js index 3b3f7571f..b4ee9092f 100644 --- a/src/store/state/index.js +++ b/src/store/state/index.js @@ -33,6 +33,7 @@ let proLastDetail = '' // 流程结果详情 let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用) let accessStandRegRows = '' // 标准法规清单编辑 let accessStandRegTabName = '' // 标准法规清单页面当前页签 +let refreshFlag = '' // 监听其他页面刷新 try { if (localStorage.theme) { defaultTheme = localStorage.theme } if (localStorage.token) { defaultToken = localStorage.token } @@ -65,6 +66,7 @@ try { if (sessionStorage.rukuBaseInfo) { rukuBaseInfo = sessionStorage.rukuBaseInfo } if (sessionStorage.accessStandRegRows) { accessStandRegRows = sessionStorage.accessStandRegRows } if (sessionStorage.accessStandRegTabName) { accessStandRegTabName = sessionStorage.accessStandRegTabName } + if (sessionStorage.refreshFlag) { refreshFlag = localStorage.refreshFlag } } catch (e) {} export default { theme: defaultTheme, // 主题 @@ -99,5 +101,6 @@ export default { proLastDetail, rukuBaseInfo, accessStandRegRows, - accessStandRegTabName + accessStandRegTabName, + refreshFlag } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 23276ef5e..16614fc66 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,9 +6,9 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.6' -// const devIp = '62.234.136.153' -const devInterfacePORT = '9999' +// const devIp = '192.168.10.6' +const devIp = '62.234.136.153' +const devInterfacePORT = '8033' // const devIp = '10.19.11.243' // const devInterfacePORT = '4304' // 配置 idm 认证 From bebc201341b22da3ec9a4116cd773c1338d8a8b5 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 26 Jan 2022 17:20:02 +0800 Subject: [PATCH 09/14] commit --- .../standardForComments/pags/AddFileDetails.vue | 3 +-- .../pags/consultationDetails.vue | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue index 331766662..53f6ac132 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue @@ -80,8 +80,6 @@ }, methods: { saveUserInfo () { - this.$store.commit('SET_REFRESH_FLAG', true) - return false this.$refs['formAdd'].validate((valid) => { if (valid) { this.isSubmit = true @@ -104,6 +102,7 @@ }, res => { if (res.respCode === '200') { // 储存变量监听刷新页面 + this.$store.commit('SET_REFRESH_FLAG', true) localStorage.setItem('freshClueNum', new Date().getTime()) this.isSubmit = false this.opinionContent.partCode = '' diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index e15616a25..dfe93e83d 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -401,13 +401,11 @@ } else { localStorage.setItem('freshClueNum', new Date().getTime()) this.freshClueNum = localStorage.getItem('freshClueNum') || ''; - const that = this const watcherRefreshData = function(ev) { const { key: eventType, newValue } = ev if (eventType === 'refreshFlag' && eval(newValue) === true) { // 更新数据... - console.log('更新数据') that.$store.commit('SET_REFRESH_FLAG', false) } } @@ -540,7 +538,8 @@ }, watch: { refreshFlag(val) { - console.log('refresh刷新了') + this.form.page = 1 + this.getList() } }, computed: { @@ -561,12 +560,12 @@ } } // 详情数据 - window.addEventListener("storage", ev => { - if(ev.key === 'freshClueNum'){ - this.form.page = 1 - this.getList() - } - }) + // window.addEventListener("storage", ev => { + // if(ev.key === 'freshClueNum'){ + // this.form.page = 1 + // this.getList() + // } + // }) if (JSON.parse(this.lawsStand.wkfiles).length) { this.fileInfoLists = JSON.parse(this.lawsStand.wkfiles) } else { From 5c4213efb834f1a6ccc765479c9975a69729a9c4 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 26 Jan 2022 19:12:51 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2=E6=A1=86=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 345 ++++++++---- .../pages/creatProcess/qbzxdlx/step1.vue | 509 ++++++++++++++++++ .../pages/creatProcess/qbzxdlx/step2.vue | 231 ++++++++ .../processCenter/pages/newProcess/index.vue | 6 + .../tabComponents/newProcess/index.vue | 22 +- 5 files changed, 998 insertions(+), 115 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 958c1cd4b..c6c7bd926 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -4,13 +4,13 @@
-
+
- - - + + +
@@ -36,23 +36,30 @@ - - - - - - + + + + + + + v-model="dynamic.startIssueTime" + type="date" + size="mini" + :picker-options="pickerBeginDateBefore" + format="yyyy-MM-dd" + placeholder="选择开始时间"> + + + + @@ -61,56 +68,77 @@ + v-model="dynamic.startSSRQ" + type="date" + size="mini" + :picker-options="SSRQDateBefore" + format="yyyy-MM-dd" + placeholder="选择开始时间"> + + + + + v-model="dynamic.startXCXSSRQ" + type="date" + size="mini" + :picker-options="XCXSSRQDateBefore" + format="yyyy-MM-dd" + placeholder="选择开始时间"> + + + + + v-model="dynamic.startZCCSSRQ" + type="date" + size="mini" + :picker-options="ZCCSSRQDateBefore" + format="yyyy-MM-dd" + placeholder="选择开始时间"> + + + + + style="margin: 6px 8px 0 0" + type="primary" + size="mini" + @click="searchBtnClick" + class="common-button-primary"> 查询 + style="margin: 6px 0 0 0" + size="mini" + @click="clearBtnClick" + class="common-button-primary"> 清空 @@ -121,21 +149,21 @@ 导出Excel
- + + type="selection" + width="55" + align="center">