diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue index 2824f79..13c6544 100644 --- a/src/components/DetailComponent/CompanyPicker.vue +++ b/src/components/DetailComponent/CompanyPicker.vue @@ -161,8 +161,6 @@ const show = () => { getList() }; const handleChange = (data, checked) => { - // 左侧有选择框 - // if (props.showCheckbox) { // 左侧有选择框 + 多选 if (props.multiple) { //不添加重复的数据到右边 @@ -197,7 +195,6 @@ const handleChange = (data, checked) => { tree.value.setCheckedKeys([]); } } - // } }; const handle = (node, check) => { if (check.isLeaf !== false) { diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index b8ae84a..74e27d9 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -4,10 +4,12 @@ - {{ localFormData.preProcess?.requestName }} +
+ {{ item.requestName }} +
- {{ localFormData.preProcess?.requestName ? '更改' : '请选择' }} + {{ localFormData.preProcess ? '更改' : '请选择' }} @@ -32,29 +34,30 @@
- +
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
提交 重新提交 @@ -71,7 +74,9 @@ 重置 - + + @@ -81,15 +86,17 @@ +
+ 确定 + 取消 +
@@ -163,11 +170,13 @@ const tagsViewStore = useTagsView() const processStore = useProcessStore() const otherFileList = ref([]) const localFormData = ref({ - preProcess: { - requestId: null, - requestName: '', - baseUrl: '' - } + preProcess: [ + // { + // requestId: null, + // requestName: '', + // baseUrl: '' + // } + ] }) const attachment = ref() const deploymentData = ref({}) @@ -177,7 +186,24 @@ const loading = ref(false) const processDiagramViewer = ref(false) const name = ref(router.currentRoute.value.name) const deploymentId = ref() +const selectRows = ref([]) const projectId = ref(route.query.projectId) +const getPreProcessUrl = (list) => { + // list.map(item => { + // item.baseUrl = getPreProcessUrl(item.preProcess) + // }) + // let baseUrl= + // list.forEach(item => { + // baseUrl=item.baseUrl + // }) + // return baseUrl +} +const handleSelect = async (selection) => { + selectRows.value = selection +} +const handleCancel = () => { + showPreTable.value = false +} const searchPreProcess = () => { getPreProcessList() @@ -207,12 +233,19 @@ const getPreProcessList = () => { preProcessList.value = currentList.value.slice(0, 10) }) } -const chooseProProcess = (item) => { - localFormData.value.preProcess = { - requestId: item.requestId, - requestName: item.requestName, - baseUrl: item.baseUrl - } +const choosePreProcess = () => { + let preProcessObj = {} + let preProcessArray = [] + selectRows.value.forEach((item) => { + preProcessObj = { + requestId: item.requestId, + requestName: item.requestName, + baseUrl: item.baseUrl + } + preProcessArray.push(preProcessObj) + }) + localFormData.value.preProcess = preProcessArray + console.log('localFormData.value.preProcess', localFormData.value.preProcess) showPreTable.value = false } @@ -252,11 +285,11 @@ const compositeParam = (item) => { } } const getAttachment = (val) => { - console.log('上传文件getAttachment', val) + // console.log('上传文件getAttachment', val) localFormData.value.singleFile = compositeParam(val) } const getOtherFile = (val) => { - console.log('上传文件getOtherFile', val) + // console.log('上传文件getOtherFile', val) showTable.value = false let fileObj = compositeParam(val) otherFileList.value.push(fileObj) @@ -271,7 +304,7 @@ const getFileParam = (item) => { } } const handleSubmit = async () => { - if(deploymentData.value.deploymentName==='重大项目立项'||deploymentData.value.deploymentName==='重大项目验收'){ + if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') { if (localFormData.value.preProcess === undefined) { ElNotification({ title: '提示', @@ -377,7 +410,7 @@ const init = async () => { let data = res.data deploymentId.value = data.deploymentId deploymentData.value = data - preProcessRequired.value = data.deploymentName === '重大项目立项'||data.deploymentName === '重大项目验收'; + preProcessRequired.value = data.deploymentName === '重大项目立项' || data.deploymentName === '重大项目验收'; processStore.setDesign(data) processStore.runningList.value = data.runningList; processStore.endList.value = data.endList; @@ -406,5 +439,9 @@ onMounted(async () => { diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue index 06e5445..bda800a 100644 --- a/src/views/expense-management/ledger/index.vue +++ b/src/views/expense-management/ledger/index.vue @@ -47,11 +47,11 @@ const searchConfig = reactive([ } }, { - label: '项目阶段', + label: '研发阶段', prop: 'researchStage', component: shallowRef(fvSelect), props: { - placeholder: '请选择项目阶段查询', + placeholder: '请选择研发阶段查询', clearable: true, filterable: true, checkStrictly: true, @@ -115,7 +115,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { diff --git a/src/views/expense-management/share/detail.vue b/src/views/expense-management/share/detail.vue index a502767..01ebc9d 100644 --- a/src/views/expense-management/share/detail.vue +++ b/src/views/expense-management/share/detail.vue @@ -102,7 +102,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', currentRender: ({row, index}) => { if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) { diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index 5df1dd5..08a8a52 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -34,8 +34,9 @@ -
{{ getName(companyList) }}
- {{ companyList.length === 0 ? '请选择所属公司' : '更改' }} +
{{selectedCompanyList}}
+
{{ getName(selectedCompanyList) }}
+ {{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }} @@ -96,7 +97,7 @@ 重新提交 返回 - + @@ -119,11 +120,13 @@ import {getSubCompOpt} from '@/api/user/user.js' import {useTagsView} from '@/stores/tagsview.js' import {getFundOption} from "@/api/special-fund"; import CompanyPicker from "@/components/DetailComponent/CompanyPicker.vue"; +import {matterTree} from "@/utils/matterTree"; import {useCacheStore} from '@/stores/cache.js' const cacheStore = useCacheStore() const companyRef = ref() -const companyList = ref([]) +const selectedCompanyList = ref([]) +// const companyList = ref([]) const changeDiagram = ref(false) const tagsViewStore = useTagsView() const authStore = useAuthStore() @@ -152,6 +155,7 @@ const showTable = ref(true) const processStore = useProcessStore() const processInstanceData = ref() const formPermMap = ref(new Map()); +const companyNameArray = ref([]) const rules = reactive({ requirementName: [{required: true, message: '请输入征集名称', trigger: 'blur'}], companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}], @@ -203,6 +207,15 @@ const tableConfig = reactive({ } ] }) + +const getCompanyOptionItem = (val) => { + if (val !== undefined) { + val.forEach(item => { + matterTree(companyNameArray.value, companyOption.value, item) + }) + } + return companyNameArray.value.join('，'); +} const getName = (list) => { return list.map(item => item.label).join('，') } @@ -210,12 +223,10 @@ const showCompany = () => { companyRef.value.show() } const selected = (select) => { - let companyInfoList = [] for (let val of select) { - companyInfoList.push(val) formData.value.companyIds.push(val.value) } - companyList.value = companyInfoList + selectedCompanyList.value = select } const checkFormPrem = (formKey) => { if (formPermMap.value.hasOwnProperty(formKey)) { @@ -306,7 +317,6 @@ const init = async () => { }) } const submitParam = (item) => { - console.log('item..', item.companyIds) if (item.companyIds.length === 0) { ElNotification({ title: '提示', @@ -373,6 +383,7 @@ const handleResubmit = () => { const getDetailInfo = async () => { getFormInfo(route.query.id).then(res => { if (res.code === 1000) { + selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds) formData.value = res.data showTinymce.value = false showTable.value = false diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index a035274..42d202f 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -60,11 +60,11 @@ const searchConfig = reactive([ } }, { - label: '项目阶段', + label: '研发阶段', prop: 'researchStage', component: shallowRef(fvSelect), props: { - placeholder: '请选择项目阶段查询', + placeholder: '请选择研发阶段查询', clearable: true, filterable: true, checkStrictly: true, @@ -123,7 +123,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 57f9f3c..ca6c397 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -183,7 +183,7 @@ const tableConfig = reactive({ }, { prop: 'researchStage', - label: '项目阶段', + label: '研发阶段', align: 'center', showOverflowTooltip: false, currentRender: ({row, index}) => { diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue index cf01a8d..80af415 100644 --- a/src/views/project-management/implementation/uploadFee.vue +++ b/src/views/project-management/implementation/uploadFee.vue @@ -31,10 +31,10 @@ - +