From 31841786bcc033cf53d7c4274d53591190e4b33e Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 26 May 2023 10:28:47 +0800
Subject: [PATCH] 2023-5-26

---
 .../contract/components/editorContract.vue    | 14 ++++++++-
 src/views/contract/contractList.vue           | 30 +++++++++++++++++--
 src/views/contract/seeContract.vue            | 21 +++++++++++--
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 5611a65..f94f8ff 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -191,7 +191,7 @@
     </xy-dialog>
 
     <!--  编辑中 预算计划  -->
-    <xy-dialog :is-show.sync="isShowPlan" title="预算计划" :width="640" @on-ok="planSelect">
+    <xy-dialog :is-show.sync="isShowPlan" title="预算计划" :width="820" @on-ok="planSelect">
       <template>
         <Input v-model="planSearch" search enter-button="搜 索" placeholder="搜索预算计划.." @on-search="getBudgets" />
 
@@ -454,6 +454,18 @@
             prop: 'money',
             align: 'right',
             width: 120,
+          },
+          {
+            label: "实付金额",
+            prop: 'use_money_total',
+            width: 120,
+            align: 'right'
+          },
+          {
+            label: '已用金额',
+            prop: 'has_money_total',
+            width: 120,
+            align: 'right'
           }
         ],
         planTotal: 0,
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index fbfe786..b22ccce 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -471,7 +471,7 @@
     </xy-dialog>
 
     <!--  新增表 预算计划  -->
-    <xy-dialog :is-show.sync="isShowPlan" :width="720" title="预算计划" @on-ok="planSelect">
+    <xy-dialog :is-show.sync="isShowPlan" :width="820" title="预算计划" @on-ok="planSelect">
       <template>
         <div style="display: flex;">
           <el-select placeholder="科室选择" clearable size="small" v-model="planSearch.plan_department_id"
@@ -1029,6 +1029,23 @@ export default {
           width: 140,
           prop: 'admin.name'
         },
+        {
+          label: "合同服务日期",
+          width: 200,
+          customFn:row => {
+            if(row.start_date && row.end_date){
+              return (
+              <div>
+                <span>{row.start_date} ~ {row.end_date}</span>
+              </div>
+              )
+            }else{
+              return (
+                <span></span>
+              )
+            }
+          }
+        },
         {
           label: "签订日期",
           width: 160,
@@ -1145,11 +1162,17 @@ export default {
           }
         },
         {
-          label: "已用金额",
+          label: "实付金额",
           prop: 'use_money_total',
           width: 120,
           align: 'right'
         },
+        {
+          label: '已用金额',
+          prop: 'has_money_total',
+          width: 120,
+          align: 'right'
+        }
       ],
 
 
@@ -1238,7 +1261,8 @@ export default {
       isShowContractToContracts: false,
       contractSelect: {
         page: 1,
-        page_size: 10
+        page_size: 10,
+        is_framework: 1
       },
       contractTotal: 0,
       contractList: [],
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index ed30885..8a63279 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -592,7 +592,7 @@
                 width: 145,
                 prop: 'invite_status',
                 formatter: (cell, data, value) => {
-                  if (cell.purchase_way.remark === 'false') {
+                  if (cell.purchase_way?.remark === 'false') {
                     return '无'
                   }
                   switch (value) {
@@ -772,6 +772,23 @@
                 prop: 'supply',
                 align: "left"
               },
+          {
+            label: "合同服务日期",
+            width: 200,
+            customFn:row => {
+              if(row.start_date && row.end_date){
+                return (
+                  <div>
+                    <span>{row.start_date} ~ {row.end_date}</span>
+                  </div>
+                )
+              }else{
+                return (
+                  <span></span>
+                )
+              }
+            }
+          },
               {
                 label: "签订日期",
                 width: 160,
@@ -1134,7 +1151,7 @@
               }
             }
             if (column.property === 'invite_status') {
-              if (row.purchase_way.remark === 'false') {
+              if (row.purchase_way?.remark === 'false') {
                 return {
                   'color': 'rgb(140,140,140)'
                 }