diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index a8b14c9..2e481b9 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -246,9 +246,9 @@ let preProcess = { component: () => (
{ - props.formData.preProcess ? props.formData.preProcess.map(item => { + props.formData.preProcess ? props.formData.preProcess.map((item,index) => { return {item.requestName} + href={props.formData.preProcessBaseUrl + item.requestId}>{item.requestName} {index != (props.formData.preProcess.length -1)? :''} }) : {'--'} }
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index ad5b6d8..504f414 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -35,7 +35,6 @@ - {{ projectChargePersonUserList.length !== 0 ? '更改' : '请选择' }}
@@ -49,7 +48,6 @@ - {{ projectPersonUserList.length !== 0 ? '更改' : getProjectPerson(projectPersonUserList) ? '更改' : '请选择' }}
@@ -59,6 +57,19 @@ v-model:value="projectPersonUserList" @ok="projectPersonUserPickerOk"/> + + + + {{ optionalChargeLeadershipList.length !== 0 ? '更改' : getOptionalChargeLeadershipList(optionalChargeLeadershipList) ? '更改' : '请选择' }} + +
+ {{ item.name }} +
+ +
+
@@ -303,13 +314,23 @@ const deploymentId = ref() const selectRows = ref([]) const projectId = ref(route.query.projectId) const sessionParams = ref({}) - +const optionalChargeLeadershipPickerRef = ref() +const optionalChargeLeadershipList = ref([]) const filePreviewParam = ref({ fileUrl: '', fileName: '', fileType: 'pdf' }) const filePreviewShow = ref(false) +const handleShowOptionalChargeLeadershipPicker = () => { + optionalChargeLeadershipPickerRef.value.showUserPicker() +} + +const optionalChargeLeaderPickerOk = (userList) => { + optionalChargeLeadershipList.value = userList + localStorage.setItem('optionalChargeLeadershipList', JSON.stringify(optionalChargeLeadershipList.value)) +} + const clickToPreview=(row)=>{ filePreviewShow.value = false filePreviewParam.value = { @@ -322,6 +343,17 @@ const clickToPreview=(row)=>{ }) } +const getOptionalChargeLeadershipList = (list) => { + if (!list || list && list.length === 0) { + if (localStorage.getItem('optionalChargeLeadershipList')) { + let param = JSON.parse(localStorage.getItem('optionalChargeLeadershipList')) + optionalChargeLeadershipList.value = param + return optionalChargeLeadershipList.value + } + } else { + return list + } +} const getProjectPerson = (list) => { if (!list || list && list.length === 0) { if (localStorage.getItem('projectPersonUserList')) { @@ -615,12 +647,14 @@ const handleSubmit = async () => { } params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id) params.projectPersonIds = projectPersonIds + params.optionalChargeLeadership = optionalChargeLeadershipList.value if (props.mode === 'resubmit') { res = await resubmitApply(params) } else { res = await projectApply(params) } } else if (props.step === '40') { + params.optionalChargeLeadership = optionalChargeLeadershipList.value if (props.mode === 'resubmit') { res = await resubmitCheck(params) } else { @@ -745,6 +779,12 @@ watchEffect(() => { localProjectPerson.value = param localStorage.setItem('projectPersonUserList', JSON.stringify(param)) } + if (localStorage.getItem('optionalChargeLeadershipList')) { + let param = JSON.parse(localStorage.getItem('optionalChargeLeadershipList')) + optionalChargeLeadershipList.value = param + // localProjectPerson.value = param + localStorage.setItem('optionalChargeLeadershipList', JSON.stringify(param)) + } return flag }) diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue index 74034a5..4fa73d9 100644 --- a/src/views/expense-management/ledger/index.vue +++ b/src/views/expense-management/ledger/index.vue @@ -10,9 +10,10 @@