From c394f1947b7237419fa9c9e1078551a4ac48e671 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 19 Sep 2023 16:30:12 +0800 Subject: [PATCH 001/136] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 71 +++++---- .../tabComponents/newProcess/index.vue | 150 +++++++++--------- 2 files changed, 113 insertions(+), 108 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index fef635dbf..2cc157a54 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -213,34 +213,39 @@ // } ] }, - // { - // title: '政策法规库', - // path: '/policyRegulation', - // 'icon-class': 'el-icon-s-management', - // menuId: 'asdzcfgk', - // children: [ - // { - // title: '问题项管控', - // path: '/problemControl', - // menuId: '50d7a0c0af4740c486100c257ae6068e' - // }, - // { - // title: '国内外政策', - // path: '/nationalPolicy', - // menuId: '6557e9c4ce672af71be5807052da126b' - // }, - // { - // title: '标准跟踪清单', - // path: '/standardTrackingList', - // menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4' - // }, - // { - // title: '政策工作组', - // path: '/policyWorkGroup', - // menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6' - // } - // ] - // }, + { + title: '政策法规库', + path: '/policyRegulation', + 'icon-class': 'el-icon-s-management', + menuId: 'asdzcfgk', + children: [ + { + title: '问题项管控', + path: '/problemControl', + menuId: '50d7a0c0af4740c486100c257ae6068e' + }, + { + title: '国内外政策', + path: '/nationalPolicy', + menuId: '6557e9c4ce672af71be5807052da126b' + }, + // { + // title: '国内外政策', + // path: '/Policy', + // menuId: '6557e9c4ce672af71be5807052da126b' + // }, + { + title: '标准跟踪清单', + path: '/standardTrackingList', + menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4' + }, + { + title: '政策工作组', + path: '/policyWorkGroup', + menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6' + } + ] + }, { title: '工作中心', path: '/processCenter', @@ -399,11 +404,11 @@ // path: '/convertDocView', // menuId: '3F52K25546' // }, - // { - // title: '菜单管理', - // path: '/menuManage', - // menuId: '87b8b4f5817a7829696e63185c744d52' - // }, + { + title: '菜单管理', + path: '/menuManage', + menuId: '87b8b4f5817a7829696e63185c744d52' + }, { title: '链接管理', path: '/linkManage', diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index fdfd53a98..a28361a66 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -79,21 +79,21 @@ - - - - - - - - - - - - - - - +
+ +
+
+
+ +
+
+
政策征求意见流程
+
+
+
+
+ +
@@ -124,21 +124,21 @@
- - - - - - - - - - - - - - - +
+ +
+
+
+ +
+
+
重点认证标准/政策合规性项目审查流程
+
+
+
+
+ +
@@ -154,21 +154,21 @@
- - - - - - - - - - - - - - - +
+ +
+
+
+ +
+
+
政策入库流程
+
+
+
+
+ +
@@ -284,36 +284,36 @@

标准化活动相关流程
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+
+ +
+
+
政策课题入会流程
+
+
+
+
+ +
+
+ +
+
+
+ +
+
+
政策课题参会流程
+
+
+
+
+ +
From 4110f158252c9cd68f813553beff24b7bd1d1479 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 19 Sep 2023 17:16:53 +0800 Subject: [PATCH 002/136] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 10 +- .../policy/components/addStructure.vue | 185 +++ .../policy/components/advancedSearch.vue | 355 +++++ .../policy/components/configStandDrawer.vue | 317 ++++ .../policy/components/editDrawer.vue | 1342 +++++++++++++++++ .../policy/components/exportFileDialog.vue | 78 + .../policy/components/mainTable.vue | 634 ++++++++ .../policy/components/policySearch.vue | 92 ++ .../policy/components/policyTable.vue | 302 ++++ .../policy/components/policyTree.vue | 261 ++++ src/pages/policyRegulation/policy/index.vue | 123 ++ src/router/index.js | 11 + 12 files changed, 3705 insertions(+), 5 deletions(-) create mode 100644 src/pages/policyRegulation/policy/components/addStructure.vue create mode 100644 src/pages/policyRegulation/policy/components/advancedSearch.vue create mode 100644 src/pages/policyRegulation/policy/components/configStandDrawer.vue create mode 100644 src/pages/policyRegulation/policy/components/editDrawer.vue create mode 100644 src/pages/policyRegulation/policy/components/exportFileDialog.vue create mode 100644 src/pages/policyRegulation/policy/components/mainTable.vue create mode 100644 src/pages/policyRegulation/policy/components/policySearch.vue create mode 100644 src/pages/policyRegulation/policy/components/policyTable.vue create mode 100644 src/pages/policyRegulation/policy/components/policyTree.vue create mode 100644 src/pages/policyRegulation/policy/index.vue diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 2cc157a54..cda4843c9 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -229,11 +229,11 @@ path: '/nationalPolicy', menuId: '6557e9c4ce672af71be5807052da126b' }, - // { - // title: '国内外政策', - // path: '/Policy', - // menuId: '6557e9c4ce672af71be5807052da126b' - // }, + { + title: '国内外政策', + path: '/Policy', + menuId: '6557e9c4ce672af71be5807052da126b' + }, { title: '标准跟踪清单', path: '/standardTrackingList', diff --git a/src/pages/policyRegulation/policy/components/addStructure.vue b/src/pages/policyRegulation/policy/components/addStructure.vue new file mode 100644 index 000000000..05f42f7b9 --- /dev/null +++ b/src/pages/policyRegulation/policy/components/addStructure.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/advancedSearch.vue b/src/pages/policyRegulation/policy/components/advancedSearch.vue new file mode 100644 index 000000000..c79e6d6fd --- /dev/null +++ b/src/pages/policyRegulation/policy/components/advancedSearch.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/configStandDrawer.vue b/src/pages/policyRegulation/policy/components/configStandDrawer.vue new file mode 100644 index 000000000..a42c6e1c2 --- /dev/null +++ b/src/pages/policyRegulation/policy/components/configStandDrawer.vue @@ -0,0 +1,317 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue new file mode 100644 index 000000000..edf179028 --- /dev/null +++ b/src/pages/policyRegulation/policy/components/editDrawer.vue @@ -0,0 +1,1342 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/exportFileDialog.vue b/src/pages/policyRegulation/policy/components/exportFileDialog.vue new file mode 100644 index 000000000..976d32e59 --- /dev/null +++ b/src/pages/policyRegulation/policy/components/exportFileDialog.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/mainTable.vue b/src/pages/policyRegulation/policy/components/mainTable.vue new file mode 100644 index 000000000..05d10f201 --- /dev/null +++ b/src/pages/policyRegulation/policy/components/mainTable.vue @@ -0,0 +1,634 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/policySearch.vue b/src/pages/policyRegulation/policy/components/policySearch.vue new file mode 100644 index 000000000..3748e6e51 --- /dev/null +++ b/src/pages/policyRegulation/policy/components/policySearch.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/policyTable.vue b/src/pages/policyRegulation/policy/components/policyTable.vue new file mode 100644 index 000000000..9257a928b --- /dev/null +++ b/src/pages/policyRegulation/policy/components/policyTable.vue @@ -0,0 +1,302 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/components/policyTree.vue b/src/pages/policyRegulation/policy/components/policyTree.vue new file mode 100644 index 000000000..add037f04 --- /dev/null +++ b/src/pages/policyRegulation/policy/components/policyTree.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/src/pages/policyRegulation/policy/index.vue b/src/pages/policyRegulation/policy/index.vue new file mode 100644 index 000000000..8e9781a52 --- /dev/null +++ b/src/pages/policyRegulation/policy/index.vue @@ -0,0 +1,123 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index 7299ca608..b5ee5df89 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3894,6 +3894,17 @@ const routes = [ menuId: '6557e9c4ce672af71be5807052da126b' } }, + { + path: '/Policy', + name: 'Policy', + component: () => + import('@/pages/policyRegulation/policy'), + meta: { + requireAuth: true, + title: '国内外政策', + menuId: '6557e9c4ce672af71be5807052da126b' + } + }, { path: '/standardTrackingList', name: 'StandardTrackingList', From 6ff1ae6e155b0115ec71dc101bad41992095c3db Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 20 Sep 2023 18:00:57 +0800 Subject: [PATCH 003/136] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=94=BF?= =?UTF-8?q?=E7=AD=96-=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policy/components/editDrawer.vue | 1485 +++++++++++------ .../policy/components/mainTable.vue | 139 +- .../components/DatePickerGroup.vue | 2 +- 3 files changed, 1021 insertions(+), 605 deletions(-) diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue index edf179028..bec60e61d 100644 --- a/src/pages/policyRegulation/policy/components/editDrawer.vue +++ b/src/pages/policyRegulation/policy/components/editDrawer.vue @@ -1,12 +1,11 @@ 4级政策分类 - - + + - - + + - - + + - - + + Date: Tue, 7 Nov 2023 08:56:27 +0800 Subject: [PATCH 115/136] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/policyRegulation/policyTopics/index.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/policyRegulation/policyTopics/index.vue b/src/pages/policyRegulation/policyTopics/index.vue index 40de2b460..76514186c 100644 --- a/src/pages/policyRegulation/policyTopics/index.vue +++ b/src/pages/policyRegulation/policyTopics/index.vue @@ -308,7 +308,7 @@ export default { const params = { ...this.form, exportName: exportName, - exportIds: this.ids.join(',') + exportIds: this.selectedList.join(',') } let query = '?' for(let i in params){ @@ -354,8 +354,7 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { - alert('delete') - this.$http._deleteData(this.api.delete, { meetingId: id }).then(res => { + this.$http._deleteData(this.api.delete, { id }).then(res => { if (res.ok) { this.$message.success('删除成功') this.getData() From 9e4abc44724b03af7ffa4e2de670eb40f01e594e Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 16:34:24 +0800 Subject: [PATCH 116/136] =?UTF-8?q?78195=20=E6=94=BF=E7=AD=96=E8=AF=BE?= =?UTF-8?q?=E9=A2=98--=E5=90=AF=E5=8A=A8=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E7=BB=93=E6=9E=9C=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/policyRegulation/meeting/index.vue | 4 +--- src/pages/policyRegulation/policyTopics/index.vue | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue index 135f54b75..29a48004c 100644 --- a/src/pages/policyRegulation/meeting/index.vue +++ b/src/pages/policyRegulation/meeting/index.vue @@ -231,9 +231,7 @@ export default { let params = { ...this.searchForm, ...this.advancedSearchForm } const res = await this.$http._getData(this.api.page, params, {_this:this,loading: 'loading'}) if (res.ok && res.data) { - if (res.data.list && res.data.list.length > 0) { - this.data = res.data.list - } + this.data = res.data.list this.total = res.data.count } }, diff --git a/src/pages/policyRegulation/policyTopics/index.vue b/src/pages/policyRegulation/policyTopics/index.vue index 76514186c..c0c95841e 100644 --- a/src/pages/policyRegulation/policyTopics/index.vue +++ b/src/pages/policyRegulation/policyTopics/index.vue @@ -245,9 +245,7 @@ export default { let params = { ...this.searchForm, ...this.advancedSearchForm } const res = await this.$http._getData(this.api.page, params, {_this:this,loading: 'loading'}) if (res.ok && res.data) { - if (res.data.list && res.data.list.length > 0) { - this.data = res.data.list - } + this.data = res.data.list this.total = res.data.count } }, From 9236c1a9b862f4b2c4fe76bc68b2ac0952b116b9 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 16:46:18 +0800 Subject: [PATCH 117/136] =?UTF-8?q?78220=20=E6=94=BF=E7=AD=96=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E8=B5=84=E6=96=99--=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryMaterials/components/editDrawer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue b/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue index d0dd8109b..0917db21a 100644 --- a/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue +++ b/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue @@ -243,7 +243,7 @@ export default { this.form[field] = val.join(',') }, add (treeNodeId) { - this.form = this.initForm + this.form = { ...this.initForm } this.form.treeNodeId = treeNodeId this.title = '新增' this.showDrawer = true From 1f5fa74bd9a833ba64b3f0a925031d8a629d44d7 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 16:53:10 +0800 Subject: [PATCH 118/136] =?UTF-8?q?78247=20=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE--=E5=BF=85=E5=A1=AB=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/policyRegulation/meeting/components/editDrawer.vue | 4 ++-- .../processCenter/pages/creatProcess/policyMeetings/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/policyMeetings/step2.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/policyRegulation/meeting/components/editDrawer.vue b/src/pages/policyRegulation/meeting/components/editDrawer.vue index d16c095f8..e4c4e5a09 100644 --- a/src/pages/policyRegulation/meeting/components/editDrawer.vue +++ b/src/pages/policyRegulation/meeting/components/editDrawer.vue @@ -221,10 +221,10 @@ export default { {type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change'} ], firstMeetingType: [ - {required: true, message: '1级会议类别不能为空', trigger: 'change'} + {required: true, message: '1级会议分类不能为空', trigger: 'change'} ], secondMeetingType: [ - {required: true, message: '2级会议类别不能为空', trigger: 'change'} + {required: true, message: '2级会议分类不能为空', trigger: 'change'} ], agendaName: [ {required: true, type: 'string', message: '议题名称不能为空', trigger: 'change'}, diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue index a527956c2..5fed1ff5b 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue @@ -136,10 +136,10 @@ export default { {type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change'} ], firstMeetingType: [ - {required: true, message: '1级会议类别不能为空', trigger: 'change'} + {required: true, message: '1级会议分类不能为空', trigger: 'change'} ], secondMeetingType: [ - {required: true, message: '2级会议类别不能为空', trigger: 'change'} + {required: true, message: '2级会议分类不能为空', trigger: 'change'} ], agendaName: [ {required: true, type: 'string', message: '议题名称不能为空', trigger: 'change'}, diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue index e6113fc71..650f40bdb 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue @@ -139,10 +139,10 @@ export default { {type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change'} ], firstMeetingType: [ - {required: true, message: '1级会议类别不能为空', trigger: 'change'} + {required: true, message: '1级会议分类不能为空', trigger: 'change'} ], secondMeetingType: [ - {required: true, message: '2级会议类别不能为空', trigger: 'change'} + {required: true, message: '2级会议分类不能为空', trigger: 'change'} ], agendaName: [ {required: true, type: 'string', message: '议题名称不能为空', trigger: 'change'}, From bc000ece966932da71dd6b6b3c7e445ad202f76d Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 16:55:30 +0800 Subject: [PATCH 119/136] =?UTF-8?q?78278=20=E6=94=BF=E7=AD=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=94=BF=E7=AD=96=E6=96=87?= =?UTF-8?q?=E5=8F=B7=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/policyWarehousing/step2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue index 6d3faae3a..ed663f956 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue @@ -216,7 +216,7 @@ export default { {validator: this.verify.valiateEnName, trigger: 'change'} ], lawsNo: [ - {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, + // {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} ], issueCompany: [ From e09b88c579ad9df69a980dfda2b6634474be7d2b Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 17:09:44 +0800 Subject: [PATCH 120/136] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=94=BF?= =?UTF-8?q?=E7=AD=96-=E6=94=BF=E7=AD=96=E5=88=86=E7=B1=BB=E5=A4=9A?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policy/components/editDrawer.vue | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue index 4e38a65e2..e9292a1f7 100644 --- a/src/pages/policyRegulation/policy/components/editDrawer.vue +++ b/src/pages/policyRegulation/policy/components/editDrawer.vue @@ -46,7 +46,8 @@ - @@ -63,7 +64,8 @@ - @@ -80,7 +82,8 @@ - @@ -97,7 +100,8 @@ - @@ -905,6 +909,16 @@ export default { // this.getDept() }, methods: { + initType (value) { + if (value && value !== '') { + return value.split(',') + } else { + return [] + } + }, + handleChange (event, type) { + this.sarLawsStandEO[type] = event.join(',') + }, // 编辑 selectStandardPro (row, state) { this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: row.id}, { From 029e1db55e59f909c4b5c4f24e7a1ed84aceb114 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 7 Nov 2023 17:18:11 +0800 Subject: [PATCH 121/136] =?UTF-8?q?78281=20=E6=94=BF=E7=AD=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93-=E6=88=91=E5=8F=B8=E5=8F=82=E4=B8=8E=E6=B7=B1?= =?UTF-8?q?=E5=BA=A6=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/policyWarehousing/step1.vue | 5 ++++- .../pages/creatProcess/policyWarehousing/step2.vue | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue index 1ebb30371..c0edd2a22 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue @@ -184,7 +184,10 @@ export default { ], SSRQLAWS: [ {required: true, message: '实施日期不能为空', trigger: 'change'} - ] + ], + CYSDLAWS: [ + {required: true, message: '我司参与深度不能为空', trigger: 'change'} + ], } // 认证清单为否 的校验 const littleSarLawsStandRules = { diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue index ed663f956..f89dfa0e4 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue @@ -190,7 +190,10 @@ export default { ], SSRQLAWS: [ {required: true, message: '实施日期不能为空', trigger: 'change'} - ] + ], + CYSDLAWS: [ + {required: true, message: '我司参与深度不能为空', trigger: 'change'} + ], } // 认证清单为否 的校验 const littleSarLawsStandRules = { From 75bc4b32ee1759816bb38b0c161780ebe2b527ad Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 8 Nov 2023 10:38:48 +0800 Subject: [PATCH 122/136] =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryMaterials/components/RegulatoryMaterialsMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue index 69e18905e..cca50ff7d 100644 --- a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue +++ b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue @@ -332,7 +332,7 @@ export default { ...this.form, exportName: exportName, userId: this.$store.getters.userInfo.userId, - exportIds: this.ids.join(',') + exportIds: this.selectedList.join(',') } let query = '?' for(let i in params){ From bddf9ecb7c2debec8fb7fdc2a8397ec3c223a192 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 8 Nov 2023 11:15:36 +0800 Subject: [PATCH 123/136] =?UTF-8?q?78308=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E3=80=81=E6=94=BF=E7=AD=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E6=A0=B9=E6=8D=AE=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=85=A5=E5=B9=B4?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyRegulation/policy/components/editDrawer.vue | 9 ++++++++- .../creatProcess/policyWarehousing/components/Basic.vue | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue index e9292a1f7..bb465a28c 100644 --- a/src/pages/policyRegulation/policy/components/editDrawer.vue +++ b/src/pages/policyRegulation/policy/components/editDrawer.vue @@ -140,7 +140,9 @@ + placeholder="请选择发文日期" + @change="issueTimeChange" + > @@ -572,6 +574,7 @@ import CustomSelect from '@/components/CustomFormComponents/Select' import customSelectArray from '@/components/CustomFormComponents/SelectArray' import RoleTree from "@/components/roleTree"; import MechanismTree from "@/components/mechanismTree"; +import moment from "moment"; export default { name: "editDrawer", @@ -909,6 +912,10 @@ export default { // this.getDept() }, methods: { + issueTimeChange (val) { + const year = moment(val).format('YYYY') + this.sarLawsStandEO.lawsYear = this.lawsYearOptions.find(item => item.label === year)?.value || '' + }, initType (value) { if (value && value !== '') { return value.split(',') diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue index c17331718..3e6553e99 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue @@ -68,7 +68,8 @@ + :disabled="disabled" + @input="issueTimeChange"> @@ -161,6 +162,7 @@ @@ -316,10 +344,33 @@ export default { .demo-drawer-content{ .drawer-content{ //height: calc(~'100% - 52px - 56px'); - flex: auto; + //flex: auto; + height: calc(100% - 220px); display: flex; flex-direction: column; } + .divDel { + border-top: 1px solid #000; + height: 100px; + .divDel_title { + margin: 10px; + } + .divDel_box { + height: 55px; + padding: 0px; + display: flex; + flex-wrap: wrap; + overflow: auto; + margin: 10px; + align-content: flex-start; + span { + margin: 0px 5px 5px 0; + } + } + } + } + .demo-drawer-footer{ + height: 60px; } } From b414136dc7d47f6ec4125c9234a03ea2c2f7d097 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 9 Nov 2023 16:00:21 +0800 Subject: [PATCH 128/136] =?UTF-8?q?78280=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=94=BF=E7=AD=96-=E7=BC=96=E8=BE=91=E6=97=B6=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=BA=B3=E5=85=A5=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?-=E9=80=89=E6=8B=A9=E6=98=AF-=E6=97=A0=E6=B3=95=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policy/components/editDrawer.vue | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue index bb465a28c..7822f056f 100644 --- a/src/pages/policyRegulation/policy/components/editDrawer.vue +++ b/src/pages/policyRegulation/policy/components/editDrawer.vue @@ -834,7 +834,7 @@ export default { {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'} ], },// 认证清单为否 的校验 - commentCycleDate2:'', + commentCycleDate2:[], pickerOptions: { shortcuts: [{ text: '最近一周', @@ -1111,26 +1111,7 @@ export default { if (this.sarLawsStandEO.isRelateAccess === '2') { rules = this.littleSarLawsStandRules } else { - const formFieldList = this.formFieldList rules = {...this.moreSarLawsStandRules} - formFieldList.forEach((item) => { - const rule = [] - if (item.isMust === '0') { - if (item.attrType === 'DATE_PICKER') { - rule.push({required: true, type: 'date', message: `${item.attrName}不能为空`, trigger: 'change'}) - } else if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) - } else { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) - } - } - if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS') { - rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'}) - } - if (rule.length > 0) { - rules[item.attrField] = rule - } - }) } this.$set(this, 'sarLawsStandRules', rules) From 496c21a857eca79f35cb2d961c77503e28077b97 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 10 Nov 2023 10:08:26 +0800 Subject: [PATCH 129/136] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/hzwlComponents/UploadFormItem.vue | 13 +++++-------- .../policyMeetings/components/Topics.vue | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue index 944f4c34f..12787889f 100644 --- a/src/components/hzwlComponents/UploadFormItem.vue +++ b/src/components/hzwlComponents/UploadFormItem.vue @@ -121,17 +121,14 @@ export default { const fileSuffix = fileName.slice(fileName.lastIndexOf('.') + 1) // 判断上传文件格式 const acceptArr = this.accept.split(',').map(type => type.slice(type.lastIndexOf('.') + 1)) - if (acceptArr.includes(fileSuffix)) { - return true - } else { - this.$message.error('文件' + file.name + `格式不正确，请上传${acceptArr.join(',')}文件`) + // 判断上传文件格式 + if (!acceptArr.includes(fileSuffix)) { + this.$message.error(`文件${file.name}格式不正确，请上传${acceptArr.join('、')}文件`) return false } // 判断文件上传大小 - if (file.size / 1024 / 1024 <= this.size) { - return true - } else { - this.$message.error('文件' + file.name + `大小不超过${this.size}M`) + if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line + this.$message.error('文件' + file.name + `大小不超过${ this.size }M`) return false } return true diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue index 4595b8a1b..90aa27c2e 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Topics.vue @@ -64,7 +64,7 @@ export default { required: true }, rules: { - type: Array + type: Object }, disabled: { type: Boolean, From f0063727f8e98657cba1909d240d417a4310d7c3 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 10 Nov 2023 10:59:44 +0800 Subject: [PATCH 130/136] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 8 ++++++-- src/components/hzwlComponents/UploadFormItem.vue | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 77c1ae80e..674832417 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -323,12 +323,16 @@ export default { fileSuffix = fileSuffix.toLocaleLowerCase() // 判断上传文件格式 if (!this.allowType.includes(fileSuffix)) { - this.$message.error(`文件${file.name}格式不正确，请上传${this.allowType.join('、')}文件`) + this.$message({ + dangerouslyUseHTMLString: true, + message:
文件{file.name}格式不正确，请上传{this.allowType.join('、')}文件
, + type: 'error' + }) return false } // 判断文件上传大小 if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line - this.$message.error('文件' + file.name + `大小不超过${ this.size }M`) + this.$message.error('文件' + file.name + `超过${ this.size }M`) return false } return true diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue index 12787889f..2765699e3 100644 --- a/src/components/hzwlComponents/UploadFormItem.vue +++ b/src/components/hzwlComponents/UploadFormItem.vue @@ -123,12 +123,16 @@ export default { const acceptArr = this.accept.split(',').map(type => type.slice(type.lastIndexOf('.') + 1)) // 判断上传文件格式 if (!acceptArr.includes(fileSuffix)) { - this.$message.error(`文件${file.name}格式不正确，请上传${acceptArr.join('、')}文件`) + this.$message({ + dangerouslyUseHTMLString: true, + message:
文件{file.name}格式不正确，请上传{this.allowType.join('、')}文件
, + type: 'error' + }) return false } // 判断文件上传大小 if (file.size / 1024 / 1024 > this.size) {// eslint-disable-line - this.$message.error('文件' + file.name + `大小不超过${ this.size }M`) + this.$message.error('文件' + file.name + `超过${ this.size }M`) return false } return true From f35962eb69a7db55e2c5fb46952e08d8a6331a44 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 10 Nov 2023 15:13:11 +0800 Subject: [PATCH 131/136] =?UTF-8?q?78263=20=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE-=E6=B7=BB=E5=8A=A0=E8=B0=83=E5=8F=96?= =?UTF-8?q?=E8=AF=BE=E9=A2=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/components/TopicsTable.vue | 238 ++++++++++++++++++ .../meeting/components/editDrawer.vue | 26 +- .../policyMeetings/components/Basic.vue | 51 +++- 3 files changed, 301 insertions(+), 14 deletions(-) create mode 100644 src/pages/policyRegulation/meeting/components/TopicsTable.vue diff --git a/src/pages/policyRegulation/meeting/components/TopicsTable.vue b/src/pages/policyRegulation/meeting/components/TopicsTable.vue new file mode 100644 index 000000000..4dca28cd8 --- /dev/null +++ b/src/pages/policyRegulation/meeting/components/TopicsTable.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/src/pages/policyRegulation/meeting/components/editDrawer.vue b/src/pages/policyRegulation/meeting/components/editDrawer.vue index e4c4e5a09..58f246549 100644 --- a/src/pages/policyRegulation/meeting/components/editDrawer.vue +++ b/src/pages/policyRegulation/meeting/components/editDrawer.vue @@ -21,6 +21,20 @@ clearable> + + + + 调取课题 + + 提交 取消
+ @@ -172,12 +187,15 @@ import CustomDatePick from '@/components/CustomFormComponents/DatePicker' import CustomFile from '@/components/CustomFormComponents/File' import CustomTextarea from '@/components/CustomFormComponents/Textarea' +import TopicsTable from "./TopicsTable"; + export default { name: "editDrawer", components: { CustomDatePick, CustomFile, - CustomTextarea + CustomTextarea, + TopicsTable }, props: { dict: { @@ -353,6 +371,12 @@ export default { } } }) + }, + handleGetTopic () { + this.$refs.TopicsTableRef.open() + }, + dragIn (val) { + this.$set(this.form, 'topicName', val.topicName) } } } diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Basic.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Basic.vue index 09d0f018e..d715f1d4d 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Basic.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/components/Basic.vue @@ -7,18 +7,6 @@ v-model="form.meetingName" :disabled="disabled"> - - - - - - + + + 调取课题 + + + + + + +
@@ -53,13 +67,16 @@ import InputFormItem from '@/components/hzwlComponents/InputFormItem' import DatePickerFormItem from '@/components/hzwlComponents/DatePickerFormItem' import UploadFormItem from "@/components/hzwlComponents/UploadFormItem"; import TextareaFormItem from "@/components/hzwlComponents/TextareaFormItem"; +import TopicsTable from '@/pages/policyRegulation/meeting/components/TopicsTable.vue' + export default { name: "Basic", components: { InputFormItem, DatePickerFormItem, UploadFormItem, - TextareaFormItem + TextareaFormItem, + TopicsTable }, props: { form: { @@ -74,6 +91,14 @@ export default { type: Object, required: true } + }, + methods: { + handleGetTopic () { + this.$refs.TopicsTableRef.open() + }, + dragIn (val) { + this.$set(this.form, 'topicName', val.topicName) + } } } From 2a7b50f3cb2f224a3d4aab597041467f03132b2a Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 10 Nov 2023 16:12:50 +0800 Subject: [PATCH 132/136] =?UTF-8?q?78224=20=E5=86=85=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E3=80=81=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84=E8=B5=84=E6=96=99?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=B8=AD=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/components/TopicsTable.vue | 16 ++- src/pages/policyRegulation/meeting/index.vue | 18 ++- .../policyRegulation/policyTopics/index.vue | 18 ++- .../components/RegulatoryMaterialsMain.vue | 18 ++- .../components/RetrieveTopics.vue | 120 ++++++++++-------- 5 files changed, 129 insertions(+), 61 deletions(-) diff --git a/src/pages/policyRegulation/meeting/components/TopicsTable.vue b/src/pages/policyRegulation/meeting/components/TopicsTable.vue index 4dca28cd8..69ed77451 100644 --- a/src/pages/policyRegulation/meeting/components/TopicsTable.vue +++ b/src/pages/policyRegulation/meeting/components/TopicsTable.vue @@ -17,7 +17,7 @@ - + + + + + - + + + + + - + + + + + - + + + + + @@ -10,53 +10,71 @@
- - - - - - - - - - - - - - {{ opt.label }} - - - - - - 查询 - - - 清空 - - + + + + + + + + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + 查询 + + + 清空 + + + +
@@ -162,7 +180,8 @@ export default { pageSize: this.$store.getters.userInfo.configContent, topicName: '', organizer: '', - startTime: '', + startTimeBegin: '', + startTimeEnd: '', topicStatus: '' }, total: 0, @@ -207,7 +226,8 @@ export default { pageSize: this.$store.getters.userInfo.configContent, topicName: '', organizer: '', - startTime: '', + startTimeBegin: '', + startTimeEnd: '', topicStatus: '' } From 5bcbe06f1c021db59278ceff344b9ce36c4d725b Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 10 Nov 2023 16:22:51 +0800 Subject: [PATCH 133/136] =?UTF-8?q?78231=20=E6=94=BF=E7=AD=96=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E8=B5=84=E6=96=99--=E8=B5=84=E6=96=99=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RegulatoryMaterialsMain.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue index 7f82f7373..92b57d632 100644 --- a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue +++ b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue @@ -29,8 +29,8 @@ - - + + Date: Fri, 10 Nov 2023 16:44:36 +0800 Subject: [PATCH 134/136] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98-?= =?UTF-8?q?=E8=AF=BE=E9=A2=98=E7=BB=84=E8=B5=84=E6=96=99-=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E8=B5=84=E6=96=99=E9=99=90=E5=88=B6500M=EF=BC=8C?= =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=8D=E8=83=BD=E4=B8=8A=E4=BC=A0=E8=A7=86?= =?UTF-8?q?=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyRegulation/policyTopics/components/editDrawer.vue | 4 ++-- .../components/ResearchGroupMaterials.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue index c836944d8..2a1cce572 100644 --- a/src/pages/policyRegulation/policyTopics/components/editDrawer.vue +++ b/src/pages/policyRegulation/policyTopics/components/editDrawer.vue @@ -177,8 +177,8 @@ attrField: 'conferenceMaterials' }" v-model="form.conferenceMaterials" - :allowType="['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX', '.pdg', '.PDG', '.mp3', '.MP3', '.Ogg', '.Wav', '.mp4', '.MP4', '.WebM']" - :size="2048" + :allowType="['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX', '.pdg', '.PDG', '.mp3', '.MP3', '.Ogg', '.Wav']" + :size="500" > diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue index 0ce9d897a..3843ced4f 100644 --- a/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue +++ b/src/pages/processCenter/pages/creatProcess/policyTopicEnrollment/components/ResearchGroupMaterials.vue @@ -30,8 +30,8 @@ prop="conferenceMaterials" :ids.sync="form.conferenceMaterials" :names.sync="form.conferenceMaterialsName" - accept=".pdf, .PDF, .doc, .DOC, .docx, .DOCX, .ppt, .PPT, .pptx, .PPTX, .xls, .XLS, .xlsx, .XLSX, .pdg, .PDG, .mp3, .MP3, .Ogg, .Wav, .mp4, .MP4, .WebM" - :size="2048" + accept=".pdf, .PDF, .doc, .DOC, .docx, .DOCX, .ppt, .PPT, .pptx, .PPTX, .xls, .XLS, .xlsx, .XLSX, .pdg, .PDG, .mp3, .MP3, .Ogg, .Wav" + :size="500" :disabled="disabled"> From 1e7a36d8f59f57c287f56ba2ab56c43ace4ad22c Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 13 Nov 2023 09:44:50 +0800 Subject: [PATCH 135/136] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E8=B5=84=E6=96=99=20=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90?= =?UTF-8?q?=E3=80=81=E4=B8=8B=E8=BD=BD=E6=9D=83=E9=99=90=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/regulatoryMaterialsDetail/index.vue | 4 ++-- .../components/RegulatoryMaterialsMain.vue | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pages/details/regulatoryMaterialsDetail/index.vue b/src/pages/details/regulatoryMaterialsDetail/index.vue index bf58debfb..051c251d0 100644 --- a/src/pages/details/regulatoryMaterialsDetail/index.vue +++ b/src/pages/details/regulatoryMaterialsDetail/index.vue @@ -48,8 +48,8 @@

-

diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue index 92b57d632..43c9f3cc7 100644 --- a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue +++ b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue @@ -142,8 +142,7 @@ sortable="custom" > Date: Mon, 13 Nov 2023 11:15:03 +0800 Subject: [PATCH 136/136] =?UTF-8?q?=E8=AF=84=E5=88=86=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step5.vue | 24 +++++++++----- .../pages/creatProcess/qbrk/step6.vue | 23 +++++++++----- .../pages/creatProcess/qbrk/step7.vue | 23 +++++++++----- .../pages/creatProcess/qbrk/step9.vue | 27 ++++++++++------ .../pages/creatProcess/qbrk/stepC1.vue | 31 ++++++++++++------- .../pages/creatProcess/qbrk/stepC6.vue | 23 +++++++++----- 6 files changed, 103 insertions(+), 48 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 8b7c90bbd..28a10e7d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -21,6 +21,7 @@