diff --git a/src/views/ProcessApprovalSubPage/planFileApproval.vue b/src/views/ProcessApprovalSubPage/planFileApproval.vue index ca3f1f2..b29660c 100644 --- a/src/views/ProcessApprovalSubPage/planFileApproval.vue +++ b/src/views/ProcessApprovalSubPage/planFileApproval.vue @@ -8,7 +8,15 @@
计划金额 - + 实际金额
diff --git a/src/views/projectLib/projectContract/ContractPay.vue b/src/views/projectLib/projectContract/ContractPay.vue index 406809d..94309ff 100644 --- a/src/views/projectLib/projectContract/ContractPay.vue +++ b/src/views/projectLib/projectContract/ContractPay.vue @@ -33,8 +33,8 @@ import { message } from 'ant-design-vue'; import { PlusCircleOutlined, MinusCircleOutlined } from '@ant-design/icons-vue'; import { cloneDeep } from 'lodash-es'; - import { getTaskNameTypeDict,getContractinfoByProjectIdAndTaskName } from './projectContract.api'; - import { da } from 'element-plus/es/locale'; + import { getTaskNameTypeDict } from './projectContract.api'; + import { getContractinfoByTaskName } from '@/views/projectLib/projectPlan/projectPlan.api'; const aaa = ({ values }) => { console.log('values:', values); //表单所有值 @@ -156,7 +156,7 @@ }; // const [registerModal, { closeModal }] = useModalInner(init); - let data = defineProps(['projectid', 'taskName', 'isModify', 'isEdit']); + let data = defineProps(['projectid', 'taskName', 'isModify', 'isEdit',"isJiHua"]); let fileList = reactive>([]); let isModify = ref(); let projectid = ref(); @@ -201,10 +201,16 @@ if (data.isModify == true || (data.isEdit != null && data.isEdit != undefined)) { isModify.value = data.isModify; let param: any = { - projectid: data.projectid, + projectId: data.projectid, taskName: data.taskName, }; - let res = (await getContractinfoByProjectIdAndTaskName(param)) as Array; + let resdate = (await getContractinfoByTaskName(param)) ; + let res =[] + if(data.isJiHua == true){ + res = resdate.planList + }else{ + res = resdate.realList + } let obj = new Object(); //记录一共有几次支付 let num = res.length; diff --git a/src/views/projectLib/projectPlan/addPlanFile.vue b/src/views/projectLib/projectPlan/addPlanFile.vue index 2721654..69be85b 100644 --- a/src/views/projectLib/projectPlan/addPlanFile.vue +++ b/src/views/projectLib/projectPlan/addPlanFile.vue @@ -5,18 +5,28 @@ 下载模板 --> +
计划金额 - + 实际金额
- -
- +
@@ -327,7 +337,7 @@ } else { return; } - } else if (dataTo.taskName == '合同签订' ) { + } else if (dataTo.taskName == '合同签订') { if (await validateContractMoneyForm()) { const contractMoneyFieldsValue = getContractMoneyFieldsValue(); const { @@ -359,7 +369,7 @@ return; } //合同支付 - if (dataTo.taskName == '合同签订'|| showMoneyForm.value) { + if (dataTo.taskName == '合同签订' || showMoneyForm.value) { let fromdate = await contractRef.value.getFieldsValuetoRef(); params.append('contractinfoList', JSON.stringify(fromdate)); } diff --git a/src/views/projectLib/projectPlan/planinfoFileDetail.vue b/src/views/projectLib/projectPlan/planinfoFileDetail.vue index 6be3d37..18a1fa4 100644 --- a/src/views/projectLib/projectPlan/planinfoFileDetail.vue +++ b/src/views/projectLib/projectPlan/planinfoFileDetail.vue @@ -10,12 +10,28 @@
- -
- + +
+ 计划金额 + + 实际金额 +
+
+
项目计划资料详情 @@ -57,7 +73,10 @@ // labelCol: { style: { width: '120px' } }, wrapperCol: { style: { width: 'auto' } }, }); - import { getProjectinfoMoneyInfo,getContractinfoByTaskName } from '@/views/projectLib/projectPlan/projectPlan.api'; + import { + getProjectinfoMoneyInfo, + getContractinfoByTaskName, + } from '@/views/projectLib/projectPlan/projectPlan.api'; import { ApprovalMoneyFormSchemas, ContractMoneyFormSchemas, @@ -131,22 +150,6 @@ let res = await queryProjectInfoById(param); setMoneyFieldsValue(res); } - - let contract = await getContractinfoByTaskName({ - taskName: taskName.value, - projectId: projectId.value, - }); - if (contract.realList != null && contract.realList.length > 0) { - showMoneyForm.value = true; - setContractMoneyFieldsValue({ - contractTotalMoney: contract.realList[0].totalMoney, - contractCentralMoney: contract.realList[0].centralMoney, - contractProvincialMoney: contract.realList[0].provincialMoney, - contractCityMoney: contract.realList[0].cityMoney, - contractCountyMoney: contract.realList[0].countyMoney, - contractSelfMoney: contract.realList[0].selfMoney, - }); - } }