diff --git a/src/assets/less/common.less b/src/assets/less/common.less index f5f25445..82cb096a 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -867,6 +867,23 @@ .form-flex-item { width: calc(100% / 3); + padding: 0 20px; +} + +.custom-flex-form-item { + .ant-form-item { + display: flex; + + .ant-form-item-label { + width: 9rem; + text-align: left; + } + + .ant-form-item-control-wrapper { + flex: 1; + width: 0; + } + } } .collapsible-panel-form { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index cf79e39d..3a1060fc 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -1,6 +1,7 @@ module.exports = { basicInformation: '基础信息', personalInformation: '人员信息', + dispatchInformation: '业务分派信息', // 新建流程页 newProcess: { externalStandardsManagementProcess: '外部标准管理流程', @@ -230,7 +231,9 @@ module.exports = { standardConsultationProcess: { standardText: '标准文本', selectText: '选择文本', - selectionStandardFile: '选择标准文件' + selectionStandardFile: '选择标准文件', + relevantDocument: '相关文件', + endDate: '征求意见结束日期' }, // 企标稽查计划 esInspectionPlan: { diff --git a/src/components/CollapsiblePanelForm.vue b/src/components/CollapsiblePanelForm.vue deleted file mode 100644 index 14e7ea58..00000000 --- a/src/components/CollapsiblePanelForm.vue +++ /dev/null @@ -1,503 +0,0 @@ - - - - - diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index f6890a81..b6a81a16 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -111,6 +111,8 @@ tree-checkable treeCheckStrictly :label-in-value="false" + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> = 0 + }, } } diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue index fd30f950..1c0a1b99 100644 --- a/src/components/customField/Search.vue +++ b/src/components/customField/Search.vue @@ -16,6 +16,8 @@ :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="optionsData[item.dbFieldName]" tree-checkable + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> @@ -29,6 +31,8 @@ :maxTagCount="1" :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="optionsData[item.dbFieldName]" + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> @@ -74,7 +78,7 @@ + :triggerChange="false" :dictCode="item.dictField" /> @@ -89,6 +93,8 @@ class="box-input" style="width: 100%" :tree-data="categoryTreeList" + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect') + item.dbFieldTxt" /> @@ -108,6 +114,8 @@ :placeholder="$t('pleaseSelect') + item.dbFieldTxt" treeCheckable treeCheckStrictly + show-search + :filterTreeNode="filterTreeOption" /> @@ -141,6 +149,8 @@ tree-checkable treeCheckStrictly :placeholder="$t('pleaseSelect')+item.dbFieldTxt" + show-search + :filterTreeNode="filterTreeOption" /> @@ -154,6 +164,8 @@ :getPopupContainer="triggerNode=> triggerNode.parentNode" :tree-data="optionsData[item.dbFieldName]" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" + show-search + :filterTreeNode="filterTreeOption" /> @@ -179,6 +191,8 @@ style="width: 100%" :tree-data="categoryTreeList" :placeholder="$t('pleaseSelect') + item.dbFieldTxt" + show-search + :filterTreeNode="filterTreeOption" /> @@ -197,6 +211,7 @@ :placeholder="$t('pleaseSelect') + item.dbFieldTxt" treeCheckable treeCheckStrictly + :filterTreeNode="filterTreeOption" /> @@ -223,7 +238,7 @@ + :triggerChange="false" :dictCode="item.dictField" /> @@ -244,7 +259,10 @@ {{ !toggleSearchStatus ? $t('open') : $t('putAway') }} - {{ $t('query') }} + {{ + $t('query') + }} + {{ $t('reset') }} @@ -396,6 +414,10 @@ export default { }, handleToggleSearch () { this.toggleSearchStatus = !this.toggleSearchStatus + }, + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 } } } diff --git a/src/enums/EsEnum.js b/src/enums/EsEnum.js index bda0852c..033a9318 100644 --- a/src/enums/EsEnum.js +++ b/src/enums/EsEnum.js @@ -116,4 +116,20 @@ export default class EsEnum { } return [] } + + /** + * 根据value获取key + */ + keyOfValue(value) { + if (!value && value!== 0) { + return null + } + for (const i in this){ + const e = this[i] + if (e.value !== undefined && e.value !== null && e.value.toString() === value.toString()) { + return i + } + } + return null + } } diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 97fabee6..54494a64 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -167,7 +167,9 @@ export const ProcessKey = { // 已封存企标启用流程 ES_ENABLE: { text: 'es-enable', value: 'es-enable' }, // 标准法规入库/变更流程 - FB_ENTRY_CHANGE: { text: 'fb-entry-change', value: 'fb-entry-change' } + FB_ENTRY_CHANGE: { text: 'fb-entry-change', value: 'fb-entry-change' }, + // 征求意见流程 + CONSULTATION: { text: 'fb-standard-consultation', value: 'fb-standard-consultation' } } // 标准性质 @@ -202,3 +204,10 @@ export const FGEntryChangeProcessNode = new EsEnums({ initiate: { text: '法规工程师发起', value: '1', btn: ['save', 'submit'] }, approve: { text: '审批', value: '审批', btn: ['return', 'save', 'agree', 'reject'] } }) + +// 标准征求意见流程 +export const ConsultationProcess = new EsEnums({ + initiate: { text: '法规工程师发起', value: '1', btn: ['save', 'submit'] }, + distribute: { text: '各部所主管级领导分发', value: '2', btn: ['return', 'save', 'submit'] }, + audit: { text: '审批', value: '3', btn: ['return', 'save', 'agree', 'reject'] } +}) diff --git a/src/views/documentTool/customComparison/CustomComparisonList.vue b/src/views/documentTool/customComparison/CustomComparisonList.vue index 62032c0f..27bdfc98 100644 --- a/src/views/documentTool/customComparison/CustomComparisonList.vue +++ b/src/views/documentTool/customComparison/CustomComparisonList.vue @@ -26,6 +26,8 @@ style="width: 100%" :tree-data="countriesInvolvedOptions" :label-in-value="false" + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect')+$t('docTool.customComparison.countriesInvolved')" /> @@ -187,7 +189,11 @@ export default { this.$refs.modalForm.edit(id) this.$refs.modalForm.title = this.$t('details') this.$refs.modalForm.disableSubmit = false - } + }, + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, } } diff --git a/src/views/documentTool/customComparison/modules/CustomComparisonDrawer.vue b/src/views/documentTool/customComparison/modules/CustomComparisonDrawer.vue index 41b8be24..a281586a 100644 --- a/src/views/documentTool/customComparison/modules/CustomComparisonDrawer.vue +++ b/src/views/documentTool/customComparison/modules/CustomComparisonDrawer.vue @@ -39,6 +39,8 @@ :replace-fields="{key: 'value'}" :label-in-value="false" disabled + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect')+$t('docTool.customComparison.countriesInvolved')" /> @@ -610,6 +612,10 @@ export default { compareResult: record.compareResult } this.$refs.resultModal.open(params) + }, + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 } } } diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue index b85ec1e0..07cae31c 100644 --- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue +++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue @@ -136,6 +136,8 @@ treeCheckStrictly :label-in-value="false" @change="updateDom" + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> @@ -692,6 +696,10 @@ export default { }, updateDom () { this.$forceUpdate() + }, + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 } } } diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue index 546b6dfa..c49c816c 100644 --- a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue +++ b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue @@ -130,6 +130,8 @@ tree-checkable treeCheckStrictly :label-in-value="false" + show-search + :filterTreeNode="filterTreeOption" :placeholder="$t('pleaseSelect')+item.dbFieldTxt"/> @@ -433,6 +437,10 @@ export default { if (item.id) { this.deleteIds.push(item.id) } + }, + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 } } } diff --git a/src/views/documentTool/standardWarning/StandardWarningList.vue b/src/views/documentTool/standardWarning/StandardWarningList.vue index b6907dcf..3d399f48 100644 --- a/src/views/documentTool/standardWarning/StandardWarningList.vue +++ b/src/views/documentTool/standardWarning/StandardWarningList.vue @@ -39,6 +39,7 @@ v-model="queryParam.responsibleDepartment" :maxTagCount="1" :show-search="true" + :filterTreeNode="filterTreeOption" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -256,7 +257,11 @@ export default { }, handleDepartsChange () { this.$forceUpdate() - } + }, + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, } } diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index 9bb221bf..d653e1b5 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -1,5 +1,5 @@