From 6bfb113d38f52d8e7cfeb58db6a37ef485b0b62f Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 26 Oct 2023 16:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=B3=95=E8=A7=84=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 9 + .../hzwlComponents/DatePickerFormItem.vue | 7 +- .../components/editDrawer.vue | 3 +- .../pages/components/ProcessMixin.vue | 4 + .../components/PersonInfo.vue | 51 ++ .../policyRegulatoryMaterials/index.vue | 553 ++++++++++++++++++ .../policyTopicParticipation/index.vue | 2 +- .../pages/processDetail/index.vue | 4 + .../tabComponents/newProcess/index.vue | 24 + .../tabComponents/processCenter/index.vue | 23 + .../tabComponents/taskDraft/index.vue | 15 + src/router/index.js | 9 + 12 files changed, 700 insertions(+), 4 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/policyRegulatoryMaterials/components/PersonInfo.vue create mode 100644 src/pages/processCenter/pages/creatProcess/policyRegulatoryMaterials/index.vue diff --git a/src/api/process.js b/src/api/process.js index 2ce98ce27..c5a9fee18 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -1101,3 +1101,12 @@ export function processLawsTopicParticipation (data) { data }) } + +// 政策法规资料入库流程 +export function processLawsRegulatoryInformation (data) { + return axios({ + url: '/api/lawss/sarLawsTopic/processLawsRegulatoryInformation', + method: 'post', + data + }) +} diff --git a/src/components/hzwlComponents/DatePickerFormItem.vue b/src/components/hzwlComponents/DatePickerFormItem.vue index 6e7678164..fd376c2e6 100644 --- a/src/components/hzwlComponents/DatePickerFormItem.vue +++ b/src/components/hzwlComponents/DatePickerFormItem.vue @@ -4,7 +4,7 @@ :editable="editable" :disabled="disabled" :clearable="clearable" - :placeholder="placeholder" + :placeholder="placeholder || defaultPlaceholder" value-format="yyyy-MM-dd" @input="handleChange"> @@ -35,10 +35,13 @@ export default { editable: { type: Boolean, default: false + }, + placeholder: { + type: String } }, computed: { - placeholder () { + defaultPlaceholder () { return `请选择${this.label}` }, }, diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue b/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue index 0533c6ec0..d0dd8109b 100644 --- a/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue +++ b/src/pages/policyRegulation/regulatoryMaterials/components/editDrawer.vue @@ -126,6 +126,7 @@ }" v-model="form.informationFile" :allowType="['.pdf', '.PDF', '.doc','.DOC', '.docx','.DOCX', '.pptx', '.PPTX', '.ppt', '.PPT', '.xls','.XLS', '.xlsx','.XLSX', '.pdg', '.PDG', '.zip']" + :size="100" > + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyRegulatoryMaterials/index.vue b/src/pages/processCenter/pages/creatProcess/policyRegulatoryMaterials/index.vue new file mode 100644 index 000000000..c5f3755d6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyRegulatoryMaterials/index.vue @@ -0,0 +1,553 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue index 36d43544b..ba17bc55b 100644 --- a/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyTopicParticipation/index.vue @@ -207,7 +207,7 @@ export default { showProcessFooter: true, showTransfer: true, // 转办 showOver2: true, // 驳回 - showSave: true, // 报错 + showSave: true, // 保存 showSubmit: true, // 提交 approval: false, // 同意 reloadForm: true, diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 60527b0b4..bf58447ea 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -402,6 +402,10 @@ export default { //政策课题参会流程 const params = { type: 'step1' } this.toProcessDetailForParams('policyTopicParticipation', row, params) + } else if(prcType === '32'){ + // 政策法规资料入库流程 + const params = { type: 'step1' } + this.toProcessDetailForParams('policyRegulatoryMaterials', row, params) } } else { this.$message.warning('当前流程未全部办理完成,无法查看') diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index d8a81a9b7..e629b8951 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -184,6 +184,21 @@ +
+ +
+
+
+ +
+
+
政策法规资料入库流程
+
+
+
+
+
+
@@ -638,6 +653,15 @@ export default { } }) break + case '32': + // 政策法规资料入库流程 + this.$router.push({ + name: 'policyRegulatoryMaterials', + params: { + type: 'step1' + } + }) + break } }, checkPermission(permissionIdArray) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 68b94cb55..4ac6d872f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2340,6 +2340,29 @@ export default { }) } break + case '32': { + let type = '' + switch (row.taskInfo) { + case '批准': + type = 'step2' + break + case '重新起草': + type = 'step1_1' + break + } + this.$router.push({ + name: 'policyRegulatoryMaterials', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + }, + params: { type } + }) + } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 317ff11b5..ce1c07b6c 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -975,6 +975,7 @@ export default { } }) break + // 政策课题参会流程 case '31': this.$router.push({ name: 'policyTopicParticipation', @@ -988,6 +989,20 @@ export default { } }) break + // 政策法规资料入库流程 + case '32': + this.$router.push({ + name: 'policyRegulatoryMaterials', + query: { + prcType: '32', + processName: '政策法规资料入库流程', + bpnId: id, + }, + params: { + type: 'step1' + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 66f5b61be..b4878cf4f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2090,6 +2090,15 @@ const routes = [ title: '政策课题参会流程' } }, + { + path: '/policyRegulatoryMaterials/:type', + name: 'policyRegulatoryMaterials', + component: () => import('@/pages/processCenter/pages/creatProcess/policyRegulatoryMaterials'), + meta: { + requireAuth: true, + title: '政策法规资料入库流程' + } + }, { path: '/zcchStep1', name: 'zcchStep1',