From 43da113a89a868761ad005edee23de3cd70074b5 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 28 Feb 2024 21:22:23 +0800
Subject: [PATCH] add

---
 src/views/project_progress_payment/edit.vue   | 45 +++++++++------
 .../project_progress_payment_detail/edit.vue  | 56 +++++++++++++------
 2 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/src/views/project_progress_payment/edit.vue b/src/views/project_progress_payment/edit.vue
index 5078980..6ddfe3d 100644
--- a/src/views/project_progress_payment/edit.vue
+++ b/src/views/project_progress_payment/edit.vue
@@ -34,23 +34,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="进度申报造价合计" prop="sbhj" label-width="160px">
-                            <el-input v-model="formData.sbhj" clearable placeholder="系统自动计算" disabled type='number' />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="进度审核造价合计" prop="shhj" label-width="160px">
-                            <el-input v-model="formData.shhj" clearable placeholder="系统自动计算" disabled type='number' />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="累计应付工程款合计" prop="ljhj" label-width="160px">
-                            <el-input v-model="formData.ljhj" clearable placeholder="系统自动计算" disabled type='number' />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+
                 <el-form-item label="附件" prop="annex">
                     <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
                         @delFile="delFileFn" />
@@ -173,6 +157,23 @@
                     </el-table-column>
                 </el-table>
             </div>
+            <el-row>
+                <el-col :span="8">
+                    <el-form-item label="进度申报造价合计" prop="sbhj" label-width="160px">
+                        <el-input v-model="formData.sbhj" clearable placeholder="系统自动计算" disabled type='number' />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="进度审核造价合计" prop="shhj" label-width="160px">
+                        <el-input v-model="formData.shhj" clearable placeholder="系统自动计算" disabled type='number' />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="累计应付工程款合计" prop="ljhj" label-width="160px">
+                        <el-input v-model="formData.ljhj" clearable placeholder="系统自动计算" disabled type='number' />
+                    </el-form-item>
+                </el-col>
+            </el-row>
         </popup>
     </div>
 </template>
@@ -254,11 +255,19 @@ const formData = reactive({
 watch(
     () => formData.project_progress_payment_detail,
     (value) => {
+        formData.sbhj = 0
+        formData.shhj = 0
+        formData.ljhj = 0
         value.forEach(item => {
             item.jdsbzj_xiaoji = Number(item.declared_cost_tj) + Number(item.declared_cost_az) + Number(item.declared_cost_other)
             item.jdshzj_xiaoji = Number(item.audit_cost_tj) + Number(item.audit_cost_az) + Number(item.audit_cost_other)
             item.payment_rate = item.dcntract_payment_rate
-            item.deduction_amount = jdsbzj_xiaoji - jdshzj_xiaoji
+            item.deduction_amount = item.jdsbzj_xiaoji - item.jdshzj_xiaoji
+            item.ljwc_funds = item.jdshzj_xiaoji
+            item.current_payable_funds = (Number(item.ljwc_funds) * Number(item.payment_rate)) || 0
+            formData.sbhj += Number(item.jdsbzj_xiaoji || 0)
+            formData.shhj += Number(item.jdshzj_xiaoji || 0)
+            formData.ljhj += Number(item.current_payable_funds || 0)
         })
     },
     {
diff --git a/src/views/project_progress_payment_detail/edit.vue b/src/views/project_progress_payment_detail/edit.vue
index 4ce44c4..f8c0613 100644
--- a/src/views/project_progress_payment_detail/edit.vue
+++ b/src/views/project_progress_payment_detail/edit.vue
@@ -16,7 +16,7 @@
                     <el-col :span="8">
                         <el-form-item label="时间" prop="time">
                             <el-date-picker class="flex-1 !flex" v-model="formData.time" clearable type="date"
-                                value-format="YYYY-MM-DD" placeholder="请选择日期" :disabled="mode != 'add'">
+                                value-format="YYYY-MM-DD" placeholder="请选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -33,14 +33,21 @@
                                 type="number" />
                         </el-form-item>
                     </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="合同付款比例(%)" prop="dcntract_payment_rate">
+                            <el-input v-model="formData.dcntract_payment_rate" clearable placeholder="请输入合同付款比例(%)"
+                                type="number" />
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+                <el-row>
                     <el-col :span="8">
                         <el-form-item label="申报造价(安装)" prop="declared_cost_az">
                             <el-input v-model="formData.declared_cost_az" clearable placeholder="请输入申报造价(安装)"
                                 type="number" />
                         </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row>
                     <el-col :span="8">
                         <el-form-item label="申报造价(其他)" prop="declared_cost_other">
                             <el-input v-model="formData.declared_cost_other" clearable placeholder="请输入申报造价(其他)"
@@ -53,13 +60,14 @@
                                 type="number" />
                         </el-form-item>
                     </el-col>
+
+                </el-row>
+                <el-row>
                     <el-col :span="8">
                         <el-form-item label="审核造价(土建)" prop="audit_cost_tj">
                             <el-input v-model="formData.audit_cost_tj" clearable placeholder="请输入审核造价(土建)" type="number" />
                         </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row>
                     <el-col :span="8">
                         <el-form-item label="审核造价(安装)" prop="audit_cost_az">
                             <el-input v-model="formData.audit_cost_az" clearable placeholder="请输入审核造价(安装)" type="number" />
@@ -71,13 +79,14 @@
                                 type="number" />
                         </el-form-item>
                     </el-col>
+
+                </el-row>
+                <el-row>
                     <el-col :span="8">
                         <el-form-item label="进度审核造价小计" prop="jdshzj_xiaoji">
                             <el-input v-model="formData.jdshzj_xiaoji" clearable placeholder="请输入进度审核造价小计" type="number" />
                         </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row>
                     <el-col :span="8">
                         <el-form-item label="审减额(元)" prop="deduction_amount">
                             <el-input v-model="formData.deduction_amount" clearable placeholder="系统自动计算" disabled
@@ -90,25 +99,21 @@
                                 type="number" />
                         </el-form-item>
                     </el-col>
+
+                </el-row>
+                <el-row>
                     <el-col :span="8">
                         <el-form-item label="合同工程款总额" prop="contract_total_amount">
                             <el-input v-model="formData.contract_total_amount" clearable placeholder="请输入合同工程款总额"
                                 type="number" />
                         </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row>
                     <el-col :span="8">
                         <el-form-item label="累计完成工程款" prop="ljwc_funds">
                             <el-input v-model="formData.ljwc_funds" clearable placeholder="系统自动计算" disabled type="number" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
-                        <el-form-item label="当期应付工程款(元)" prop="current_payable_funds">
-                            <el-input v-model="formData.current_payable_funds" clearable placeholder="系统自动计算" disabled
-                                type="number" />
-                        </el-form-item>
-                    </el-col>
+
                     <el-col :span="8">
                         <el-form-item label="付款比例(%)" prop="payment_rate">
                             <el-input v-model="formData.payment_rate" clearable placeholder="系统自动计算" disabled
@@ -118,8 +123,8 @@
                 </el-row>
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="合同付款比例(%)" prop="dcntract_payment_rate">
-                            <el-input v-model="formData.dcntract_payment_rate" clearable placeholder="请输入合同付款比例(%)"
+                        <el-form-item label="当期应付工程款(元)" prop="current_payable_funds">
+                            <el-input v-model="formData.current_payable_funds" clearable placeholder="系统自动计算" disabled
                                 type="number" />
                         </el-form-item>
                     </el-col>
@@ -184,6 +189,23 @@ const formData = reactive({
 
 })
 
+// 监听计算
+watch(
+    () => formData,
+    (value) => {
+        formData.jdsbzj_xiaoji = Number(formData.declared_cost_tj) + Number(formData.declared_cost_az) + Number(formData.declared_cost_other)
+        formData.jdshzj_xiaoji = Number(formData.audit_cost_tj) + Number(formData.audit_cost_az) + Number(formData.audit_cost_other)
+        formData.payment_rate = formData.dcntract_payment_rate
+        formData.deduction_amount = formData.jdsbzj_xiaoji - formData.jdshzj_xiaoji
+        formData.ljwc_funds = formData.jdshzj_xiaoji
+        formData.current_payable_funds = (Number(formData.ljwc_funds) * Number(formData.payment_rate)) || 0
+    },
+    {
+        deep: true
+    }
+)
+
+
 
 // 表单验证
 const formRules = reactive<any>({