diff --git a/src/assets/less/common.less b/src/assets/less/common.less index cb605bdc..b3370301 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -794,6 +794,7 @@ color: #1D2129; padding-left: 12px; position: relative; + margin-top: 32px; } .process-part-title::before { @@ -807,4 +808,8 @@ top: 2px; } +.process-part-title:first-child{ + margin-top: 0; +} + /*流程表单样式end*/ diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue index b805b57a..02f316cd 100644 --- a/src/components/dict/JDictSelectTag.vue +++ b/src/components/dict/JDictSelectTag.vue @@ -40,6 +40,13 @@ export default { getPopupContainer: { type: Function, default: (node) => node.parentNode + }, + options: { + type: Array, + required: false, + default: () => { + return [] + } } }, data () { @@ -54,6 +61,8 @@ export default { handler () { if (this.dictCode) { this.initDictData() + } else { + this.dictOptions = this.options } } } diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index 307e8b68..4d1dcf50 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -17,7 +17,7 @@ + :triggerChange="false" dictCode="standard_source" /> @@ -27,8 +27,8 @@
- {{$t('reset')}} - {{$t('query')}} + {{ $t('reset') }} + {{ $t('query') }}
@@ -39,15 +39,15 @@ :scroll="{x: 900}" :data-source="dataList" :pagination="ipagination" - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: changeType }" + :row-selection="{ type: type, selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :loading="loading">
- {{$t('cancel')}} - {{$t('submit')}} + {{ $t('cancel') }} + {{ $t('submit') }}
@@ -73,9 +73,9 @@ export default { type: Boolean, default: false }, - // 选择是单选还是多选 - changeType: { + type: { type: String, + required: false, default: 'checkbox' } }, diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 7c71f664..733f704d 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -69,3 +69,9 @@ export const DynamicCataloging = { FOREIGN_TRENDS: { text: '国外动态', value: '7' }, OTHER: { text: '其他', value: '8' } } + +// 标准法规入库/变更流程-操作类型 +export const OperationType = { + ENTRY: { text: '标准法规入库', value: '1' }, + CHANGE: { text: '标准法规变更', value: '2' } +} diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue index 03ca154d..1bdf3cc4 100644 --- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue +++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue @@ -1,38 +1,278 @@