Merge branch 'master' of http://121.40.242.89:8888/Guoyan/new_huozhou_frontend

src/views/ProcessApprovalSubPage/planFileApproval.vue

@@ -8,7 +8,15 @@
   <BasicForm @register="registerApprovalMoneyForm" v-if="taskName == '立项审批'" />
   <div v-if="showMoneyForm">
     <el-divider content-position="left">计划金额</el-divider>
-    <BasicForm @register="registerContractMoneyFormShow" />
+    <ContractPay
+      :projectid="pjid"
+      :taskName="taskName"
+      :isModify="false"
+      :isEdit="false"
+      :isJiHua="true"
+      v-if="pjid"
+      ref="contractRef"
+    />
     <el-divider content-position="left">实际金额</el-divider>
   </div>
 

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 { getTaskNameTypeDict } from './projectContract.api';
-  import { da } from 'element-plus/es/locale';
+  import { getContractinfoByTaskName } from '@/views/projectLib/projectPlan/projectPlan.api';
 
   const aaa = ({ values }) => {
     console.log('values:', values); //表单所有值
@@ -146,7 +146,7 @@
   };
   // const [registerModal, { closeModal }] = useModalInner(init);
 
-  let data = defineProps(['projectid', 'taskName', 'isModify', 'isEdit']);
+  let data = defineProps(['projectid', 'taskName', 'isModify', 'isEdit',"isJiHua"]);
   let fileList = reactive<Array<any>>([]);
   let isModify = ref();
   let projectid = ref();
@@ -191,10 +191,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<any>;
+      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;

src/views/projectLib/projectPlan/addPlanFile.vue

@@ -5,18 +5,28 @@
         <el-button slot="trigger" type="primary">下载模板</el-button>
     </div> -->
   <BasicForm @register="registerApprovalMoneyForm" v-if="dataTo.taskName == '立项审批'" />
+  <BasicForm @register="registerContractMoneyForm" v-if="dataTo.taskName == '合同签订'" />
   <div v-if="showMoneyForm">
     <el-divider content-position="left">计划金额</el-divider>
-    <BasicForm @register="registerContractMoneyFormShow" />
+    <ContractPay
+      :projectid="projectId"
+      :taskName="dataTo.taskName"
+      :isModify="false"
+      :isEdit="false"
+      :isJiHua="true"
+      v-if="projectId"
+      ref="contractRef"
+    />
     <el-divider content-position="left">实际金额</el-divider>
   </div>
-  <BasicForm
-    @register="registerContractMoneyForm"
-    v-if="dataTo.taskName == '合同签订'"
-  />
-
   <div v-if="showMoneyForm || dataTo.taskName == '合同签订'">
-    <ContractPay :projectid="projectId" :taskName="dataTo.taskName" :isModify="false" v-if="projectId" ref="contractRef" />
+    <ContractPay
+      :projectid="projectId"
+      :taskName="dataTo.taskName"
+      :isModify="false"
+      v-if="projectId"
+      ref="contractRef"
+    />
   </div>
   <!-- <BasicForm @register="registerContractMoneyForm" v-if="dataTo.taskName == '合同签订'" /> -->
 
@@ -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));
       }

src/views/projectLib/projectPlan/planinfoFileDetail.vue

@@ -10,12 +10,28 @@
     <div>
       <BasicForm @register="registerMoneyForm" v-if="taskName == '联合技术审查'" />
       <BasicForm @register="registerApprovalMoneyForm" v-if="taskName == '立项审批'" />
-      <BasicForm
+      <BasicForm @register="registerContractMoneyForm" v-if="taskName == '合同签订'" />
-        @register="registerContractMoneyForm"
+      <div v-if="showMoneyForm">
-        v-if="taskName == '合同签订'"
+        <el-divider content-position="left">计划金额</el-divider>
-      />
+        <ContractPay
-      <div v-if="showMoneyForm ||taskName == '合同签订'">
+          :projectid="projectId"
-        <ContractPay :projectid="projectId" :taskName="taskName" :isModify="false" :isEdit="false" v-if="projectId"/>
+          :taskName="taskName"
+          :isModify="false"
+          :isEdit="false"
+          :isJiHua="true"
+          v-if="projectId"
+          ref="contractRef"
+        />
+        <el-divider content-position="left">实际金额</el-divider>
+      </div>
+      <div v-if="showMoneyForm || taskName == '合同签订'">
+        <ContractPay
+          :projectid="projectId"
+          :taskName="taskName"
+          :isModify="false"
+          :isEdit="false"
+          v-if="projectId"
+        />
       </div>
       <el-divider content-position="left">项目计划资料详情</el-divider>
       <PlanFileDetail :planinfoid="planinfoid" :stage="1" :key="planFileDetailkey" />
@@ -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,
-        });
-      }
   }
 </script>
 <style></style>