|
@@ -21,7 +21,7 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<div class="ml-2">
|
|
<div class="ml-2">
|
|
- <el-button type="default" @click="budgetModalShow(item,index)">
|
|
|
|
|
|
+ <el-button type="default" @click="budgetModalShow(item,index)" >
|
|
<HcIcon name="add"/>
|
|
<HcIcon name="add"/>
|
|
<span>关联预算计划</span>
|
|
<span>关联预算计划</span>
|
|
</el-button>
|
|
</el-button>
|
|
@@ -70,18 +70,18 @@
|
|
</el-divider>
|
|
</el-divider>
|
|
<el-form class="mt-16" inline :model="detailsData" label-position="top">
|
|
<el-form class="mt-16" inline :model="detailsData" label-position="top">
|
|
<el-form-item label="归属人">
|
|
<el-form-item label="归属人">
|
|
- <el-select v-model="detailsData.userIdVesting">
|
|
|
|
|
|
+ <el-select v-model="detailsData.userIdVesting" clearable>
|
|
<el-option v-for="item in userList" :label="item.name" :value="item.id"/>
|
|
<el-option v-for="item in userList" :label="item.name" :value="item.id"/>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="是否抵消借款金额">
|
|
<el-form-item label="是否抵消借款金额">
|
|
- <el-select v-model="detailsData.isDeductLoan">
|
|
|
|
|
|
+ <el-select v-model="detailsData.isDeductLoan" clearable>
|
|
<el-option label="否" :value="0" />
|
|
<el-option label="否" :value="0" />
|
|
<el-option label="是" :value="1" />
|
|
<el-option label="是" :value="1" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="选择借款项">
|
|
<el-form-item label="选择借款项">
|
|
- <el-select v-model="detailsData.deductLoanId">
|
|
|
|
|
|
+ <el-select v-model="detailsData.deductLoanId" clearable>
|
|
<el-option v-for="item in loanListData" :label="item.loanName" :value="item.id" />
|
|
<el-option v-for="item in loanListData" :label="item.loanName" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -186,10 +186,22 @@ const getApi = () => {
|
|
if (dataId.value > 0 && dataType.value !== 'add') {
|
|
if (dataId.value > 0 && dataType.value !== 'add') {
|
|
getDetailsData()
|
|
getDetailsData()
|
|
} else {
|
|
} else {
|
|
|
|
+ console.log('新增');
|
|
|
|
+ console.log(detailsObj,'detailsObj');
|
|
|
|
+
|
|
totalFrMoney.value = '0'
|
|
totalFrMoney.value = '0'
|
|
detailsData.value = {
|
|
detailsData.value = {
|
|
...detailsObj,
|
|
...detailsObj,
|
|
- details: [detailsObj1]
|
|
|
|
|
|
+ details: [{
|
|
|
|
+ projectId: null, // 所属项目id
|
|
|
|
+ budgetPlanIds: '', // 预算计划ids
|
|
|
|
+ frMoney: null, // 报销金额
|
|
|
|
+ frDate: null, // 报销时间
|
|
|
|
+ frDesc: '', // 费用说明
|
|
|
|
+ frType: null, // 报销类型
|
|
|
|
+ frElectronicInvoiceUrl: '', // 电子发票url地址
|
|
|
|
+ frAttachmentUrl: '', // 附件url地址
|
|
|
|
+ }]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -431,6 +443,7 @@ const rowDisassociate = (row) => {
|
|
ids.splice(index, 1)
|
|
ids.splice(index, 1)
|
|
}
|
|
}
|
|
budgetIds.value = ids
|
|
budgetIds.value = ids
|
|
|
|
+ console.log( budgetIds.value ,' 关联budgetIds.value ');
|
|
row.isRelevance = false
|
|
row.isRelevance = false
|
|
}
|
|
}
|
|
|
|
|
|
@@ -439,6 +452,7 @@ const rowRelevance = (row) => {
|
|
const ids = budgetIds.value
|
|
const ids = budgetIds.value
|
|
ids.push(row.id)
|
|
ids.push(row.id)
|
|
budgetIds.value = ids
|
|
budgetIds.value = ids
|
|
|
|
+ console.log( budgetIds.value ,' 取消关联budgetIds.value ');
|
|
row.isRelevance = true
|
|
row.isRelevance = true
|
|
}
|
|
}
|
|
|
|
|
|
@@ -447,8 +461,10 @@ const rowRelevance = (row) => {
|
|
const budgetSaveClick = () => {
|
|
const budgetSaveClick = () => {
|
|
const index = budgetIndex.value
|
|
const index = budgetIndex.value
|
|
const ids = budgetIds.value?.join(',')
|
|
const ids = budgetIds.value?.join(',')
|
|
- console.log('ids', ids)
|
|
|
|
- console.log('index', index)
|
|
|
|
|
|
+ detailsData.value.details[index].budgetPlanIds=ids
|
|
|
|
+ window.$message.success('操作成功')
|
|
|
|
+ budgetModal.value = false
|
|
|
|
+ console.log( detailsData.value.details,' detailsData.value.details');
|
|
}
|
|
}
|
|
|
|
|
|
//关闭预算计划
|
|
//关闭预算计划
|