diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue index 6c2120e..9d50940 100644 --- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue +++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue @@ -87,7 +87,7 @@ tree-checkable treeCheckStrictly disabled - :placeholder="isGetDataAfter ? '' : $t('pleaseSelect')+$t('countryRegion')" /> + :placeholder="$t('pleaseSelect')+$t('countryRegion')" /> @@ -162,16 +162,15 @@ import { marketListReleaseAgree, marketListReleaseApproval, marketListReleaseGetDataById, - marketListReleaseGetDataDraft, marketListReleaseReject, marketListReleaseSave, - marketListReleaseTurnTo + getDataDraft, + processTransfer } from '@/api/workCenter' import pick from 'lodash.pick' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' -import { marketRegulationDetailPublish } from '../../../api/standardRegulationLibraryApi' -import { getDataDraft, processTransfer } from '../../../api/workCenter' import { getFormDictTreeList } from '../../../api/api' +import STreeSelect from '../../../components/STreeSelect' export default { name: 'MarketListReleaseProcess', @@ -180,7 +179,8 @@ export default { InternalDetailPage, ProcessDetailList, PersonnelInfo, - UserSelectModal + UserSelectModal, + STreeSelect }, mixins: [WorkCenterMixin], computed: { @@ -348,7 +348,9 @@ export default { // 清单名称 processInfo.manifestName = this.model.businessInfoDTO.manifestName // 国家/地区 - processInfo.country = this.model.businessInfoDTO.country + processInfo.country = this.model.businessInfoDTO.country.split(',').map(item => { + return { value: item } + }) this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country')) } } @@ -365,7 +367,9 @@ export default { // 清单名称 processInfo.manifestName = this.draftModel.businessInfoDTO.manifestName // 国家/地区 - processInfo.country = this.draftModel.businessInfoDTO.country + processInfo.country = this.draftModel.businessInfoDTO.country.split(',').map(item => { + return { value: item } + }) this.processInfoForm.setFieldsValue(pick(processInfo, 'processName', 'processDueDate', 'processDescription', 'manifestNo', 'manifestName', 'country')) } // 初始化流程审批信息 @@ -376,7 +380,8 @@ export default { } } if (this.$refs.baseInfoRef) { - this.$refs.baseInfoRef.initData(this.draftModel.businessInfoDTO || this.model.businessInfoDTO) + + this.$refs.baseInfoRef.initData(this.draftModel ? this.draftModel.businessInfoDTO : this.model.businessInfoDTO) } }) // 初始化业务基本信息中组件内容 diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue index 89674c6..c954c1b 100644 --- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue +++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue @@ -322,7 +322,7 @@ export default { } } if (this.$refs.baseInfoRef) { - this.$refs.baseInfoRef.initData(this.draftModel.businessInfoDTO || this.model.businessInfoDTO) + this.$refs.baseInfoRef.initData(this.draftModel ? this.draftModel.businessInfoDTO : this.model.businessInfoDTO) } }) // 初始化业务基本信息中组件内容