diff --git a/src/views/ProcessApprovalSubPage/planFileApproval.vue b/src/views/ProcessApprovalSubPage/planFileApproval.vue
index c1e199d..ca3f1f2 100644
--- a/src/views/ProcessApprovalSubPage/planFileApproval.vue
+++ b/src/views/ProcessApprovalSubPage/planFileApproval.vue
@@ -12,10 +12,11 @@
实际金额
-
-
+
+
-->
diff --git a/src/views/projectLib/projectPlan/addPlanFile.vue b/src/views/projectLib/projectPlan/addPlanFile.vue
index 797516d..2721654 100644
--- a/src/views/projectLib/projectPlan/addPlanFile.vue
+++ b/src/views/projectLib/projectPlan/addPlanFile.vue
@@ -9,10 +9,14 @@
计划金额
实际金额
-
+
+
-
+
+
@@ -171,17 +175,13 @@
// labelCol: { style: { width: '120px' } },
wrapperCol: { style: { width: 'auto' } },
});
- const [
- registerContractMoneyFormShow,
- {
- setFieldsValue: setContractMoneyFieldsValueShow,
- },
- ] = useForm({
- schemas: ContractMoneyFormSchemas,
- showActionButtonGroup: false,
- disabled: true,
- wrapperCol: { style: { width: 'auto' } },
- });
+ const [registerContractMoneyFormShow, { setFieldsValue: setContractMoneyFieldsValueShow }] =
+ useForm({
+ schemas: ContractMoneyFormSchemas,
+ showActionButtonGroup: false,
+ disabled: true,
+ wrapperCol: { style: { width: 'auto' } },
+ });
let fileList = reactive
>([]);
let projectId = ref('');
let contractRef = ref();
@@ -327,7 +327,7 @@
} else {
return;
}
- } else if (dataTo.taskName == '合同签订' || showMoneyForm.value) {
+ } else if (dataTo.taskName == '合同签订' ) {
if (await validateContractMoneyForm()) {
const contractMoneyFieldsValue = getContractMoneyFieldsValue();
const {
@@ -353,14 +353,13 @@
params.append('contractMoneyFieldsValue', JSON.stringify(contractMoneyFieldsValue));
} else {
message.error('总金额与其他金额之和不相等,请重新输入!');
-
return;
}
} else {
return;
}
//合同支付
- if (dataTo.taskName == '合同签订') {
+ 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 c7c88f7..6be3d37 100644
--- a/src/views/projectLib/projectPlan/planinfoFileDetail.vue
+++ b/src/views/projectLib/projectPlan/planinfoFileDetail.vue
@@ -12,10 +12,10 @@
-
-
+
+
项目计划资料详情
diff --git a/src/views/projectLib/projectPlan/viewPlanDetail.vue b/src/views/projectLib/projectPlan/viewPlanDetail.vue
index 4df5e09..1852897 100644
--- a/src/views/projectLib/projectPlan/viewPlanDetail.vue
+++ b/src/views/projectLib/projectPlan/viewPlanDetail.vue
@@ -221,10 +221,11 @@
label: '上传资料',
ifShow: () => {
if (
- record.isfinish == 0 &&
- record.taskFile?.length > 0 &&
- record.taskName != '可研技术审查报告确认' &&
- record.taskName != '造价评估报告确认'
+ (record.isfinish == 0 &&
+ record.taskFile?.length > 0 &&
+ record.taskName != '可研技术审查报告确认' &&
+ record.taskName != '造价评估报告确认') ||
+ record.ismodify
) {
if (isShowByRoles('projectContact')) {
//有子项目,就展示一级的任务