From 252f2b2fc118fa4c6d8057464f9dbe5a7fd8dada Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 13 Dec 2023 11:44:28 +0800
Subject: [PATCH] 2023-12-13

---
 src/views/contract/paymentRegistrationList.vue   | 12 ++++++++++++
 src/views/finance/components/addPropertyPlan.vue |  2 +-
 src/views/finance/paymentRegistrationList.vue    | 10 ++++++++++
 src/views/statisticalReport/budgetProgress.vue   |  6 +++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index d6a787b..a1ace68 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -19,6 +19,15 @@
           ></DatePicker>
         </span>
 
+        <span style="padding: 0 6px; word-break: keep-all">付款日期</span>
+        <span>
+          <DatePicker v-model="selectActDate"
+                      type="daterange"
+                      placement="bottom-start"
+                      placeholder="请选择日期"
+                      style="width: 200px"></DatePicker>
+        </span>
+
         <span style="padding: 0 6px; word-break: keep-all">关键字</span>
         <span>
           <Input
@@ -275,6 +284,7 @@ export default {
       ],
       isShowPlanForSearch: false,
       selectDate: "",
+      selectActDate: [],
       keywords: "",
       list: [],
       contractId: "",
@@ -543,6 +553,8 @@ export default {
         date: this.selectDate,
         status: this.status,
         act_plan_link_id: this.select.plan_id,
+        start_act_date: this.selectActDate[0] ? this.$moment(this.selectActDate[0]).format("YYYY-MM-DD") : "",
+        end_act_date: this.selectActDate[1] ? this.$moment(this.selectActDate[1]).format("YYYY-MM-DD") : "",
       }).then((res) => {
         let tokens = getToken();
         if (is_export) {
diff --git a/src/views/finance/components/addPropertyPlan.vue b/src/views/finance/components/addPropertyPlan.vue
index 65bb320..5502737 100644
--- a/src/views/finance/components/addPropertyPlan.vue
+++ b/src/views/finance/components/addPropertyPlan.vue
@@ -19,7 +19,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-cascader
-              :options="[{children:lists,project_name:'根节点',id:0}]"
+              :options="[{children:lists,project_name:'根项目',id:0}]"
               :props="{ checkStrictly: true, label: 'project_name', value: 'id' }"
               :value="form.pid"
               clearable
diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index f5e71cb..debe8ed 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -19,6 +19,15 @@
           ></DatePicker>
         </span>
 
+        <span style="padding: 0 6px; word-break: keep-all">付款日期</span>
+        <span>
+          <DatePicker v-model="selectActDate"
+                      type="daterange"
+                      placement="bottom-start"
+                      placeholder="请选择日期"
+                      style="width: 200px"></DatePicker>
+        </span>
+
         <span style="padding: 0 6px; word-break: keep-all">关键字</span>
         <span>
           <Input
@@ -242,6 +251,7 @@ export default {
         plan_id: "",
         plan_name: "",
       },
+      selectActDate: [],
       selectDate: "",
       list: [],
       total: 0,
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 03df042..5c7f439 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -156,10 +156,10 @@
             width: 200,
             fixed: "right",
             customFn: (row) => {
-              return ( < div >
+              return (<div>
                 <el-progress percentage = {
-                  (Number(row.calculation_result || 0)*100).toFixed(2)
-                } > </el-progress> </div >
+                  (Number(row.update_money) && Number(row.money)) ? Number((Number(row.calculation_result || 0)*100).toFixed(2)) : 100
+                } > </el-progress> </div>
               )
             }
           },