diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue index 3a7be0c0e..57565f70d 100644 --- a/src/pages/policyRegulation/meeting/index.vue +++ b/src/pages/policyRegulation/meeting/index.vue @@ -234,6 +234,7 @@ export default { this.$refs.exportDialogRef.openModel() }, handleExport (exportName) { + alert('导出' + exportName) const params = { ...this.form, exportName: exportName, @@ -256,11 +257,13 @@ export default { }, // 导入 addImportModal() { + alert('导入') this.importModalShowFlag = true this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?'+ 'userId=' + this.$store.getters.userInfo.userId }, // 模板下载 handleMoudel(){ + alert('模板下载') window.open('/api/lawss/sarBussionessStand/exportTemplateFile?fileName=企业标准导入模板') }, // 新增编辑 diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step1.vue b/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step1.vue index 150265812..dc16e3942 100644 --- a/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step1.vue @@ -37,6 +37,7 @@ +
@@ -64,6 +65,7 @@ import Basic from "./components/Basic"; import Classification from "./components/Classification"; import Topics from "./components/Topics"; import PersonInfo from "./components/PersonInfo"; +import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription"; import { getDicTypeListCode, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel } from 'api/process' @@ -76,7 +78,8 @@ export default { Basic, Classification, Topics, - PersonInfo + PersonInfo, + ReceiptDescription }, data () { const form = { @@ -99,7 +102,8 @@ export default { reportingUnit: '', agendaContent: '' } - ] + ], + commentText: '' } const rules = { meetingName: [ @@ -204,7 +208,7 @@ export default { this.form.meetingTopicList = [ ...res ] }, getData () { - const { bpnId, taskIds, prcId, disabled } = this.$route.query + const { bpnId, taskIds, prcId, disabledXX } = this.$route.query // 1. 根据草稿查询流程详情 2.已办、已发、监控:查看流程数据 if(bpnId) { queryTaskFirst({ bpnId }).then(res => { @@ -217,8 +221,8 @@ export default { }) }) } - if (disabled) { - this.disabled = disabled + if (disabledXX) { + this.disabled = disabledXX } // 重新起草 if (taskIds) { @@ -251,7 +255,7 @@ export default { _formData.append('id', this.$route.query.bpnId || '') // 草稿id _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) - _formData.append('prcType', '28') + _formData.append('prcType', '29') _formData.append('prcName', '内外部会议入库流程') _formData.append('json', JSON.stringify({ taskInfo: '起草', @@ -265,7 +269,7 @@ export default { this.$router.replace({ path: this.$route.path, query: { - prcType: '28', + prcType: '29', processName: '申请人发起流程', bpnId: res.result } @@ -291,7 +295,7 @@ export default { const startProcessRollBackQuery = { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, - type: '28', + type: '29', json: JSON.stringify(json) } const res = await this.$http._post('lawss/activiti/startProcessRollBack', startProcessRollBackQuery) diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step2.vue b/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step2.vue index e29f48211..10b4f6756 100644 --- a/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/hzwl-hyrk/step2.vue @@ -37,6 +37,7 @@
+
@@ -73,6 +74,7 @@ import Classification from "./components/Classification"; import Topics from "./components/Topics"; import PersonInfo from "./components/PersonInfo"; import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory"; +import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription"; import { getDicTypeListCode, inboundLiaisonDetail, changeAssigneeNew, processCreateMeeting } from 'api/process' export default { @@ -85,7 +87,8 @@ export default { Classification, Topics, PersonInfo, - ApprovalHistory + ApprovalHistory, + ReceiptDescription }, data () { const form = { @@ -108,7 +111,8 @@ export default { reportingUnit: '', agendaContent: '' } - ] + ], + commentText: '' } const rules = { meetingName: [ @@ -173,7 +177,7 @@ export default { } return { active: '1', - disabled: false, + disabled: true, footerLoading: false, reloadForm: true, form, @@ -282,8 +286,22 @@ export default { this.form.approvalOpinion = 0 this.handleSubmit() }, + addRule () { + if (this.form.approvalOpinion === 0) { + this.rules.commentText = [ + { required: false } + ] + this.$refs.form.clearValidate('commentText') + }else { + this.rules.commentText = [ + { required: true, message: '审批意见不能为空' } + ] + } + this.rules = { ...this.rules } + }, // 提交 handleSubmit() { + this.addRule() this.$refs['form'].validate((valid) => { if (valid) { this.footerLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue index 4fdc9b9b8..637cce23e 100644 --- a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step1.vue @@ -6,7 +6,8 @@
基础信息
-
人员信息
+
人员信息
+
审批历史
+
+ +
{ + this.$set(this, 'processData', res) + }, e => {}) + } + }, // 带入流程 dragIn (form) { this.reloadForm = false diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 465dfcaac..3f2aa19a6 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -391,7 +391,7 @@ export default { }else if(prcType === '12'){ //政策课题参会发起流程 this.toProcessDetail('zdrzbzORzchgxxmscStep1',row) - }else if(prcType === '28'){ + }else if(prcType === '29'){ //内外部会议入库 this.toProcessDetail('hyrk1',row) } diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 5900b83ac..f5c1b5ff5 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -156,7 +156,7 @@
-
+
@@ -614,7 +614,7 @@ export default { }) break // 内外部会议入库流程 - case '28': + case '29': this.$router.push({ name: 'hyrk1' }) diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 855dc0284..ec7f2c7ed 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2260,7 +2260,7 @@ export default { } }) break - case '28': { + case '29': { let routeName = '' switch (row.taskInfo) { case '内外部会议入库审批': diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 827c52aef..69ff7bf4e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -963,11 +963,11 @@ export default { } }) break - case '28': + case '29': this.$router.push({ name: 'hyrk1', query: { - prcType: '28', + prcType: '29', processName: '申请人发起流程', bpnId: id }