From 8d596fd27305c904214459bd64e0813f3d369329 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 1 Feb 2024 17:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E8=AE=A1=E5=88=92=E6=80=BB?=
 =?UTF-8?q?=E9=A2=9D=E8=A6=81=E7=AD=89=E4=BA=8E=E5=90=88=E5=90=8C=E6=80=BB?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=8C=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E8=AE=A1=E5=88=92=E3=80=82=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=87=91=E9=A2=9D=E8=B7=B3=E8=BD=AC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/components/contractSign.vue      | 27 +++++++++++++++----
 .../contract/paymentRegistrationList.vue      |  3 +++
 .../finance/components/addPropertyPlan.vue    | 24 ++++++++++-------
 .../statisticalReport/budgetProgress.vue      | 17 +++++++++++-
 4 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index ed8851c..eb5dc91 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -203,7 +203,8 @@
 
     <Modal
       v-model="isShowAddManyPlan"
-      title="计划任务">
+      title="计划任务"
+      @on-ok="manyCreate">
 
       <div class="many-plan">
         <div class="many-plan-item">
@@ -378,13 +379,10 @@
         contract: {},
         signList: [],
         signTable: [{
-            prop: 'created_at',
+            prop: 'date',
             label: '日期',
             width: 170,
             sortable: false,
-            formatter: (v1, v2, value) => {
-              return parseTime(new Date(value))
-            }
           },
           {
             prop: 'money',
@@ -553,6 +551,25 @@
         })
       },
 
+      manyCreate () {
+        Promise.all(this.manyForm.map(i => {
+          return addContractSign({
+            contract_id: this.contract.id,
+            date: i.date,
+            content: '',
+            money: i.money,
+            remark: ''
+          })
+        })).then(res => {
+          this.getContractSignList()
+          Message({
+            type: 'success',
+            message: '操作成功'
+          })
+          this.isShowAddManyPlan = false;
+        })
+      },
+
       //获取oa合同信息
       async getOaContractInfo() {
         try {
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index ac62d2b..caba11d 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -591,6 +591,9 @@ export default {
   mounted() {
     this.contractId = this.$route.query.contractId;
 
+    const { plan_id, plan_name } = this.$route.query
+    this.select.plan_id = plan_id;
+    this.select.plan_name = plan_name
     this.getFundLogs();
   },
   created() {
diff --git a/src/views/finance/components/addPropertyPlan.vue b/src/views/finance/components/addPropertyPlan.vue
index b167bed..16e1827 100644
--- a/src/views/finance/components/addPropertyPlan.vue
+++ b/src/views/finance/components/addPropertyPlan.vue
@@ -37,7 +37,7 @@
             <span style="color: red; font-weight: 600; padding-right: 4px"
               >*</span
             >
-            项目库选择 ：
+            项目 ：
           </div>
           <div class="xy-table-item-content">
             <el-input
@@ -111,7 +111,10 @@
               content: '',
               plan_date: '',
               actually_date: '',
-              date: ''
+              date: '',
+              introduce: '',
+              total: '',
+              audit_total: ''
             })
           "
           >新增</el-button
@@ -240,35 +243,35 @@ export default {
           },
         },
         {
-          prop: "",
+          prop: "introduce",
           label: "评审项目情况简介",
           width: 180,
           sortable: false,
           customFn: row => {
             return (
-              <el-input size="mini" placeholder="评审项目情况简介" clearable={true}></el-input>
+              <el-input v-model={row.introduce} size="mini" placeholder="评审项目情况简介" clearable={true}></el-input>
             )
           }
         },
         {
-          prop: "",
+          prop: "total",
           label: "总投资金额",
           width: 180,
           sortable: false,
           customFn: row => {
             return (
-              <el-input-number precision={2} controls={false} size="mini" placeholder="总投资金额" clearable={true}></el-input-number>
+              <el-input-number v-model={row.total} precision={2} controls={false} size="mini" placeholder="总投资金额" clearable={true}></el-input-number>
             )
           }
         },
         {
-          prop: "",
+          prop: "audit_total",
           label: "评审金额",
           width: 180,
           sortable: false,
           customFn: row => {
             return (
-              <el-input-number precision={2} controls={false} size="mini" placeholder="评审金额" clearable={true}></el-input-number>
+              <el-input-number v-model={row.audit_total} precision={2} controls={false} size="mini" placeholder="评审金额" clearable={true}></el-input-number>
             )
           }
         },
@@ -576,7 +579,10 @@ export default {
           content: i.content || '',
           plan_date: i.plan_date || '',
           actually_date: i.actually_date || '',
-          date: i.date || ''
+          date: i.date || '',
+          introduce: i.introduce || '',
+          total: i.total,
+          audit_total: i.audit_total
         };
       });
     },
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 968a892..d253b0a 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -148,7 +148,22 @@
             prop: 'use_money_total',
             label: '使用金额',
             align: 'right',
-            width: 180
+            width: 180,
+            customFn:row => {
+              return (
+                <a on={{
+                  ['click']:_ => {
+                    this.$router.push({
+                      path: "/contract/paymentRegistrationList_1",
+                      query: {
+                        plan_id: row.id,
+                        plan_name: `[${row.year}]-${row.name}`
+                      }
+                    })
+                  }
+                }}>{ row.use_money_total }</a>
+              )
+            }
           },
           {
             prop: 'calculation_result',