From 4ae5c7250962c6ff73922cece5e08cfaac1edbe7 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 28 May 2024 17:36:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/contract/contract.js        |  5 +++--
 src/views/contract/contractEdit.vue |  8 +++++++-
 src/views/contract/contractList.vue | 11 ++++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/api/contract/contract.js b/src/api/contract/contract.js
index 61419e6..5b79729 100644
--- a/src/api/contract/contract.js
+++ b/src/api/contract/contract.js
@@ -18,11 +18,12 @@ export function addContrant(data,noloading=false){
   })
 }
 
-export function detailContract(params){
+export function detailContract(params,noloading=false){
   return request({
     method:'get',
     url:'/api/admin/contract/show',
-    params
+    params,
+    noloading
   })
 }
 
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index d7009ac..b701853 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -1078,7 +1078,7 @@ export default {
         page_size: 20,
         page: 1,
         is_tree: 1,
-        year: "",
+        year: new Date().getFullYear().toString(),
         plan_department_id: "",
         type: ""
       },
@@ -1116,6 +1116,12 @@ export default {
           minWidth: 180,
           align: "left",
         },
+        {
+          label: "内容",
+          prop: "content",
+          minWidth: 180,
+          align: "left",
+        },
         {
           label: "计划金额",
           prop: "money",
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index aa5ede0..fa2731a 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -1152,6 +1152,7 @@ import {
   delContract,
   checkContractName,
   updateStatus,
+  detailContract
 } from "@/api/contract/contract";
 import { getparameter } from "@/api/system/dictionary";
 import { listdeptNoAuth } from "@/api/system/department";
@@ -2253,6 +2254,14 @@ export default {
 
     //采购流程
     async buyProcess(row) {
+      let zijinlaiyuanjuti;
+      if (row.to_contracts instanceof Array && row.to_contracts.length > 0) {
+        let toContractIds = row.to_contracts.map((item) => item.to_contract_id)
+        const toContracts = await Promise.all(toContractIds.map((id) => detailContract({ id },true)))
+        let plans = toContracts.map(i => (i.plans)).flat()
+        zijinlaiyuanjuti = plans.reduce((pre,cur,index)=>(index === 0 ? (`【${cur?.year}】${cur?.name}`) : (pre+`，【${cur?.year}】${cur?.name}`)),"")
+        console.log(zijinlaiyuanjuti)
+      }
       this.setNowContract(row, "caigou");
       let baseInfo = {
         title: row?.name,
@@ -2271,7 +2280,7 @@ export default {
 
           }
         }, ""),
-        zijinlaiyuanjuti: row?.plans.reduce((pre,cur,index)=>(index === 0 ? (`【${cur?.year}】${cur?.name}`) : (pre+`，【${cur?.year}】${cur?.name}`)),"")
+        zijinlaiyuanjuti: zijinlaiyuanjuti ? zijinlaiyuanjuti : row?.plans.reduce((pre,cur,index)=>(index === 0 ? (`【${cur?.year}】${cur?.name}`) : (pre+`，【${cur?.year}】${cur?.name}`)),"")
       };
       console.log(baseInfo.zijinlaiyuanjuti)
       // let res = await getOatoken()