From 5c125bc37bd70b664b423d525853a856dfcb0d98 Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Sat, 30 Aug 2025 00:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/design/designChange/indexEdit.vue |  2 +-
 src/views/out/constructionValue/index.vue   | 32 +++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index 90718bc..2e7703f 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -428,7 +428,7 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(form.value.id);
+  approvalRecordRef.value.init(form.value.id + '_audit');
 };
 //提交回调
 const submitCallback = async () => {
diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index 0887fb5..947f094 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -58,7 +58,19 @@
     <!-- 添加或修改施工产值对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="constructionValueFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="方阵" prop="matrixId" v-if="!form.id">
+        <el-form-item label="对应项目结构" prop="progressCategoryId">
+          <el-tree-select
+            v-model="form.progressCategoryId"
+            :data="ProjectStructureList"
+            @node-click="handleCheckChange"
+            :props="{ value: 'id', label: 'name', children: 'children' }"
+            value-key="id"
+            @change="selectTime"
+            placeholder="请选择项目结构"
+            check-strictly
+          />
+        </el-form-item>
+        <!-- <el-form-item label="方阵" prop="matrixId" v-if="!form.id">
           <el-cascader
             :options="matrixOptions"
             placeholder="请选择"
@@ -81,7 +93,7 @@
             clearable
           >
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="计划日期" prop="reportDateId" v-if="!form.id">
           <el-cascader
             :options="progressTimeList"
@@ -129,6 +141,7 @@ import {
   updateConstructionValue
 } from '@/api/out/constructionValue';
 import { ConstructionValueVO, ConstructionValueQuery, ConstructionValueForm } from '@/api/out/constructionValue/types';
+import { getProjectStructure } from '@/api/progress/constructionSchedulePlan';
 import { getProjectSquare, listProgressCategory, workScheduleList, workScheduleListDetail, workScheduleListPosition } from '@/api/progress/plan';
 import { ProgressCategoryVO } from '@/api/progress/plan/types';
 
@@ -216,7 +229,7 @@ const data = reactive<PageData<ConstructionValueForm, ConstructionValueQuery>>({
 });
 
 const { queryParams, form, rules } = toRefs(data);
-
+const ProjectStructureList = ref([]);
 /** 查询施工产值列表 */
 const getList = async () => {
   loading.value = true;
@@ -304,6 +317,18 @@ const submitTime = async (value: string) => {
   form.value.artificialNum = data?.finishedNumber;
 };
 
+/** 查询施工进度计划列表 */
+const getProjectStructureList = async () => {
+  const res = await getProjectStructure(currentProject.value?.id);
+  ProjectStructureList.value = [res.data];
+  console.log(ProjectStructureList.value);
+};
+
+/** 查询施工进度计划列表 */
+const handleCheckChange = (val) => {
+  form.value.projectStructureName = val.name;
+};
+
 /** 重置选择器 */
 const resetCascader = (index?: number) => {
   if (index) {
@@ -370,6 +395,7 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getProjectStructureList();
   getList();
 });