diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue index 2f95257..7827482 100644 --- a/src/components/AttachmentUpload.vue +++ b/src/components/AttachmentUpload.vue @@ -19,7 +19,7 @@ - + diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue index ccd1b78..51af440 100644 --- a/src/components/DetailComponent/AllocationSummaryDetail.vue +++ b/src/components/DetailComponent/AllocationSummaryDetail.vue @@ -24,7 +24,7 @@ @@ -33,7 +33,6 @@ diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index c95f922..dded12f 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -11,7 +11,12 @@ :class="stepClass(index)" @click="handleStep(item.key, index)" - /> + > + + @@ -311,4 +316,10 @@ watchEffect(() => { .step-error { cursor: not-allowed; } +.is-active { + color: #BEA266; +} +.is-end { + color: #67c23a; +} diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue index 6a8a2ba..cbe616e 100644 --- a/src/views/expense-management/share/add.vue +++ b/src/views/expense-management/share/add.vue @@ -39,9 +39,9 @@ @@ -211,13 +211,13 @@ const showPersonnelPicker = (row, index) => { userPicker.value.showUserPicker() } const selected = (select) => { - for (const selectElement of select) { - currentReachPerson.value = selectElement + if (!select || select.length === 0) { + return } formData.value.tableData.forEach((item, index) => { - if (index == currentIndex.value) { - item.researchPersonnel = currentReachPerson.value.id - item.researchPersonnelName = currentReachPerson.value.name + if (index === currentIndex.value) { + item.researchPersonnel = select[0].id + item.researchPersonnelName = select[0].name } }) } @@ -252,7 +252,7 @@ const handleAdd = () => { workday: '21.75', researchDuration: null, } - currentReachPerson.value.name='' + currentReachPerson.value.name = '' formData.value.tableData.push(row) } const handleCopy = (row) => { @@ -260,6 +260,7 @@ const handleCopy = (row) => { projectId: row.projectId, projectName: '', researchPersonnel: row.researchPersonnel, + researchPersonnelName: row.researchPersonnelName, wagesPayable: row.wagesPayable, performance: row.performance, reserveFund: row.reserveFund, diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index 93c11e1..37b7c18 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -9,8 +9,8 @@ - - + + - + - +
- {{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }} + {{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
-
{{ selectedCompanyList }}
+
{{ getName(selectedCompanyList) }}
{{ getName(selectedCompanyList) }}
{{ showExpendText }} + @click="handleExpend"> + {{ showExpendText }} +
@@ -54,8 +56,8 @@ - - + + 重新提交 返回 - + @@ -168,7 +171,7 @@ const rules = reactive({ companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}], collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}], deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}], - specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}], + specialFundId: [{required: true, message: '请选择专项资金名称', trigger: 'blur'}], }) const tableConfig = reactive({ @@ -222,24 +225,16 @@ const showExpendClass = (showMoreCompany) => { if (!showMoreCompany) { if (selectedCompanyList.value.length === 0) { showExpendText.value = '' - return '' - } else if (selectedCompanyList.value.length>14) { + return '' + } else if (selectedCompanyList.value.length > 14) { showExpendText.value = '展开' - return 'company-style' + return 'company-style' } } else { showExpendText.value = '收缩' - return '' + return '' } } -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(',') } @@ -405,6 +400,25 @@ const handleResubmit = () => { } }) } + +const getCompanyOptionItem = (val) => { + let newObj = {} + let newArray = [] + if (val !== undefined) { + val.forEach(item => { + matterTree(companyNameArray.value, companyOption.value, item) + companyNameArray.value.forEach(companyItem => { + newObj = { + label: companyItem, + value: item + } + newArray.push(newObj) + }) + }) + } + + return newArray; +} const getDetailInfo = async () => { getFormInfo(route.query.id).then(res => { if (res.code === 1000) { diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 1170283..8d88b2b 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -1,14 +1,14 @@