Browse Source

指定阶段金额回显

master
gjh 2 days ago
parent
commit
c3ac4c072e
  1. 20
      src/views/ProcessApprovalSubPage/planFileApproval.vue
  2. 19
      src/views/projectLib/projectContract/ContractPay.vue
  3. 75
      src/views/projectLib/projectContract/projectContract.data.ts
  4. 21
      src/views/projectLib/projectPlan/addPlanFile.vue
  5. 10
      src/views/projectLib/projectPlan/planinfoFileDetail.vue

20
src/views/ProcessApprovalSubPage/planFileApproval.vue

@ -15,7 +15,7 @@
:isEdit="false" :isEdit="false"
:isJiHua="true" :isJiHua="true"
v-if="pjid" v-if="pjid"
ref="contractRef" ref="contractRef1"
/> />
<el-divider content-position="left">实际金额</el-divider> <el-divider content-position="left">实际金额</el-divider>
</div> </div>
@ -221,13 +221,6 @@
disabled: true, disabled: true,
wrapperCol: { style: { width: 'auto' } }, wrapperCol: { style: { width: 'auto' } },
}); });
const [registerContractMoneyFormShow, { setFieldsValue: setContractMoneyFieldsValueShow }] =
useForm({
schemas: ContractMoneyFormSchemas,
showActionButtonGroup: false,
disabled: true,
wrapperCol: { style: { width: 'auto' } },
});
let dataTo = defineProps(['record']); let dataTo = defineProps(['record']);
const emit = defineEmits(['close']); const emit = defineEmits(['close']);
console.log('routerouterouteroute', dataTo.record); console.log('routerouterouteroute', dataTo.record);
@ -315,14 +308,6 @@
}); });
if (contract.realList != null && contract.realList.length > 0) { if (contract.realList != null && contract.realList.length > 0) {
showMoneyForm.value = true; showMoneyForm.value = true;
setContractMoneyFieldsValueShow({
contractTotalMoney: contract.planList[0].totalMoney,
contractCentralMoney: contract.planList[0].centralMoney,
contractProvincialMoney: contract.planList[0].provincialMoney,
contractCityMoney: contract.planList[0].cityMoney,
contractCountyMoney: contract.planList[0].countyMoney,
contractSelfMoney: contract.planList[0].selfMoney,
});
setContractMoneyProps({ disabled: resButton.isEdit == true ? false : true }); setContractMoneyProps({ disabled: resButton.isEdit == true ? false : true });
} }
}, },
@ -513,6 +498,9 @@
} }
let fromdate = await contractRef.value.getFieldsValuetoRef(); let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate)); params.append('contractinfoList', JSON.stringify(fromdate));
}else if(showMoneyForm.value){
let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate));
} }
if (resButton.isEdit) { if (resButton.isEdit) {
if (fileList.length == 0) { if (fileList.length == 0) {

19
src/views/projectLib/projectContract/ContractPay.vue

@ -3,8 +3,9 @@
<!-- <BasicModal v-bind="$attrs" @register="registerModal" title="项目合同信息详情" width="1500px" :showOkBtn="false" <!-- <BasicModal v-bind="$attrs" @register="registerModal" title="项目合同信息详情" width="1500px" :showOkBtn="false"
:showCancelBtn="false"> --> :showCancelBtn="false"> -->
<el-divider content-position="left">合同信息</el-divider> <el-divider content-position="left">合同信息</el-divider>
<BasicForm @register="registerContractForm" /> <BasicForm @register="registerContractForm"/>
<el-button type="primary" @click="addFrom"> <div v-if="data.isEdit">
<el-button type="primary" @click="addFrom">
<template #icon> <template #icon>
<PlusCircleOutlined /> <PlusCircleOutlined />
</template> </template>
@ -15,6 +16,8 @@
</template> </template>
</el-button> </el-button>
</div>
<!-- </BasicModal> --> <!-- </BasicModal> -->
</template> </template>
<script lang="ts" name="addAndModify" setup> <script lang="ts" name="addAndModify" setup>
@ -174,14 +177,14 @@
tempSchemas = cloneDeep(contractformSchemas) as Array<FormSchema>; tempSchemas = cloneDeep(contractformSchemas) as Array<FormSchema>;
tempSchemas.forEach((item) => { tempSchemas.forEach((item) => {
if (item.field.indexOf('Money') != -1) { if (item.field.indexOf('Money') != -1) {
item.dynamicRules = aaa; // item.dynamicRules = aaa;
item.componentProps = bbb; item.componentProps = bbb;
} }
if (item.field == 'taskName') { if (item.field == 'taskName') {
item.componentProps.options = taskNameTypeDict.value; item.componentProps.options = taskNameTypeDict.value;
console.log('item.componentProps.options', item.componentProps.options,data.taskName); console.log('item.componentProps.options', item.componentProps.options,data.taskName);
if (data.taskName != '合同签订') { if (data.taskName != '合同签订') {
item.dynamicDisabled = true; // item.dynamicDisabled = true;
item.defaultValue = data.taskName; item.defaultValue = data.taskName;
} }
} }
@ -220,7 +223,7 @@
contractformSchemas.forEach((item) => { contractformSchemas.forEach((item) => {
let tempitem = cloneDeep(item); let tempitem = cloneDeep(item);
if (tempitem.field.indexOf('Money') != -1) { if (tempitem.field.indexOf('Money') != -1) {
tempitem.dynamicRules = aaa; // tempitem.dynamicRules = aaa;
tempitem.componentProps = bbb; tempitem.componentProps = bbb;
} }
if (tempitem.field == 'payDate') { if (tempitem.field == 'payDate') {
@ -229,7 +232,7 @@
if (tempitem.field == 'taskName') { if (tempitem.field == 'taskName') {
tempitem.componentProps.options = taskNameTypeDict.value; tempitem.componentProps.options = taskNameTypeDict.value;
if (data.taskName != '合同签订') { if (data.taskName != '合同签订') {
tempitem.dynamicDisabled = true; // tempitem.dynamicDisabled = true;
tempitem.defaultValue = data.taskName; tempitem.defaultValue = data.taskName;
} }
} }
@ -296,7 +299,7 @@
contractformSchemas.forEach((item) => { contractformSchemas.forEach((item) => {
let tempitem = cloneDeep(item); let tempitem = cloneDeep(item);
if (tempitem.field.indexOf('Money') != -1) { if (tempitem.field.indexOf('Money') != -1) {
tempitem.dynamicRules = aaa; // tempitem.dynamicRules = aaa;
tempitem.componentProps = bbb; tempitem.componentProps = bbb;
} }
if (tempitem.field == 'payDate') { if (tempitem.field == 'payDate') {
@ -305,7 +308,7 @@
if (tempitem.field == 'taskName') { if (tempitem.field == 'taskName') {
tempitem.componentProps.options = taskNameTypeDict.value; tempitem.componentProps.options = taskNameTypeDict.value;
if (data.taskName != '合同签订') { if (data.taskName != '合同签订') {
tempitem.dynamicDisabled = true; // tempitem.dynamicDisabled = true;
tempitem.defaultValue = data.taskName; tempitem.defaultValue = data.taskName;
} }
} }

75
src/views/projectLib/projectContract/projectContract.data.ts

@ -298,44 +298,43 @@ export const contractformSchemas: FormSchema[] = [
componentProps: { componentProps: {
options: [{label:"首付支付",value:"首付支付"}], options: [{label:"首付支付",value:"首付支付"}],
}, },
// dynamicRules: ({ values }) => {
dynamicRules: ({ values }) => { // console.log('values:', values);//表单所有值
console.log('values:', values);//表单所有值 // //需要return
//需要return // return [
return [ // {
{ // //默认开启表单检验
//默认开启表单检验 // required: true,
required: true, // // value 当前手机号输入的值
// value 当前手机号输入的值 // validator: (formSchemas, value) => {
validator: (formSchemas, value) => { // console.log("______", formSchemas, value);
console.log("______", formSchemas, value); // //需要return 一个Promise对象
//需要return 一个Promise对象 // return new Promise((resolve, reject) => {
return new Promise((resolve, reject) => { // isExitTaskNameInPlanInfo({ projectid: values.id, taskName: value }).then
isExitTaskNameInPlanInfo({ projectid: values.id, taskName: value }).then // (res => {
(res => { // if (!res) {
if (!res) { // console.log("当前项目的计划中没有这个阶段");
console.log("当前项目的计划中没有这个阶段"); // reject("当前项目的计划中没有这个阶段");
reject("当前项目的计划中没有这个阶段"); // }
} // Object.keys(values).forEach(key => {
Object.keys(values).forEach(key => { // //判断是否taskName字段的名称是否重复
//判断是否taskName字段的名称是否重复 // if (key != formSchemas.field && key.includes("taskName")) {
if (key != formSchemas.field && key.includes("taskName")) { // if (values[key] == value) {
if (values[key] == value) { // reject("属性值重复");
reject("属性值重复"); // }
} // }
} // })
}) // if (!value) {
if (!value) { // reject(`此项不能未空`);
reject(`此项不能未空`); // } else {
} else { // resolve();
resolve(); // }
} // })
}) // });
}); // },
}, // },
}, // ];
]; // },
},
required: true, required: true,
colProps: { span: 6,}, colProps: { span: 6,},
helpMessage: '需与项目计划的阶段名称所匹配', helpMessage: '需与项目计划的阶段名称所匹配',

21
src/views/projectLib/projectPlan/addPlanFile.vue

@ -185,13 +185,6 @@
// labelCol: { style: { width: '120px' } }, // labelCol: { style: { width: '120px' } },
wrapperCol: { style: { width: 'auto' } }, wrapperCol: { style: { width: 'auto' } },
}); });
const [registerContractMoneyFormShow, { setFieldsValue: setContractMoneyFieldsValueShow }] =
useForm({
schemas: ContractMoneyFormSchemas,
showActionButtonGroup: false,
disabled: true,
wrapperCol: { style: { width: 'auto' } },
});
let fileList = reactive<Array<any>>([]); let fileList = reactive<Array<any>>([]);
let projectId = ref(''); let projectId = ref('');
let contractRef = ref(); let contractRef = ref();
@ -228,14 +221,6 @@
}); });
if (contract.planList != null && contract.planList.length > 0) { if (contract.planList != null && contract.planList.length > 0) {
showMoneyForm.value = true; showMoneyForm.value = true;
setContractMoneyFieldsValueShow({
contractTotalMoney: contract.planList[0].totalMoney,
contractCentralMoney: contract.planList[0].centralMoney,
contractProvincialMoney: contract.planList[0].provincialMoney,
contractCityMoney: contract.planList[0].cityMoney,
contractCountyMoney: contract.planList[0].countyMoney,
contractSelfMoney: contract.planList[0].selfMoney,
});
} }
}); });
@ -369,11 +354,15 @@
return; return;
} }
// //
if (dataTo.taskName == '合同签订' || showMoneyForm.value) { if (dataTo.taskName == '合同签订') {
let fromdate = await contractRef.value.getFieldsValuetoRef(); let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate)); params.append('contractinfoList', JSON.stringify(fromdate));
} }
} }
else if(showMoneyForm.value){
let fromdate = await contractRef.value.getFieldsValuetoRef();
params.append('contractinfoList', JSON.stringify(fromdate));
}
// paramsData // paramsData
fileList.forEach((x) => { fileList.forEach((x) => {
console.log('xxxxxxxxxx', x, x.file); console.log('xxxxxxxxxx', x, x.file);

10
src/views/projectLib/projectPlan/planinfoFileDetail.vue

@ -30,6 +30,7 @@
:taskName="taskName" :taskName="taskName"
:isModify="false" :isModify="false"
:isEdit="false" :isEdit="false"
:isJiHua="true"
v-if="projectId" v-if="projectId"
/> />
</div> </div>
@ -150,6 +151,15 @@
let res = await queryProjectInfoById(param); let res = await queryProjectInfoById(param);
setMoneyFieldsValue(res); setMoneyFieldsValue(res);
} }
let contract = await getContractinfoByTaskName({
taskName: taskName.value,
projectId: data.projectid,
});
if (contract.realList != null && contract.realList.length > 0) {
showMoneyForm.value = true;
setContractMoneyProps({ disabled: resButton.isEdit == true ? false : true });
}
} }
</script> </script>
<style></style> <style></style>

Loading…
Cancel
Save