diff --git a/src/components/hzwlComponents/Import.vue b/src/components/hzwlComponents/Import.vue index 90f457450..6acb5812d 100644 --- a/src/components/hzwlComponents/Import.vue +++ b/src/components/hzwlComponents/Import.vue @@ -48,7 +48,12 @@ - +

导入失败

@@ -141,6 +146,8 @@ export default { }) } this.fileList = fileList + } else { + this.fileList = [] } }, onClose () { diff --git a/src/components/hzwlComponents/StandardListDrawer.vue b/src/components/hzwlComponents/StandardListDrawer.vue new file mode 100644 index 000000000..36cd47d7f --- /dev/null +++ b/src/components/hzwlComponents/StandardListDrawer.vue @@ -0,0 +1,705 @@ + + + + + diff --git a/src/components/hzwlComponents/TimeLineFormItem.vue b/src/components/hzwlComponents/TimeLineFormItem.vue index 30cfcf949..774f888ba 100644 --- a/src/components/hzwlComponents/TimeLineFormItem.vue +++ b/src/components/hzwlComponents/TimeLineFormItem.vue @@ -5,33 +5,35 @@

{{ title }}

+ :disabled="disabled" + :value="name" + :placeholder="placeholder || `选择${title}`" + readonly + @click.native="choice(id)" + />
- + + + diff --git a/src/pages/details/meetingDetail/index.vue b/src/pages/details/meetingDetail/index.vue index c1810f20e..e147788bd 100644 --- a/src/pages/details/meetingDetail/index.vue +++ b/src/pages/details/meetingDetail/index.vue @@ -61,7 +61,7 @@ diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index 0d647b7e1..ca36c2224 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -53,7 +53,7 @@

{{ sarStandardsInfoEO.issueTime || '-' }}

{{ sarStandardsInfoEO.issueCompany || '-' }}

{{ formatDateFunc(sarStandardsInfoEO.commentCycleStart) || '' }} - {{formatDateFunc(sarStandardsInfoEO.commentCycleEnd) || ''}}

-

{{ sarStandardsInfoEO.standStatusShow || '-' }}

+

{{ sarStandardsInfoEO.standStatusShow || '-' }}

{{ sarStandardsInfoEO.lawsSycx || '-' }}

{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}

{{ sarStandardsInfoEO.lawsYear || '-' }}

@@ -64,11 +64,17 @@ {{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}

-

{{ sarStandardsInfoEO.lawsBulletin || '-' }}

+

{{ sarStandardsInfoEO.lawsBulletin || '-' }}

+

{{ sarStandardsInfoEO.referenceNews || '-' }}

{{ sarStandardsInfoEO.lawsLabel || '-' }}

-

{{ sarStandardsInfoEO.lawsRemark || '-' }}

- - + +

{{ sarStandardsInfoEO.lawsKeyPoint || '-' }}

+

{{ sarStandardsInfoEO.lawsRemark || '-' }}

+

+ + {{ sarStandardsInfoEO.lawsOriginalLink }} + - +

+ + diff --git a/src/pages/policyRegulation/standardTrackingList/Inventory.vue b/src/pages/policyRegulation/standardTrackingList/Inventory.vue new file mode 100644 index 000000000..bd4df4dca --- /dev/null +++ b/src/pages/policyRegulation/standardTrackingList/Inventory.vue @@ -0,0 +1,252 @@ + + + + + diff --git a/src/pages/policyRegulation/standardTrackingList/PersonInfo.vue b/src/pages/policyRegulation/standardTrackingList/PersonInfo.vue new file mode 100644 index 000000000..40312ed6d --- /dev/null +++ b/src/pages/policyRegulation/standardTrackingList/PersonInfo.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/pages/policyRegulation/standardTrackingList/addModel.vue b/src/pages/policyRegulation/standardTrackingList/addModel.vue new file mode 100644 index 000000000..fa6b49dd8 --- /dev/null +++ b/src/pages/policyRegulation/standardTrackingList/addModel.vue @@ -0,0 +1,278 @@ + + + + + diff --git a/src/pages/policyRegulation/standardTrackingList/index.vue b/src/pages/policyRegulation/standardTrackingList/index.vue index 12b8507a8..b0b3301d6 100644 --- a/src/pages/policyRegulation/standardTrackingList/index.vue +++ b/src/pages/policyRegulation/standardTrackingList/index.vue @@ -1,27 +1,485 @@ diff --git a/src/pages/processCenter/pages/components/ProcessTitle.vue b/src/pages/processCenter/pages/components/ProcessTitle.vue index 30951677b..c9916ba57 100644 --- a/src/pages/processCenter/pages/components/ProcessTitle.vue +++ b/src/pages/processCenter/pages/components/ProcessTitle.vue @@ -1,15 +1,15 @@ diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue index 4622f8e39..5c77615ea 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue @@ -1,353 +1,401 @@ diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue index 1c850f4e8..86da73597 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue @@ -9,57 +9,70 @@
审批历史
-
- + - +
- +
- +
- +
+ show-submit + show-over2 + show-transfer + :submitLoading="footerLoading" + :saveLoading="footerLoading" + @transfer="handleTransfer" + @submit="handleApprove" + @over2="handleOver" + /> + check-box + :is-title="drawerTitle" + :is-visible.sync="drawerModal" + :nodeList="nodeList" + @checkedRole="checkedRole" + /> 数据获取中 @@ -68,16 +81,16 @@ ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' import ProcessHeader from '@/pages/processCenter/pages/components//ProcessHeader' import ProcessFooter from '@/pages/processCenter/pages/components//ProcessFooter' -import Basic from "./components/Basic"; -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 Basic from './components/Basic'; +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, completeTask } from 'api/process' export default { - name: "policyMeetings2", + name: 'PolicyMeetings2', components: { ProcessTitle, ProcessHeader, @@ -115,49 +128,49 @@ export default { } const rules = { meetingName: [ - {required: true, type: 'string', message: '会议名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '会议名称不能超过500个字符', trigger: 'change' } ], meetingOrganizer: [ - {required: true, type: 'string', message: '会议主办单位不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议主办单位不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议主办单位不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '会议主办单位不能超过500个字符', trigger: 'change' } ], meetingTime: [ - {required: true, message: '会议时间不能为空', trigger: 'change'} + { required: true, message: '会议时间不能为空', trigger: 'change' } ], meetingAddress: [ - {required: true, type: 'string', message: '会议地点不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议地点不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议地点不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '会议地点不能超过500个字符', trigger: 'change' } ], participants: [ - {required: true, type: 'string', message: '参会人员不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '参会人员不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '参会人员不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '参会人员不能超过500个字符', trigger: 'change' } ], meetingContent: [ - {required: true, type: 'string', message: '会议主要内容不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '会议主要内容不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '会议主要内容不能为空', trigger: 'change' }, + { 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'}, - {type: 'string', max: 500, message: '议题名称不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '议题名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '议题名称不能超过500个字符', trigger: 'change' } ], reporter: [ - {required: true, type: 'string', message: '汇报人不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '汇报人不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '汇报人不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '汇报人不能超过500个字符', trigger: 'change' } ], reportingUnit: [ - {required: true, type: 'string', message: '汇报人单位不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '汇报人单位不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '汇报人单位不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '汇报人单位不能超过500个字符', trigger: 'change' } ], agendaContent: [ - {required: true, type: 'string', message: '议题主要内容不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '议题主要内容不能超过500个字符', trigger: 'change'} + { required: true, type: 'string', message: '议题主要内容不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '议题主要内容不能超过500个字符', trigger: 'change' } ], } const roleForm = { @@ -168,10 +181,10 @@ export default { } const roleRules = { applyUserName: [ - {required: true, message: '流程发起人不能为空', trigger: ['blur', 'change']} + { required: true, message: '流程发起人不能为空', trigger: [ 'blur', 'change' ] } ], jlUserName: [ - {required: true, message: '审批人不能为空', trigger: ['blur', 'change']} + { required: true, message: '审批人不能为空', trigger: [ 'blur', 'change' ] } ] } return { @@ -193,12 +206,12 @@ export default { loading: false } }, - created() { + created () { this.getDicTypeListCode() this.getData() }, methods: { - handleTabs(tab) { + handleTabs (tab) { this.active = tab }, addMeetingTopic () { @@ -210,10 +223,10 @@ export default { reportingUnit: '', agendaContent: '' } - this.form.meetingTopicList = [...this.form.meetingTopicList, meetingTopicItem] + this.form.meetingTopicList = [ ...this.form.meetingTopicList, meetingTopicItem ] }, removeMeetingTopic (index) { - let res = [] + const res = [] this.form.meetingTopicList.forEach((item, i) => { if (i !== index) { res.push(item) @@ -221,7 +234,7 @@ export default { }) this.form.meetingTopicList = [ ...res ] }, - getData() { + getData () { return new Promise((resolve, reject) => { this.loading = true inboundLiaisonDetail({ @@ -242,7 +255,7 @@ export default { }) }) }, - handleTransfer() { + handleTransfer () { this.drawerModal = true this.drawerTitle = '转办处理人' }, @@ -250,25 +263,25 @@ export default { checkedRole (data) { changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id - userId:this.$store.getters.userInfo.userId, // 委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { if (res.success) { this.drawerModal = false this.$message.success('调整成功') - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' }) } else { this.$message.warning(res.message) } }) }, - handleOver(){ + handleOver () { // 驳回 this.form.approvalOpinion = 1 this.handleSubmit() }, - handleApprove(){ + handleApprove () { // 通过 this.form.approvalOpinion = 0 this.handleSubmit() @@ -287,7 +300,7 @@ export default { this.rules = { ...this.rules } }, // 提交 - handleSubmit() { + handleSubmit () { this.addRule() this.$refs['form'].validate((valid) => { if (valid) { @@ -295,16 +308,16 @@ export default { const json = JSON.stringify(this.form); const query = { taskId: this.$route.query.taskIds, - userId:this.$store.getters.userInfo.userId, + userId: this.$store.getters.userInfo.userId, json: json } this.$http._post('lawss/activiti/completeTask', query).then(res => { if (res.success) { - if(this.form.approvalOpinion === 1){ - this.$message.warning("驳回成功") + if(this.form.approvalOpinion === 1) { + this.$message.warning('驳回成功') this.footerLoading = false // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' }) }else{ this.processCreate(json) } @@ -315,7 +328,8 @@ export default { }) } else { this.$message.warning('请检查基础信息表单是否填写完整') - }}) + } + }) }, // 流程入库 processCreate (json) { @@ -325,7 +339,7 @@ export default { if (res.result === '操作成功' || res.data === '入库成功') { this.$message.success(res.data) setTimeout(() => { - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' }) }, 100) } else { this.$message.warning(res.message) diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue index 3a663bea9..1eee06729 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/components/Basic.vue @@ -6,159 +6,217 @@
- - - + - - + - - + - - + - - + - - + + 根据编号、名称、标准状态查询 - - + - - + @input="issueTimeChange" + /> - - + - - + - - + - - + :options="dict.lawsSycxOptions || []" + /> - - + - - + - - + - - + - - + - - + - - + + + + + + + + + + + + + + +
- + + @@ -171,9 +229,11 @@ import InputFormItem from '@/components/hzwlComponents/InputFormItem' import DatePickerFormItem from '@/components/hzwlComponents/DatePickerFormItem' import DataRangePickerFormItem from '@/components/hzwlComponents/DataRangePickerFormItem' import SelectMultipleFormItem from '@/components/hzwlComponents/SelectMultipleFormItem' +import TextareaFormItem from '@/components/hzwlComponents/TextareaFormItem'; +import PolicyTree from '@/components/hzwlComponents/policy/PolicyTree' import SearchResult from './SearchResult' export default { - name: "Basic", + name: 'Basic', components: { ProcessTitle, SelectFormItem, @@ -181,22 +241,10 @@ export default { DatePickerFormItem, DataRangePickerFormItem, SelectMultipleFormItem, + TextareaFormItem, + PolicyTree, SearchResult }, - data () { - return { - isRelateAccessOptions: [ - { - label: '是', - value: '1' - }, - { - label: '否', - value: '2' - } - ] - } - }, props: { form: { type: Object, @@ -211,6 +259,20 @@ export default { required: true } }, + data () { + return { + isRelateAccessOptions: [ + { + label: '是', + value: '1' + }, + { + label: '否', + value: '2' + } + ] + } + }, methods: { issueTimeChange (val) { const year = moment(val).format('YYYY') @@ -221,6 +283,20 @@ export default { }, dragIn (form) { this.$emit('dragIn', form) + }, + openChoose (e) { + if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') { + return; + } + this.$refs.PolicyTree.open(this.form.menuId) + }, + handleChoose (data) { + this.$set(this.form, 'menuName', data.menuName) + this.$set(this.form, 'menuId', data.id) + }, + handleClear () { + this.$set(this.form, 'menuName', '') + this.$set(this.form, 'menuId', '') } } } diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue index db232ba30..e71ee17a9 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue @@ -10,7 +10,8 @@
审批历史
-
- - - - - - + + + + + +
-
- +
+
- +
- + /> 数据获取中
@@ -49,19 +49,19 @@ import ProcessHeader from '@/pages/processCenter/pages/components/ProcessHeader' import ProcessFooter from '@/pages/processCenter/pages/components/ProcessFooter' -import Basic from "./components/Basic"; -import EffectiveDate from "./components/EffectiveDate"; -import TextInfo from "./components/TextInfo"; -import Range from "./components/Range"; -import RelatesInfo from "./components/RelatesInfo"; -import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription"; -import PersonInfo from "./components/PersonInfo"; +import Basic from './components/Basic'; +import EffectiveDate from './components/EffectiveDate'; +import TextInfo from './components/TextInfo'; +import Range from './components/Range'; +import RelatesInfo from './components/RelatesInfo'; +import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'; +import PersonInfo from './components/PersonInfo'; -import {saveTaskFirst, queryTaskFirst, taskDel, inboundLiaisonDetail, saveTaskForPub} from "api/process"; -import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory"; +import { saveTaskFirst, queryTaskFirst, taskDel, inboundLiaisonDetail, saveTaskForPub } from 'api/process'; +import ApprovalHistory from '@/components/hzwlComponents/ApprovalHistory'; export default { - name: "zrckStep1", + name: 'ZrckStep1', components: { ProcessHeader, ProcessFooter, @@ -86,8 +86,8 @@ export default { lawsNo: '', issueTime: '', issueCompany: '', - commentCycleStart: '',// 征集意见周期 - commentCycleEnd: '',// 征集意见周期 + commentCycleStart: '', // 征集意见周期 + commentCycleEnd: '', // 征集意见周期 lawsTextState: '', lawsSycx: '', isRelateAccess: '2', @@ -95,8 +95,13 @@ export default { lawsNotisyncNum: '', NotisyncNumLink: '', lawsBulletin: '', + referenceNews: '', lawsLabel: '', lawsRemark: '', + lawsKeyPoint: '', + lawsOriginalLink: '', + menuId: '', + menuName: '', // 实施日期 SSRQLAWS: '', XRZSSRQLAWS: '', @@ -125,7 +130,7 @@ export default { GLWJLAWSName: '', YYBZZCLAWS: '', // 回执说明 - commentText:'' + commentText: '' } const roleForm = { jlUserId: '', @@ -136,103 +141,127 @@ export default { // 完整校验 const moreSarLawsStandRules = { lawsTypeFirstLevel: [ - {required: true, message: '1级政策分类不能为空', trigger: 'change'} + { required: true, message: '1级政策分类不能为空', trigger: 'change' } ], lawsTypeSecondLevel: [ - {required: true, message: '2级政策分类不能为空', trigger: 'change'} + { required: true, message: '2级政策分类不能为空', trigger: 'change' } ], lawsTypeThirdLevel: [ - {required: true, message: '3级政策分类不能为空', trigger: 'change'} + { required: true, message: '3级政策分类不能为空', trigger: 'change' } ], lawsTypeFourthLevel: [ - {required: true, message: '4级政策分类不能为空', trigger: 'change'} + { required: true, message: '4级政策分类不能为空', trigger: 'change' } ], lawsName: [ - {required: true, message: '政策名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} + { required: true, message: '政策名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.checkSpecialCharacterOftags, trigger: 'change' } ], lawsEnName: [ - {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateEnName, trigger: 'change'} + { type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.valiateEnName, trigger: 'change' } ], lawsNo: [ - {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} + { type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change' } ], issueTime: [ - {required: true, message: '发文日期不能为空', trigger: 'change'}, + { required: true, message: '发文日期不能为空', trigger: 'change' }, ], issueCompany: [ - {required: true, type: 'string', message: '发文单位不能为空', trigger: 'change'}, - {type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change'} + { required: true, type: 'string', message: '发文单位不能为空', trigger: 'change' }, + { type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change' } ], lawsTextState: [ - {required: true, message: '标准状态不能为空', trigger: 'change'} + { required: true, message: '标准状态不能为空', trigger: 'change' } ], isRelateAccess: [ - {required: true, message: '是否纳入认证清单不能为空', trigger: 'change'} + { required: true, message: '是否纳入认证清单不能为空', trigger: 'change' } ], lawsYear: [ - {required: true, message: '年度不能为空', trigger: 'change'} + { required: true, message: '年度不能为空', trigger: 'change' } ], lawsNotisyncNum: [ - {type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change' } ], lawsRemark: [ - {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change' } ], SSRQLAWS: [ - {required: true, message: '实施日期不能为空', trigger: 'change'} + { required: true, message: '实施日期不能为空', trigger: 'change' } ], CYSDLAWS: [ - {required: true, message: '我司参与深度不能为空', trigger: 'change'} + { required: true, message: '我司参与深度不能为空', trigger: 'change' } + ], + referenceNews: [ + { type: 'string', max: 500, message: '参考消息不能超过500个字符', trigger: 'change' } + ], + lawsKeyPoint: [ + { type: 'string', max: 500, message: '政策要点不能超过500个字符', trigger: 'change' } + ], + lawsOriginalLink: [ + { type: 'string', max: 500, message: '政策原文链接不能超过500个字符', trigger: 'change' } + ], + menuName: [ + { required: true, message: '政策体系不能为空', trigger: 'change' } ], } // 认证清单为否 的校验 const littleSarLawsStandRules = { lawsTypeFirstLevel: [ - {required: true, message: '1级政策分类不能为空', trigger: 'change'} + { required: true, message: '1级政策分类不能为空', trigger: 'change' } ], lawsTypeSecondLevel: [ - {required: true, message: '2级政策分类不能为空', trigger: 'change'} + { required: true, message: '2级政策分类不能为空', trigger: 'change' } ], lawsTypeThirdLevel: [ - {required: true, message: '3级政策分类不能为空', trigger: 'change'} + { required: true, message: '3级政策分类不能为空', trigger: 'change' } ], lawsTypeFourthLevel: [ - {required: true, message: '4级政策分类不能为空', trigger: 'change'} + { required: true, message: '4级政策分类不能为空', trigger: 'change' } ], lawsName: [ - {required: true, message: '政策名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} + { required: true, message: '政策名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.checkSpecialCharacterOftags, trigger: 'change' } ], lawsEnName: [ - {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateEnName, trigger: 'change'} + { type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.valiateEnName, trigger: 'change' } ], lawsNo: [ - {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} + { type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change' } ], issueCompany: [ - {type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change'} + { type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change' } ], lawsNotisyncNum: [ - {type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change' } ], lawsRemark: [ - {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change' } ], isRelateAccess: [ - {required: true, message: '是否纳入认证清单不能为空', trigger: 'change'} + { required: true, message: '是否纳入认证清单不能为空', trigger: 'change' } + ], + referenceNews: [ + { type: 'string', max: 500, message: '参考消息不能超过500个字符', trigger: 'change' } + ], + lawsKeyPoint: [ + { type: 'string', max: 500, message: '政策要点不能超过500个字符', trigger: 'change' } + ], + lawsOriginalLink: [ + { type: 'string', max: 500, message: '政策原文链接不能超过500个字符', trigger: 'change' } + ], + menuName: [ + { required: true, message: '政策体系不能为空', trigger: 'change' } ], } const roleRules = { prcCreateUserName: [ - {required: true, message: '流程发起人不能为空', trigger: ['blur', 'change']} + { required: true, message: '流程发起人不能为空', trigger: [ 'blur', 'change' ] } ], jlUserName: [ - {required: true, message: '政策业务经理不能为空', trigger: ['blur', 'change']} + { required: true, message: '政策业务经理不能为空', trigger: [ 'blur', 'change' ] } ] } return { @@ -254,19 +283,19 @@ export default { loading: false, } }, - created() { - this.getDicTypeListCode() - this.resolveRules() - this.getData() - }, watch: { 'form.isRelateAccess' () { // 移除校验结果重新生成校验 this.resolveRules() } }, + created () { + this.getDicTypeListCode() + this.resolveRules() + this.getData() + }, methods: { - handleTabs(tab) { + handleTabs (tab) { this.active = tab }, resolveRules () { @@ -325,13 +354,13 @@ export default { } // 根据草稿查询流程详情 - if(this.$route.query.bpnId){ + if(this.$route.query.bpnId) { this.loading = true queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { this.reloadForm = false - let mes = JSON.parse(res.mes) + const mes = JSON.parse(res.mes) if (mes.form) { // 驳回 this.$set(this, 'form', mes.form) @@ -362,10 +391,10 @@ export default { this.reloadForm = true }) }, - //保存 - handleSave() { + // 保存 + handleSave () { this.footerLoading = true - let _formData = new FormData() + const _formData = new FormData() _formData.append('prcType', 'laws1') if (this.$route.query.taskIds) { // 重新起草保存 @@ -411,7 +440,7 @@ export default { // 重新起草 completeTaskQuery = { taskIds: this.$route.query.taskIds, - userId : this.$store.getters.userInfo.userId, + userId: this.$store.getters.userInfo.userId, json: JSON.stringify(json) } } else { @@ -431,7 +460,7 @@ export default { completeTaskQuery = { taskIds: res.data, - userId : this.$store.getters.userInfo.userId, + userId: this.$store.getters.userInfo.userId, json: JSON.stringify(json) } } @@ -449,9 +478,9 @@ export default { taskDel({ id: this.$route.query.bpnId }) } // 流程提交之后，应该流转至待办任务页面 - await this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + await this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' }) }, - handleSubmit() { + handleSubmit () { this.$refs['form'].validate((valid) => { if (valid) { this.$refs['roleForm'].$refs['userForm'].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue index 8c3294895..fdd4b669b 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue @@ -9,43 +9,43 @@
审批历史
-
- - - - - - + + + + + +
- +
- + show-submit + show-over2 + show-transfer + :submitLoading="footerLoading" + :saveLoading="footerLoading" + @transfer="handleTransfer" + @submit="handleApprove" + @over2="handleOver" + /> + check-box + :is-title="drawerTitle" + :is-visible.sync="drawerModal" + :nodeList="nodeList" + @checkedRole="checkedRole" + /> 数据获取中 @@ -54,19 +54,19 @@ import ProcessHeader from '@/pages/processCenter/pages/components//ProcessHeader' import ProcessFooter from '@/pages/processCenter/pages/components//ProcessFooter' -import Basic from "./components/Basic"; -import EffectiveDate from "./components/EffectiveDate"; -import TextInfo from "./components/TextInfo"; -import Range from "./components/Range"; -import RelatesInfo from "./components/RelatesInfo"; -import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription"; -import PersonInfo from "./components/PersonInfo"; -import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory"; +import Basic from './components/Basic'; +import EffectiveDate from './components/EffectiveDate'; +import TextInfo from './components/TextInfo'; +import Range from './components/Range'; +import RelatesInfo from './components/RelatesInfo'; +import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'; +import PersonInfo from './components/PersonInfo'; +import ApprovalHistory from '@/components/hzwlComponents/ApprovalHistory'; -import {inboundLiaisonDetail, processCreateLaws, changeAssigneeNew, completeTask} from 'api/process' +import { inboundLiaisonDetail, processCreateLaws, changeAssigneeNew, completeTask } from 'api/process' export default { - name: "zrckStep2", + name: 'ZrckStep2', components: { ProcessHeader, ProcessFooter, @@ -91,8 +91,8 @@ export default { lawsNo: '', issueTime: '', issueCompany: '', - commentCycleStart: '',// 征集意见周期 - commentCycleEnd: '',// 征集意见周期 + commentCycleStart: '', // 征集意见周期 + commentCycleEnd: '', // 征集意见周期 lawsTextState: '', lawsSycx: '', isRelateAccess: '2', @@ -100,8 +100,13 @@ export default { lawsNotisyncNum: '', NotisyncNumLink: '', lawsBulletin: '', + referenceNews: '', lawsLabel: '', lawsRemark: '', + lawsKeyPoint: '', + lawsOriginalLink: '', + menuId: '', + menuName: '', // 实施日期 SSRQLAWS: '', XRZSSRQLAWS: '', @@ -130,7 +135,7 @@ export default { GLWJLAWSName: '', YYBZZCLAWS: '', // 回执说明 - commentText:'' + commentText: '' } const roleForm = { jlUserId: '', @@ -141,105 +146,111 @@ export default { // 完整校验 const moreSarLawsStandRules = { lawsTypeFirstLevel: [ - {required: true, message: '1级政策分类不能为空', trigger: 'change'} + { required: true, message: '1级政策分类不能为空', trigger: 'change' } ], lawsTypeSecondLevel: [ - {required: true, message: '2级政策分类不能为空', trigger: 'change'} + { required: true, message: '2级政策分类不能为空', trigger: 'change' } ], lawsTypeThirdLevel: [ - {required: true, message: '3级政策分类不能为空', trigger: 'change'} + { required: true, message: '3级政策分类不能为空', trigger: 'change' } ], lawsTypeFourthLevel: [ - {required: true, message: '4级政策分类不能为空', trigger: 'change'} + { required: true, message: '4级政策分类不能为空', trigger: 'change' } ], lawsName: [ - {required: true, message: '政策名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} + { required: true, message: '政策名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.checkSpecialCharacterOftags, trigger: 'change' } ], lawsEnName: [ - {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateEnName, trigger: 'change'} + { type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.valiateEnName, trigger: 'change' } ], lawsNo: [ // {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, - {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} + { type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change' } ], issueTime: [ - {required: true, message: '发文日期不能为空', trigger: 'change'}, + { required: true, message: '发文日期不能为空', trigger: 'change' }, ], issueCompany: [ - {required: true, type: 'string', message: '发文单位不能为空', trigger: 'change'}, - {type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change'} + { required: true, type: 'string', message: '发文单位不能为空', trigger: 'change' }, + { type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change' } ], lawsTextState: [ - {required: true, message: '标准状态不能为空', trigger: 'change'} + { required: true, message: '标准状态不能为空', trigger: 'change' } ], isRelateAccess: [ - {required: true, message: '是否纳入认证清单不能为空', trigger: 'change'} + { required: true, message: '是否纳入认证清单不能为空', trigger: 'change' } ], lawsYear: [ - {required: true, message: '年度不能为空', trigger: 'change'} + { required: true, message: '年度不能为空', trigger: 'change' } ], lawsNotisyncNum: [ - {type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change' } ], lawsRemark: [ - {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change' } ], SSRQLAWS: [ - {required: true, message: '实施日期不能为空', trigger: 'change'} + { required: true, message: '实施日期不能为空', trigger: 'change' } ], CYSDLAWS: [ - {required: true, message: '我司参与深度不能为空', trigger: 'change'} + { required: true, message: '我司参与深度不能为空', trigger: 'change' } + ], + menuName: [ + { required: true, message: '政策体系不能为空', trigger: 'change' } ], } // 认证清单为否 的校验 const littleSarLawsStandRules = { lawsTypeFirstLevel: [ - {required: true, message: '1级政策分类不能为空', trigger: 'change'} + { required: true, message: '1级政策分类不能为空', trigger: 'change' } ], lawsTypeSecondLevel: [ - {required: true, message: '2级政策分类不能为空', trigger: 'change'} + { required: true, message: '2级政策分类不能为空', trigger: 'change' } ], lawsTypeThirdLevel: [ - {required: true, message: '3级政策分类不能为空', trigger: 'change'} + { required: true, message: '3级政策分类不能为空', trigger: 'change' } ], lawsTypeFourthLevel: [ - {required: true, message: '4级政策分类不能为空', trigger: 'change'} + { required: true, message: '4级政策分类不能为空', trigger: 'change' } ], lawsName: [ - {required: true, message: '政策名称不能为空', trigger: 'change'}, - {type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} + { required: true, message: '政策名称不能为空', trigger: 'change' }, + { type: 'string', max: 500, message: '政策名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.checkSpecialCharacterOftags, trigger: 'change' } ], lawsEnName: [ - {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}, - {validator: this.verify.valiateEnName, trigger: 'change'} + { type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change' }, + { validator: this.verify.valiateEnName, trigger: 'change' } ], lawsNo: [ // {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, - {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} + { type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change' } ], issueCompany: [ - {type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change'} + { type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change' } ], lawsNotisyncNum: [ - {type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change' } ], lawsRemark: [ - {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'} + { type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change' } ], isRelateAccess: [ - {required: true, message: '是否纳入认证清单不能为空', trigger: 'change'} + { required: true, message: '是否纳入认证清单不能为空', trigger: 'change' } + ], + menuName: [ + { required: true, message: '政策体系不能为空', trigger: 'change' } ], } const roleRules = { prcCreateUserName: [ - {required: true, message: '政策业务经理不能为空', trigger: ['blur', 'change']} + { required: true, message: '政策业务经理不能为空', trigger: [ 'blur', 'change' ] } ], jlUserName: [ - {required: true, message: '政策业务经理不能为空', trigger: ['blur', 'change']} + { required: true, message: '政策业务经理不能为空', trigger: [ 'blur', 'change' ] } ] } return { @@ -255,7 +266,7 @@ export default { footerLoading: false, reloadForm: true, // 重新渲染表单 - userId:this.$store.getters.userInfo.userId, + userId: this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, @@ -267,22 +278,22 @@ export default { loading: false, } }, - created() { - this.getDicTypeListCode() - this.getData() - this.resolveRules() - }, watch: { 'form.isRelateAccess' () { // 移除校验结果重新生成校验 this.resolveRules() } }, + created () { + this.getDicTypeListCode() + this.getData() + this.resolveRules() + }, methods: { - handleTabs(tab) { + handleTabs (tab) { this.active = tab }, - getData() { + getData () { return new Promise((resolve, reject) => { this.loading = true inboundLiaisonDetail({ @@ -318,7 +329,7 @@ export default { this.reloadForm = true }) }, - handleTransfer() { + handleTransfer () { this.drawerModal = true this.drawerTitle = '转办处理人' }, @@ -333,18 +344,18 @@ export default { if (res.success) { this.drawerModal = false this.$message.success('调整成功') - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' }) } else { this.$message.warning(res.message) } }) }, - handleOver(){ + handleOver () { // 驳回 this.form.approvalOpinion = 1 this.handleSubmit() }, - handleApprove(){ + handleApprove () { // 通过 this.form.approvalOpinion = 0 this.handleSubmit() @@ -363,7 +374,7 @@ export default { this.rules = { ...this.rules } }, // 提交 - handleSubmit() { + handleSubmit () { this.addRule() this.$refs['form'].validate((valid) => { if (valid) { @@ -371,16 +382,16 @@ export default { const json = JSON.stringify(this.form); const query = { taskIds: this.$route.query.taskIds, - userId : this.$store.getters.userInfo.userId, + userId: this.$store.getters.userInfo.userId, json: json } this.$http._post('lawss/activiti/completeTask', query).then(res => { if (res.success) { - if(this.form.approvalOpinion === 1){ - this.$message.warning("驳回成功") + if(this.form.approvalOpinion === 1) { + this.$message.warning('驳回成功') this.footerLoading = false // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' }) }else{ this.processCreateLaws(json) } @@ -391,17 +402,18 @@ export default { }) } else { this.$message.warning('请检查基础信息表单是否填写完整') - }}) + } + }) }, // 流程入库 - processCreateLaws(json) { + processCreateLaws (json) { const _formData = new FormData() _formData.append('infoJson', json) processCreateLaws(_formData).then(res => { if (res.result === '操作成功' || res.data === '入库成功') { this.$message.success(res.data) setTimeout(() => { - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' }) }, 100) this.footerLoading = false } else { diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 813f986f9..97c9607b3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -312,7 +312,7 @@
-

标准化活动相关流程

 +

标准化活动/政策课题相关流程