From f677c0154419d2b183effef2ae658531c62e6ba2 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 15 Mar 2024 11:51:16 +0800
Subject: [PATCH] add

---
 src/views/cost_projects/edit.vue  | 14 ++++++++++----
 src/views/cost_projects/index.vue |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/cost_projects/edit.vue b/src/views/cost_projects/edit.vue
index df2dadb..4ea88dc 100644
--- a/src/views/cost_projects/edit.vue
+++ b/src/views/cost_projects/edit.vue
@@ -215,6 +215,7 @@
 import type { FormInstance } from "element-plus";
 import Popup from "@/components/popup/index.vue";
 import { apiCostProjectAdd, apiCostProjectEdit } from "@/api/cost_project";
+import { apiCostApprovedProjectDetail } from '@/api/cost_approved_project'
 import type { PropType } from "vue";
 import { deptAll } from "@/api/org/department";
 import { getAll } from "@/api/org/organization";
@@ -312,8 +313,6 @@ const customEvent = (e) => {
     formData.aunit = e.part_a
     formData.generalize = e.project_scale
     formData.Acontact = e.part_a_contract
-
-
     // part_a_contract
     showDialog.value = false;
 };
@@ -404,6 +403,9 @@ const setFormData = async (data: Record<any, any>) => {
     formData.city = Number(formData.city);
     formData.depar = Number(formData.depar);
     formData.contract_name = data.contract.contract_name;
+    formData.principal = data.contract?.signing_person
+    formData.starting = data.contract.start_date
+    formData.endtime = data.contract.end_date
     getCityList();
     deptrmt(formData.org_id);
 };
@@ -460,8 +462,12 @@ const handleClose = () => {
 
 if (route.query.contractId) {
     // handleAdd()
-    formData.contract_id = route.query.contractId;
-    formData.contract_name = route.query.contractName;
+    apiCostApprovedProjectDetail({ id: route.query.contractId }).then(res => {
+        customEvent(res)
+    })
+    // // handleAdd()
+    // formData.contract_id = route.query.contractId;
+    // formData.contract_name = route.query.contractName;
 }
 
 getProvinceList();
diff --git a/src/views/cost_projects/index.vue b/src/views/cost_projects/index.vue
index f3c69c1..bac48c7 100644
--- a/src/views/cost_projects/index.vue
+++ b/src/views/cost_projects/index.vue
@@ -59,8 +59,8 @@
                     <el-table-column label="计划开始日期" prop="starting" show-overflow-tooltip />
                     <el-table-column label="计划结束日期" prop="endtime" show-overflow-tooltip />
                     <el-table-column label="计划工期（天）" prop="jhgq" show-overflow-tooltip />
-                    <el-table-column label="项目负责人" prop="principal" show-overflow-tooltip />
-                    <el-table-column label="项目相关人员" prop="person" show-overflow-tooltip />
+                    <el-table-column label="项目负责人" prop="contract.signing_person" show-overflow-tooltip />
+                    <el-table-column label="项目相关人员" prop="person_text" show-overflow-tooltip />
                     <el-table-column label="项目总投资（万元）" prop="invest" show-overflow-tooltip />
                     <el-table-column label="预算造价（万元）" prop="budget" show-overflow-tooltip />
                     <el-table-column label="送审造价（万元）" prop="cost" show-overflow-tooltip />