diff --git a/.env.development b/.env.development
index b59befd..500d6b0 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,16 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+# 李陈杰 209
+VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+# 曾涛
+# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+# 罗成
+# VITE_APP_BASE_API = 'http://192.168.110.213:8899'
+# 朱银
+# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+#曾涛
+# VITE_APP_BASE_API = 'http://192.168.110.171:8899'
 
 # 无人机接口地址
 
diff --git a/src/api/ctr/incomeContract/index.ts b/src/api/ctr/incomeContract/index.ts
index eda6901..5cf0c75 100644
--- a/src/api/ctr/incomeContract/index.ts
+++ b/src/api/ctr/incomeContract/index.ts
@@ -71,4 +71,16 @@ export const getFileList = (data) => {
     method: 'get',
     params: data
   })
+}
+
+/**
+ * 查看收入合同附件列表
+ * @param id
+ */
+export const getInfoByProjectId = (data) => {
+  return request({
+    url: '/bidding/listOfWinningBids/getInfoByProjectId',
+    method: 'get',
+    params: data
+  })
 }
\ No newline at end of file
diff --git a/src/api/largeScreen/index.ts b/src/api/largeScreen/index.ts
new file mode 100644
index 0000000..1a0da4c
--- /dev/null
+++ b/src/api/largeScreen/index.ts
@@ -0,0 +1,99 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MasterVO, MasterForm, MasterQuery } from '@/api/patch/types';
+/**
+ * 合同金额
+ *
+ */
+export const totalAmount = () => {
+  return request({
+    url: '/money/big/screen/totalAmount',
+    method: 'get'
+  });
+};
+
+/**
+ * 查询项目位置列表
+ *
+ */ export const projectGis = (clientid) => {
+  return request({
+    url: '/money/big/screen/project/gis',
+    method: 'get',
+    params: clientid
+  });
+};
+
+/**
+ * 应收实收
+ *
+ */ export const incomePay = (clientid) => {
+  return request({
+    url: '/money/big/screen/income/pay',
+    method: 'get',
+    params: clientid
+  });
+};
+
+/**
+ * 收入合同分析
+ *
+ */ export const incomeAnalyze = (clientid) => {
+  return request({
+    url: '/money/big/screen/income/analyze',
+    method: 'get',
+    params: clientid
+  });
+};
+/**
+ * 应付实付
+ *
+ */ export const expensesPay = (clientid) => {
+  return request({
+    url: '/money/big/screen/expenses/pay',
+    method: 'get',
+    params: clientid
+  });
+};
+/**
+ * 支出合同分析
+ *
+ */ export const expensesAnalyze = (clientid) => {
+  return request({
+    url: '/money/big/screen/expenses/analyze',
+    method: 'get',
+    params: clientid
+  });
+};
+/**
+ * 成本
+ *
+ */ export const cost = (clientid) => {
+  return request({
+    url: '/money/big/screen/cost',
+    method: 'get',
+    params: clientid
+  });
+};
+
+// 资金KPI
+export const monthMoney = () => {
+  return request({
+    url: '/money/big/screen/monthMoney',
+    method: 'get',
+  });
+};
+// 现金流
+export const monthCash = () => {
+  return request({
+    url: '/money/big/screen/monthCash',
+    method: 'get',
+  });
+};
+// 现金流总和
+
+export const cashTotal = () => {
+  return request({
+    url: '/money/big/screen/cashTotal',
+    method: 'get',
+  });
+};
diff --git a/src/api/materials/batchPlan/index.ts b/src/api/materials/batchPlan/index.ts
index 8633eee..c9231af 100644
--- a/src/api/materials/batchPlan/index.ts
+++ b/src/api/materials/batchPlan/index.ts
@@ -143,3 +143,20 @@ export const getDictList = (query: any): AxiosPromise<any[]> => {
     params: query
   });
 };
+export const coryEngineeringList = (query: any): AxiosPromise<any[]> => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/coryEngineeringList',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 获取到物资状态为已完成的版本
+ */
+export const obtainTheVersion = (query: any) => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/obtainTheVersion',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/materials/materialIssue/index.ts b/src/api/materials/materialIssue/index.ts
index 31e8076..a366fa6 100644
--- a/src/api/materials/materialIssue/index.ts
+++ b/src/api/materials/materialIssue/index.ts
@@ -61,3 +61,10 @@ export const delMaterialIssue = (id: string | number | Array<string | number>) =
     method: 'delete'
   });
 };
+//获取一起名称
+export const getMaterialName = (id: any) => {
+  return request({
+    url: '/materials/materials/inventoryNumber/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/api/materials/materialsUseRecord/index.ts b/src/api/materials/materialsUseRecord/index.ts
new file mode 100644
index 0000000..177b5b2
--- /dev/null
+++ b/src/api/materials/materialsUseRecord/index.ts
@@ -0,0 +1,70 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MaterialsUseRecordVO, MaterialsUseRecordForm, MaterialsUseRecordQuery } from '@/api/materials/materialsUseRecord/types';
+
+/**
+ * 查询材料使用登记列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMaterialsUseInventory = (query?: MaterialsUseRecordQuery): AxiosPromise<MaterialsUseRecordVO[]> => {
+  return request({
+    url: '/materials/materialsInventory/list',
+    method: 'get',
+    params: query
+  });
+};
+export const listMaterialsUseRecord = (query?: MaterialsUseRecordQuery): AxiosPromise<MaterialsUseRecordVO[]> => {
+  return request({
+    url: '/materials/materialsUseRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询材料使用登记详细
+ * @param id
+ */
+export const getMaterialsUseRecord = (id: string | number): AxiosPromise<MaterialsUseRecordVO> => {
+  return request({
+    url: '/materials/materialsUseRecord/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增材料使用登记
+ * @param data
+ */
+export const addMaterialsUseRecord = (data: MaterialsUseRecordForm) => {
+  return request({
+    url: '/materials/materialsUseRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改材料使用登记
+ * @param data
+ */
+export const updateMaterialsUseRecord = (data: MaterialsUseRecordForm) => {
+  return request({
+    url: '/materials/materialsUseRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除材料使用登记
+ * @param id
+ */
+export const delMaterialsUseRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/materials/materialsUseRecord/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/materials/materialsUseRecord/types.ts b/src/api/materials/materialsUseRecord/types.ts
new file mode 100644
index 0000000..697f347
--- /dev/null
+++ b/src/api/materials/materialsUseRecord/types.ts
@@ -0,0 +1,111 @@
+export interface MaterialsUseRecordVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 库存ID
+   */
+  inventoryId: string | number;
+
+  /**
+   * 使用部位
+   */
+  usePart: string;
+
+  /**
+   * 使用数量
+   */
+  useNumber: number;
+
+  /**
+   * 剩余量
+   */
+  residueNumber: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MaterialsUseRecordForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 库存ID
+   */
+  inventoryId?: string | number;
+
+  /**
+   * 使用部位
+   */
+  usePart?: string;
+
+  /**
+   * 使用数量
+   */
+  useNumber?: number;
+
+  /**
+   * 剩余量
+   */
+  residueNumber?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MaterialsUseRecordQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 库存ID
+   */
+  inventoryId?: string | number;
+
+  /**
+   * 使用部位
+   */
+  usePart?: string;
+
+  /**
+   * 使用数量
+   */
+  useNumber?: number;
+
+  /**
+   * 剩余量
+   */
+  residueNumber?: string | number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/out/monthPlan/index.ts b/src/api/out/monthPlan/index.ts
index b902124..48f376f 100644
--- a/src/api/out/monthPlan/index.ts
+++ b/src/api/out/monthPlan/index.ts
@@ -98,3 +98,26 @@ export const getMonthInfo = (query): AxiosPromise<MonthPlanVO> => {
     params: query
   });
 };
+/**
+ * 修改采购完工产值对甲
+
+ * @param id
+ */
+export const purchaseValueAup = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueAup',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 采购完工产值对甲
+ * @param id
+ */
+export const purchaseValueA = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueA',
+    method: 'get',
+    params: query
+  });
+};
\ No newline at end of file
diff --git a/src/api/out/outDesignTableVS/index.ts b/src/api/out/outDesignTableVS/index.ts
index 788d797..9385a1d 100644
--- a/src/api/out/outDesignTableVS/index.ts
+++ b/src/api/out/outDesignTableVS/index.ts
@@ -7,3 +7,19 @@ export function listOutTable(query: any) {
     params: query
   });
 }
+// 对甲产值和对乙产值
+export function comparisonOfOutputValue(query: any) {
+  return request({
+    url: '/out/table/outCompare',
+    method: 'get',
+    params: query
+  });
+}
+// 对甲结算和对乙结算
+export function comparisonOfSettlementValue(query: any) {
+  return request({
+    url: '/out/table/comparisonOfOwnerAndSub',
+    method: 'get',
+    params: query
+  });
+}
diff --git a/src/api/out/purchase/index.ts b/src/api/out/purchase/index.ts
new file mode 100644
index 0000000..410a1cd
--- /dev/null
+++ b/src/api/out/purchase/index.ts
@@ -0,0 +1,24 @@
+import request from '@/utils/request';
+/**
+ * 修改采购完工产值对甲
+
+ * @param id
+ */
+export const purchaseValueAup = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueAup',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 采购完工产值对甲
+ * @param id
+ */
+export const purchaseValueA = (query) => {
+  return request({
+    url: '/out/monthPlan/purchaseValueA',
+    method: 'get',
+    params: query
+  });
+};
\ No newline at end of file
diff --git a/src/api/progress/constructionSchedulePlan/index.ts b/src/api/progress/constructionSchedulePlan/index.ts
index 3a7352d..fec34f8 100644
--- a/src/api/progress/constructionSchedulePlan/index.ts
+++ b/src/api/progress/constructionSchedulePlan/index.ts
@@ -61,3 +61,13 @@ export const delConstructionSchedulePlan = (id: string | number | Array<string |
     method: 'delete'
   });
 };
+/**
+ * 获取项目结构
+ * @param id
+ */
+export const getProjectStructure = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/project/project/projectStructure/' + id,
+    method: 'get'
+  });
+};
diff --git a/src/api/progress/progressCategory/index.ts b/src/api/progress/progressCategory/index.ts
index d525264..ed4bb07 100644
--- a/src/api/progress/progressCategory/index.ts
+++ b/src/api/progress/progressCategory/index.ts
@@ -61,3 +61,12 @@ export const delProgressCategory = (id: string | number | Array<string | number>
     method: 'delete'
   });
 };
+
+//下载
+export const downloadProgressCategory = (data) => {
+  return request({
+    url: '/progress/progressCategory/export',
+    method: 'post',
+    data
+  });
+};
diff --git a/src/api/progress/progressCategory/types.ts b/src/api/progress/progressCategory/types.ts
index 6e05749..c24a173 100644
--- a/src/api/progress/progressCategory/types.ts
+++ b/src/api/progress/progressCategory/types.ts
@@ -84,10 +84,10 @@ export interface ProgressCategoryVO {
    */
   remark: string;
 
-    /**
-     * 子对象
-     */
-    children: ProgressCategoryVO[];
+  /**
+   * 子对象
+   */
+  children: ProgressCategoryVO[];
 }
 
 export interface ProgressCategoryForm extends BaseEntity {
@@ -95,7 +95,8 @@ export interface ProgressCategoryForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
-
+  constructionPrice?: string | number;
+  ownerPrice?: string | number;
   /**
    * 父类别id
    */
@@ -175,11 +176,9 @@ export interface ProgressCategoryForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface ProgressCategoryQuery {
-
   /**
    * 父类别id
    */
@@ -255,11 +254,8 @@ export interface ProgressCategoryQuery {
    */
   status?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
diff --git a/src/api/tender/index.ts b/src/api/tender/index.ts
index 2f79a49..10a75dd 100644
--- a/src/api/tender/index.ts
+++ b/src/api/tender/index.ts
@@ -106,3 +106,27 @@ export const delBiddView = (query: any): AxiosPromise<any> => {
     method: 'delete'
   });
 };
+//获取招标单位
+export const getUnitList = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/supplierInput/supplierInput/getList',
+    method: 'get',
+    params: query
+  });
+};
+//修改状态
+export const editStatus = (query: any): AxiosPromise<any> => {
+  return request({
+    url: '/tender/biddingPlan/editStatus',
+    method: 'put',
+    data: query
+  });
+};
+//获取审核状态
+export const getApproval = (id) => {
+  return request({
+    url: '/tender/tenderPlanLimitList/getVersionDetail',
+    method: 'get',
+    params: { versions: id }
+  });
+};
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index d2ecb24..d9409ed 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -288,3 +288,14 @@ h6 {
 .top-right-btn {
   margin-left: auto;
 }
+
+.text-two-lines {
+  display: -webkit-box; /* 触发弹性盒模型 */
+  -webkit-box-orient: vertical; /* 垂直排列文本行 */
+  -webkit-line-clamp: 2; /* 限制显示2行 */
+  /* 3. 超出部分处理 */
+  overflow: hidden; /* 隐藏超出容器的内容 */
+  text-overflow: ellipsis; /* 超出部分显示省略号 */
+  /* 可选：优化文本间距 */
+  line-height: 1.5; /* 行高，控制两行的垂直间距 */
+}
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index ba70fbb..2b569d0 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -1,28 +1,14 @@
 <template>
   <div>
-    <el-upload
-      v-if="type === 'url'"
-      :action="upload.url"
-      :before-upload="handleBeforeUpload"
-      :on-success="handleUploadSuccess"
-      :on-error="handleUploadError"
-      class="editor-img-uploader"
-      name="file"
-      :show-file-list="false"
-      :headers="upload.headers"
-    >
+    <el-upload v-if="type === 'url'" :action="upload.url" :before-upload="handleBeforeUpload"
+      :on-success="handleUploadSuccess" :on-error="handleUploadError" class="editor-img-uploader" name="file"
+      :show-file-list="false" :headers="upload.headers">
       <i ref="uploadRef"></i>
     </el-upload>
   </div>
   <div class="editor">
-    <quill-editor
-      ref="quillEditorRef"
-      v-model:content="content"
-      content-type="html"
-      :options="options"
-      :style="styles"
-      @text-change="(e: any) => $emit('update:modelValue', content)"
-    />
+    <quill-editor ref="quillEditorRef" v-model:content="content" content-type="html" :options="options" :style="styles"
+      @text-change="(e: any) => $emit('update:modelValue', content)" />
   </div>
 </template>
 
@@ -47,7 +33,9 @@ const props = defineProps({
   /* 上传文件大小限制(MB) */
   fileSize: propTypes.number.def(5),
   /* 类型（base64格式、url格式） */
-  type: propTypes.string.def('url')
+  type: propTypes.string.def('url'),
+  /* 占位符 */
+  placeholder: propTypes.string.def('请输入内容'),
 });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -90,7 +78,7 @@ const options = ref<any>({
       }
     }
   },
-  placeholder: '请输入内容',
+  placeholder: props.placeholder,
   readOnly: props.readOnly
 });
 
@@ -166,77 +154,96 @@ const handleUploadError = (err: any) => {
 .editor-img-uploader {
   display: none;
 }
+
 .editor,
 .ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;
 }
+
 .quill-img {
   display: none;
 }
+
 .ql-snow .ql-tooltip[data-mode='link']::before {
   content: '请输入链接地址:';
 }
+
 .ql-snow .ql-tooltip.ql-editing a.ql-action::after {
   border-right: 0;
   content: '保存';
   padding-right: 0;
 }
+
 .ql-snow .ql-tooltip[data-mode='video']::before {
   content: '请输入视频地址:';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before {
   content: '14px';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='small']::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
   content: '10px';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='large']::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
   content: '18px';
 }
+
 .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='huge']::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
   content: '32px';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item::before {
   content: '文本';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='1']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
   content: '标题1';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='2']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
   content: '标题2';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='3']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
   content: '标题3';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='4']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
   content: '标题4';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='5']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
   content: '标题5';
 }
+
 .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='6']::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
   content: '标题6';
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item::before {
   content: '标准字体';
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value='serif']::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
   content: '衬线字体';
 }
+
 .ql-snow .ql-picker.ql-font .ql-picker-label[data-value='monospace']::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
   content: '等宽字体';
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 8bfd847..5011b9d 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -1,11 +1,28 @@
 <template>
   <div class="upload-file">
-    <el-upload ref="fileUploadRef" multiple :action="realUploadUrl" :before-upload="handleBeforeUpload"
-      :file-list="fileList" :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed"
-      :on-success="handleUploadSuccess" :show-file-list="showFileList" :headers="headers" class="upload-file-uploader"
-      :list-type="isConstruction ? 'picture-card' : 'text'" :accept="accept" :drag="isDarg" :data="data"
-      :auto-upload="autoUpload" :on-change="handleChange" :on-remove="handleRemove" :method="method"
-      :http-request="customUpload">
+    <el-upload
+      ref="fileUploadRef"
+      multiple
+      :action="realUploadUrl"
+      :before-upload="handleBeforeUpload"
+      :file-list="fileList"
+      :limit="limit"
+      :on-error="handleUploadError"
+      :on-exceed="handleExceed"
+      :on-success="handleUploadSuccess"
+      :show-file-list="showFileList"
+      :headers="headers"
+      class="upload-file-uploader"
+      :list-type="isConstruction ? 'picture-card' : 'text'"
+      :accept="accept"
+      :drag="isDarg"
+      :data="data"
+      :auto-upload="autoUpload"
+      :on-change="handleChange"
+      :on-remove="handleRemove"
+      :method="method"
+      :http-request="customUpload"
+    >
       <slot>
         <div>
           <!-- 上传按钮 -->
@@ -24,10 +41,14 @@
             的文件
           </div>
           <!-- 文件列表 -->
-          <transition-group v-if="!isConstruction && !isImportInfo"
-            class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul" @click.stop>
-            <li style="margin-top: 10px" v-for="(file, index) in fileList" :key="file.uid"
-              class="el-upload-list__item ele-upload-list__item-content">
+          <transition-group
+            v-if="!isConstruction && !isImportInfo"
+            class="upload-file-list el-upload-list el-upload-list--text"
+            name="el-fade-in-linear"
+            tag="ul"
+            @click.stop
+          >
+            <li style="margin-top: 10px" v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
               <el-link :href="`${file.url}`" :underline="false" target="_blank">
                 <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
               </el-link>
@@ -180,13 +201,16 @@ watch(
   },
   { deep: true, immediate: true }
 );
-watch(() => props.defaultFileList, () => {
-  if (props.defaultFileList.length === 0) return;
-  props.defaultFileList.forEach((item: any) => {
-    fileList.value.push(item);
-  });
-
-}, { deep: true, immediate: true });
+watch(
+  () => props.defaultFileList,
+  () => {
+    if (props.defaultFileList.length === 0) return;
+    props.defaultFileList.forEach((item: any) => {
+      fileList.value.push(item);
+    });
+  },
+  { deep: true, immediate: true }
+);
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
   // 校检文件类型
@@ -424,7 +448,7 @@ defineExpose({ submitUpload });
     }
   }
 
-  >span {
+  > span {
     width: 100%;
   }
 }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 288b711..0ff507c 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -176,22 +176,26 @@ service.interceptors.response.use(
   }
 );
 // 通用下载方法
-export function download(url: string, params: any, fileName: string) {
+export function download(url: string, params: any, fileName: string, isHeader?: boolean) {
   downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
   // prettier-ignore
-  return service.post(url, params, {
+  let data={
       transformRequest: [
         (params: any) => {
           
           return tansParams(params);
         }
       ],
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      headers: isHeader?{'Content-Type': 'application/json'}:{ 'Content-Type': 'application/x-www-form-urlencoded' },
       responseType: 'blob'
-    }).then(async (resp: any) => {
+  }
+  if (isHeader) delete data.transformRequest;
+  return service
+    .post(url, params, data as any)
+    .then(async (resp: any) => {
       const isLogin = blobValidate(resp);
       if (isLogin) {
-        console.log("🚀 ~ download ~ resp:", resp)
+        console.log('🚀 ~ download ~ resp:', resp);
         const blob = new Blob([resp]);
         FileSaver.saveAs(blob, fileName);
       } else {
@@ -201,7 +205,8 @@ export function download(url: string, params: any, fileName: string) {
         ElMessage.error(errMsg);
       }
       downloadLoadingInstance.close();
-    }).catch((r: any) => {
+    })
+    .catch((r: any) => {
       console.error(r);
       ElMessage.error('下载文件出现错误，请联系管理员！');
       downloadLoadingInstance.close();
diff --git a/src/views/biddingManagemen/appointment/index.vue b/src/views/biddingManagemen/appointment/index.vue
index 7c45599..ce519ad 100644
--- a/src/views/biddingManagemen/appointment/index.vue
+++ b/src/views/biddingManagemen/appointment/index.vue
@@ -58,7 +58,7 @@ import type { ComponentInternalInstance } from 'vue';
 import { useUserStoreHook } from '@/store/modules/user';
 import { ElMessage, ElLoading } from 'element-plus';
 import { biddingGetUser, AddbiddingUser, biddingUserList } from '@/api/bidding/appointment';
-
+import { getProject } from '@/api/project/project';
 // 获取当前实例
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 // 获取用户 store
@@ -68,7 +68,7 @@ const currentProject = computed(() => userStore.selectedProject);
 // 专业字典数据
 const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
 const isDisabled = ref(false);
-
+const projectInfo = ref({}); //项目信息
 // 表单数据
 const form = reactive({
   id: null,
diff --git a/src/views/biddingManagemen/biddingLimit/index.vue b/src/views/biddingManagemen/biddingLimit/index.vue
index 79b4d4f..ce13de3 100644
--- a/src/views/biddingManagemen/biddingLimit/index.vue
+++ b/src/views/biddingManagemen/biddingLimit/index.vue
@@ -16,7 +16,7 @@
           <el-form-item>
             <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
           </el-form-item>
-          <el-form-item>
+          <!-- <el-form-item>
             <el-upload
               ref="uploadRef"
               class="upload-demo"
@@ -28,7 +28,7 @@
                 <el-button type="primary">导入excel</el-button>
               </template>
             </el-upload>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item>
             <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
           </el-form-item>
@@ -78,7 +78,7 @@
             {{ scope.row.price }}
           </template>
         </el-table-column>
-        <el-table-column prop="price" label="操作" align="center">
+        <!-- <el-table-column prop="price" label="操作" align="center">
           <template #default="scope">
             <el-button
               type="primary"
@@ -89,7 +89,7 @@
               >修改</el-button
             >
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
     </el-card>
   </div>
diff --git a/src/views/biddingManagemen/biddingLimit/indexEdit.vue b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
index 450d058..fee3dd1 100644
--- a/src/views/biddingManagemen/biddingLimit/indexEdit.vue
+++ b/src/views/biddingManagemen/biddingLimit/indexEdit.vue
@@ -70,7 +70,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { useUserStoreHook } from '@/store/modules/user';
-import { getVersionDetail } from '@/api/bidding/biddingLimit';
+import { getVersionDetail, sheetList } from '@/api/bidding/biddingLimit';
 
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -82,8 +82,8 @@ const loading = ref(true);
 const routeParams = ref<Record<string, any>>({});
 const flowCodeOptions = [
   {
-    value: currentProject.value?.id + '_costAccounting',
-    label: '成本核算清单审批'
+    value: currentProject.value?.id + '_biddingLimitList',
+    label: '投标一览审核'
   }
 ];
 
@@ -151,11 +151,25 @@ const getInfo = () => {
   nextTick(async () => {
     const res = await getVersionDetail(routeParams.value.id);
     Object.assign(form.value, res.data);
+    getSheetName(res.data.versions);
     loading.value = false;
     buttonLoading.value = false;
   });
 };
-
+//获取表名
+const getSheetName = async (versions) => {
+  const params = {
+    projectId: currentProject.value?.id,
+    versions
+  };
+  const res = await sheetList(params);
+  if (res.code == 200) {
+    sheets.value = res.data;
+    if (res.data.length > 0) {
+      sheets.value = res.data;
+    }
+  }
+};
 /** 提交按钮 */
 const submitForm = (status1: string) => {
   status.value = status1;
@@ -171,7 +185,7 @@ const submitFlow = async () => {
 const handleStartWorkFlow = async (data: LeaveForm) => {
   try {
     submitFormData.value.flowCode = flowCode.value;
-    submitFormData.value.businessId = data.id;
+    submitFormData.value.businessId = data.versions + '_abc';
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
@@ -189,7 +203,7 @@ const handleStartWorkFlow = async (data: LeaveForm) => {
 };
 //审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(form.value.id);
+  approvalRecordRef.value.init(form.value.versions + '_abc');
 };
 //提交回调
 const submitCallback = async () => {
@@ -227,13 +241,10 @@ onMounted(() => {
   nextTick(async () => {
     reset();
     routeParams.value = proxy.$route.query;
-    sheets.value = routeParams.value.sheets;
-    versions.value = routeParams.value.versions;
-    Object.assign(form.value, versions.value);
     loading.value = false;
-    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
-      getInfo();
-    }
+    // if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+    getInfo();
+    // }
   });
 });
 </script>
diff --git a/src/views/biddingManagemen/listOfWinningBids/index copy 2.vue b/src/views/biddingManagemen/listOfWinningBids/index copy 2.vue
new file mode 100644
index 0000000..1e7356c
--- /dev/null
+++ b/src/views/biddingManagemen/listOfWinningBids/index copy 2.vue	
@@ -0,0 +1,524 @@
+<template>
+  <div class="p-4 bg-gray-50 min-h-screen">
+    <!-- 卡片容器：控制最大宽度+居中+圆角阴影 -->
+    <el-card shadow="hover" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0" style="background-color: #ffffff">
+      <!-- 卡片头部：项目信息展示区（非表单布局） -->
+      <template #header>
+        <div class="bg-blue-50 px-6 rounded-t-xl" style="padding: 10px 20px">
+          <h3 class="el-card__header-title text-lg font-semibold text-blue-800">投标项目信息</h3>
+          <h4>{{ currentProject.name }}</h4>
+          <!-- 项目信息部分 -->
+          <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+            <div class="project-info-item">
+              <span>负责人：</span>
+              <span> {{ projectInfo.principal || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>负责人电话：</span>
+              <span> {{ projectInfo.principalPhone || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>项目类型：</span>
+              <span> {{ getDictLabel(project_type, projectInfo.projectType) || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>项目阶段：</span>
+              <span> {{ getDictLabel(project_stage, projectInfo.projectStage) || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>开工时间：</span>
+              <span> {{ projectInfo.onStreamTime || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>经纬度：</span>
+              <span> {{ projectInfo.lng || '-' }}，{{ projectInfo.lat || '-' }}</span>
+            </div>
+            <div class="project-info-item md:col-span-2 lg:col-span-3">
+              <span>项目地址：</span>
+              <span> {{ projectInfo.projectSite || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>计划容量(M)：</span>
+              <span> {{ projectInfo.plan || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>实际容量(M)：</span>
+              <span> {{ projectInfo.actual || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>设计总量(M)：</span>
+              <span> {{ projectInfo.designTotal || '-' }}</span>
+            </div>
+            <div class="project-info-item md:col-span-2 lg:col-span-3">
+              <span>备注：</span>
+              <span> {{ projectInfo.remark || '-' }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="mt-4 mb-6">
+          <el-button @click="isDisabled = false" type="primary" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
+            点击编辑
+          </el-button>
+        </div>
+      </template>
+      <!-- 中标信息表单区域（保持原有逻辑） -->
+      <el-form
+        :disabled="isDisabled"
+        ref="listOfWinningBidsFormRef"
+        :model="form"
+        :rules="rules"
+        label-width="150px"
+        class="p-6 pt-4"
+        style="background-color: #ffffff"
+      >
+        <el-row :gutter="32">
+          <el-col :span="12">
+            <el-form-item label="中标价(美元)" prop="winningBidOriginal" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model.number="form.winningBidOriginal" type="number" placeholder="请输入中标价" @input="calculateWinningBid" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="汇率" prop="exchangeRate" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model.number="form.exchangeRate" type="number" placeholder="请输入汇率" step="0.0001" @input="calculateWinningBid" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="币种" prop="currency" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.currency" placeholder="请输入币种" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中标价(人民币)" prop="winningBid" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.winningBid" type="number" placeholder="根据美元中标价和汇率自动计算" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中标日期" prop="bidWinningDate" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-date-picker
+                clearable
+                v-model="form.bidWinningDate"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择中标日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="投标保证金(人民币)" prop="bidDeposit" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.bidDeposit" type="number" placeholder="请输入投标保证金" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否退还" prop="whetherSendBack" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-radio-group v-model="form.whetherSendBack">
+                <el-radio label="是" border>是</el-radio>
+                <el-radio label="否" border>否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属主体" prop="subject" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.subject" placeholder="请输入所属主体" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="建设单位" prop="construction" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.construction" placeholder="请输入建设单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="总造价" prop="totalCost" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.totalCost" placeholder="请输入总造价" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="立项申请人" prop="projectApplicant" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="立项部门" prop="projectApplicantDept" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="立项申请日期" prop="projectApplicantTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-date-picker
+                clearable
+                v-model="form.projectApplicantTime"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择立项申请日期"
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="项目编号" prop="projectNumbering" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="中标通知书" prop="projectNumbering" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <file-upload v-model="form.bidFile" :limit="10" :file-type="['pdf']" :file-size="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 操作按钮区域 -->
+        <el-row v-if="!isDisabled" class="mt-8">
+          <el-col :span="24" class="text-center">
+            <el-button
+              :loading="buttonLoading"
+              type="primary"
+              @click="submitForm"
+              v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
+              class="rounded-full px-8"
+              size="large"
+            >
+              确认提交
+            </el-button>
+            <el-button type="default" @click="resetForm" class="ml-6 rounded-full px-8" size="large"> 重置 </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script setup name="ListOfWinningBidsForm" lang="ts">
+import { ref, reactive, toRefs, watch, onMounted, onUnmounted, getCurrentInstance, ComponentInternalInstance, computed } from 'vue';
+import { addListOfWinningBids, updateListOfWinningBids, listListOfWinningBids, getListOfWinningBids } from '@/api/bidding/listOfWinningBids';
+import { ListOfWinningBidsVO, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
+import { useUserStoreHook } from '@/store/modules/user';
+import { ElFormInstance, ElMessage } from 'element-plus';
+import { getProject, updateProject } from '@/api/project/project'; // 补充项目信息更新接口
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { project_type, project_stage } = toRefs<any>(proxy?.useDict('project_type', 'project_stage'));
+
+// 用户状态管理
+const userStore = useUserStoreHook();
+// 当前选中项目（从store获取）
+const currentProject = computed(() => userStore.selectedProject);
+
+// 项目信息（非表单绑定，直接响应式数据）
+const projectInfo = reactive({
+  projectName: undefined,
+  shortName: undefined,
+  pId: undefined,
+  status: undefined,
+  picUrl: undefined,
+  remark: undefined,
+  projectType: undefined,
+  projectCategory: undefined,
+  deletedAt: undefined,
+  projectSite: undefined,
+  principal: undefined,
+  principalPhone: undefined,
+  actual: undefined,
+  lng: undefined,
+  lat: undefined,
+  plan: undefined,
+  onStreamTime: undefined,
+  playCardStart: undefined,
+  playCardEnd: undefined,
+  designTotal: undefined,
+  securityAgreement: undefined,
+  sort: 0,
+  showHidden: undefined,
+  isDelete: undefined
+});
+
+// 表单相关引用
+const listOfWinningBidsFormRef = ref<ElFormInstance>();
+// 加载状态
+const buttonLoading = ref(false);
+// 编辑/查看状态控制
+const isDisabled = ref(false);
+
+// 表单初始数据
+const initFormData: ListOfWinningBidsForm = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  projectStatus: undefined,
+  projectName: undefined,
+  winningBidOriginal: undefined,
+  exchangeRate: undefined,
+  currency: undefined,
+  subject: undefined,
+  winningBid: undefined,
+  bidWinningDate: undefined,
+  bidDeposit: undefined,
+  whetherSendBack: undefined,
+  construction: undefined,
+  totalCost: undefined,
+  projectApplicant: undefined,
+  projectApplicantDept: undefined,
+  projectApplicantTime: undefined,
+  processStatus: undefined,
+  projectNumbering: undefined
+};
+
+// 表单数据与验证规则
+const data = reactive({
+  form: { ...initFormData } as ListOfWinningBidsForm,
+  rules: {
+    projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+    projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+    winningBidOriginal: [{ required: true, message: '请输入原始中标价', trigger: 'blur' }],
+    exchangeRate: [
+      { required: true, message: '请输入汇率', trigger: 'blur' },
+      { type: 'number', min: 0.001, message: '汇率需大于0', trigger: 'blur' }
+    ],
+    currency: [{ required: true, message: '请输入币种', trigger: 'blur' }],
+    subject: [{ required: true, message: '请输入所属主体', trigger: 'blur' }],
+    winningBid: [{ required: true, message: '请输入中标价', trigger: 'blur' }],
+    bidWinningDate: [{ required: true, message: '请选择中标日期', trigger: 'blur' }],
+    projectNumbering: [{ required: true, message: '请输入项目编号', trigger: 'blur' }]
+  } as Record<string, any>
+});
+
+// 解构响应式数据
+const { form, rules } = toRefs(data);
+
+/**
+ * 根据字典值获取字典标签（用于项目类型/阶段的文本展示）
+ */
+const getDictLabel = (dictList: any[], value: any) => {
+  if (!dictList || !value) return '';
+  const dictItem = dictList.find((item) => item.value === value);
+  return dictItem ? dictItem.label : '';
+};
+
+/**
+ * 计算人民币中标价
+ */
+const calculateWinningBid = () => {
+  const dollarAmount = Number(form.value.winningBidOriginal);
+  const rate = Number(form.value.exchangeRate);
+
+  if (isNaN(dollarAmount) || isNaN(rate) || dollarAmount <= 0 || rate <= 0) {
+    form.value.winningBid = undefined;
+    return;
+  }
+
+  const result = dollarAmount * rate;
+  form.value.winningBid = Number(result.toFixed(2));
+};
+
+/**
+ * 页面初始化 - 获取已有数据（如存在）
+ */
+const initData = async () => {
+  try {
+    if (currentProject.value?.id) {
+      const res = await listListOfWinningBids({ projectId: currentProject.value.id });
+      if (res.code === 200) {
+        resetForm();
+        if (!res.data) {
+          isDisabled.value = false;
+          return;
+        }
+        Object.assign(form.value, res.data);
+        isDisabled.value = true;
+      }
+    }
+  } catch (error) {
+    console.error('初始化中标数据失败:', error);
+  }
+};
+
+/**
+ * 提交表单（含项目信息+中标信息同步提交）
+ */
+const submitForm = () => {
+  listOfWinningBidsFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        // 1. 计算人民币中标价
+        calculateWinningBid();
+        // 2. 绑定项目ID和项目名称（从项目信息同步）
+        form.value.projectId = currentProject.value?.id;
+        form.value.projectName = projectInfo.projectName;
+
+        // 3. 先更新项目信息（若项目信息有修改）
+        if (currentProject.value?.id) {
+          await updateProject({ id: currentProject.value.id, ...projectInfo });
+        }
+
+        // 4. 再提交中标信息（新增/编辑逻辑）
+        const isEdit = !!form.value.id;
+        if (isEdit) {
+          await updateListOfWinningBids(form.value);
+        } else {
+          await addListOfWinningBids(form.value);
+        }
+
+        // 5. 提交成功后切换为查看状态
+        isDisabled.value = true;
+        ElMessage.success(isEdit ? '编辑成功' : '提交成功');
+      } catch (error) {
+        ElMessage.error('提交失败，请重试');
+        console.error('提交表单失败:', error);
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/**
+ * 获取项目详细信息
+ */
+const getProjectDetail = async () => {
+  try {
+    if (currentProject.value?.id) {
+      const res = await getProject(currentProject.value.id);
+      Object.assign(projectInfo, res.data);
+    }
+  } catch (error) {
+    console.error('获取项目详情失败:', error);
+    ElMessage.error('获取项目信息失败');
+  }
+};
+
+/**
+ * 重置表单（含项目信息重置）
+ */
+const resetForm = () => {
+  // 重置中标表单
+  form.value = { ...initFormData, projectId: currentProject.value?.id };
+  listOfWinningBidsFormRef.value?.resetFields();
+
+  // 重置项目信息（恢复为当前项目的原始数据）
+  getProjectDetail();
+};
+
+/**
+ * 监听项目ID变化 - 重新初始化数据
+ */
+const projectIdWatcher = watch(
+  () => currentProject.value?.id,
+  (newId) => {
+    if (newId) {
+      form.value.projectId = newId;
+      getProjectDetail();
+      initData();
+    }
+  }
+);
+
+// 页面挂载时初始化
+onMounted(() => {
+  getProjectDetail();
+  initData();
+});
+
+// 页面卸载时清除监听
+onUnmounted(() => {
+  projectIdWatcher();
+});
+</script>
+
+<style scoped>
+/* 全局背景色 */
+.bg-gray-50 {
+  background-color: #f9fafb;
+}
+
+/* 项目信息项布局样式 */
+.project-info-item {
+  transition: all 0.2s ease;
+  padding: 4px 0;
+  color: #696969;
+}
+
+/* 输入框/选择器统一样式 */
+.el-input__wrapper,
+.el-date-editor .el-input__wrapper,
+.el-select__wrapper {
+  border-radius: 6px !important;
+  transition: all 0.2s ease;
+}
+
+/* 输入框hover效果 */
+.el-input__wrapper:hover,
+.el-date-editor .el-input__wrapper:hover,
+.el-select__wrapper:hover {
+  border-color: #409eff;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+}
+
+/* 卡片头部文字样式 */
+.el-card__header-title {
+  display: flex;
+  align-items: center;
+  height: 100%;
+}
+
+/* 按钮样式优化 */
+.el-button {
+  transition: all 0.2s ease;
+}
+.el-button:hover {
+  transform: translateY(-1px);
+}
+
+/* 表单项样式优化 */
+.el-form-item {
+  transition: all 0.2s ease;
+}
+.el-form-item:hover {
+  border-color: #e6f7ff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+/* 响应式网格布局适配 */
+@media (max-width: 767px) {
+  .grid {
+    display: grid;
+  }
+  .grid-cols-1 {
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+  }
+}
+
+@media (min-width: 768px) and (max-width: 1023px) {
+  .md\:grid-cols-2 {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+  .md\:col-span-2 {
+    grid-column: span 2 / span 2;
+  }
+}
+
+@media (min-width: 1024px) {
+  .lg\:grid-cols-3 {
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+  }
+  .lg\:col-span-3 {
+    grid-column: span 3 / span 3;
+  }
+}
+
+/* 间距样式 */
+.gap-6 {
+  gap: 1.5rem;
+}
+.mb-1 {
+  margin-bottom: 0.25rem;
+}
+.mb-6 {
+  margin-bottom: 1.5rem;
+}
+.mt-4 {
+  margin-top: 1rem;
+}
+.mt-6 {
+  margin-top: 1.5rem;
+}
+.mt-8 {
+  margin-top: 2rem;
+}
+</style>
diff --git a/src/views/biddingManagemen/listOfWinningBids/index copy.vue b/src/views/biddingManagemen/listOfWinningBids/index copy.vue
deleted file mode 100644
index cd2f39a..0000000
--- a/src/views/biddingManagemen/listOfWinningBids/index copy.vue	
+++ /dev/null
@@ -1,344 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
-            <el-form-item label="项目名称" prop="projectName">
-              <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="建设单位" prop="construction">
-              <el-input v-model="queryParams.construction" placeholder="请输入建设单位" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="立项申请人" prop="projectApplicant">
-              <el-input v-model="queryParams.projectApplicant" placeholder="请输入立项申请人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['bidding:listOfWinningBids:add']">新增</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="listOfWinningBidsList" @selection-change="handleSelectionChange">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
-        <el-table-column label="序号" align="center" type="index" width="60" />
-        <el-table-column label="项目状态" align="center" prop="projectStatus" />
-        <el-table-column label="项目名称" align="center" prop="projectName" />
-        <el-table-column label="中标价" align="center" prop="winningBidOriginal" />
-        <el-table-column label="汇率" align="center" prop="exchangeRate" />
-        <el-table-column label="币种" align="center" prop="currency" />
-        <el-table-column label="所属主体" align="center" prop="subject" />
-        <el-table-column label="中标价" align="center" prop="winningBid" />
-        <el-table-column label="中标日期" align="center" prop="bidWinningDate" width="120"> </el-table-column>
-        <el-table-column label="投标保证金" align="center" prop="bidDeposit" width="120" />
-        <el-table-column label="是否退还" align="center" prop="whetherSendBack" />
-        <el-table-column label="建设单位" align="center" prop="construction" />
-        <el-table-column label="总造价" align="center" prop="totalCost" />
-        <el-table-column label="立项申请人" align="center" prop="projectApplicant" width="120" />
-        <el-table-column label="立项部门" align="center" prop="projectApplicantDept" />
-        <el-table-column label="立项申请日期" align="center" prop="projectApplicantTime" width="120"> </el-table-column>
-        <el-table-column label="流程状态" align="center" prop="processStatus" />
-        <el-table-column label="项目编号" align="center" prop="projectNumbering" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
-          <template #default="scope">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['bidding:listOfWinningBids:edit']"
-              >修改</el-button
-            >
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['bidding:listOfWinningBids:remove']">
-              删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
-    <!-- 添加或修改中标项目一览对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
-      <el-form ref="listOfWinningBidsFormRef" :model="form" :rules="rules" label-width="110px">
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="项目名称" prop="projectName"> <el-input v-model="form.projectName" placeholder="请输入项目名称" /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="中标价" prop="winningBidOriginal">
-              <el-input v-model="form.winningBidOriginal" placeholder="请输入中标价" /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="汇率" prop="exchangeRate"> <el-input v-model="form.exchangeRate" placeholder="请输入汇率" /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="币种" prop="currency"> <el-input v-model="form.currency" placeholder="请输入币种" /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="所属主体" prop="subject"> <el-input v-model="form.subject" placeholder="请输入所属主体" /> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="中标价" prop="winningBid"> <el-input v-model="form.winningBid" placeholder="请输入中标价" /> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="中标日期" prop="bidWinningDate">
-              <el-date-picker
-                clearable
-                v-model="form.bidWinningDate"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择中标日期"
-              >
-              </el-date-picker> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="投标保证金" prop="bidDeposit"> <el-input v-model="form.bidDeposit" placeholder="请输入投标保证金" /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="是否退还" prop="whetherSendBack">
-              <el-input v-model="form.whetherSendBack" placeholder="请输入是否退还" /> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="建设单位" prop="construction"> <el-input v-model="form.construction" placeholder="请输入建设单位" /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="总造价" prop="totalCost"> <el-input v-model="form.totalCost" placeholder="请输入总造价" /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="立项申请人" prop="projectApplicant">
-              <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" /> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="立项部门" prop="projectApplicantDept">
-              <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" /> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="立项申请日期" prop="projectApplicantTime">
-              <el-date-picker
-                clearable
-                v-model="form.projectApplicantTime"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择立项申请日期"
-              >
-              </el-date-picker> </el-form-item
-          ></el-col>
-          <el-col :span="12"
-            ><el-form-item label="项目编号" prop="projectNumbering">
-              <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" /> </el-form-item
-          ></el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="ListOfWinningBids" lang="ts">
-import {
-  listListOfWinningBids,
-  getListOfWinningBids,
-  delListOfWinningBids,
-  addListOfWinningBids,
-  updateListOfWinningBids
-} from '@/api/bidding/listOfWinningBids';
-import { ListOfWinningBidsVO, ListOfWinningBidsQuery, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
-import { useUserStoreHook } from '@/store/modules/user';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-// 获取用户 store
-const userStore = useUserStoreHook();
-// 从 store 中获取当前选中的项目
-const currentProject = computed(() => userStore.selectedProject);
-const listOfWinningBidsList = ref<ListOfWinningBidsVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const listOfWinningBidsFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: ListOfWinningBidsForm = {
-  id: undefined,
-  projectId: currentProject.value?.id,
-  projectStatus: undefined,
-  projectName: undefined,
-  winningBidOriginal: undefined,
-  exchangeRate: undefined,
-  currency: undefined,
-  subject: undefined,
-  winningBid: undefined,
-  bidWinningDate: undefined,
-  bidDeposit: undefined,
-  whetherSendBack: undefined,
-  construction: undefined,
-  totalCost: undefined,
-  projectApplicant: undefined,
-  projectApplicantDept: undefined,
-  projectApplicantTime: undefined,
-  processStatus: undefined,
-  projectNumbering: undefined
-};
-const data = reactive<PageData<ListOfWinningBidsForm, ListOfWinningBidsQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    projectId: currentProject.value?.id,
-    projectStatus: undefined,
-    projectName: undefined,
-    winningBidOriginal: undefined,
-    exchangeRate: undefined,
-    currency: undefined,
-    subject: undefined,
-    winningBid: undefined,
-    bidWinningDate: undefined,
-    bidDeposit: undefined,
-    whetherSendBack: undefined,
-    construction: undefined,
-    totalCost: undefined,
-    projectApplicant: undefined,
-    projectApplicantDept: undefined,
-    projectApplicantTime: undefined,
-    processStatus: undefined,
-    projectNumbering: undefined,
-    params: {}
-  },
-  rules: {
-    id: [{ required: true, message: '不能为空', trigger: 'blur' }],
-    projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询中标项目一览列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listListOfWinningBids(queryParams.value);
-  listOfWinningBidsList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  listOfWinningBidsFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: ListOfWinningBidsVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加中标项目一览';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: ListOfWinningBidsVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getListOfWinningBids(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改中标项目一览';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  listOfWinningBidsFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateListOfWinningBids(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addListOfWinningBids(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: ListOfWinningBidsVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除中标项目一览编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delListOfWinningBids(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'bidding/listOfWinningBids/export',
-    {
-      ...queryParams.value
-    },
-    `listOfWinningBids_${new Date().getTime()}.xlsx`
-  );
-};
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    getList();
-  }
-);
-
-onUnmounted(() => {
-  listeningProject();
-});
-onMounted(() => {
-  getList();
-});
-</script>
diff --git a/src/views/biddingManagemen/listOfWinningBids/index.vue b/src/views/biddingManagemen/listOfWinningBids/index.vue
index f2c7700..02a45c0 100644
--- a/src/views/biddingManagemen/listOfWinningBids/index.vue
+++ b/src/views/biddingManagemen/listOfWinningBids/index.vue
@@ -1,345 +1,547 @@
 <template>
   <div class="p-4 bg-gray-50 min-h-screen">
     <!-- 卡片容器：控制最大宽度+居中+圆角阴影 -->
-    <el-card shadow="hover" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0" style="background-color: #ffffff">
-      <!-- 卡片头部：独立背景色+内边距+圆角 -->
+    <el-card shadow="hover" class="max-w-6xl mx-auto rounded-xl overflow-hidden border-0"
+      style="background-color: #ffffff">
+      <!-- 卡片头部：项目信息展示区 -->
       <template #header>
-        <div class="bg-blue-50 px-6 py-4 rounded-t-xl mb-0">
-          <h3 class="el-card__header-title text-lg font-semibold text-blue-800">投标项目信息填写</h3>
-          <span>{{ currentProject.name }}</span>
-          <div style="margin-top: 10px">
-            <el-button @click="isDisabled = false" type="primary" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
-              点击编辑
-            </el-button>
+        <div class="bg-blue-50 px-6 rounded-t-xl" style="padding: 10px 20px">
+          <h3 class="el-card__header-title text-lg font-semibold text-blue-800">投标项目信息</h3>
+          <h4>{{ currentProject.name }}</h4>
+          <!-- 项目信息部分 -->
+          <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+            <div class="project-info-item">
+              <span>负责人：</span>
+              <span> {{ projectInfo.principal || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>负责人电话：</span>
+              <span> {{ projectInfo.principalPhone || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>项目类型：</span>
+              <span> {{ getDictLabel(project_type, projectInfo.projectType) || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>项目阶段：</span>
+              <span> {{ getDictLabel(project_stage, projectInfo.projectStage) || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>开工时间：</span>
+              <span> {{ projectInfo.onStreamTime || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>经纬度：</span>
+              <span> {{ projectInfo.lng || '-' }}，{{ projectInfo.lat || '-' }}</span>
+            </div>
+            <div class="project-info-item md:col-span-2 lg:col-span-3">
+              <span>项目地址：</span>
+              <span> {{ projectInfo.projectSite || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>计划容量(M)：</span>
+              <span> {{ projectInfo.plan || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>实际容量(M)：</span>
+              <span> {{ projectInfo.actual || '-' }}</span>
+            </div>
+            <div class="project-info-item">
+              <span>设计总量(M)：</span>
+              <span> {{ projectInfo.designTotal || '-' }}</span>
+            </div>
+            <div class="project-info-item md:col-span-2 lg:col-span-3">
+              <span>备注：</span>
+              <span> {{ projectInfo.remark || '-' }}</span>
+            </div>
           </div>
         </div>
+        <!-- <div class="mt-4 mb-6">
+          <el-button @click="isDisabled = false" type="primary"
+            class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled">
+            点击编辑
+          </el-button>
+        </div> -->
       </template>
-      <el-form
-        :disabled="isDisabled"
-        ref="listOfWinningBidsFormRef"
-        :model="form"
-        :rules="rules"
-        label-width="150px"
-        class="p-6 pt-4"
-        style="background-color: #ffffff"
-      >
+      <!-- 中标信息表单区域 -->
+      <el-form :disabled="isDisabled" ref="listOfWinningBidsFormRef" :model="form" :rules="rules" label-width="150px"
+        class="p-6 pt-4" style="background-color: #ffffff">
         <el-row :gutter="32">
+          <!-- 招标代理机构 -->
           <el-col :span="12">
-            <el-form-item label="中标价(美元)" prop="winningBidOriginal" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model.number="form.winningBidOriginal" type="number" placeholder="请输入中标价" @input="calculateWinningBid" />
+            <el-form-item label="招标代理机构" prop="biddingAgency" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.biddingAgency" placeholder="请输入招标代理机构" />
             </el-form-item>
           </el-col>
+          <!-- 招标人 -->
           <el-col :span="12">
-            <el-form-item label="汇率" prop="exchangeRate" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model.number="form.exchangeRate" type="number" placeholder="请输入汇率" step="0.0001" @input="calculateWinningBid" />
+            <el-form-item label="招标人" prop="tenderer" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.tenderer" placeholder="请输入招标人" />
             </el-form-item>
           </el-col>
+          <!-- 投标截止时间 -->
           <el-col :span="12">
-            <el-form-item label="币种" prop="currency" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.currency" placeholder="请输入币种" />
+            <el-form-item label="投标截止时间" prop="biddingDeadline" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-date-picker v-model="form.biddingDeadline" format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择投标截止时间" />
             </el-form-item>
           </el-col>
+          <!-- 开标时间 -->
           <el-col :span="12">
-            <el-form-item label="中标价(人民币)" prop="winningBid" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <!-- 人民币输入框：添加readonly禁止手动修改 -->
-              <el-input v-model="form.winningBid" type="number" placeholder="根据美元中标价和汇率自动计算" readonly />
+            <el-form-item label="开标时间" prop="bidopeningTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-date-picker v-model="form.bidopeningTime" format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择开标时间" />
             </el-form-item>
           </el-col>
-          <!-- 其他表单项保持不变 -->
+
+          <!-- 建设地点 -->
           <el-col :span="12">
-            <el-form-item label="中标日期" prop="bidWinningDate" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-date-picker
-                clearable
-                v-model="form.bidWinningDate"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择中标日期"
-              />
+            <el-form-item label="建设地点" prop="constructionsite" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.constructionsite" placeholder="请输入建设地点" />
             </el-form-item>
           </el-col>
+          <!-- 计划工期 -->
           <el-col :span="12">
-            <el-form-item label="投标保证金(人民币)" prop="bidDeposit" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.bidDeposit" type="number" placeholder="请输入投标保证金" />
+            <el-form-item label="计划工期" prop="planDuration" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.planDuration" placeholder="请输入计划工期（如：180天）" />
             </el-form-item>
           </el-col>
+          <!-- 答疑截止时间 -->
           <el-col :span="12">
-            <el-form-item label="是否退还" prop="whetherSendBack" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-radio-group v-model="form.whetherSendBack">
-                <el-radio label="是" border>是</el-radio>
-                <el-radio label="否" border>否</el-radio>
-              </el-radio-group>
+            <el-form-item label="答疑截止时间" prop="answeringDeadlineTime"
+              class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-date-picker v-model="form.answeringDeadlineTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择答疑截止时间" />
             </el-form-item>
           </el-col>
+          <!-- 澄清截止时间 -->
           <el-col :span="12">
-            <el-form-item label="所属主体" prop="subject" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.subject" placeholder="请输入所属主体" />
+            <el-form-item label="澄清截止时间" prop="clarifyDeadlineTime" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-date-picker format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss "
+                v-model="form.clarifyDeadlineTime" type="datetime" placeholder="请选择澄清截止时间" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="建设单位" prop="construction" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.construction" placeholder="请输入建设单位" />
+          <!-- 项目概况 -->
+          <el-col :span="24">
+            <el-form-item label="项目概况" prop="projectOverview" class="rounded-lg border border-gray-100 p-1 mb-5">
+              <el-input v-model="form.projectOverview" type="textarea" placeholder="请输入项目概况" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="总造价" prop="totalCost" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.totalCost" placeholder="请输入总造价" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="立项申请人" prop="projectApplicant" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.projectApplicant" placeholder="请输入立项申请人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="立项部门" prop="projectApplicantDept" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.projectApplicantDept" placeholder="请输入立项部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="立项申请日期" prop="projectApplicantTime" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-date-picker
-                clearable
-                v-model="form.projectApplicantTime"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择立项申请日期"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目编号" prop="projectNumbering" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.projectNumbering" placeholder="请输入项目编号" />
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
-            <el-form-item label="项目状态" prop="projectStatus" class="rounded-lg border border-gray-100 p-1 mb-5">
-              <el-input v-model="form.projectStatus" placeholder="请输入项目状态(如：进行中/已完成)" />
-            </el-form-item>
-          </el-col> -->
         </el-row>
         <!-- 操作按钮区域 -->
-        <el-row v-if="!isDisabled" class="mt-8">
+        <el-row v-if="!form.id" class="mt-4">
           <el-col :span="24" class="text-center">
-            <el-button
-              :loading="buttonLoading"
-              type="primary"
-              @click="submitForm"
-              v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
-              class="rounded-full px-8"
-              size="large"
-            >
+            <el-button :loading="buttonLoading" type="primary" @click="submitForm"
+              v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']" class="rounded-full px-8"
+              size="large">
               确认提交
             </el-button>
             <el-button type="default" @click="resetForm" class="ml-6 rounded-full px-8" size="large"> 重置 </el-button>
           </el-col>
         </el-row>
       </el-form>
+      <div style="margin-top: 20px;" v-if="form.id">
+        <span style=" color: rgb(38 153 255);
+    display: inline-block;
+    margin-left: 40px;
+    font-weight: 700;">是否中标配置</span>
+        <el-form ref="listOfWinningBidsFormRef" :disabled="iswhetherBid" :model="form" :rules="rules"
+          label-width="150px" class="p-6 pt-4" style="background-color: #ffffff">
+          <el-row>
+            <!-- 是否中标（必填） -->
+            <el-col :span="12">
+              <el-form-item label="是否中标" prop="whetherBid" class="rounded-lg border border-gray-100 p-1 mb-5">
+                <el-radio-group v-model="form.whetherBid">
+                  <el-radio label="0" border>中标</el-radio>
+                  <el-radio label="1" border>未中标</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <!-- 中标价（必填，仅中标时显示） -->
+            <el-col :span="12" v-if="form.whetherBid == '0'">
+              <el-form-item label="中标价(人民币)" prop="bidPrice" class="rounded-lg border border-gray-100 p-1 mb-5">
+                <el-input v-model="form.bidPrice" type="number" placeholder="请输入中标价" />
+              </el-form-item>
+            </el-col>
+            <!-- 中标通知书（必填，仅中标时显示） -->
+            <!-- <el-col :span="12" v-if="form.whetherBid == '0'">
+              <el-form-item label="中标通知书" prop="bidFileId" class="rounded-lg border border-gray-100 p-1 mb-5">
+                <el-input v-if="form.bidFileName" v-model="form.bidFileName" disabled placeholder="请输入中标通知书" />
+                <file-upload v-else v-model="form.bidFileId" :limit="1" :file-type="['pdf']" :file-size="50" />
+              </el-form-item>
+            </el-col> -->
+          </el-row>
+          <!-- 操作按钮区域 -->
+          <el-row class="mt-4" v-if="!iswhetherBid && form.whetherBid == '0'">
+            <el-col :span="24" class="text-center">
+              <el-button :loading="buttonLoading1" type="primary" @click="submitForm"
+                v-hasPermi="['bidding:listOfWinningBids:add', 'bidding:listOfWinningBids:edit']"
+                class="rounded-full px-8" size="large">
+                中标
+              </el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </el-card>
   </div>
 </template>
 
 <script setup name="ListOfWinningBidsForm" lang="ts">
 import { ref, reactive, toRefs, watch, onMounted, onUnmounted, getCurrentInstance, ComponentInternalInstance, computed } from 'vue';
-import { addListOfWinningBids, updateListOfWinningBids, listListOfWinningBids, getListOfWinningBids } from '@/api/bidding/listOfWinningBids';
-import { ListOfWinningBidsVO, ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
+import { addListOfWinningBids, updateListOfWinningBids, listListOfWinningBids } from '@/api/bidding/listOfWinningBids';
+import { ListOfWinningBidsForm } from '@/api/bidding/listOfWinningBids/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import { ElFormInstance, ElMessage } from 'element-plus';
-
-// 获取组件实例
+import { getProject, updateProject } from '@/api/project/project';
+import { globalHeaders } from '@/utils/request';
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
+import { genFileId } from 'element-plus';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-// 用户状态管理
+const { project_type, project_stage } = toRefs<any>(proxy?.useDict('project_type', 'project_stage'));
+const headers = ref(globalHeaders());
+const fileList = ref([]);
+// 用户状态管理与当前项目
 const userStore = useUserStoreHook();
-// 当前选中项目（从store获取）
+const iswhetherBid = ref(false); // 是否中标
 const currentProject = computed(() => userStore.selectedProject);
+// const realUploadUrl = computed(() => {
+//   const search = new URLSearchParams().toString();
+//   return search ? `${baseUrl}${props.uploadUrl}?${search}` : `${baseUrl}${props.uploadUrl}`;
+// });
+// 项目信息（仅展示，非表单编辑）
+const projectInfo = reactive({
+  principal: undefined,
+  principalPhone: undefined,
+  projectType: undefined,
+  projectStage: undefined,
+  onStreamTime: undefined,
+  lng: undefined,
+  lat: undefined,
+  projectSite: undefined,
+  plan: undefined,
+  actual: undefined,
+  designTotal: undefined,
+  remark: undefined,
+  projectName: undefined
+});
 
-// 表单相关引用
+// 表单核心变量
 const listOfWinningBidsFormRef = ref<ElFormInstance>();
-// 加载状态
 const buttonLoading = ref(false);
+const buttonLoading1 = ref(false);
 const isDisabled = ref(false);
-// 表单初始数据
-const initFormData: ListOfWinningBidsForm = {
+const fileObj = ref({
+  bidFile: undefined,
+  bidFileName: undefined
+});
+// 表单初始数据（新增招标相关参数）
+const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
-  projectStatus: undefined,
-  projectName: undefined,
-  winningBidOriginal: undefined,
-  exchangeRate: undefined,
-  currency: undefined,
-  subject: undefined,
-  winningBid: undefined,
-  bidWinningDate: undefined,
-  bidDeposit: undefined,
-  whetherSendBack: undefined,
-  construction: undefined,
-  totalCost: undefined,
-  projectApplicant: undefined,
-  projectApplicantDept: undefined,
-  projectApplicantTime: undefined,
-  processStatus: undefined,
-  projectNumbering: undefined
+  whetherBid: '1', // 是否中标：0=中标，1=未中标
+  bidPrice: undefined, // 中标价（人民币）
+  bidFileId: undefined, // 中标通知书
+  biddingAgency: undefined, //招标代理机构
+  tenderer: undefined, //招标人
+  biddingDeadline: undefined, //投标截止时间
+  bidopeningTime: undefined, //开标时间
+  projectOverview: undefined, //项目概况
+  constructionsite: undefined, //建设地点
+  planDuration: undefined, //计划工期
+  answeringDeadlineTime: undefined, //答疑截止时间
+  clarifyDeadlineTime: undefined //澄清截止时间
 };
 
-// 表单数据与验证规则
+// 表单数据与验证规则（核心：是否中标/中标价/中标通知书均设为必填，新增参数添加基础验证）
 const data = reactive({
   form: { ...initFormData } as ListOfWinningBidsForm,
   rules: {
-    projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
-    projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
-    winningBidOriginal: [{ required: true, message: '请输入原始中标价', trigger: 'blur' }],
-    exchangeRate: [
-      { required: true, message: '请输入汇率', trigger: 'blur' },
-      { type: 'number', min: 0.001, message: '汇率需大于0', trigger: 'blur' }
+    // 是否中标：必填
+    whetherBid: [{ required: true, message: '请选择是否中标', trigger: 'change' }],
+    // 中标价：仅中标时必填，且为正数
+    bidPrice: [
+      {
+        required: true,
+        message: '请输入中标价',
+        trigger: 'blur',
+        validator: (rule: any, value: any, callback: any) => {
+          if (form.value.whetherBid === '0') {
+            if (!value && value !== 0) {
+              return callback(new Error('请输入中标价'));
+            }
+            if (Number(value) <= 0) {
+              return callback(new Error('中标价需大于0'));
+            }
+          }
+          callback();
+        }
+      }
     ],
-    currency: [{ required: true, message: '请输入币种', trigger: 'blur' }],
-    subject: [{ required: true, message: '请输入所属主体', trigger: 'blur' }],
-    winningBid: [{ required: true, message: '请输入中标价', trigger: 'blur' }],
-    bidWinningDate: [{ required: true, message: '请选择中标日期', trigger: 'blur' }],
-    projectNumbering: [{ required: true, message: '请输入项目编号', trigger: 'blur' }]
+    // 中标通知书：仅中标时必填
+    bidFileId: [
+      {
+        required: true,
+        message: '请上传中标通知书',
+        trigger: 'change',
+        validator: (rule: any, value: any, callback: any) => {
+          if (form.value.whetherBid === '0' && !value) {
+            return callback(new Error('请上传中标通知书'));
+          }
+          callback();
+        }
+      }
+    ],
+    // 招标代理机构：必填
+    biddingAgency: [{ required: true, message: '请输入招标代理机构', trigger: 'blur' }],
+    // 招标人：必填
+    tenderer: [{ required: true, message: '请输入招标人', trigger: 'blur' }],
+    // 投标截止时间：必填
+    biddingDeadline: [{ required: true, message: '请选择投标截止时间', trigger: 'change' }],
+    // 开标时间：必填
+    bidopeningTime: [{ required: true, message: '请选择开标时间', trigger: 'change' }],
+    // 项目概况：必填
+    projectOverview: [{ required: true, message: '请输入项目概况', trigger: 'blur' }],
+    // 建设地点：必填
+    constructionsite: [{ required: true, message: '请输入建设地点', trigger: 'blur' }],
+    // 计划工期：必填
+    planDuration: [{ required: true, message: '请输入计划工期', trigger: 'blur' }],
+    // 答疑截止时间：必填
+    answeringDeadlineTime: [{ required: true, message: '请选择答疑截止时间', trigger: 'change' }],
+    // 澄清截止时间：必填
+    clarifyDeadlineTime: [{ required: true, message: '请选择澄清截止时间', trigger: 'change' }]
   } as Record<string, any>
 });
 
-// 解构响应式数据
 const { form, rules } = toRefs(data);
+
 /**
- * 计算人民币中标价
- * 显式触发的计算函数，确保执行时机可靠
+ * 字典标签转换（项目类型/阶段）
  */
-const calculateWinningBid = () => {
-  // 确保数据类型正确
-  const dollarAmount = Number(form.value.winningBidOriginal);
-  const rate = Number(form.value.exchangeRate);
-
-  // 验证输入有效性
-  if (isNaN(dollarAmount) || isNaN(rate) || dollarAmount <= 0 || rate <= 0) {
-    form.value.winningBid = undefined;
-    return;
-  }
-
-  // 计算并保留2位小数
-  const result = dollarAmount * rate;
-  form.value.winningBid = Number(result.toFixed(2));
+const getDictLabel = (dictList: any[], value: any) => {
+  if (!dictList || !value) return '';
+  const dictItem = dictList.find((item) => item.value === value);
+  return dictItem ? dictItem.label : '';
 };
+const upload = ref<UploadInstance>();
 
+const handleExceed: UploadProps['onExceed'] = (files) => {
+  upload.value!.clearFiles();
+  const file = files[0] as UploadRawFile;
+  file.uid = genFileId();
+  upload.value!.handleStart(file);
+};
 /**
- * 页面初始化 - 获取已有数据（如存在）
+ * 初始化中标数据（根据项目ID查询已有记录）
  */
 const initData = async () => {
   try {
     if (currentProject.value?.id) {
       const res = await listListOfWinningBids({ projectId: currentProject.value.id });
-      if (res.code == 200) {
-        console.log(res.data);
+      console.log(res);
+      if (res.code === 200) {
         resetForm();
-        if (!res.data) {
-          isDisabled.value = false;
-          return;
-        } else {
+        if (res.data) {
+          if (res.data.bidPrice) {
+            iswhetherBid.value = true;
+          } else {
+            iswhetherBid.value = false;
+          }
           Object.assign(form.value, res.data);
+          isDisabled.value = true;
+        } else {
+          isDisabled.value = false;
         }
-        isDisabled.value = true;
       }
     }
   } catch (error) {
-    // ElMessage.error('初始化数据失败');
+    console.error('初始化中标数据失败:', error);
+    ElMessage.error('初始化数据失败');
   }
 };
 
 /**
- * 提交表单
+ * 提交表单（含项目信息更新+中标信息提交）
  */
-const submitForm = () => {
+const submitForm = async () => {
   listOfWinningBidsFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
       try {
-        // 提交前确保计算正确
-        calculateWinningBid();
+        // 1. 同步项目ID和名称
         form.value.projectId = currentProject.value?.id;
-        await addListOfWinningBids(form.value);
+        form.value.projectName = projectInfo.projectName;
+        delete projectInfo.id;
+        await addListOfWinningBids({ ...form.value, ...projectInfo });
+        initData();
+        // 4. 提交成功后切换为查看状态
         isDisabled.value = true;
         ElMessage.success('提交成功');
-      } catch (error) {
-        ElMessage.error('提交失败，请重试');
-        console.error('提交表单失败:', error);
       } finally {
         buttonLoading.value = false;
       }
     }
   });
 };
+
 /**
- * 重置表单
+ * 获取项目详细信息（用于展示）
+ */
+const getProjectDetail = async () => {
+  try {
+    if (currentProject.value?.id) {
+      const res = await getProject(currentProject.value.id);
+
+      Object.assign(projectInfo, res.data);
+    }
+  } catch (error) {
+    console.error('获取项目详情失败:', error);
+    ElMessage.error('获取项目信息失败');
+  }
+};
+
+/**
+ * 重置表单（恢复初始状态+重新拉取项目信息）
  */
 const resetForm = () => {
   form.value = { ...initFormData, projectId: currentProject.value?.id };
   listOfWinningBidsFormRef.value?.resetFields();
+  getProjectDetail();
 };
+
 /**
- * 监听项目ID变化 - 重新初始化数据
+ * 监听项目ID变化，重新初始化数据
  */
 const projectIdWatcher = watch(
   () => currentProject.value?.id,
   (newId) => {
     if (newId) {
       form.value.projectId = newId;
+      getProjectDetail();
       initData();
     }
   }
 );
 
-// 页面挂载时初始化
+// 生命周期钩子
 onMounted(() => {
+  getProjectDetail();
   initData();
 });
 
-// 页面卸载时清除监听
 onUnmounted(() => {
   projectIdWatcher();
 });
 </script>
 
 <style scoped>
-/* 全局背景色：柔和灰色，区分页面与卡片 */
+/* 全局背景色 */
 .bg-gray-50 {
   background-color: #f9fafb;
 }
 
-/* 表单项优化：hover效果+边框过渡，提升交互感 */
-.el-form-item {
+/* 项目信息项样式 */
+.project-info-item {
+  transition: all 0.2s ease;
+  padding: 4px 0;
+  color: #696969;
+}
+
+/* 输入框/选择器统一样式 */
+.el-input__wrapper,
+.el-date-editor .el-input__wrapper,
+.el-select__wrapper {
+  border-radius: 6px !important;
   transition: all 0.2s ease;
 }
-.el-form-item:hover {
-  border-color: #e6f7ff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+
+/* 输入框hover效果 */
+.el-input__wrapper:hover,
+.el-date-editor .el-input__wrapper:hover,
+.el-select__wrapper:hover {
+  border-color: #409eff;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
 }
 
-/* 输入框/选择器统一圆角 */
-.el-input__wrapper,
-.el-date-editor .el-input__wrapper {
-  border-radius: 6px !important;
-}
-
-/* 卡片头部文字对齐优化 */
+/* 卡片头部文字样式 */
 .el-card__header-title {
   display: flex;
   align-items: center;
   height: 100%;
 }
 
-/* 按钮间距与过渡效果 */
+/* 按钮样式优化 */
 .el-button {
   transition: all 0.2s ease;
 }
+
 .el-button:hover {
   transform: translateY(-1px);
 }
 
-/* 只读输入框样式优化（区分可编辑状态） */
-.el-input--readonly .el-input__wrapper {
-  background-color: #f9fafb;
-  cursor: not-allowed;
+/* 表单项样式优化 */
+.el-form-item {
+  transition: all 0.2s ease;
+}
+
+.el-form-item:hover {
+  border-color: #e6f7ff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+/* 响应式网格布局适配 */
+@media (max-width: 767px) {
+  .grid {
+    display: grid;
+  }
+
+  .grid-cols-1 {
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+  }
+}
+
+@media (min-width: 768px) and (max-width: 1023px) {
+  .md\:grid-cols-2 {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
+  .md\:col-span-2 {
+    grid-column: span 2 / span 2;
+  }
+}
+
+@media (min-width: 1024px) {
+  .lg\:grid-cols-3 {
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+  }
+
+  .lg\:col-span-3 {
+    grid-column: span 3 / span 3;
+  }
+}
+
+/* 间距样式 */
+.gap-6 {
+  gap: 1.5rem;
+}
+
+.mb-5 {
+  margin-bottom: 1.25rem;
+}
+
+.mb-6 {
+  margin-bottom: 1.5rem;
+}
+
+.mt-4 {
+  margin-top: 1rem;
+}
+
+.mt-6 {
+  margin-top: 1.5rem;
+}
+
+.mt-8 {
+  margin-top: 2rem;
 }
 </style>
diff --git a/src/views/contract/bidCost/index.vue b/src/views/contract/bidCost/index.vue
new file mode 100644
index 0000000..8a6297b
--- /dev/null
+++ b/src/views/contract/bidCost/index.vue
@@ -0,0 +1,301 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <el-card shadow="always">
+        <el-form :model="queryForm" :inline="true">
+          <el-form-item label="版本号" prop="versions">
+            <el-select v-model="queryForm.versions" placeholder="选择版本号" @change="changeVersions">
+              <el-option v-for="item in options" :key="item.id" :label="item.versions" :value="item.id" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="表名" prop="sheet">
+            <el-select v-model="queryForm.sheet" placeholder="选择表名" @change="changeSheet">
+              <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-upload
+              ref="uploadRef"
+              class="upload-demo"
+              :http-request="importExcel"
+              :show-file-list="false"
+              v-hasPermi="['bidding:biddingLimitList:importExcelFile']"
+            >
+              <template #trigger>
+                <el-button type="primary">导入excel</el-button>
+              </template>
+            </el-upload>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              v-if="versionObj.status == 'draft'"
+              icon="Edit"
+              @click="handleAudit"
+              v-hasPermi="['desibiddinggn:biddingLimitList:query']"
+              >审核</el-button
+            >
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="view"
+              @click="handleViewInfo"
+              v-hasPermi="['desibiddinggn:biddingLimitList:query']"
+              v-if="versionObj.status != 'draft'"
+              >查看流程</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </el-card>
+    </transition>
+    <el-card shadow="never" class="mb8">
+      <el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
+        <el-table-column prop="num" label="编号" />
+        <el-table-column prop="name" label="工程或费用名称" />
+        <el-table-column prop="unit" label="单位" />
+        <el-table-column prop="quantity" label="数量" />
+        <el-table-column prop="remark" label="单价" align="center">
+          <template #default="scope">
+            <el-input-number
+              :disabled="versionObj.status != 'draft'"
+              :model-value="scope.row.unitPrice"
+              @change="(val) => (scope.row.unitPrice = val)"
+              :precision="2"
+              :step="0.1"
+              :controls="false"
+              v-if="scope.row.quantity && scope.row.quantity != 0"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="总价" align="center">
+          <template #default="scope">
+            {{ scope.row.price }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="操作" align="center">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              size="small"
+              :disabled="versionObj.status != 'draft'"
+              @click="handleSave(scope.row)"
+              v-if="scope.row.quantity && scope.row.quantity != 0"
+              v-hasPermi="['bidding:biddingLimitList:edit']"
+              >确定</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useUserStoreHook } from '@/store/modules/user';
+import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList, obtainAllVersionNumbers } from '@/api/bidding/biddingLimit';
+const { proxy } = getCurrentInstance() as any;
+
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const queryForm = ref({
+  versions: '',
+  sheet: ''
+});
+const loading = ref(false);
+const options = ref<any[]>([]);
+const sheets = ref<any[]>([]);
+const tableData = ref<any[]>([]);
+const isExpandAll = ref(true);
+const versionObj: any = ref({});
+const versionMap = new Map();
+//获取版本号
+const getVersionNums = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id,
+      pageSize: 1000,
+      pageNum: 1
+    };
+    const res = await obtainAllVersionNumbers(params);
+    if (res.code == 200) {
+      options.value = res.data;
+      if (res.data.length > 0) {
+        res.data.forEach((item: any) => {
+          versionMap.set(item.versions, item);
+        });
+        queryForm.value.versions = res.data[0].versions;
+        versionObj.value = res.data[0];
+        getSheetName();
+      } else {
+        queryForm.value.versions = '';
+        versionObj.value = {};
+      }
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
+//选择版本号
+const changeVersions = (val) => {
+  getSheetName();
+};
+
+//选择表名
+const changeSheet = () => {
+  getTableData();
+};
+
+//获取表名
+const getSheetName = async () => {
+  const params = {
+    projectId: currentProject.value?.id,
+    versions: queryForm.value.versions
+  };
+  const res = await sheetList(params);
+  if (res.code == 200) {
+    sheets.value = res.data;
+    if (res.data.length > 0) {
+      queryForm.value.sheet = res.data[0];
+    } else {
+      queryForm.value.sheet = '';
+    }
+    getTableData();
+  }
+};
+//获取表格
+const getTableData = async () => {
+  loading.value = true;
+  const params = {
+    projectId: currentProject.value?.id,
+    sheet: queryForm.value.sheet
+  };
+  const res = await getTreeLimit(params);
+  loading.value = false;
+  if (res.code == 200) {
+    if (res.data && res.data.length > 0) {
+      tableData.value = [res.data[0]];
+    } else {
+      tableData.value = [];
+    }
+  }
+};
+//修改单价
+const handleSave = (row: any) => {
+  try {
+    if (!row.unitPrice) {
+      ElMessage({
+        message: '请输入单价',
+        type: 'warning'
+      });
+      return;
+    }
+    loading.value = true;
+    biddingLimitListUpdate(row).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '修改成功',
+          type: 'success'
+        });
+        getTableData();
+      }
+    });
+  } catch (error) {
+    ElMessage({
+      message: '修改失败',
+      type: 'error'
+    });
+  }
+};
+const tableRef = ref<any>();
+
+const toggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  console.log(isExpandAll.value);
+
+  tableData.value.forEach((row) => {
+    tableRef.value.toggleRowExpansion(row, isExpandAll.value);
+  });
+};
+//导入
+const importExcel = (options: any): any => {
+  let formData = new FormData();
+  formData.append('file', options.file);
+  loading.value = true;
+  BiddingImportExcelFile({ projectId: currentProject.value?.id }, formData)
+    .then((res) => {
+      const { code } = res;
+      if (code == 200) {
+        proxy.$modal.msgSuccess(res.msg || '导入成功');
+        getTableData();
+      }
+    })
+    .catch((err) => {})
+    .finally(() => {
+      loading.value = false;
+    });
+};
+//监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    getVersionNums();
+    // getSheetName();
+  }
+);
+const handleExport = () => {
+  proxy?.download(
+    '/bidding/biddingLimitList/export',
+    {
+      projectId: currentProject.value?.id,
+      sheet: queryForm.value.sheet
+    },
+    `限价一览表${queryForm.value.sheet}.xlsx`
+  );
+};
+// 审核
+const handleAudit = () => {
+  proxy.$tab.closePage(proxy.$route);
+  let id = versionMap.get(queryForm.value.versions).id;
+  proxy.$router.push({
+    path: `/approval/biddingLimit/indexEdit`,
+    query: {
+      id,
+      type: 'add',
+      sheets: sheets.value,
+      versions: versionObj.value
+    }
+  });
+};
+// 查看审核
+const handleViewInfo = () => {
+  proxy.$tab.closePage(proxy.$route);
+  let id = versionMap.get(queryForm.value.versions).id;
+  console.log(versionObj.value);
+
+  proxy.$router.push({
+    path: `/approval/biddingLimit/indexEdit`,
+    query: {
+      id,
+      type: 'view',
+      sheets: sheets.value,
+      versions: versionObj.value
+    }
+  });
+};
+onUnmounted(() => {
+  listeningProject();
+});
+onMounted(() => {
+  getVersionNums();
+  // getSheetName();
+});
+</script>
+
+<style scoped></style>
diff --git a/src/views/contract/bidCost/indexEdit.vue b/src/views/contract/bidCost/indexEdit.vue
new file mode 100644
index 0000000..f97c080
--- /dev/null
+++ b/src/views/contract/bidCost/indexEdit.vue
@@ -0,0 +1,343 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.id"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
+      </el-card>
+      <!-- 表单区域 -->
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">成本核算清单</h3>
+        </div>
+        <div class="p-6">
+          <el-form ref="leaveFormRef" disabled :model="form" :rules="rules" label-width="100px" class="space-y-4">
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4" v-for="item in sheets" :key="item">
+              <el-form-item label="表格文件">
+                <span style="color: #8d8d8d">{{ item }}</span>
+              </el-form-item>
+            </div>
+          </el-form>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as any;
+import { useUserStoreHook } from '@/store/modules/user';
+import { getVersionDetail } from '@/api/bidding/biddingLimit';
+
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_biddingLimitList',
+    label: '成本核算清单审批'
+  }
+];
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
+const sheets = ref([]);
+const versions = ref({});
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  versionNumber: undefined,
+  fileName: undefined,
+  fileUrl: undefined,
+  fileType: undefined,
+  fileSuffix: undefined,
+  originalName: undefined,
+  remark: undefined,
+  fileId: undefined
+};
+const data = reactive({
+  form: { ...initFormData },
+  rules: {}
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getVersionDetail(routeParams.value.id);
+    Object.assign(form.value, res.data);
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  buttonLoading.value = true;
+  submit(status.value, form.value);
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    console.log(data);
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    reset();
+    routeParams.value = proxy.$route.query;
+    sheets.value = routeParams.value.sheets;
+    versions.value = routeParams.value.versions;
+    Object.assign(form.value, versions.value);
+    loading.value = false;
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      getInfo();
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>
diff --git a/src/views/contract/division/index.vue b/src/views/contract/division/index.vue
index fe7153c..f78dd09 100644
--- a/src/views/contract/division/index.vue
+++ b/src/views/contract/division/index.vue
@@ -25,6 +25,7 @@
           </el-table-column>
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="content" label="内容" />
+          <el-table-column prop="price" label="限价" />
           <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
             <template #default="scope">
               <el-date-picker v-model="scope.row.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="选择时间" />
diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue
index c491091..55230b6 100644
--- a/src/views/contract/limitPrice/index.vue
+++ b/src/views/contract/limitPrice/index.vue
@@ -36,7 +36,10 @@
             <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="clickApprovalSheet()" v-hasPermi="['tender:billofquantitiesLimitList:export']">审核</el-button>
+            <el-button type="primary" v-if="reviewStatus == 'draft'" @click="clickApprovalSheet()">审核</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" v-if="reviewStatus != 'draft'" @click="clickApprovalSheet()">查看流程</el-button>
           </el-form-item>
         </el-form>
       </el-card>
@@ -47,9 +50,10 @@
         <el-table-column prop="name" label="工程或费用名称" />
         <el-table-column prop="unit" label="单位" />
         <el-table-column prop="quantity" label="数量" />
-        <el-table-column prop="remark" label="单价" align="center">
+        <el-table-column prop="unitPrice" label="单价" align="center">
           <template #default="scope">
             <el-input-number
+              :disabled="reviewStatus != 'draft'"
               :model-value="scope.row.unitPrice"
               @change="(val) => (scope.row.unitPrice = val)"
               :precision="2"
@@ -69,6 +73,7 @@
             <el-button
               type="primary"
               size="small"
+              :disabled="reviewStatus != 'draft'"
               @click="handleSave(scope.row)"
               v-if="scope.row.quantity && scope.row.quantity != 0"
               v-hasPermi="['tender:billofquantitiesLimitList:edit']"
@@ -84,7 +89,7 @@
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
 import { listBillofquantitiesLimitList, obtainAllVersionNumbers, sheetList, updatePrice, importExcelFile } from '@/api/contract/index';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
 
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
@@ -97,6 +102,7 @@ const options = ref<any[]>([]);
 const sheets = ref<any[]>([]);
 const tableData = ref<any[]>([]);
 const isExpandAll = ref(false);
+const reviewStatus = ref('');
 
 //获取版本号
 const getVersionNums = async () => {
@@ -113,6 +119,7 @@ const getVersionNums = async () => {
       options.value = res.data;
       if (res.data.length > 0) {
         queryForm.value.versions = res.data[0].versions;
+        reviewStatus.value = res.data[0].status;
 
         getSheetName();
       } else {
@@ -132,17 +139,22 @@ const getVersionNums = async () => {
   }
 };
 //选择版本号
-const changeVersions = () => {
+const changeVersions = (val) => {
+  options.value.forEach((item) => {
+    if (item.versions == val) {
+      reviewStatus.value = item.status;
+    }
+  });
   getSheetName();
 };
 
 //选择表名
 const changeSheet = () => {
-  getTableData(); 
+  getTableData();
 };
 
 //获取表名
-const getSheetName = async () => {  
+const getSheetName = async () => {
   try {
     const params = {
       projectId: currentProject.value?.id,
@@ -182,14 +194,10 @@ const getTableData = async () => {
     };
     const res = await listBillofquantitiesLimitList(params);
     if (res.code == 200) {
-      tableData.value = [res.data[0]];
+      tableData.value = res.data;
     }
   } catch (error) {
     console.log(error);
-    ElMessage({
-      message: '获取表格失败',
-      type: 'error'
-    });
     tableData.value = [];
     loading.value = false;
   } finally {
@@ -273,18 +281,22 @@ const handleExport = () => {
   );
 };
 // 审批
-function clickApprovalSheet() {
-  proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push({
+const clickApprovalSheet = () => {
+  proxy.$tab.closePage(proxy?.$route);
+  proxy?.$router.push({
     path: `/approval/contractLimitPrice/indexEdit`,
     query: {
-      id: '',
-      type: 'update'
+      projectId: currentProject.value?.id,
+      versions: queryForm.value.versions,
+      sheet: queryForm.value.sheet,
+      type: 'update',
+      status: reviewStatus.value
     }
   });
-}
+};
 onUnmounted(() => {
   listeningProject();
+  console.log(11111111);
 });
 onMounted(() => {
   getVersionNums();
diff --git a/src/views/contract/limitPrice/indexEdit.vue b/src/views/contract/limitPrice/indexEdit.vue
index d8bbdda..d4e32da 100644
--- a/src/views/contract/limitPrice/indexEdit.vue
+++ b/src/views/contract/limitPrice/indexEdit.vue
@@ -34,17 +34,25 @@
                   <el-form-item label="版本号" prop="formNo">
                     <el-input disabled v-model="form.versions" placeholder="请输入文件名称" />
                   </el-form-item>
+                  <el-form-item label="表名" prop="formNo">
+                    <el-input disabled v-model="form.sheet" placeholder="请输入文件名称" />
+                  </el-form-item>
                 </el-col>
               </el-row>
             </div>
           </el-form>
-          <el-table :data="tableData"  style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" border>
+          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" default-expand-all border>
             <el-table-column prop="num" label="编号" />
             <el-table-column prop="name" label="名称" />
             <el-table-column prop="specification" label="规格" />
             <el-table-column prop="unit" label="单位" />
             <el-table-column prop="quantity" label="数量" />
-            <el-table-column prop="remark" label="备注" />
+            <el-table-column prop="unitPrice" label="单价" align="center" />
+            <el-table-column prop="price" label="总价" align="center">
+              <template #default="scope">
+                {{ scope.row.price }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </el-card>
@@ -88,10 +96,10 @@ import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as any;
 import { useUserStoreHook } from '@/store/modules/user';
 const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
-import { detailsMaterialAndEquipmentApproval } from '@/api/design/billofQuantities/index';
+import { listBillofquantitiesLimitList } from '@/api/contract/index';
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
@@ -100,6 +108,7 @@ const buttonLoading = ref(false);
 const loading = ref(true);
 //路由参数
 const routeParams = ref<Record<string, any>>({});
+
 const flowCode = ref<string>('');
 const status = ref<string>('');
 const dialogVisible = reactive<DialogOption>({
@@ -113,8 +122,8 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 //按钮组件
 const flowCodeOptions = [
   {
-    value: currentProject.value?.id + '_contractPriceLimit',
-    label: '合同限价审核'
+    value: currentProject.value?.id + '_xianjiayilan',
+    label: '合约限价审核'
   }
 ];
 
@@ -132,11 +141,9 @@ const submitFormData = ref<StartProcessBo>({
 const taskVariables = ref<Record<string, any>>({});
 
 const initFormData = {
-  id: undefined,
-  fileName: undefined,
-  fileUrl: undefined,
-  status: undefined,
-  originalName: undefined
+  versions: '',
+  sheet: '',
+  status: ''
 };
 const data = reactive({
   form: { ...initFormData },
@@ -162,13 +169,16 @@ const getInfo = () => {
   loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
-    const res = await detailsMaterialAndEquipmentApproval(routeParams.value.id);
+    const res = await listBillofquantitiesLimitList({
+      projectId: routeParams.value?.id,
+      versions: routeParams.value.versions,
+      sheet: routeParams.value.sheet
+    });
     console.log('res.data', res.data);
-
-    Object.assign(form.value, res.data);
+    Object.assign(form.value, routeParams.value);
     console.log('form', form.value);
-
-    tableData.value = res.data.auditData;
+    tableData.value = res.data;
+    console.log('tableData', tableData.value);
     loading.value = false;
     buttonLoading.value = false;
   });
@@ -185,10 +195,10 @@ const submitFlow = async () => {
   dialogVisible.visible = false;
 };
 //提交申请
-const handleStartWorkFlow = async (data: LeaveForm) => {
+const handleStartWorkFlow = async (data: any) => {
   try {
     submitFormData.value.flowCode = flowCode.value;
-    submitFormData.value.businessId = data.versions;
+    submitFormData.value.businessId = data.versions + '_xianjiayilan';
     //流程变量
     taskVariables.value = {
       // leave4/5 使用的流程变量
@@ -244,6 +254,8 @@ onMounted(() => {
     routeParams.value = proxy.$route.query;
     reset();
     loading.value = false;
+    console.log(routeParams.value);
+
     if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
       console.log('routeParams.value', routeParams.value);
diff --git a/src/views/ctr/expensesContract/index.vue b/src/views/ctr/expensesContract/index.vue
index f7dbf2b..141c854 100644
--- a/src/views/ctr/expensesContract/index.vue
+++ b/src/views/ctr/expensesContract/index.vue
@@ -15,9 +15,10 @@
               <el-input v-model="queryParams.contractSupplier" placeholder="请输入供应商" clearable
                 @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="合同金额" prop="amount">
+            <!-- <el-form-item label="合同金额" prop="amount">
               <el-input v-model="queryParams.amount" placeholder="请输入合同金额" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
+
             <!-- <el-form-item label="招标Id" prop="tenderId">
               <el-input v-model="queryParams.tenderId" placeholder="请输入招标Id" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
@@ -59,15 +60,25 @@
         <el-table-column type="index" width="50" label="序号" />
         <!-- <el-table-column label="项目ID" align="center" prop="projectId" /> -->
         <el-table-column label="合同编号" align="center" prop="contractCode" />
-        <el-table-column label="合同类型" align="center" prop="contractType" />
+        <!-- <el-table-column label="合同类型" align="center" prop="contractType" /> -->
         <el-table-column label="合同类型" align="center" prop="contractType">
           <template #default="scope">
             <dict-tag :options="expenses_contract_type" :value="scope.row.contractType" />
           </template>
         </el-table-column>
+        <el-table-column label="支付方式" align="center" prop="payType">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.payType == '1'">月结算</el-tag>
+            <el-tag type="primary" v-else-if="scope.row.payType == '2'">形象节点</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="供应商" align="center" prop="contractSupplier" />
-        <el-table-column label="分包内容" align="center" prop="contractedContent" />
+        <!-- <el-table-column label="分包内容" align="center" prop="contractedContent" /> -->
         <el-table-column label="合同金额" align="center" prop="amount" />
+        <el-table-column label="预付款比例(%)" align="center" prop="advancePayRatio" />
+        <el-table-column label="尾款比例(%)" align="center" prop="balancePayRatio" />
+        <el-table-column label="质保金比例(%)" align="center" prop="assuranceDepositRatio" />
+        <el-table-column label="付款比例(%)" align="center" prop="payRatio" />
         <!-- <el-table-column label="招标Id" align="center" prop="tenderId" /> -->
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -80,9 +91,13 @@
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['ctr:expensesContract:remove']"></el-button>
             </el-tooltip> -->
-            <el-tooltip content="查看附件列表" placement="top">
+
+            <div>
+              <el-button link type="success" icon="View" @click="handleShowDetail(scope.row)">查看分包内容</el-button>
+            </div>
+            <div>
               <el-button link type="primary" icon="View" @click="handleShowFileList(scope.row)">查看附件列表</el-button>
-            </el-tooltip>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -123,7 +138,17 @@
       </template>
     </el-dialog>
     <FileList v-model="fileListVisible" :fileList="fileList" />
+    <el-dialog v-model="detailVisible" title="分包内容详情" width="45%">
+      <editor :model-value="detailContent" :min-height="192" readOnly placeholder="" />
 
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="detailVisible = false">
+            关闭
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -151,6 +176,8 @@ const userStore = useUserStore();
 const queryFormRef = ref<ElFormInstance>();
 const expensesContractFormRef = ref<ElFormInstance>();
 const currentProject = computed(() => userStore.selectedProject);
+const detailContent = ref('');
+const detailVisible = ref(false); // 控制承包内容详情对话框的显示
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -294,7 +321,10 @@ const handleShowFileList = async (row: ExpensesContractVO) => {
   });
 
 }
-
+const handleShowDetail = (data) => {
+  detailContent.value = data.contractedContent
+  detailVisible.value = true;
+}
 onMounted(() => {
   getList();
 });
diff --git a/src/views/ctr/incomeContract/index.vue b/src/views/ctr/incomeContract/index.vue
index c9a4ad9..0eb9431 100644
--- a/src/views/ctr/incomeContract/index.vue
+++ b/src/views/ctr/incomeContract/index.vue
@@ -15,9 +15,9 @@
               <el-input v-model="queryParams.contractOwner" placeholder="请输入业主单位" clearable
                 @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="合同金额" prop="amount">
+            <!-- <el-form-item label="合同金额" prop="amount">
               <el-input v-model="queryParams.amount" placeholder="请输入合同金额" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -61,11 +61,21 @@
             <dict-tag :options="income_contract_type" :value="scope.row.contractType" />
           </template>
         </el-table-column>
+        <el-table-column label="支付方式" align="center" prop="payType">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.payType == '1'">月结算</el-tag>
+            <el-tag type="primary" v-else-if="scope.row.payType == '2'">形象节点</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="业主单位" align="center" prop="contractOwner" />
-        <el-table-column label="承包内容" align="center" prop="contractedContent" />
+        <!-- <el-table-column label="承包内容" align="center" prop="contractedContent" /> -->
         <el-table-column label="合同金额" align="center" prop="amount" />
+        <el-table-column label="预付款比例(%)" align="center" prop="advancePayRatio" />
+        <el-table-column label="尾款比例(%)" align="center" prop="balancePayRatio" />
+        <el-table-column label="质保金比例(%)" align="center" prop="assuranceDepositRatio" />
+        <el-table-column label="付款比例(%)" align="center" prop="payRatio" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template #default="scope">
             <!-- <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -75,9 +85,20 @@
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['ctr:incomeContract:remove']"></el-button>
             </el-tooltip> -->
-            <el-tooltip content="查看附件列表" placement="top">
+            <!-- <el-tooltip content="查看承包内容" placement="top">
+              <el-button link type="primary" icon="View" @click="handleDetail(scope.row)">详情</el-button>
+            </el-tooltip> -->
+            <div>
+              <el-button link type="primary" icon="edit" @click="handleEdit(scope.row)"
+                v-if="scope.row.isUpdate">修改合同</el-button>
+            </div>
+            <div>
+              <el-button link type="success" icon="View" @click="handleShowDetail(scope.row)">查看合同内容</el-button>
+
+            </div>
+            <div>
               <el-button link type="primary" icon="View" @click="handleShowFileList(scope.row)">查看附件列表</el-button>
-            </el-tooltip>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -115,17 +136,31 @@
       </template>
     </el-dialog>
     <FileList v-model="fileListVisible" :fileList="fileList" />
+    <el-dialog v-model="detailVisible" title="合同内容详情" width="45%">
+      <editor :model-value="detailContent" :min-height="192" readOnly placeholder="" />
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="detailVisible = false">
+            关闭
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="IncomeContract" lang="ts">
-import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList } from '@/api/ctr/incomeContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getFileList, getInfoByProjectId } from '@/api/ctr/incomeContract';
 import { IncomeContractVO, IncomeContractQuery, IncomeContractForm } from '@/api/ctr/incomeContract/types';
 import FileList from '@/components/FileList/index.vue';
 import useUserStore from '@/store/modules/user';
+import { useRouter } from 'vue-router'
+
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
 const currentProject = computed(() => userStore.selectedProject);
+const router = useRouter();
 
 const { expenses_contract_type, income_contract_type } = toRefs(
   proxy?.useDict('income_contract_type', 'expenses_contract_type')
@@ -146,7 +181,8 @@ const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-
+const detailVisible = ref(false); // 控制承包内容详情对话框的显示
+const detailContent = ref('');
 const initFormData: IncomeContractForm = {
   id: undefined,
   projectId: undefined,
@@ -284,6 +320,20 @@ const handleShowFileList = async (row: IncomeContractVO) => {
   });
 
 }
+const handleEdit = (row: IncomeContractVO) => {
+  // console.log(router);
+
+  router.push({
+    path: "/ctr/update",
+    query: {
+      id: row.id,
+    }
+  })
+}
+const handleShowDetail = (data) => {
+  detailContent.value = data.contractedContent
+  detailVisible.value = true;
+}
 onMounted(() => {
   getList();
 });
diff --git a/src/views/ctr/index.vue b/src/views/ctr/index.vue
index 851d61e..ba6d367 100644
--- a/src/views/ctr/index.vue
+++ b/src/views/ctr/index.vue
@@ -31,9 +31,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="业主单位" prop="contractOwner">
-                            <el-input v-model="form.contractOwner" placeholder="请输入业主单位" />
+                            <el-input disabled v-model="form.contractOwner" placeholder="请输入业主单位" />
                         </el-form-item>
-                        <el-form-item label="承包内容">
+                        <el-form-item label="承包内容" v-if="contract_type !== 'income'">
+                            <editor v-model="form.contractedContent" :min-height="192" />
+                        </el-form-item>
+                        <el-form-item label="合同内容" v-else">
                             <editor v-model="form.contractedContent" :min-height="192" />
                         </el-form-item>
                         <el-form-item label="合同金额" prop="amount">
@@ -86,7 +89,7 @@
                         <el-form-item label="备注" prop="remark">
                             <el-input v-model="form.remark" placeholder="请输入备注" />
                         </el-form-item>
-                        <el-form-item label="附件">
+                        <el-form-item label="合同附件">
                             <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
                                 :ref="fileRef" :defaultFileList="tempFileList" />
                         </el-form-item>
@@ -107,20 +110,16 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="预付款比例（%）" prop="advancePayRatio">
-                        <el-input v-model="form.advancePayRatio" placeholder="请输入预付款比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                        <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
                     </el-form-item>
                     <el-form-item label="尾款比例（%）" prop="balancePayRatio">
-                        <el-input v-model="form.balancePayRatio" placeholder="请输入尾款比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                        <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
                     </el-form-item>
-                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio;">
-                        <el-input v-model="form.assuranceDepositRatio" placeholder="请输入质保金比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
+                        <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
                     </el-form-item>
                     <el-form-item label="付款比例（%）" prop="payRatio">
-                        <el-input v-model="form.payRatio" placeholder="请输入付款比例"
-                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                        <el-input-number v-model="payRatioComputed" disabled />
                     </el-form-item>
                     <el-form-item>
                         <div>
@@ -157,8 +156,9 @@
 <script setup>
 import FileUpload from '@/components/FileUpload';
 import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
-import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract, getInfoByProjectId } from '@/api/ctr/incomeContract';
 import { useUserStore } from '@/store/modules/user';
+
 const active = ref(0);
 const contract_type = ref("")
 const form = ref({ payType: 1 })
@@ -198,7 +198,7 @@ const payMentRules = {
     advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
     balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
     assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
-    payRatio: [{ required: true, message: '请输入付款比例', trigger: 'blur' }],
+
 };
 
 const project = computed(() => {
@@ -207,6 +207,16 @@ const project = computed(() => {
     return JSON.parse(localStorage.getItem("selectedProject"))
 });
 
+const payRatioComputed = computed({
+    get: () => {
+        const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
+        const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
+        // form.value.payRatio = total;
+        return total;
+    },
+    // 只读
+    set: () => { }
+});
 const checkContractType = (type) => {
     contract_type.value = type;
     form.value.contract_type = type;
@@ -281,11 +291,18 @@ const resetForm = () => {
         localStorage.removeItem("tempContractForm");
     }, 0);
 };
-const submitForm = async () => {
-    console.log(payMentRef.value);
 
+const submitForm = async () => {
     await payMentRef.value.validate(async (valid) => {
         if (valid) {
+
+            if (payRatioComputed.value < 0) {
+
+                ElMessage.error('四项付款比例之和必须等于100%');
+                return;
+            }
+            form.value.payRatio = payRatioComputed.value;
+
             // 提交付款信息逻辑
             console.log('提交付款信息', form.value, fileList.value);
             // 这里可以调用API提交数据
@@ -304,6 +321,12 @@ const submitForm = async () => {
             }
             resetForm();
             ElMessage.success('合同提交成功');
+            // active.value = 0; // 重置步骤
+            if (contract_type.value === 'income') {
+                proxy.$router.push('/ctr/incomeContract');
+            } else {
+                proxy.$router.push('/ctr/expensesContract');
+            }
         } else {
             ElMessage.error('请填写完整的付款信息');
         }
@@ -358,9 +381,10 @@ const handleChoose = async () => {
 const handleChooseData = (row) => {
     form.value.tenderId = row.id;
     form.value.name = row.name;
-    form.value.contractPrice = row.contractPrice;
+    // form.value.contractPrice = row.contractPrice;
     form.value.content = row.content;
-    form.value.winningBidder = row.winningBidder;
+    form.value.contractSupplier = row.winningBidder;
+    form.value.amount = row.contractPrice;
     dialogVisible.value = false;
 };
 watch(form, (val) => {
@@ -369,7 +393,15 @@ watch(form, (val) => {
 watch(fileList, (val) => {
     localStorage.setItem("tempContractForm", JSON.stringify({ ...form.value, fileList: val }));
 }, { deep: true });
+// 获取投标列表
+const getInfoByProjectIdList = async () => {
+    const res = await getInfoByProjectId({ projectId: userStore.selectedProject.id, });
+    console.log(res);
+    form.value.contractOwner = res.data.planDuration;
+}
 onMounted(() => {
+    getInfoByProjectIdList();
+
     const tempForm = localStorage.getItem("tempContractForm");
     if (tempForm) {
         ElMessageBox.confirm('检测到有未完成的合同录入，是否继续？', '提示', {
diff --git a/src/views/ctr/update/index.vue b/src/views/ctr/update/index.vue
new file mode 100644
index 0000000..c6aa4d8
--- /dev/null
+++ b/src/views/ctr/update/index.vue
@@ -0,0 +1,328 @@
+<template>
+    <div class="container">
+        <el-steps style="max-width: 100%" :active="active" finish-status="success" align-center>
+            <el-step title="选择合同类型" />
+            <el-step title="修改合同内容" />
+            <el-step title="修改收款方式" />
+        </el-steps>
+        <div class="content">
+            <template v-if="active == 1">
+                <h1>修改收入合同</h1>
+                <el-form ref="incomeContractFormRef" :model="form" :rules="incomeContractFormRules" label-width="80px">
+                    <!-- <el-form-item label="项目名称">
+                            <el-input :model-value="project.name" disabled />
+                        </el-form-item> -->
+                    <el-form-item label="合同编号" prop="contractCode">
+                        <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
+                    </el-form-item>
+                    <el-form-item label="合同类型" prop="contractType">
+                        <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                            <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label"
+                                :value="item.value" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="业主单位" prop="contractOwner">
+                        <el-input v-model="form.contractOwner" placeholder="请输入业主单位" disabled />
+                    </el-form-item>
+                    <el-form-item label="承包内容" v-if="contract_type !== 'income'">
+                        <editor v-model="form.contractedContent" :min-height="192" />
+                    </el-form-item>
+                    <el-form-item label="合同内容" v-else>
+                        <editor v-model="form.contractedContent" :min-height="192" />
+                    </el-form-item>
+                    <el-form-item label="合同金额" prop="amount">
+                        <el-input v-model="form.amount" placeholder="请输入合同金额"
+                            oninput="value=value.replace(/[^0-9.]/g,'').replace(/\.{2,}/g,'.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')" />
+                    </el-form-item>
+                    <el-form-item label="备注" prop="remark">
+                        <el-input v-model="form.remark" placeholder="请输入备注" />
+                    </el-form-item>
+                    <el-form-item label="附件">
+                        <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
+                            :ref="fileRef" :defaultFileList="tempFileList" />
+                    </el-form-item>
+                </el-form>
+                <div>
+                    <el-button type="primary" @click="next">下一步</el-button>
+                </div>
+            </template>
+            <template v-else-if="active == 2">
+                <h1>修改收入合同</h1>
+                <el-form :model="form" :rules="payMentRules" label-width="150" ref="payMentRef">
+                    <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
+                        <el-select v-model="form.payType">
+                            <el-option :value="1" label="月结算">月结算</el-option>
+                            <el-option :value="2" label="形象节点">形象节点</el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="预付款比例（%）" prop="advancePayRatio">
+                        <el-input-number v-model="form.advancePayRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="尾款比例（%）" prop="balancePayRatio">
+                        <el-input-number v-model="form.balancePayRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="质保金比例（%）" prop="assuranceDepositRatio">
+                        <el-input-number v-model="form.assuranceDepositRatio" :max="100" :min="0" />
+                    </el-form-item>
+                    <el-form-item label="付款比例（%）" prop="payRatio">
+                        <el-input-number v-model="payRatioComputed" disabled />
+                    </el-form-item>
+                    <el-form-item>
+                        <div>
+                            <el-button @click="back(false)">上一步</el-button>
+                            <el-button type="success" @click="submitForm">提交</el-button>
+                        </div>
+                    </el-form-item>
+                </el-form>
+            </template>
+        </div>
+    </div>
+</template>
+<script setup>
+import FileUpload from '@/components/FileUpload';
+import { listExpensesContract, getExpensesContract, delExpensesContract, addExpensesContract, updateExpensesContract, getTenderPlan } from '@/api/ctr/expensesContract';
+import { listIncomeContract, getIncomeContract, delIncomeContract, addIncomeContract, updateIncomeContract } from '@/api/ctr/incomeContract';
+import { useUserStore } from '@/store/modules/user';
+const active = ref(1);
+const contract_type = ref("income")
+const form = ref({ payType: 1 })
+const fileList = ref([])
+const tempFileList = ref([])
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+const planList = ref([]);
+const dialogVisible = ref(false);
+const route = useRoute();
+const router = useRouter();
+const { expenses_contract_type, income_contract_type } = toRefs(
+    proxy?.useDict('income_contract_type', 'expenses_contract_type')
+);
+const fileRef = ref(null);
+const incomeContractFormRef = ref(null);
+const expensesContractFormRef = ref(null);
+const payMentRef = ref(null);
+const incomeContractFormRules = {
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+    contractOwner: [{ required: true, message: '请输入业主单位', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+};
+const expensesContractFormRules = {
+    contractCode: [{ required: true, message: '请输入合同编号', trigger: 'blur' }],
+    contractType: [{ required: true, message: '请选择合同类型', trigger: 'change' }],
+
+    contractSupplier: [{ required: true, message: '请输入供应商', trigger: 'blur' }],
+    amount: [{ required: true, message: '请输入合同金额', trigger: 'blur' }],
+    tenderId: [{ required: true, message: '请选择招标计划', trigger: 'blur' }],
+
+    remark: [{ required: false, message: '请输入备注', trigger: 'blur' }],
+};
+const payMentRules = {
+    payType: [{ required: true, message: '请选择支付方式', trigger: 'change' }],
+    advancePayRatio: [{ required: true, message: '请输入预付款比例', trigger: 'blur' }],
+    balancePayRatio: [{ required: true, message: '请输入尾款比例', trigger: 'blur' }],
+    assuranceDepositRatio: [{ required: true, message: '请输入质保金比例', trigger: 'blur' }],
+
+};
+
+const project = computed(() => {
+    return JSON.parse(localStorage.getItem("selectedProject"))
+});
+
+const payRatioComputed = computed({
+    get: () => {
+        const { advancePayRatio = 0, balancePayRatio = 0, assuranceDepositRatio = 0 } = form.value;
+        const total = 100 - (advancePayRatio + balancePayRatio + assuranceDepositRatio);
+        // form.value.payRatio = total;
+        return total;
+    },
+    // 只读
+    set: () => { }
+});
+
+const onUploadSuccess = (data) => {
+    fileList.value = data
+}
+
+const next = async () => {
+    if (contract_type.value === 'income') {
+        await incomeContractFormRef.value.validate((valid) => {
+            if (valid) {
+                active.value++;
+            } else {
+                ElMessage.error('请填写完整的收入合同信息');
+            }
+        });
+    } else if (contract_type.value === 'expenses') {
+        await expensesContractFormRef.value.validate((valid) => {
+            if (valid) {
+                active.value++;
+            } else {
+                ElMessage.error('请填写完整的支出合同信息');
+            }
+        });
+    }
+    console.log(active.value);
+
+    form.value.step = active.value;
+};
+const submitForm = async () => {
+    await payMentRef.value.validate(async (valid) => {
+        if (valid) {
+
+            if (payRatioComputed.value < 0) {
+
+                ElMessage.error('四项付款比例之和必须等于100%');
+                return;
+            }
+            form.value.payRatio = payRatioComputed.value;
+
+            // 提交付款信息逻辑
+            console.log('提交付款信息', form.value, fileList.value);
+            // 这里可以调用API提交数据
+            form.value.projectId = project.value.id;
+            form.value.fileList = fileList.value.map((data) => {
+                return {
+                    ...data,
+                    fileName: data.name,
+                    fileUrl: data.url,
+                }
+            })
+            if (contract_type.value === 'income') {
+                await updateIncomeContract({ ...form.value });
+            }
+            ElMessage.success('合同修改成功');
+        } else {
+            ElMessage.error('请填写完整的付款信息');
+        }
+    });
+
+}
+const handleChoose = async () => {
+    if (!form.value.contractType) {
+        ElMessage.error('请先选择合同类型');
+        return;
+    }
+    const formData = {
+        projectId: userStore.selectedProject.id,
+        dictName: form.value.contractType,
+        status: 1,
+    }
+    const { data } = await getTenderPlan(formData)
+    if (data.length === 0) {
+        ElMessage.warning('当前没有招标计划，请先创建招标计划');
+        return;
+    }
+    planList.value = data
+    dialogVisible.value = true;
+
+}
+
+onMounted(async () => {
+    // const id = route.query.id;
+    // if (id) {
+    //     const { data } = await getIncomeContract(id);
+    //     form.value.id = data.id;
+    //     form.value.contractOwner = data.contractOwner
+    // } else {
+    //     router.push('/ctr/incomeContract');
+    // }
+
+    proxy?.download(
+        '/progress/progressCategory/export',
+        {
+            "ids": [
+                "1951552037761114114",
+                "1951552037811445761",
+                "1951552037811445762",
+                "1951552037811445763",
+                "1951552037811445764",
+                "1951552037811445765",
+                "1951552037811445766",
+                "1951552037811445767",
+                "1951552037865971713",
+                "1951552037865971714",
+                "1951552037865971715",
+                "1951552037865971716",
+                "1951552037865971717",
+                "1951552037865971718",
+                "1951552037865971719",
+                "1951552037865971720",
+                "1951552037865971721",
+                "1951552037865971722",
+                "1951552037865971723",
+                "1951552037865971724",
+                "1951552037865971725",
+                "1951552037924691969",
+                "1951552037924691970",
+                "1951552037924691971",
+                "1951552037924691972",
+                "1951552037924691973",
+                "1951552037924691974",
+                "1951552037924691975",
+                "1951552037924691976",
+                "1951552037924691977",
+                "1951552037962440706",
+                "1951552037962440707",
+                "1951552037962440708",
+                "1951552037962440709",
+                "1951552037962440710",
+                "1951552037962440711",
+                "1951552037962440712",
+                "1951552038004383745",
+                "1951552038004383746",
+                "1951552038004383747",
+                "1951552038004383748",
+                "1951552038004383749",
+                "1951552038004383750",
+                "1951552038004383751",
+                "1951552038004383752",
+                "1951552038004383753",
+                "1951552038004383754",
+                "1951552038058909698",
+                "1951552038058909699",
+                "1951552038058909700",
+                "1951552038058909701",
+                "1951552038058909702",
+                "1951552038058909703",
+                "1951552038058909704",
+                "1951552038096658434",
+                "1951552038096658435",
+                "1951552038096658436",
+                "1951552038096658437",
+                "1951552038096658438",
+                "1951552038096658439",
+                "1951552038096658440",
+                "1951552038096658441",
+                "1951552038096658442",
+                "1951552038096658443",
+                "1951552038096658444",
+                "1951552038146990081",
+                "1951552038146990082",
+                "1951552038146990083",
+                "1951552038146990084",
+                "1951552038146990085",
+                "1951552038188933122",
+                "1951552038188933123",
+                "1951552038188933124"
+            ]
+        },
+        `1.xlsx`
+    );
+})
+</script>
+<style scoped lang="scss">
+.container {
+    padding: 20px;
+
+    .content {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 30px;
+        flex-direction: column;
+    }
+}
+</style>
diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue
index 1aa02bc..cbf9764 100644
--- a/src/views/design/designChange/index.vue
+++ b/src/views/design/designChange/index.vue
@@ -74,14 +74,14 @@
               link
               icon="Upload"
               @click="handleAddChange(scope.row)"
-              v-if="scope.row.status == 'draft' || scope.row.status == 'back'"
+              v-if="(scope.row.status == 'finish' || scope.row.costEstimation == '0') && scope.row.auditStatus == 'draft'"
               >上传</el-button
             >
             <el-button
               type="success"
               link
               icon="View"
-              v-if="scope.row.status != 'draft'"
+              v-if="scope.row.auditStatus != 'draft'"
               v-hasPermi="['design:designChange:query']"
               @click="handleViewInfo(scope.row)"
               >查看</el-button
@@ -238,6 +238,7 @@ const handleViewInfo = (row) => {
     path: `/approval/drawing/indexEdit`,
     query: {
       id: row.id,
+      costEstimation: row.costEstimation,
       type: 'view'
     }
   });
diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue
index f48e6f7..a834692 100644
--- a/src/views/design/designChange/indexEdit.vue
+++ b/src/views/design/designChange/indexEdit.vue
@@ -1,25 +1,21 @@
 <template>
-  <div class="p-4 bg-gray-50 designChangeForm">
+  <div class="p-4 bg-gray-50">
     <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton @submitForm="submitForm" @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord" :buttonLoading="buttonLoading" :id="form.id"
+          :status="form.status" :pageType="routeParams.type" />
+      </el-card>
       <!-- 表单区域 -->
-      <div v-if="routeParams.type == 'view'" style="width: 100%; text-align: right; margin-bottom: 10px">
-        <el-button @click="goBack" size="large" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
-          >返回</el-button
-        >
-      </div>
-      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+      <el-card
+        class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
-          <h3 class="text-lg font-semibold text-gray-800">下发变更通知信息</h3>
+          <h3 class="text-lg font-semibold text-gray-800">变更图纸信息</h3>
         </div>
         <div class="p-6">
-          <el-form
-            ref="leaveFormRef"
-            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
-            :model="form"
-            :rules="rules"
-            label-width="100px"
-            class="space-y-4"
-          >
+          <el-form ref="leaveFormRef" :disabled="routeParams.type === 'view' || form.status == 'waiting'" :model="form"
+            :rules="rules" label-width="100px" class="space-y-4">
             <div class="grid grid-cols-1 gap-4">
               <el-row>
                 <el-col :span="12">
@@ -29,27 +25,14 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="工程名称" prop="projectName">
-                    <el-input v-model="form.projectName" placeholder="请输入工程名称" /> </el-form-item
-                ></el-col>
+                    <el-input v-model="form.projectName" placeholder="请输入工程名称" /> </el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="原卷册号" prop="volumeNo">
-                    <el-select
-                      id="projectSelect"
-                      v-model="form.volumeNo"
-                      placeholder="请选择原卷册号"
-                      clearable
-                      filterable
-                      @change="handleSelect"
-                      style="width: 150px; margin-right: 20px"
-                    >
-                      <el-option
-                        v-for="project in volumeCatalogList"
-                        :key="project.volumeNumber"
-                        :label="project.volumeNumber"
-                        :value="project.volumeNumber"
-                      />
-                    </el-select> </el-form-item
-                ></el-col>
+                    <el-select id="projectSelect" v-model="form.volumeNo" placeholder="请选择原卷册号" clearable filterable
+                      @change="handleSelect" style="width: 150px; margin-right: 20px">
+                      <el-option v-for="project in volumeCatalogList" :key="project.volumeNumber"
+                        :label="project.volumeNumber" :value="project.volumeNumber" />
+                    </el-select> </el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="提出单位" prop="submitUnit">
                     <el-input v-model="form.submitUnit" placeholder="请输入提出单位" />
@@ -62,16 +45,16 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="提出日期" prop="submitDate">
-                    <el-date-picker clearable v-model="form.submitDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择提出日期">
-                    </el-date-picker> </el-form-item
-                ></el-col>
+                    <el-date-picker clearable v-model="form.submitDate" type="date" value-format="YYYY-MM-DD HH:mm:ss"
+                      placeholder="请选择提出日期">
+                    </el-date-picker> </el-form-item></el-col>
                 <!-- <el-col :span="12">
                   <el-form-item label="卷册名称" prop="volumeName"> <el-input v-model="form.volumeName" placeholder="请输入卷册名称" /> </el-form-item
                 ></el-col> -->
                 <el-col :span="12">
                   <el-form-item label="子项名称" prop="subName">
-                    <el-input disabled v-model="form.extendDetail.subName" placeholder="请输入子项名称" /> </el-form-item
-                ></el-col>
+                    <el-input disabled v-model="form.extendDetail.subName" placeholder="请输入子项名称" />
+                  </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="原设计处置" prop="designDisposal">
                     <el-radio-group v-model="form.extendDetail.designDisposal" @change="handleRadio">
@@ -79,8 +62,7 @@
                       <el-radio value="2" :disabled="!designId" size="large">原图保留，部分修改</el-radio>
                       <el-radio value="3" size="large">原图保留，补充设计</el-radio>
                     </el-radio-group>
-                  </el-form-item></el-col
-                >
+                  </el-form-item></el-col>
                 <el-col :span="24" v-if="form.extendDetail.designDisposal == 2">
                   <el-form-item label="保留文件" prop="saveFile">
                     <el-checkbox-group v-model="form.saveFile">
@@ -88,20 +70,17 @@
                         {{ dict.fileName }}
                       </el-checkbox>
                     </el-checkbox-group>
-                  </el-form-item></el-col
-                >
+                  </el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="设计阶段" prop="designPhase">
-                    <el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item
-                ></el-col>
+                    <el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更类别" prop="changeCategory">
                     <el-radio-group v-model="form.extendDetail.changeCategory">
                       <el-radio value="1" size="large">重大设计变更</el-radio>
                       <el-radio value="2" size="large">一般设计变更</el-radio>
                     </el-radio-group>
-                  </el-form-item></el-col
-                >
+                  </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="实施程序" prop="ImpProcedure">
                     <el-radio-group v-model="form.extendDetail.ImpProcedure">
@@ -109,15 +88,14 @@
                       <el-radio value="2" size="large">建设单位送原施工图审查机构审查、建设主管部分备案后交付实施</el-radio>
                       <el-radio value="3" size="large">建设单位确认后交付实施</el-radio>
                     </el-radio-group>
-                  </el-form-item></el-col
-                >
+                  </el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="更改相关专业" prop="involvingProfessions">
-                    <el-input v-model="form.extendDetail.involvingProfessions" placeholder="请输入更改相关专业" /> </el-form-item
-                ></el-col>
+                    <el-input v-model="form.extendDetail.involvingProfessions" placeholder="请输入更改相关专业" />
+                  </el-form-item></el-col>
                 <el-col :span="24">
-                  <el-form-item label="附图" prop="attachmentPic"> <image-upload v-model="form.attachmentPic" :fileSize="100" /> </el-form-item
-                ></el-col>
+                  <el-form-item label="附图" prop="attachmentPic"> <image-upload v-model="form.attachmentPic"
+                      :fileSize="100" /> </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更原因" prop="changeReason">
                     <el-checkbox-group v-model="form.changeReason">
@@ -125,78 +103,107 @@
                         {{ dict.label }}
                       </el-checkbox>
                     </el-checkbox-group>
-                  </el-form-item></el-col
-                >
+                  </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更内容" prop="changeContent">
-                    <el-input v-model="form.changeContent" type="textarea" placeholder="请输入内容" /> </el-form-item
-                ></el-col>
+                    <el-input v-model="form.changeContent" type="textarea" placeholder="请输入内容" />
+                  </el-form-item></el-col>
                 <el-col :span="12">
                   <el-form-item label="费用" prop="costEstimation">
-                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" /> </el-form-item
-                ></el-col>
+                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" />
+                  </el-form-item></el-col>
                 <el-col :span="24">
                   <el-form-item label="变更费用估算表" label-width="110px" prop="costEstimationFile">
-                    <file-upload v-model="form.costEstimationFile" :fileSize="100" /> </el-form-item
-                ></el-col>
+                    <file-upload v-model="form.costEstimationFile" :fileSize="100" /> </el-form-item></el-col>
                 <!-- <el-col :span="24">
                   <el-form-item label="变更文件" prop="fileId"> <file-upload v-model="form.fileId" :fileSize="100" /> </el-form-item
                 ></el-col> -->
-                <el-col :span="24"
-                  ><el-form-item label="备注" prop="remark">
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> </el-form-item
-                ></el-col>
+                <el-col :span="24"><el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> </el-form-item></el-col>
               </el-row>
             </div>
           </el-form>
         </div>
-        <div class="flex justify-center gap-4 mt-8">
-          <el-button
-            v-if="routeParams.type != 'view'"
-            @click="goBack"
-            size="large"
-            class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
-            >返回</el-button
-          >
-          <el-button
-            type="primary"
-            size="large"
-            v-if="routeParams.type != 'view'"
-            @click="submitForm"
-            class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
-            >确认</el-button
-          >
-        </div>
       </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog draggable v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose"
+        width="500" class="rounded-lg shadow-lg">
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose"
+              class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors">取消</el-button>
+            <el-button type="primary" @click="submitFlow()"
+              class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors">确认</el-button>
+          </div>
+        </template>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script setup name="Leave" lang="ts">
+import { LeaveForm } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { useUserStoreHook } from '@/store/modules/user';
-import { addDesignChange, getDesignChange, catalogList, blueprintList } from '@/api/design/designChange';
+import { getDrawing } from '@/api/design/drawing';
+import { updateDesignChange, getDesignChange, catalogList, blueprintList, addDesignChange } from '@/api/design/designChange';
 const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
-const route = useRoute();
-const router = useRouter();
+
 // 获取用户 store
 const userStore = useUserStoreHook();
 // 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const buttonLoading = ref(false);
-const volumeCatalogList = ref([]);
-const blueprintListAll = ref([]);
-let volumeMap = new Map();
+const loading = ref(true);
 //路由参数
 const routeParams = ref<Record<string, any>>({});
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_designchangeddoc',
+    label: '设计变更下发审批'
+  }
+];
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const approvalButtonRef = ref<InstanceType<typeof ApprovalButton>>();
+
 const leaveFormRef = ref<ElFormInstance>();
 const dialog = reactive({
   visible: false,
   title: '',
   isEdit: false
 });
-const fileVoList = ref([]);
-const designId = ref('');
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
 const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
@@ -243,55 +250,35 @@ const data = reactive({
   rules: {
     // 卷册号
     volumeNo: [{ required: true, message: '请请选择卷册号', trigger: 'change' }],
-    formNo: [{ required: true, message: '申请单编号不能为空', trigger: 'change' }]
+    formNo: [{ required: true, message: '申请单编号不能为空', trigger: 'change' }],
+    costEstimation: [{ required: true, message: '费用不能为空', trigger: 'change' }]
   }
 });
 
 const { form, rules } = toRefs(data);
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  leaveFormRef.value?.resetFields();
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
 };
 
-//返回
-const goBack = () => {
-  proxy.$tab.closePage(route);
-  router.go(-1);
-};
-/** 提交按钮 */
-const submitForm = () => {
-  var changeReason = '';
-  if (form.value.changeReason && form.value.changeReason.length > 0) {
-    changeReason = form.value.changeReason.join(',');
-  }
-  var saveFile = '';
-  if (form.value.saveFile && form.value.saveFile.length > 0) {
-    saveFile = form.value.saveFile.join(',');
-  }
-  leaveFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      var res;
-      res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
-      if (res.code == 200) {
-        ElMessage.success('通知成功');
-        goBack();
-      } else {
-        ElMessage.error(res.msg);
-      }
-    }
-  });
-};
-/** 查询卷册目录列表 */
-const getList = async () => {
-  const res = await catalogList(currentProject.value?.id);
-  volumeCatalogList.value = res.data;
-  volumeCatalogList.value.forEach((e) => {
-    volumeMap.set(e.volumeNumber, e);
-  });
+const fileVoList = ref([]);
+const designId = ref('');
+let volumeMap = new Map();
+
+const handleSelect = (val) => {
+  let obj = volumeMap.get(val);
+  console.log('🚀 ~ handleSelect ~ obj:', obj);
+
+  fileVoList.value = obj.fileVoList;
+  designId.value = obj.design;
+  form.value.volumeName = obj.volumeName;
+  form.value.specialty = obj.specialty;
+  form.value.specialtyName = obj.specialtyName;
+  form.value.extendDetail.subName = obj.designSubitem;
 };
 // 获取图纸列表
+const blueprintListAll = ref([]);
 const getBlueprintList = async () => {
   const res = await blueprintList(designId.value);
   blueprintListAll.value = res.data;
@@ -302,17 +289,17 @@ const handleRadio = (val) => {
     getBlueprintList();
   }
 };
-const handleSelect = (val) => {
-  let obj = volumeMap.get(val);
-  fileVoList.value = obj.fileVoList;
-  designId.value = obj.design;
-  form.value.volumeName = obj.volumeName;
-  form.value.specialty = obj.specialty;
-  form.value.specialtyName = obj.specialtyName;
-  form.value.extendDetail.subName = obj.designSubitem;
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
 };
+const volumeCatalogList = ref([]);
+
 /** 获取详情 */
 const getInfo = () => {
+  loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
     const res = await getDesignChange(routeParams.value.id);
@@ -320,27 +307,127 @@ const getInfo = () => {
     if (form.value.changeReason.length > 0) {
       form.value.changeReason = form.value.changeReason.split(',');
     }
+    loading.value = false;
     buttonLoading.value = false;
   });
 };
+//返回
+const goBack = () => {
+  proxy.$tab.closePage(route);
+  router.go(-1);
+};
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  if (routeParams.value.type == 'add') {
+    var changeReason = '';
+    if (form.value.changeReason && form.value.changeReason.length > 0) {
+      changeReason = form.value.changeReason.join(',');
+    }
+    var saveFile = '';
+    if (form.value.saveFile && form.value.saveFile.length > 0) {
+      saveFile = form.value.saveFile.join(',');
+    }
+  }
+  leaveFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      var res;
+      res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
+      if (res.code == 200) {
+        if (form.value.costEstimation == '0') {
+          ElMessage.success('通知成功');
+          goBack();
+        } else {
+          submit(status.value, res.data);
+        }
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }
+  });
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: LeaveForm) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.id;
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(route);
+  router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId, true, routeParams.value.businessId);
+  // submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const route = useRoute();
+const router = useRouter();
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(route);
+    router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    console.log(data);
+    await handleStartWorkFlow(data);
+  }
+};
 
 onMounted(() => {
   nextTick(async () => {
-    routeParams.value = proxy.$route.query;
+    routeParams.value = route.query;
     reset();
-    getList();
-    if (routeParams.value.type != 'add') {
+    loading.value = false;
+    const res = await catalogList(currentProject.value?.id);
+    volumeCatalogList.value = res.data;
+    volumeCatalogList.value.forEach((e) => {
+      volumeMap.set(e.volumeNumber, e);
+    });
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
     }
   });
 });
 </script>
 <style scoped lang="scss">
-.designChangeForm {
-  .el-select {
-    width: 300px !important;
-  }
-}
 /* 全局样式 */
 :root {
   --primary: #409eff;
diff --git a/src/views/design/designChange/indexEdit1.vue b/src/views/design/designChange/indexEdit1.vue
new file mode 100644
index 0000000..f48e6f7
--- /dev/null
+++ b/src/views/design/designChange/indexEdit1.vue
@@ -0,0 +1,446 @@
+<template>
+  <div class="p-4 bg-gray-50 designChangeForm">
+    <div class="max-w-4xl mx-auto">
+      <!-- 表单区域 -->
+      <div v-if="routeParams.type == 'view'" style="width: 100%; text-align: right; margin-bottom: 10px">
+        <el-button @click="goBack" size="large" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+          >返回</el-button
+        >
+      </div>
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">下发变更通知信息</h3>
+        </div>
+        <div class="p-6">
+          <el-form
+            ref="leaveFormRef"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+            class="space-y-4"
+          >
+            <div class="grid grid-cols-1 gap-4">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="申请单编号" prop="formNo">
+                    <el-input v-model="form.formNo" placeholder="请输入申请单编号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="工程名称" prop="projectName">
+                    <el-input v-model="form.projectName" placeholder="请输入工程名称" /> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="原卷册号" prop="volumeNo">
+                    <el-select
+                      id="projectSelect"
+                      v-model="form.volumeNo"
+                      placeholder="请选择原卷册号"
+                      clearable
+                      filterable
+                      @change="handleSelect"
+                      style="width: 150px; margin-right: 20px"
+                    >
+                      <el-option
+                        v-for="project in volumeCatalogList"
+                        :key="project.volumeNumber"
+                        :label="project.volumeNumber"
+                        :value="project.volumeNumber"
+                      />
+                    </el-select> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="提出单位" prop="submitUnit">
+                    <el-input v-model="form.submitUnit" placeholder="请输入提出单位" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="专业" prop="specialtyName">
+                    <el-input disabled v-model="form.specialtyName" placeholder="请输入专业" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="提出日期" prop="submitDate">
+                    <el-date-picker clearable v-model="form.submitDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择提出日期">
+                    </el-date-picker> </el-form-item
+                ></el-col>
+                <!-- <el-col :span="12">
+                  <el-form-item label="卷册名称" prop="volumeName"> <el-input v-model="form.volumeName" placeholder="请输入卷册名称" /> </el-form-item
+                ></el-col> -->
+                <el-col :span="12">
+                  <el-form-item label="子项名称" prop="subName">
+                    <el-input disabled v-model="form.extendDetail.subName" placeholder="请输入子项名称" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="原设计处置" prop="designDisposal">
+                    <el-radio-group v-model="form.extendDetail.designDisposal" @change="handleRadio">
+                      <el-radio value="1" size="large">原图作废</el-radio>
+                      <el-radio value="2" :disabled="!designId" size="large">原图保留，部分修改</el-radio>
+                      <el-radio value="3" size="large">原图保留，补充设计</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="24" v-if="form.extendDetail.designDisposal == 2">
+                  <el-form-item label="保留文件" prop="saveFile">
+                    <el-checkbox-group v-model="form.saveFile">
+                      <el-checkbox v-for="dict in blueprintListAll" :key="dict.id" :value="dict.id">
+                        {{ dict.fileName }}
+                      </el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="12">
+                  <el-form-item label="设计阶段" prop="designPhase">
+                    <el-input v-model="form.extendDetail.designPhase" placeholder="请输入设计阶段" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="变更类别" prop="changeCategory">
+                    <el-radio-group v-model="form.extendDetail.changeCategory">
+                      <el-radio value="1" size="large">重大设计变更</el-radio>
+                      <el-radio value="2" size="large">一般设计变更</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="24">
+                  <el-form-item label="实施程序" prop="ImpProcedure">
+                    <el-radio-group v-model="form.extendDetail.ImpProcedure">
+                      <el-radio value="1" size="large">建设单位重新申报初步设计审批</el-radio>
+                      <el-radio value="2" size="large">建设单位送原施工图审查机构审查、建设主管部分备案后交付实施</el-radio>
+                      <el-radio value="3" size="large">建设单位确认后交付实施</el-radio>
+                    </el-radio-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="12">
+                  <el-form-item label="更改相关专业" prop="involvingProfessions">
+                    <el-input v-model="form.extendDetail.involvingProfessions" placeholder="请输入更改相关专业" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="附图" prop="attachmentPic"> <image-upload v-model="form.attachmentPic" :fileSize="100" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="变更原因" prop="changeReason">
+                    <el-checkbox-group v-model="form.changeReason">
+                      <el-checkbox v-for="dict in design_change_reason_type" :key="dict.value" :value="dict.value">
+                        {{ dict.label }}
+                      </el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item></el-col
+                >
+                <el-col :span="24">
+                  <el-form-item label="变更内容" prop="changeContent">
+                    <el-input v-model="form.changeContent" type="textarea" placeholder="请输入内容" /> </el-form-item
+                ></el-col>
+                <el-col :span="12">
+                  <el-form-item label="费用" prop="costEstimation">
+                    <el-input v-model="form.costEstimation" type="number" placeholder="请输入费用" /> </el-form-item
+                ></el-col>
+                <el-col :span="24">
+                  <el-form-item label="变更费用估算表" label-width="110px" prop="costEstimationFile">
+                    <file-upload v-model="form.costEstimationFile" :fileSize="100" /> </el-form-item
+                ></el-col>
+                <!-- <el-col :span="24">
+                  <el-form-item label="变更文件" prop="fileId"> <file-upload v-model="form.fileId" :fileSize="100" /> </el-form-item
+                ></el-col> -->
+                <el-col :span="24"
+                  ><el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> </el-form-item
+                ></el-col>
+              </el-row>
+            </div>
+          </el-form>
+        </div>
+        <div class="flex justify-center gap-4 mt-8">
+          <el-button
+            v-if="routeParams.type != 'view'"
+            @click="goBack"
+            size="large"
+            class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+            >返回</el-button
+          >
+          <el-button
+            type="primary"
+            size="large"
+            v-if="routeParams.type != 'view'"
+            @click="submitForm"
+            class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+            >确认</el-button
+          >
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { useUserStoreHook } from '@/store/modules/user';
+import { addDesignChange, getDesignChange, catalogList, blueprintList } from '@/api/design/designChange';
+const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
+const route = useRoute();
+const router = useRouter();
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const volumeCatalogList = ref([]);
+const blueprintListAll = ref([]);
+let volumeMap = new Map();
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const fileVoList = ref([]);
+const designId = ref('');
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  formNo: undefined,
+  projectName: undefined,
+  submitUnit: undefined,
+  specialty: undefined,
+  specialtyName: undefined,
+  submitDate: undefined,
+  volumeName: undefined,
+  volumeNo: undefined,
+  attachmentPic: undefined,
+  changeReason: [],
+  changeContent: undefined,
+  costEstimation: undefined,
+  costEstimationFile: undefined,
+  fileId: undefined,
+  status: undefined,
+  remark: undefined,
+  saveFile: [],
+  extendDetail: {
+    changeCategory: undefined,
+    ImpProcedure: undefined,
+    involvingProfessions: undefined,
+    subName: undefined,
+    designDisposal: undefined,
+    designPhase: undefined
+  }
+};
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value?.id,
+    fileName: undefined,
+    fileType: undefined,
+    fileSuffix: undefined,
+    fileStatus: undefined,
+    originalName: undefined,
+    newest: undefined,
+    params: {}
+  },
+  rules: {
+    // 卷册号
+    volumeNo: [{ required: true, message: '请请选择卷册号', trigger: 'change' }],
+    formNo: [{ required: true, message: '申请单编号不能为空', trigger: 'change' }]
+  }
+});
+
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+//返回
+const goBack = () => {
+  proxy.$tab.closePage(route);
+  router.go(-1);
+};
+/** 提交按钮 */
+const submitForm = () => {
+  var changeReason = '';
+  if (form.value.changeReason && form.value.changeReason.length > 0) {
+    changeReason = form.value.changeReason.join(',');
+  }
+  var saveFile = '';
+  if (form.value.saveFile && form.value.saveFile.length > 0) {
+    saveFile = form.value.saveFile.join(',');
+  }
+  leaveFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      var res;
+      res = await addDesignChange({ ...form.value, changeReason, saveFile }).finally(() => (buttonLoading.value = false));
+      if (res.code == 200) {
+        ElMessage.success('通知成功');
+        goBack();
+      } else {
+        ElMessage.error(res.msg);
+      }
+    }
+  });
+};
+/** 查询卷册目录列表 */
+const getList = async () => {
+  const res = await catalogList(currentProject.value?.id);
+  volumeCatalogList.value = res.data;
+  volumeCatalogList.value.forEach((e) => {
+    volumeMap.set(e.volumeNumber, e);
+  });
+};
+// 获取图纸列表
+const getBlueprintList = async () => {
+  const res = await blueprintList(designId.value);
+  blueprintListAll.value = res.data;
+};
+const handleRadio = (val) => {
+  form.value.saveFile = [];
+  if (val == 2) {
+    getBlueprintList();
+  }
+};
+const handleSelect = (val) => {
+  let obj = volumeMap.get(val);
+  fileVoList.value = obj.fileVoList;
+  designId.value = obj.design;
+  form.value.volumeName = obj.volumeName;
+  form.value.specialty = obj.specialty;
+  form.value.specialtyName = obj.specialtyName;
+  form.value.extendDetail.subName = obj.designSubitem;
+};
+/** 获取详情 */
+const getInfo = () => {
+  buttonLoading.value = false;
+  nextTick(async () => {
+    const res = await getDesignChange(routeParams.value.id);
+    Object.assign(form.value, res.data);
+    if (form.value.changeReason.length > 0) {
+      form.value.changeReason = form.value.changeReason.split(',');
+    }
+    buttonLoading.value = false;
+  });
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    reset();
+    getList();
+    if (routeParams.value.type != 'add') {
+      getInfo();
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+.designChangeForm {
+  .el-select {
+    width: 300px !important;
+  }
+}
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>
diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue
index 76c3b5b..0f5489d 100644
--- a/src/views/design/drawing/indexEdit.vue
+++ b/src/views/design/drawing/indexEdit.vue
@@ -88,12 +88,16 @@ const buttonLoading = ref(false);
 const loading = ref(true);
 //路由参数
 const routeParams = ref<Record<string, any>>({});
-const flowCodeOptions = [
+const flowCodeOptions = ref([
   {
     value: currentProject.value?.id + '_designchanged',
     label: '变更图纸审批'
+  },
+  {
+    value: currentProject.value?.id + '_moneydesignchanged',
+    label: '资金设计变更审批'
   }
-];
+]);
 
 const flowCode = ref<string>('');
 const status = ref<string>('');
@@ -129,6 +133,7 @@ const initFormData = {
   fileUrl: undefined,
   fileType: undefined,
   fileSuffix: undefined,
+  costEstimation: undefined,
   originalName: undefined,
   remark: undefined,
   fileId: undefined
@@ -144,6 +149,7 @@ const data = reactive({
     fileSuffix: undefined,
     fileStatus: undefined,
     originalName: undefined,
+    costEstimation: undefined,
     newest: undefined,
     params: {}
   },
@@ -182,8 +188,13 @@ const getInfo = () => {
   loading.value = true;
   buttonLoading.value = false;
   nextTick(async () => {
-    const res = await getDesignChange(routeParams.value.id);
+    var id = routeParams.value.id;
+    if (routeParams.value.type === 'approval') {
+      id = routeParams.value.id.split('_')[0];
+    }
+    const res = await getDesignChange(id);
     Object.assign(form.value, res.data);
+    if (res.data.costEstimation) form.value.status = res.data.auditStatus;
     loading.value = false;
     buttonLoading.value = false;
   });
@@ -248,6 +259,8 @@ const approvalVerifyOpen = async () => {
 // 图纸上传成功之后 开始提交
 const submit = async (status, data) => {
   form.value = data;
+  form.value.id = routeParams.value.type == 'add' ? form.value.id + '_' : form.value.id.split('_')[0];
+  form.value.status = data.auditStatus ? data.auditStatus : data.status;
   if (status === 'draft') {
     buttonLoading.value = false;
     proxy?.$modal.msgSuccess('暂存成功');
@@ -255,7 +268,13 @@ const submit = async (status, data) => {
     proxy.$router.go(-1);
   } else {
     if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
-      flowCode.value = flowCodeOptions[0].value;
+      if (form.value.costEstimation == '0') {
+        flowCodeOptions.value = [flowCodeOptions.value[0]];
+      } else {
+        console.log('🚀 ~ submit ~ flowCodeOptions.value:', flowCodeOptions.value[1]);
+        flowCodeOptions.value = [flowCodeOptions.value[1]];
+      }
+      flowCode.value = flowCodeOptions.value[0].value;
       dialogVisible.visible = true;
       return;
     }
@@ -275,6 +294,8 @@ onMounted(() => {
     loading.value = false;
     if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
       getInfo();
+    } else {
+      form.value.costEstimation = routeParams.value.costEstimation;
     }
   });
 });
diff --git a/src/views/design/drawingreview/detailForm.vue b/src/views/design/drawingreview/detailForm.vue
index 2862788..b836c41 100644
--- a/src/views/design/drawingreview/detailForm.vue
+++ b/src/views/design/drawingreview/detailForm.vue
@@ -81,13 +81,8 @@
         </el-col> -->
         <el-col :span="12">
           <el-form-item label="校审时间" prop="proofreadingDate">
-            <el-date-picker
-              v-model="formData.proofreadingDate"
-              type="date"
-              placeholder="选择校审时间"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-            />
+            <el-date-picker v-model="formData.proofreadingDate" type="date" placeholder="选择校审时间" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -102,7 +97,8 @@
         </el-col> -->
         <el-col :span="12">
           <el-form-item label="审核时间" prop="auditDate">
-            <el-date-picker v-model="formData.auditDate" type="date" placeholder="选择审核时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-date-picker v-model="formData.auditDate" type="date" placeholder="选择审核时间" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -117,7 +113,8 @@
         </el-col> -->
         <el-col :span="12">
           <el-form-item label="执行时间" prop="executorDate">
-            <el-date-picker v-model="formData.executorDate" type="date" placeholder="选择执行时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-date-picker v-model="formData.executorDate" type="date" placeholder="选择执行时间" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -275,13 +272,25 @@ const submit = async (businessId, cb) => {
   // 先验证表单
   await formRef.value?.validate();
   cb();
+  // 加载中
+  ElLoading.service({
+    lock: true,
+    text: '提交中...',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
+
   formData.subprojectName = subProjectMap.get(formData.subprojectId);
-  formData.drawingreviewId = businessId;
+  // formData.drawingreviewId = businessId;
+  console.log(businessId);
+  // businessId 设置 如果有下滑线去掉后面及下划线
+  formData.drawingreviewId = businessId.replace(/_/g, '');
   const res = await drawingreviewReceipts(formData);
   if (res.code === 200) {
-    // // 提交成功处理逻辑
-    // console.log('提交成功');
+    // 提交成功处理逻辑
+    console.log('提交成功');
   }
+  // 关闭
+  ElLoading.service().close();
 };
 onMounted(() => {
   getSubProject();
diff --git a/src/views/design/received/index.vue b/src/views/design/received/index.vue
index 304c2e1..9d21ddd 100644
--- a/src/views/design/received/index.vue
+++ b/src/views/design/received/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-6 bg-gray-50">
-    <div class="received mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
+    <div
+      class="received mx-auto bg-white rounded-xl shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
       <!-- 表单标题区域 -->
       <div class="bg-gradient-to-r from-blue-500 to-blue-600 text-white p-6">
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>收集资料清单</h2>
@@ -15,23 +16,15 @@
 
           <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <el-form-item label="收资人" prop="userId" class="mb-4">
-              <el-select
-                :disabled="disabledAll"
-                v-model="form.userId"
-                placeholder="请选择收资人"
-                class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
-              >
+              <el-select :disabled="disabledAll" v-model="form.userId" placeholder="请选择收资人"
+                class="w-full transition-all duration-300 border-gray-300 focus:border-blue-400 focus:ring-1 focus:ring-blue-400">
                 <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
             <el-form-item label="专业" prop="user_major" class="mb-4">
-              <el-select
-                :disabled="disabledAll"
-                v-model="form.user_major"
-                placeholder="请选择专业"
+              <el-select :disabled="disabledAll" v-model="form.user_major" placeholder="请选择专业"
                 class="transition-all duration-300 border-gray-300"
-                :rules="{ required: true, message: '请选择专业', trigger: 'change' }"
-              >
+                :rules="{ required: true, message: '请选择专业', trigger: 'change' }">
                 <el-option v-for="item in des_user_major" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -49,32 +42,25 @@
         <div class="mb-6">
           <div class="flex items-center justify-between mb-4">
             <h3 class="text-lg font-semibold text-blue-700">资料文件清单</h3>
-            <el-button type="primary" size="small" @click="addDocumentItem" v-if="!disabledAll" icon="Plus"> 添加资料 </el-button>
+            <el-button type="primary" size="small" @click="addDocumentItem" v-if="!disabledAll" icon="Plus"> 添加资料
+            </el-button>
           </div>
           <el-form ref="documentsFormRef" :model="form" class="space-y-4">
-            <div v-for="(item, index) in form.documents" :key="item.id" class="bg-gray-50 p-4 rounded-lg transition-all duration-200 hover:shadow-sm">
+            <div v-for="(item, index) in form.documents" :key="item.id"
+              class="bg-gray-50 p-4 rounded-lg transition-all duration-200 hover:shadow-sm">
               <div class="flex justify-between items-start mb-2">
                 <span class="text-sm font-medium text-gray-600">资料 {{ index + 1 }}</span>
-                <el-button
-                  type="text"
-                  size="small"
-                  text-color="#ff4d4f"
-                  @click="removeDocumentItem(index)"
-                  icon="el-icon-delete"
-                  v-if="form.documents.length > 1 && !disabledAll"
-                >
+                <el-button type="text" size="small" text-color="#ff4d4f" @click="removeDocumentItem(index)"
+                  icon="el-icon-delete" v-if="form.documents.length > 1 && !disabledAll">
                   删除
                 </el-button>
               </div>
 
               <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                <el-form-item
-                  label="文件目录名称"
-                  :prop="`documents.${index}.catalogueName`"
-                  :rules="[{ required: true, message: '请输入文件目录名称', trigger: 'blur' }]"
-                  class="mb-4"
-                >
-                  <el-input :disabled="disabledAll" placeholder="请输入文件目录名称" v-model="item.catalogueName" autocomplete="off" />
+                <el-form-item label="文件目录名称" :prop="`documents.${index}.catalogueName`"
+                  :rules="[{ required: true, message: '请输入文件目录名称', trigger: 'blur' }]" class="mb-4">
+                  <el-input :disabled="disabledAll" placeholder="请输入文件目录名称" v-model="item.catalogueName"
+                    autocomplete="off" />
                 </el-form-item>
                 <el-form-item label="备注" :prop="`documents.${index}.remark`" class="mb-4">
                   <el-input :disabled="disabledAll" placeholder="请输入备注" v-model="item.remark" autocomplete="off" />
@@ -85,39 +71,16 @@
         </div>
         <!-- 操作按钮区域 -->
         <div class="flex justify-center gap-4 mt-8">
-          <el-button type="primary" @click="submitForm" v-hasPermi="['design:collect:add']" v-if="!form.id || form.status == 'draft'" size="large"
-            >确认提交</el-button
-          >
-          <el-button
-            type="primary"
-            @click="update"
-            v-hasPermi="['design:collect:query']"
-            v-show="form.id && form.status == 'draft'"
-            icon="Edit"
-            size="large"
-            >审核</el-button
-          >
-          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']" v-show="form.status == 'back'" size="large" icon="Edit"
-            >重新发起审核</el-button
-          >
-          <el-button
-            type="primary"
-            @click="onView"
-            v-hasPermi="['design:collect:query']"
-            v-show="form.id && form.status != 'draft'"
-            icon="view"
-            size="large"
-            >查看流程</el-button
-          >
-          <el-button
-            type="success"
-            v-hasPermi="['design:collect:export']"
-            @click="onLoad"
-            v-show="form.id && form.status != 'draft'"
-            icon="Download"
-            size="large"
-            >导出</el-button
-          >
+          <el-button type="primary" @click="submitForm" v-hasPermi="['design:collect:add']"
+            v-if="!form.id || form.status == 'draft'" size="large">确认提交</el-button>
+          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']"
+            v-show="form.id && form.status == 'draft'" icon="Edit" size="large">审核</el-button>
+          <el-button type="primary" @click="update" v-hasPermi="['design:collect:query']" v-show="form.status == 'back'"
+            size="large" icon="Edit">重新发起审核</el-button>
+          <el-button type="primary" @click="onView" v-hasPermi="['design:collect:query']"
+            v-show="form.id && form.status != 'draft'" icon="view" size="large">查看流程</el-button>
+          <el-button type="success" v-hasPermi="['design:collect:export']" @click="onLoad"
+            v-show="form.id && form.status != 'draft'" icon="Download" size="large">导出</el-button>
         </div>
       </el-form>
     </div>
@@ -130,13 +93,15 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { ElMessage, ElLoading } from 'element-plus';
 import { systemUserList } from '@/api/design/appointment';
 import { collectBatch, byProjectId, exportWord } from '@/api/design/received';
+import { getUser } from '@/api/system/user';
+// 用户状态管理
 // 获取用户 store
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const userStore = useUserStoreHook();
 // 从 store 中获取当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
 const { des_user_major } = toRefs<any>(proxy?.useDict('des_user_major'));
-
+const userId = computed(() => userStore.userId);
 // 表单引用
 const mainFormRef = ref();
 // 用户列表
@@ -196,6 +161,15 @@ const removeDocumentItem = (index: number) => {
 const byProjectIdAll = async () => {
   // 调用接口获取数据
   const res = await byProjectId(currentProject.value?.id);
+  console.log(res);
+  form.documents = [
+    {
+      id: Date.now(),
+      catalogueName: '',
+      remark: ''
+    }
+  ];
+  disabledAll.value = false;
   if (res.code === 200 && res.data) {
     const data = res.data;
     // 回显基本信息
@@ -222,6 +196,8 @@ const byProjectIdAll = async () => {
         });
       });
     } else {
+      console.log(11111111);
+
       // 如果没有资料，保持一个空项
       form.documents = [
         {
@@ -230,6 +206,9 @@ const byProjectIdAll = async () => {
           remark: ''
         }
       ];
+      console.log(form.documents);
+
+
     }
   }
 };
@@ -314,12 +293,27 @@ const onView = () => {
     }
   });
 };
+/** 获取当前用户详情 */
+const getUserDetail = async () => {
+  try {
+    const res = await getUser(userId.value);
+    // userInfo.value = res.data.user;
+    form.userId = res.data.user.userId;
+    form.phone = res.data.user.phonenumber;
+    form.email = res.data.user.email;
+  } catch (err) {
+    ElMessage.error('获取用户信息失败');
+  }
+};
+
 // 页面挂载时初始化数据
 onMounted(() => {
   // 可以在这里添加初始化逻辑
+  getUserDetail();
   getDeptAllUser(userStore.deptId).then(() => {
     byProjectIdAll();
   });
+
 });
 const onLoad = async () => {
   // 导出接口
@@ -335,6 +329,7 @@ const onLoad = async () => {
 const listeningProject = watch(
   () => currentProject.value?.id,
   (nid, oid) => {
+    getUserDetail();
     getDeptAllUser(userStore.deptId).then(() => {
       byProjectIdAll();
     });
diff --git a/src/views/largeScreen/components/ProgressComponent.vue b/src/views/largeScreen/components/ProgressComponent.vue
index da1b86c..36bc86b 100644
--- a/src/views/largeScreen/components/ProgressComponent.vue
+++ b/src/views/largeScreen/components/ProgressComponent.vue
@@ -1,17 +1,17 @@
 <template>
-    <div class="progress_component">
-        <div class="title">
-            <span class="progress_title">{{ title }}</span>
-            <span :class="percentageClass" class="roboto">{{ percentageChange }}</span>
-        </div>
-        <div class="roboto" v-if="isShowPrice">
-            <span>{{ value }}</span>
-            <span>{{ unit }}</span>
-        </div>
-        <div class="my_el_progress">
-            <el-progress :percentage="progressPercentage" :color="progressColor" :show-text="false" />
-        </div>
+  <div class="progress_component">
+    <div class="title">
+      <span class="progress_title">{{ title }}</span>
+      <span :class="percentageClass" class="roboto">{{ percentageChange }}</span>
     </div>
+    <div class="roboto" v-if="isShowPrice">
+      <span>{{ value }}</span>
+      <span>{{ unit }}</span>
+    </div>
+    <div class="my_el_progress">
+      <el-progress :percentage="progressPercentage" :color="progressColor" :show-text="false" />
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -19,103 +19,102 @@ import { defineProps, computed } from 'vue';
 
 // 定义组件属性
 const props = defineProps({
-    // 标题文本
-    title: {
-        type: String,
-        required: true,
-        default: '指标名称'
-    },
-    // 数值
-    value: {
-        type: String,
-        required: true,
-        default: '0.00'
-    },
-    // 单位
-    unit: {
-        type: String,
-        default: '万元'
-    },
-    // 百分比变化值（如：-327.55%）
-    percentageChange: {
-        type: String,
-        required: true,
-        default: '0.00%'
-    },
-    // 进度条百分比
-    progressPercentage: {
-        type: Number,
-        required: true,
-        default: 0
-    },
-    // 进度条颜色，默认红色
-    progressColor: {
-        type: String,
-        default: 'rgba(255, 77, 79, 1)'
-    },
-    // 是否显示价格
-    isShowPrice: {
-        type: Boolean,
-        default: true
-    }
+  // 标题文本
+  title: {
+    type: String,
+    required: true,
+    default: '指标名称'
+  },
+  // 数值
+  value: {
+    type: String,
+    required: true,
+    default: '0.00'
+  },
+  // 单位
+  unit: {
+    type: String,
+    default: '万元'
+  },
+  // 百分比变化值（如：-327.55%）
+  percentageChange: {
+    type: String,
+    required: true,
+    default: '0.00%'
+  },
+  // 进度条百分比
+  progressPercentage: {
+    type: Number,
+    required: true,
+    default: 0
+  },
+  // 进度条颜色，默认红色
+  progressColor: {
+    type: String,
+    default: 'rgba(255, 77, 79, 1)'
+  },
+  // 是否显示价格
+  isShowPrice: {
+    type: Boolean,
+    default: true
+  }
 });
 
 // 计算百分比变化的样式类（红色或绿色）
 const percentageClass = computed(() => {
-    // 检查变化值是否为正数
-    const isPositive = props.percentageChange.startsWith('+') ||
-        (!props.percentageChange.startsWith('-') && props.percentageChange !== '0.00%');
-    return isPositive ? 'green' : 'red';
+  // 检查变化值是否为正数
+  const isPositive = props.percentageChange.startsWith('+') || (!props.percentageChange.startsWith('-') && props.percentageChange !== '0.00%');
+  return isPositive ? 'green' : 'red';
 });
 </script>
 
 <style lang="scss" scoped>
 .progress_component {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
+  margin-bottom: 10px;
+
+  :deep(.el-progress-bar__outer) {
+    background-color: transparent;
+  }
+
+  :deep(.el-progress-bar__inner),
+  :deep(.el-progress-bar__outer) {
+    border-radius: unset;
+  }
+
+  .my_el_progress {
+    margin-top: 15px;
+    padding: 10px;
+    box-sizing: border-box;
+    border: 1px solid rgba(255, 255, 255, 0.2);
+  }
+
+  .title {
+    display: flex;
+    justify-content: space-between;
     margin-bottom: 10px;
+    font-size: 12px;
+  }
 
-    :deep(.el-progress-bar__outer) {
-        background-color: transparent;
-    }
+  .progress_title {
+    color: rgba(143, 171, 191, 1);
+    font-size: 12px;
+    font-family: SourceHanSansCN-Regular;
+    font-weight: 400;
+  }
 
-    :deep(.el-progress-bar__inner),
-    :deep(.el-progress-bar__outer) {
-        border-radius: unset;
-    }
+  .roboto {
+    font-family: Roboto-Regular;
+    font-weight: 400;
+  }
 
-    .my_el_progress {
-        margin-top: 15px;
-        padding: 10px;
-        box-sizing: border-box;
-        border: 1px solid rgba(255, 255, 255, 0.2);
-    }
+  .red {
+    color: rgba(255, 77, 79, 1);
+  }
 
-    .title {
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 10px;
-        font-size: 12px;
-    }
-
-    .progress_title {
-        color: rgba(143, 171, 191, 1);
-        font-size: 12px;
-        font-family: SourceHanSansCN-Regular;
-        font-weight: 400;
-    }
-
-    .roboto {
-        font-family: Roboto-Regular;
-        font-weight: 400;
-    }
-
-    .red {
-        color: rgba(255, 77, 79, 1);
-    }
-
-    .green {
-        color: rgba(0, 227, 150, 1);
-    }
+  .green {
+    color: rgba(0, 227, 150, 1);
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/largeScreen/components/RevenueContractCard.vue b/src/views/largeScreen/components/RevenueContractCard.vue
index 14154dc..ff4d3bc 100644
--- a/src/views/largeScreen/components/RevenueContractCard.vue
+++ b/src/views/largeScreen/components/RevenueContractCard.vue
@@ -2,29 +2,12 @@
   <div class="stat-card" :style="customStyles">
     <!-- 标题区域 -->
     <div class="stat-card__title">{{ title }}</div>
-    
+
     <!-- 数值区域 -->
     <div class="stat-card__value-container">
-      <span class="stat-card__value">{{ formattedValue }}</span>
+      <span class="stat-card__value">{{ props.value }}</span>
       <span class="stat-card__unit">{{ unit }}</span>
     </div>
-    
-    <!-- 底部信息区域 -->
-    <div class="stat-card__footer">
-      <div class="stat-card__trend">
-        <img 
-          class="stat-card__trend-icon" 
-          :src="'/src/assets/large/' + trendIcon+'.png'" 
-          :alt="trendDirection === 'up' ? '上升' : '下降'"
-        >
-        <span class="stat-card__trend-text">{{ trendText }}</span>
-      </div>
-      <img 
-        class="stat-card__badge" 
-        :src="'/src/assets/large/'+badgeIcon+'.png'" 
-        alt="徽章图标"
-      >
-    </div>
   </div>
 </template>
 
@@ -78,6 +61,10 @@ const props = defineProps({
   customStyles: {
     type: Object,
     default: () => ({})
+  },
+  showIcon: {
+    type: Boolean,
+    default: false
   }
 });
 
@@ -103,22 +90,24 @@ const trendText = computed(() => {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  padding: 20px;
+  padding: 35px 10px;
   box-sizing: border-box;
   border: 1px solid rgba(29, 214, 255, 0.1);
   border-radius: 4px; // 增加轻微圆角，提升视觉效果
-  
+
   &__title {
     font-size: 14px;
-    color: #8FABBF;
+    color: #8fabbf;
     line-height: 20px;
   }
-  
+
   &__value-container {
-    display: flex;
+    // display: flex;
     align-items: baseline;
+    // align-items: center;
+    // flex-direction: column;
   }
-  
+
   &__value {
     font-size: 24px;
     color: #fff;
@@ -126,34 +115,34 @@ const trendText = computed(() => {
     margin-right: 5px;
     font-weight: bold;
   }
-  
+
   &__unit {
-    color: #8FABBF;
+    color: #8fabbf;
     font-size: 14px;
   }
-  
+
   &__footer {
     display: flex;
     justify-content: space-between;
     align-items: center;
   }
-  
+
   &__trend {
     display: flex;
     align-items: center;
   }
-  
+
   &__trend-icon {
     width: 12px;
     height: 12px;
     margin-right: 4px;
   }
-  
+
   &__trend-text {
     font-size: 14px;
-    color: #8FABBF;
+    color: #8fabbf;
   }
-  
+
   &__badge {
     width: 40px;
     height: 40px;
diff --git a/src/views/largeScreen/components/bottomboxconpoent.vue b/src/views/largeScreen/components/bottomboxconpoent.vue
index 6735331..f904057 100644
--- a/src/views/largeScreen/components/bottomboxconpoent.vue
+++ b/src/views/largeScreen/components/bottomboxconpoent.vue
@@ -1,45 +1,162 @@
 <template>
-    <div class="bottom_box">
-        <div class="bottom_box_title">收入合同</div>
-        <div>
-            <span class="bottom_box_number">205,805.17</span>
-            <span>万元</span>
-        </div>
-        <div class="bottom_box_bottom">
-            <el-progress :percentage="50" color="rgba(255, 147, 42, 1)" />
-        </div>
-        <div class="bottom_box_text">
-            成本率
-        </div>
+  <!-- 材料成本展示框 -->
+  <div class="bottom_box">
+    <div class="bottom_box_title">材料成本</div>
+    <div class="bottom_box_bottom">
+      <el-progress :percentage="materialProgressPercent" color="rgba(255, 147, 42, 1)"
+        :format="(percent) => `${percent.toFixed(1)}%`" />
     </div>
+    <div class="bottom_box_text">成本使用率</div>
+    <div class="cost-item">
+      <span class="cost-label">材料成本：</span>
+      <span class="cost-value">{{ materialCost.toFixed(2) }} 万元</span>
+    </div>
+  </div>
+
+  <!-- 分包成本展示框 -->
+  <div class="bottom_box">
+    <div class="bottom_box_title">分包成本</div>
+    <div class="bottom_box_bottom">
+      <el-progress :percentage="subcontractProgressPercent" color="rgba(0, 227, 150, 1)"
+        :format="(percent) => `${percent.toFixed(1)}%`" />
+    </div>
+    <div class="bottom_box_text">成本使用率</div>
+    <div class="cost-item">
+      <span class="cost-label">分包成本：</span>
+      <span class="cost-value">{{ subcontractCost.toFixed(2) }} 万元</span>
+    </div>
+  </div>
+
+  <!-- 劳务成本展示框 -->
+  <div class="bottom_box">
+    <div class="bottom_box_title">劳务成本</div>
+    <div class="bottom_box_bottom">
+      <el-progress :percentage="laborProgressPercent" color="rgba(255, 77, 79, 1)"
+        :format="(percent) => `${percent.toFixed(1)}%`" />
+    </div>
+    <div class="bottom_box_text">成本使用率</div>
+    <div class="cost-item">
+      <span class="cost-label">劳务成本：</span>
+      <span class="cost-value">{{ laborCost.toFixed(2) }} 万元</span>
+    </div>
+  </div>
+
+  <!-- 管理成本展示框 -->
+  <div class="bottom_box">
+    <div class="bottom_box_title">管理成本</div>
+    <div class="bottom_box_bottom">
+      <el-progress :percentage="manageProgressPercent" color="rgba(29, 214, 255, 1)"
+        :format="(percent) => `${percent.toFixed(1)}%`" />
+    </div>
+    <div class="bottom_box_text">成本使用率</div>
+    <div class="cost-item">
+      <span class="cost-label">管理成本：</span>
+      <span class="cost-value">{{ manageCost.toFixed(2) }} 万元</span>
+    </div>
+  </div>
 </template>
 
 <script setup>
+import { ref, onMounted, computed } from 'vue';
+import { ElProgress } from 'element-plus';
+import { cost } from '@/api/largeScreen/index';
 
+// 定义各类成本的响应式数据
+const materialCost = ref(0); // 材料成本
+const subcontractCost = ref(0); // 分包成本
+const laborCost = ref(0); // 劳务成本
+const manageCost = ref(0); // 管理成本
+
+// 进度条相关配置（每个成本单独设置预算，这里假设每个成本预算相同，可根据实际调整）
+const budgetCost = 10000; // 单个成本项的预算总成本（用于计算使用率）
+
+// 计算每个成本项的进度百分比
+const materialProgressPercent = computed(() => {
+  const percent = (materialCost.value / budgetCost) * 100;
+  return Math.min(percent, 100);
+});
+const subcontractProgressPercent = computed(() => {
+  const percent = (subcontractCost.value / budgetCost) * 100;
+  return Math.min(percent, 100);
+});
+const laborProgressPercent = computed(() => {
+  const percent = (laborCost.value / budgetCost) * 100;
+  return Math.min(percent, 100);
+});
+const manageProgressPercent = computed(() => {
+  const percent = (manageCost.value / budgetCost) * 100;
+  return Math.min(percent, 100);
+});
+
+// 请求成本数据
+const getCostData = async () => {
+  try {
+    const res = await cost();
+    if (res.code === 200) {
+      // 为各类成本赋值（转换为数字类型）
+      materialCost.value = Number(res.data.materialCost);
+      subcontractCost.value = Number(res.data.subcontractCost);
+      laborCost.value = Number(res.data.laborCost);
+      manageCost.value = Number(res.data.manageCost);
+    }
+  } catch (error) {
+    console.error('获取成本数据失败：', error);
+  }
+};
+
+// 页面挂载时请求数据
+onMounted(() => {
+  getCostData();
+});
 </script>
 
 <style lang="scss">
 .bottom_box {
-    width: 225px;
-    height: 147px;
-    height: 100%;
-    padding: 10px;
-    box-sizing: border-box;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-around;
+  width: 225px;
+  height: auto;
+  padding: 10px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  background: rgba(12, 24, 46, 0.8);
+  margin-bottom: 10px;
+}
 
-    .bottom_box_title,
-    .bottom_box_text {
-      color: rgba(143, 171, 191, 1);
-      font-size: 14px;
-      line-height: 20px;
-    }
+.bottom_box_title {
+  color: rgba(143, 171, 191, 1);
+  font-size: 14px;
+  line-height: 20px;
+  font-weight: bold;
+}
 
-    .bottom_box_number {
-      font-size: 24px;
-      color: #fff;
-      line-height: 30px;
-    }
-  }
-</style>
\ No newline at end of file
+.bottom_box_text {
+  color: rgba(143, 171, 191, 1);
+  font-size: 14px;
+  line-height: 20px;
+  margin-bottom: 5px;
+}
+
+.bottom_box_bottom {
+  width: 100%;
+  height: 8px;
+  margin: 5px 0;
+}
+
+.cost-item {
+  color: #fff;
+  font-size: 14px;
+  line-height: 26px;
+  display: flex;
+  justify-content: space-between;
+}
+
+.cost-label {
+  color: rgba(143, 171, 191, 1);
+}
+
+.cost-value {
+  font-weight: 500;
+  color: #fff;
+}
+</style>
diff --git a/src/views/largeScreen/components/centerPage.vue b/src/views/largeScreen/components/centerPage.vue
index aee49f0..952a419 100644
--- a/src/views/largeScreen/components/centerPage.vue
+++ b/src/views/largeScreen/components/centerPage.vue
@@ -1,146 +1,160 @@
 <template>
   <div class="centerPage">
     <div>
-      <div style="height: 147px;width: 100%;display: flex;justify-content: space-between;">
-        <!-- <div class="top_box">
-          <div class="top_box_title">收入合同</div>
-          <div>
-            <span class="top_box_number">205,805.17</span>
-            <span>万元</span>
-          </div>
-          <div class="top_box_bottom">
-            <div>
-              <img class="up_img" src="@/assets/large/up.png" alt=""></img>
-              <span class="top_box_title"> 3.2% 较上月</span>
-            </div>
-            <img class="top_img" src="@/assets/large/top1.png" alt=""></img>
-          </div>
-        </div> -->
-        <RevenueContractCard title="收入合同" :value="156234.89" :growthRate="-1.5" trendDirection="up" trendIcon="up"
-          badgeIcon="top1" period="较上月" />
-        <RevenueContractCard title="支出合同" :value="156234.89" :growthRate="-1.5" trendDirection="up" trendIcon="up"
-          badgeIcon="top2" period="较上月" />
-        <RevenueContractCard title="合同利润" :value="156234.89" :growthRate="-1.5" trendDirection="up" trendIcon="down"
-          badgeIcon="top3" period="较上月" />
-        <RevenueContractCard title="工程变更" :value="156234.89" :growthRate="-1.5" trendDirection="up" trendIcon="up"
-          badgeIcon="top4" period="较上月" />
+      <div style="height: 147px; width: 100%; display: flex; justify-content: space-between">
+        <!-- 收入合同：保持万元显示 -->
+        <RevenueContractCard title="收入合同" :value="formatToTenThousand(data.incomeTotalAmount, 'tenThousand')" />
+        <!-- 支出合同：保持万元显示 -->
+        <RevenueContractCard title="支出合同" :value="formatToTenThousand(data.expensesTotalAmount, 'tenThousand')" />
+        <!-- 合同利润：保持万元显示 -->
+        <RevenueContractCard title="合同利润" :value="formatToTenThousand(data.profitAmount, 'tenThousand')" />
+        <!-- 工程变更：改为百分比显示 -->
+        <RevenueContractCard title="工程变更" :value="formatToTenThousand(data.changeAmount, 'percentage')" unit="" />
       </div>
     </div>
     <div class="centerPage_map">
       <div ref="mapRef" class="map-container" style="width: 100%; height: 100%" />
     </div>
     <div>
-      <div style="height: 147px;width: 100%;display: flex;justify-content: space-between;">
-        <!-- <div class="bottom_box">
-          <div class="bottom_box_title">收入合同</div>
-          <div>
-            <span class="bottom_box_number">205,805.17</span>
-            <span>万元</span>
-          </div>
-          <div class="bottom_box_bottom">
-            <el-progress :percentage="50" color="rgba(255, 147, 42, 1)" />
-          </div>
-          <div class="bottom_box_text">
-            成本率
-          </div>
-        </div> -->
-        <bottomboxconpoent> </bottomboxconpoent>
-        <bottomboxconpoent> </bottomboxconpoent>
-        <bottomboxconpoent> </bottomboxconpoent>
-        <bottomboxconpoent> </bottomboxconpoent>
+      <div style="height: 147px; width: 100%; display: flex; justify-content: space-between">
+        <bottomboxconpoent />
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-// import { getPowerStationOverview } from '@/api/large';
 import * as echarts from 'echarts';
 import china from '@/assets/china.json';
 import RevenueContractCard from './RevenueContractCard.vue';
 import bottomboxconpoent from './bottomboxconpoent.vue';
-const data = ref<any>({});
+import { totalAmount, projectGis } from '@/api/largeScreen/index'; // 导入projectGis接口
+import { ref, onMounted, onUnmounted, nextTick } from 'vue';
 
-// 地图容器引用
+// 响应式数据（所有字段均为string，匹配接口返回）
+const data = ref({
+  incomeTotalAmount: '0.00',
+  expensesTotalAmount: '0.00',
+  profitAmount: '0.00',
+  changeAmount: '0.00' // 接口返回的原始数值（如"0.05"代表5%）
+});
+
+// 地图相关变量
 const mapRef = ref<HTMLDivElement | null>(null);
-// ECharts实例
 let myChart: any = null;
+const projectData = ref<any[]>([]); // 存储项目地理信息数据
 
-// 响应窗口大小变化
-const handleResize = () => {
-  if (myChart) {
-    myChart.resize();
+// 接口请求：获取合同数据
+const getContractData = async () => {
+  try {
+    const response = await totalAmount();
+    if (response.code === 200) {
+      data.value = response.data;
+    } else {
+      console.error('合同数据请求失败：', response.msg);
+    }
+  } catch (error) {
+    console.error('合同数据调用异常：', error);
   }
 };
 
-// 初始化地图
+// 新增：获取项目地理信息数据
+const getProjectGisData = async () => {
+  try {
+    const response = await projectGis();
+    if (response.code === 200) {
+      // 过滤掉没有经纬度的项目
+      projectData.value = response.data.filter((item: any) => item.lng !== null && item.lat !== null && item.lng !== '' && item.lat !== '');
+      console.log('项目地理数据：', projectData.value);
+    } else {
+      console.error('项目地理数据请求失败：', response.msg);
+    }
+  } catch (error) {
+    console.error('项目地理数据调用异常：', error);
+  }
+};
+
+/**
+ * 工具函数：根据类型处理数据显示
+ * @param value 接口返回的原始string数值
+ * @param type 处理类型：tenThousand（万元）、percentage（百分比）
+ * @returns 直接显示的字符串
+ */
+const formatToTenThousand = (value: string, type: 'tenThousand' | 'percentage') => {
+  const num = parseFloat(value);
+  if (isNaN(num)) return type === 'percentage' ? '0.00%' : '0.00';
+
+  if (type === 'percentage') {
+    return (num * 100).toFixed(2) + '%';
+  }
+
+  return (num / 10000).toFixed(2);
+};
+
+// 地图resize处理
+const handleResize = () => {
+  if (myChart) myChart.resize();
+};
+
+// 初始化地图（修改为使用接口数据）
 const initEcharts = () => {
-  if (!mapRef.value) {
-    console.error('未找到地图容器元素');
+  if (!mapRef.value || projectData.value.length === 0) {
+    console.error('未找到地图容器或项目数据');
     return;
   }
 
-  // 注册地图
   echarts.registerMap('china', china as any);
 
-  // 地图数据
-  const mapData: any = [{ name: '田东县', value: 1, itemStyle: { color: '#fff' } }];
-
-  // 散点数据
-  // 散点数据 - 使用图片标记并调整名称位置
-  const scatterData: any[] = [
-    {
-      name: '田东光伏智慧生态工地开发项目',
-      value: [107.15, 23.63],
-      // 使用图片作为标记（注意：需替换为你的图片实际路径）
-      symbol: 'diamond',
-      // 标记颜色
-      itemStyle: {
-        color: '#0166d6'
-      },
-      // 图片标记大小（宽, 高）
-      symbolSize: [20, 20],
-      // 名称样式设置
-      label: {
-        show: true,
-        formatter: '{b}', // 显示名称
-        position: 'top', // 名称在图片上方
-        color: '#fff',
-        fontSize: 12,
-        // 可选：添加文字背景以增强可读性
-        backgroundColor: 'rgba(3, 26, 52, 0.7)',
-        padding: [3, 6],
-        borderRadius: 3
-      }
+  // 从接口数据生成散点数据
+  const scatterData = projectData.value.map((item) => ({
+    name: item.projectName,
+    value: [parseFloat(item.lng), parseFloat(item.lat)], // 转换为数值类型
+    shortName: item.shortName,
+    projectSite: item.projectSite,
+    symbol: 'diamond',
+    itemStyle: { color: '#0166d6' },
+    symbolSize: [20, 20],
+    label: {
+      show: true,
+      formatter: '{b}', // 显示项目名称
+      position: 'top',
+      color: '#fff',
+      fontSize: 12,
+      backgroundColor: 'rgba(3, 26, 52, 0.7)',
+      padding: [3, 6],
+      borderRadius: 3
     }
-  ];
-  // 初始化新实例，强制清除缓存
+  }));
+
   myChart = echarts.init(mapRef.value, null, {
-    renderer: 'canvas', // 明确指定渲染器
-    useDirtyRect: false // 禁用脏矩形渲染，避免样式缓存
+    renderer: 'canvas',
+    useDirtyRect: false
   });
-  // 配置项
+
   const option: any = {
-    roam: true, // 关键配置：允许鼠标滚轮缩放和拖拽平移
+    roam: true, // 允许缩放和平移
     geo: {
       type: 'map',
       map: 'china',
-      zoom: 5,
-      center: [107.15, 23.63],
-      label: {
-        show: false,
-        color: '#fff'
-      },
+      zoom: 4, // 调整初始缩放级别
+      center: [108.95, 34.27], // 中国中心位置经纬度
+      label: { show: false, color: '#fff' },
       itemStyle: {
-        areaColor: '#031a34', // 地图区域底色
-        borderColor: '#1e3a6e', // 区域边框颜色
+        areaColor: '#031a34',
+        borderColor: '#1e3a6e',
         borderWidth: 1
       }
     },
     tooltip: {
       trigger: 'item',
-      formatter: function (params: any) {
-        return params.name + (params.value ? `：${params.value}` : '');
+      formatter: (params: any) => {
+        // 自定义提示框内容，显示更多项目信息
+        const data = params.data;
+        return `
+          <div style="font-weight: bold;">${data.name}</div>
+          <div>地点：${data.projectSite}</div>
+          <div>经纬度：${data.value[0].toFixed(6)}, ${data.value[1].toFixed(6)}</div>
+        `;
       }
     },
     series: [
@@ -148,47 +162,39 @@ const initEcharts = () => {
         type: 'map',
         map: 'china',
         geoIndex: 0,
-        // 关键：在series级别定义emphasis，优先级最高
         emphasis: {
-          areaColor: '#fff', // 强制设置hover颜色
-          label: {
-            show: true,
-            color: '#fff'
-          },
-          itemStyle: {
-            areaColor: '#02417e' // 重复设置确保生效
-          }
+          areaColor: '#fff',
+          label: { show: true, color: '#fff' },
+          itemStyle: { areaColor: '#02417e' }
         },
-        // 确保没有使用默认样式
-        select: {
-          itemStyle: {
-            areaColor: '#02417e'
-          }
-        },
-        data: mapData
+        select: { itemStyle: { areaColor: '#02417e' } },
+        data: [] // 可以留空，或根据需要添加区域数据
       },
       {
         type: 'scatter',
         coordinateSystem: 'geo',
-        data: scatterData
+        data: scatterData,
+        emphasis: {
+          scale: true, // 鼠标悬停时放大
+          symbolSize: [25, 25]
+        }
       }
     ]
   };
 
-  // 设置配置项
   myChart.setOption(option);
 };
 
-// 组件挂载时初始化
+// 组件生命周期
 onMounted(() => {
-  // 确保DOM渲染完成
-  nextTick(() => {
+  nextTick(async () => {
+    // 先获取合同数据和项目地理数据，再初始化地图
+    await Promise.all([getContractData(), getProjectGisData()]);
     initEcharts();
     window.addEventListener('resize', handleResize);
   });
 });
 
-// 组件卸载时清理
 onUnmounted(() => {
   window.removeEventListener('resize', handleResize);
   if (myChart) {
@@ -196,15 +202,6 @@ onUnmounted(() => {
     myChart = null;
   }
 });
-// const getDataList = () => {
-//   getPowerStationOverview().then((res) => {
-//     console.log(res);
-//     if (res.code == 200) {
-//       data.value = res.data;
-//     }
-//   });
-// };
-// getDataList();
 </script>
 
 <style scoped lang="scss">
@@ -215,14 +212,11 @@ onUnmounted(() => {
   flex-direction: column;
   justify-content: space-between;
   padding: 0 10px 10px 10px;
-
   box-sizing: border-box;
 
   .centerPage_map {
     width: 100%;
     height: 60%;
   }
-
-  
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/largeScreen/components/leftPage.vue b/src/views/largeScreen/components/leftPage.vue
index 683c9a3..52e271f 100644
--- a/src/views/largeScreen/components/leftPage.vue
+++ b/src/views/largeScreen/components/leftPage.vue
@@ -1,56 +1,301 @@
 <template>
   <div class="leftPage">
-    <!--  -->
     <div class="kpi_box">
-      <TitleComponent :title="'支付KPI'" style="margin-bottom: 20px;"/>
-      <ProgressComponent 
-        title="应收账款" 
-        value="123,456.78" 
-        percentageChange="+25.30%" 
-        progressPercentage="75" 
-        progressColor="rgba(255, 77, 79, 1)"
-      />
-      <ProgressComponent 
-        title="应付账款" 
-        value="123,456.78" 
-        percentageChange="+25.30%" 
-        progressPercentage="25" 
-        progressColor="rgba(29, 214, 255, 1)"
-      />
-      <ProgressComponent 
-        title="本月付款" 
-        value="123,456.78" 
-        percentageChange="+25.30%" 
-        progressPercentage="45" 
-        progressColor="rgba(0, 227, 150, 1)"
-      />
-      <ProgressComponent 
-        title="本月收款" 
-        value="123,456.78" 
-        percentageChange="+25.30%" 
-        progressPercentage="10" 
-        progressColor="rgba(255, 147, 42, 1)"
-      />
+      <TitleComponent :title="'支付KPI'" style="margin-bottom: 20px" />
+      <ProgressComponent title="应收账款" :value="formatCurrency(incomeData.planAmount)"
+        :percentageChange="getPercentageChange(incomeData.planAmount, incomeData.actualAmount)"
+        :progressPercentage="getProgressPercentage(incomeData.planAmount, incomeData.actualAmount)"
+        progressColor="rgba(255, 77, 79, 1)" />
+      <ProgressComponent title="应付账款" :value="formatCurrency(expensesData.planAmount)"
+        :percentageChange="getPercentageChange(expensesData.planAmount, expensesData.actualAmount)"
+        :progressPercentage="getProgressPercentage(expensesData.planAmount, expensesData.actualAmount)"
+        progressColor="rgba(29, 214, 255, 1)" />
+      <ProgressComponent title="本月付款" :value="formatCurrency(expensesData.actualAmount)"
+        :percentageChange="getPercentageChange(expensesData.planAmount, expensesData.actualAmount)"
+        :progressPercentage="getProgressPercentage(expensesData.planAmount, expensesData.actualAmount)"
+        progressColor="rgba(0, 227, 150, 1)" />
+      <ProgressComponent title="本月收款" :value="formatCurrency(incomeData.actualAmount)"
+        :percentageChange="getPercentageChange(incomeData.planAmount, incomeData.actualAmount)"
+        :progressPercentage="getProgressPercentage(incomeData.planAmount, incomeData.actualAmount)"
+        progressColor="rgba(255, 147, 42, 1)" />
     </div>
     <div class="contract_box">
-      <EchartBox :option="barOption" />
+      <div style="height: 60px;">
+        <TitleComponent :title="'收支合同分析'" style="margin-bottom: 20px" />
+      </div>
+      <!-- 切换按钮 -->
+
+      <div style="margin-bottom: 10px; text-align: center">
+        <button @click="switchChart('income')"
+          :style="activeChart === 'income' ? activeBtnStyle : defaultBtnStyle">收入合同</button>
+        <button @click="switchChart('expenses')" :style="activeChart === 'expenses' ? activeBtnStyle : defaultBtnStyle"
+          style="margin-left: 15px">
+          支出合同
+        </button>
+      </div>
+      <!-- 环形图容器：固定高度确保图表不拉伸，添加flex居中 -->
+      <div class="chart-container">
+        <EchartBox :option="pieOption" />
+      </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, computed, toRefs, getCurrentInstance, nextTick } from 'vue';
-// import echarts from 'echarts';
-import TitleComponent  from './TitleComponent.vue';
+import { ref, onMounted, watch } from 'vue';
+import TitleComponent from './TitleComponent.vue';
 import ProgressComponent from './ProgressComponent.vue';
 import EchartBox from '@/components/EchartBox/index.vue';
-import { getBarOptions2 } from './optionList';
-const barOption = ref();
-const getCapitalData = (data) => {
-  barOption.value = getBarOptions2();
+import { incomePay, expensesPay, incomeAnalyze, expensesAnalyze } from '@/api/largeScreen/index';
+
+// 初始化数据容器
+const incomeData = ref({ planAmount: '0.00', actualAmount: '0.00' }); // 收入相关数据（应收/收款） 
+const expensesData = ref({ planAmount: '0.00', actualAmount: '0.00' }); // 支出相关数据（应付/付款）
+const pieOption = ref({}); // 环形图配置
+const activeChart = ref('income'); // 当前激活的图表类型：income-收入合同，expenses-支出合同
+// 新增：存储合同数据及对应总数（避免重复计算）
+const chartData = ref({
+  income: { firstCount: 0, secondCount: 0, thirdCount: 0, fourthCount: 0, total: 0 }, // 收入合同+总数
+  expenses: { firstCount: 0, secondCount: 0, thirdCount: 0, fourthCount: 0, total: 0 } // 支出合同+总数
+});
+
+// 按钮样式
+const defaultBtnStyle = {
+  padding: '4px 16px',
+  border: '1px solid rgba(29, 214, 255, 0.5)',
+  backgroundColor: 'transparent',
+  color: 'rgba(29, 214, 255, 1)',
+  cursor: 'pointer',
+  borderRadius: '4px'
 };
-onMounted(() => {
-  getCapitalData();
+const activeBtnStyle = {
+  ...defaultBtnStyle,
+  backgroundColor: 'rgba(29, 214, 255, 0.2)',
+  borderColor: 'rgba(29, 214, 255, 1)'
+};
+
+/**
+ * 格式化金额为带千分位的格式
+ * @param {string} amount 金额字符串
+ * @returns {string} 格式化后的金额
+ */
+const formatCurrency = (amount) => {
+  if (!amount) return '0.00';
+  return Number(amount).toLocaleString('zh-CN', {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2
+  });
+};
+
+/**
+ * 计算百分比变化（保留两位小数）
+ * @param {string} plan 计划金额
+ * @param {string} actual 实际金额
+ * @returns {string} 带正负号的百分比字符串
+ */
+const getPercentageChange = (plan, actual) => {
+  const planNum = Number(plan);
+  const actualNum = Number(actual);
+
+  if (planNum === 0) {
+    return planNum === actualNum ? '0.00%' : '+100.00%';
+  }
+
+  const change = ((actualNum - planNum) / planNum) * 100;
+  return `${change >= 0 ? '+' : ''}${change.toFixed(2)}%`;
+};
+
+/**
+ * 计算进度百分比（保留整数）
+ * @param {string} plan 计划金额
+ * @param {string} actual 实际金额
+ * @returns {number} 进度百分比（0-100）
+ */
+const getProgressPercentage = (plan, actual) => {
+  const planNum = Number(plan);
+  const actualNum = Number(actual);
+
+  if (planNum === 0) {
+    return actualNum === 0 ? 0 : 100;
+  }
+
+  const percentage = (actualNum / planNum) * 100;
+  return Math.min(Math.round(percentage), 100); // 限制最大为100
+};
+
+/**
+ * 获取并处理资金数据（原逻辑保留）
+ */
+const getCapitalData = async () => {
+  try {
+    const [incomeRes, expensesRes] = await Promise.all([incomePay(), expensesPay()]);
+
+    if (incomeRes.code === 200) {
+      incomeData.value = incomeRes.data;
+    }
+    if (expensesRes.code === 200) {
+      expensesData.value = expensesRes.data;
+    }
+  } catch (error) {
+    console.error('获取资金数据失败：', error);
+  }
+};
+
+/**
+ * 计算单类合同总数（复用方法）
+ * @param {Object} data 单类合同数据（收入/支出）
+ * @returns {number} 合同总数
+ */
+const calculateTotalCount = (data) => {
+  return data.firstCount + data.secondCount + data.thirdCount + data.fourthCount;
+};
+
+// 新增：标记合同图表数据是否加载完成
+const isChartDataLoaded = ref(false);
+
+// 修改 getContractChartData 方法：请求成功后标记加载完成
+const getContractChartData = async () => {
+  try {
+    const [incomeChartRes, expensesChartRes] = await Promise.all([incomeAnalyze(), expensesAnalyze()]);
+
+    // 收入合同数据处理（原逻辑保留）
+    if (incomeChartRes.code === 200) {
+      const incomeRaw = incomeChartRes.data;
+      chartData.value.income = {
+        ...incomeRaw,
+        total: calculateTotalCount(incomeRaw)
+      };
+    }
+
+    // 支出合同数据处理（原逻辑保留）
+    if (expensesChartRes.code === 200) {
+      const expensesRaw = expensesChartRes.data;
+      chartData.value.expenses = {
+        ...expensesRaw,
+        total: calculateTotalCount(expensesRaw)
+      };
+    }
+
+    // ✅ 关键：所有数据请求完成后，标记为“已加载”
+    isChartDataLoaded.value = true;
+  } catch (error) {
+    console.error('获取合同图表数据失败：', error);
+    // 可选：失败时也标记加载完成，避免一直显示“加载中”（可替换为“加载失败”提示）
+    isChartDataLoaded.value = true;
+  }
+};
+
+const generatePieOption = (data) => {
+  // 1. 未加载：返回“加载中”配置
+  if (!isChartDataLoaded.value) {
+    return {
+      tooltip: { trigger: 'none' }, // 未加载时不需要tooltip
+      legend: { show: false }, // 隐藏图例（无数据可展示）
+      series: [
+        {
+          name: '合同数量',
+          type: 'pie',
+
+          radius: ['30%', '60%'],
+          center: ['30%', '60%'],
+          data: [], // 空数据，避免显示圆环
+          itemStyle: { borderColor: '#000', borderWidth: 1 },
+          // 中心显示“加载中”提示
+          label: {
+            show: true,
+            position: 'center',
+            formatter: '合同数据加载中...',
+            textStyle: { color: 'rgba(255, 255, 255, 0.9)', fontSize: 16 }
+          },
+          emphasis: { label: { show: false } },
+          labelLine: { show: false }
+        }
+      ],
+      grid: { top: '15%', bottom: '5%', left: '5%', right: '5%' }
+    };
+  }
+
+  // 2. 已加载：返回真实数据配置（原逻辑保留，仅优化中心文本）
+  const pieData = [
+    { name: '100万以下', value: data.firstCount },
+    { name: '100-500万', value: data.secondCount },
+    { name: '500-1000万', value: data.thirdCount },
+    { name: '1000万以上', value: data.fourthCount }
+  ];
+
+  return {
+    tooltip: {
+      trigger: 'item',
+      formatter: '{b}: {c} 份'
+    },
+    legend: {
+      top: '5%',
+      left: 'center',
+      textStyle: { color: 'rgba(255, 255, 255, 0.8)' },
+      itemWidth: 12,
+      itemHeight: 12
+    },
+    series: [
+      {
+        name: '合同数量',
+        type: 'pie',
+        radius: ['70%', '80%'], // 恢复原半径（原代码中70%/80%可能过窄，可根据需求调整）
+        center: ['50%', '60%'],
+        avoidLabelOverlap: false,
+        itemStyle: {
+          borderRadius: 8,
+          borderColor: '#000',
+          borderWidth: 1
+        },
+        // 中心文本：显示真实总数（此时data.total已可靠）
+        label: {
+          show: true,
+          position: 'center',
+          formatter: `合同总数\n{total|${data.total} 份}`,
+          rich: {
+            total: {
+              fontSize: 20,
+              fontWeight: 'bold',
+              color: 'rgba(29, 214, 255, 1)',
+              marginTop: 8
+            }
+          },
+          textStyle: { color: 'rgba(255, 255, 255, 0.9)', fontSize: 14 }
+        },
+        emphasis: { label: { show: false } },
+        labelLine: { show: false },
+        data: pieData,
+        color: ['rgba(255, 77, 79, 1)', 'rgba(29, 214, 255, 1)', 'rgba(0, 227, 150, 1)', 'rgba(255, 147, 42, 1)']
+      }
+    ],
+    grid: {
+      top: '15%',
+      bottom: '5%',
+      left: '5%',
+      right: '5%'
+    }
+  };
+};
+
+/**
+ * 切换图表类型（收入/支出）
+ * @param {string} type 目标类型：income/expenses
+ */
+const switchChart = (type) => {
+  activeChart.value = type;
+};
+
+watch(
+  [activeChart, isChartDataLoaded], // 监听两个变量：图表类型 + 加载状态
+  ([newType]) => {
+    pieOption.value = generatePieOption(chartData.value[newType]);
+  },
+  { immediate: true }
+);
+
+// 组件挂载后初始化数据（并行请求，提升速度）
+onMounted(async () => {
+  await Promise.all([getCapitalData(), getContractChartData()]);
 });
 </script>
 
@@ -58,13 +303,23 @@ onMounted(() => {
 .leftPage {
   width: 100%;
   height: 100%;
-  .kpi_box{
+
+  .kpi_box {
     margin-bottom: 10px;
   }
- .contract_box{
-    height: 35vh;
+
+  .contract_box {
+    height: 33vh;
+    display: flex;
+    flex-direction: column; // 按钮区和图表区垂直排列
   }
-  .kpi_box,.contract_box {
+
+  .chart-container {
+    height: 28vh;
+  }
+
+  .kpi_box,
+  .contract_box {
     padding: 10px;
     box-sizing: border-box;
     border: 1px solid rgba(29, 214, 255, 0.3);
diff --git a/src/views/largeScreen/components/optionList.ts b/src/views/largeScreen/components/optionList.ts
index 822fd94..0daec3b 100644
--- a/src/views/largeScreen/components/optionList.ts
+++ b/src/views/largeScreen/components/optionList.ts
@@ -255,6 +255,7 @@ export const getLineOption = (lineData: any) => {
   const maxData = Math.max(...lineData.line1.flat());
 
   const option = {
+
     backgroundColor: '',
     tooltip: {
       trigger: 'axis',
@@ -312,7 +313,7 @@ export const getLineOption = (lineData: any) => {
       axisLabel: {
         textStyle: {
           color: '#fff'
-        }
+        },
       }
     },
     yAxis: {
@@ -698,17 +699,31 @@ export const getBarOptions = (data: any) => {
     backgroundColor: '',
     grid: {
       left: '8%',
-      top: '4%',
+      top: '10%',          // 顶部留一点空间给 legend
       bottom: '8%',
       right: '2%'
     },
+    legend: {
+      data: ['现金流入', '现金流出'],   // 与 series.name 对应
+      top: '0%',
+      textStyle: { color: '#fff', fontSize: 12 }
+    },
     tooltip: {
       show: true,
       backgroundColor: '',
       trigger: 'axis',
-      formatter: '{b0}：{c0}万元',
+      // formatter: '{b0}：{c0}万元',
+      formatter: (params: any) => {
+        // params 是数组，对应每条柱子
+        return params
+          .map((p: any) => `${p.seriesName}：${p.value} 万元`)
+          .join('<br/>');
+      },
       textStyle: {
         color: '#fff'
+      },
+      axisPointer: {
+        type: 'shadow' // 默认为直线，可选为：'line' | 'shadow',
       }
       // borderColor: 'rgba(252, 217, 18, 1)'
     },
@@ -779,6 +794,7 @@ export const getBarOptions = (data: any) => {
     // ],
     series: [
       {
+        name: '现金流入',
         type: 'bar',
         data: data.value[0],
         // stack: '合并',
@@ -817,6 +833,7 @@ export const getBarOptions = (data: any) => {
         }
       },
       {
+        name: '现金流出',
         type: 'bar',
         data: data.value[1],
         // stack: '合并',
@@ -846,12 +863,12 @@ export const getBarOptions = (data: any) => {
           )
         },
         label: {
-          show: false,
+          show: true,
           formatter: '{c}',
           position: 'top',
           color: '#fff',
-          fontSize: 10
-          // padding: 5
+          fontSize: 10,
+          padding: 5
         }
       }
     ]
@@ -862,7 +879,7 @@ export const getBarOptions = (data: any) => {
 // 收支合同分析
 export const getBarOptions2 = (data: any) => {
   const option = {
-    color:['#FF932A', '#678FE6', '#1DD6FF', '#00E396'],
+    color: ['#FF932A', '#678FE6', '#1DD6FF', '#00E396'],
     title: {
       text: '数量（个）',
       subtext: '16',
@@ -872,14 +889,16 @@ export const getBarOptions2 = (data: any) => {
         color: '#9DADB7',
         fontSize: 16
       },
-      subtextStyle:{
+      subtextStyle: {
         color: '#707070',
         fontSize: 32,
         fontWeight: 'bold'
       }
     },
     tooltip: {
-      trigger: 'item'
+      trigger: 'item',
+      show: true
+
     },
     legend: {
       top: '5%',
@@ -907,7 +926,7 @@ export const getBarOptions2 = (data: any) => {
           show: false
         },
         data: [
-          { value: 3, name: '100万一下' },
+          { value: 3, name: '100万以下' },
           { value: 4, name: '100-500万' },
           { value: 5, name: '500-1000万' },
           { value: 4, name: '1000万以上' },
diff --git a/src/views/largeScreen/components/rightPage.vue b/src/views/largeScreen/components/rightPage.vue
index bcde746..f9e9bfd 100644
--- a/src/views/largeScreen/components/rightPage.vue
+++ b/src/views/largeScreen/components/rightPage.vue
@@ -11,17 +11,17 @@
       <div class="inflowData">
         <div class="inflow">
           <div class="title">现金流入</div>
-          <div class="number">1000000</div>
+          <div class="number">{{ bigDataObj.incomeCash }}</div>
           <div class="unit">万元</div>
         </div>
         <div class="inflow">
           <div class="title">现金流出</div>
-          <div class="number">1000000</div>
+          <div class="number">{{ bigDataObj.expensesCash }}</div>
           <div class="unit">万元</div>
         </div>
         <div class="inflow">
           <div class="title">净现金流</div>
-          <div class="number">1000000</div>
+          <div class="number">{{ bigDataObj.profitCash }}</div>
           <div class="unit">万元</div>
         </div>
       </div>
@@ -33,7 +33,7 @@
           <div class="title">项目进度</div>
           <div class="number">100%</div>
         </div> -->
-        <ProgressComponent title="现金比率" value="123,456.78" percentageChange="3479.61%" :progressPercentage="100"
+        <ProgressComponent title="现金比率" value="123,456.78" percentageChange="98.11%" :progressPercentage="100"
           progressColor="rgba(29, 214, 255, 1)" :isShowPrice="false" class="progress_text" />
       </div>
     </div>
@@ -45,45 +45,63 @@ import TitleComponent from './TitleComponent.vue';
 import EchartBox from '@/components/EchartBox/index.vue';
 import { getLineOption, getBarOptions } from './optionList';
 import ProgressComponent from './ProgressComponent.vue';
+import { monthMoney, monthCash, cashTotal } from '@/api/largeScreen/index';
 
 const lineOption = ref();
 const barOption = ref();
+const bigDataObj = ref<any>({});
+
+const getCapitalData = async () => {
+  const { data } = await monthMoney()
+  const month = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
+  const income = data.map((item: any) => item.incomeAmount);
+  const expenses = data.map((item: any) => item.expensesAmount);
+  const profit = data.map((item: any) => item.profitAmount);
 
-const getCapitalData = (data?: any) => {
-  // const xData = data.map((item) => item.time);
-  // const yData = data.map((item) => item.content);
   const lineData = {
-    xLabel: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+    xLabel: month,
     line1: [
-      [100, 200, 150, 300, 250, 350, 400, 350, 450, 500, 400, 550],
-      [220, 250, 230, 280, 270, 300, 350, 320, 380, 400, 450, 500],
-      [300, 350, 320, 380, 400, 450, 500, 480, 520, 550, 600, 650]
+      income,
+      expenses,
+      profit
     ]
 
     // line2: ['20', '50', '12', '65', '30', '60']
   };
   lineOption.value = getLineOption(lineData);
 };
-const getTurnoverList = (data?: any) => {
+const getTurnoverList = async () => {
   // const xData = data.map((item) => item.time);
   // const yData = data.map((item) => {
   //   // 先将content转换为数字，再调用toFixed
   //   const num = Number(item.content);
   //   return isNaN(num) ? 0 : Number(num.toFixed(2));
   // });
+  const { data } = await monthCash()
+  // const month = data.map((item: any) => item.month);
+  const month = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];
 
+  const income = data.map((item: any) => item.incomeAmount);
+  const expenses = data.map((item: any) => item.expensesAmount);
   const barData = {
-    name: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+    name: month,
     value: [
-      [2, 5, 15, 30, 25, 35, 40, 35, 45, 50, 40, 55],
-      [4, 3, 6, 11, 15, 22, 30, 14, 48, 22, 25, 60]
+      income,
+      expenses
     ]
   };
+  console.log(barData);
+
   barOption.value = getBarOptions(barData);
 };
+const getTotalAmonunt = async () => {
+  const { data } = await cashTotal()
+  bigDataObj.value = data
+};
 onMounted(() => {
   getCapitalData();
   getTurnoverList();
+  getTotalAmonunt();
 });
 
 //资金KPI
diff --git a/src/views/largeScreen/index.vue b/src/views/largeScreen/index.vue
index 8ce47fd..43428c8 100644
--- a/src/views/largeScreen/index.vue
+++ b/src/views/largeScreen/index.vue
@@ -1,4 +1,4 @@
-<template>
+ID<template>
   <div class="large-screen">
     <Header />
     <div class="nav">
@@ -21,6 +21,7 @@ import leftPage from './components/leftPage.vue';
 import centerPage from './components/centerPage.vue';
 import rightPage from './components/rightPage.vue';
 // import '@/assets/styles/element.scss';
+
 </script>
 
 <style scoped lang="scss">
@@ -31,6 +32,7 @@ import rightPage from './components/rightPage.vue';
   background-size: 100% 100%;
   background-color: rgba(4, 7, 17, 1);
 }
+
 .nav {
   width: 100%;
   height: calc(100vh - 80px);
diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue
index fb9ae9b..bac3df0 100644
--- a/src/views/materials/batchPlan/index.vue
+++ b/src/views/materials/batchPlan/index.vue
@@ -6,43 +6,20 @@
         <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" :offset="0"
-                ><el-button
-                  type="primary"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
-                  size="default"
-                  @click="handleAdd"
-                  icon="FolderAdd"
-                  plain
-                  >新增</el-button
-                ></el-col
-              >
-              <el-col :span="1.5" :offset="0"
-                ><el-button
-                  type="danger"
-                  size="default"
-                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']"
-                  @click="handleDeleteBatch"
-                  icon="FolderDelete"
-                  plain
-                  >删除</el-button
-                ></el-col
-              >
+              <el-col :span="1.5" :offset="0"><el-button type="primary"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']" size="default" @click="handleAdd"
+                  icon="FolderAdd" plain>新增</el-button></el-col>
+              <el-col :span="1.5" :offset="0"><el-button type="danger" size="default"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']" @click="handleDeleteBatch"
+                  icon="FolderDelete" plain>删除</el-button></el-col>
             </el-row>
           </template>
 
-          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search" clearable />
-          <el-tree
-            ref="batchTreeRef"
-            class="mt-2"
-            node-key="id"
-            :data="batchOptions"
-            :props="{ label: 'planCode', children: 'children' }"
-            :expand-on-click-node="false"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          >
+          <el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search"
+            clearable />
+          <el-tree ref="batchTreeRef" class="mt-2" node-key="id" :data="batchOptions"
+            :props="{ label: 'planCode', children: 'children' }" :expand-on-click-node="false" highlight-current
+            default-expand-all @node-click="handleNodeClick">
             <template #default="{ node, data }">
               <div class="custom-tree-node">
                 {{ node.label }}
@@ -50,14 +27,8 @@
               </div>
             </template>
           </el-tree>
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            v-model:page="queryParams.batchData.pageNum"
-            v-model:limit="queryParams.batchData.pageSize"
-            @pagination="getList"
-            layout="prev, pager, next,jumper"
-          />
+          <pagination v-show="total > 0" :total="total" v-model:page="queryParams.batchData.pageNum"
+            v-model:limit="queryParams.batchData.pageSize" @pagination="getList" layout="prev, pager, next,jumper" />
         </el-card>
       </el-col>
       <el-col :span="19">
@@ -65,14 +36,12 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
-                <el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']"
-                  >修改</el-button
-                >
+                <el-button type="primary" plain icon="Edit" @click="handleUpdata"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']">修改</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']"
-                  >审核</el-button
-                >
+                <el-button plain type="warning" icon="Finished" @click="handleAudit()"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']">审核</el-button>
               </el-col>
 
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,19 +59,14 @@
             <el-table-column label="需求到货时间" align="center" prop="arrivalTime" width="250" />
             <el-table-column label="备注" align="center" prop="remark" />
           </el-table>
-          <pagination
-            v-show="mainTotal > 0"
-            :total="mainTotal"
-            v-model:page="queryParams.mainData.pageNum"
-            v-model:limit="queryParams.mainData.pageSize"
-            @pagination="getMainList"
-          />
+          <pagination v-show="mainTotal > 0" :total="mainTotal" v-model:page="queryParams.mainData.pageNum"
+            v-model:limit="queryParams.mainData.pageSize" @pagination="getMainList" />
         </el-card>
       </el-col>
     </el-row>
 
     <!-- 添加或修改物资-材料设备对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1250px" append-to-body>
+    <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="1300px" append-to-body>
       <el-form :model="form" ref="cailiaoshebeiFormRef" :rules="rules" label-width="80px" :inline="false">
         <el-divider>基础信息</el-divider>
         <el-row :gutter="20">
@@ -113,7 +77,8 @@
           </el-col>
           <el-col :span="8" :offset="0">
             <el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
-              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择编制日期" />
+              <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择编制日期" />
             </el-form-item>
           </el-col>
           <el-col :span="8" :offset="0">
@@ -125,10 +90,21 @@
 
         <el-divider>主要信息</el-divider>
         <el-table :data="form.planList">
+          <el-table-column prop="name" align="center" label="版本号 " width="150">
+
+            <template #default="scope">
+              <el-select v-model="scope.row.versions" placeholder="请选择"
+                @change="(val) => selectNameVersion(val, scope.row)">
+
+                <el-option v-for="item in versionList" :key="item.versions" :label="item.versions"
+                  :value="item.versions" />
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column prop="name" align="center" label="物资名称">
             <template #default="scope">
-              <!-- <el-input v-model="scope.row.name" placeholder="请输入物资" /> -->
-              <el-select v-model="scope.row.suppliespriceId" placeholder="请选择" @change="(val) => selectName(val, scope.row)">
+              <el-select :disabled="!scope.row.versions" v-model="scope.row.suppliespriceId" placeholder="请选择"
+                @change="(val) => selectName(val, scope.row)">
                 <el-option v-for="item in nameList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </template>
@@ -155,7 +131,8 @@
           </el-table-column>
           <el-table-column prop="arrivalTime" align="center" label="需求到货时间">
             <template #default="scope">
-              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 140px" />
+              <el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择"
+                style="width: 140px" />
             </template>
           </el-table-column>
           <el-table-column prop="remark" align="center" label="备注" width="150">
@@ -188,8 +165,8 @@ import {
   listBatch,
   getBatch,
   delBatch,
-  listSelectCailiaoshebei,
-  getDictList
+  listSelectCailiaoshebei, obtainTheVersion,
+  getDictList, coryEngineeringList
 } from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -271,6 +248,7 @@ const data = reactive({
 const batchNumber = ref('');
 const { queryParams, form, rules } = toRefs(data);
 const nameList = ref([]);
+const versionList = ref([]);
 /** 查询物资-材料设备列表 */
 const getList = async (type?: string) => {
   loading.value = true;
@@ -480,15 +458,26 @@ const handleAudit = async () => {
   });
 };
 
-const getNameList = () => {
-  getDictList({ projectId: currentProject.value?.id }).then((res) => {
+const getNameList = (versions) => {
+  coryEngineeringList({ projectId: currentProject.value?.id, versions }).then((res) => {
     nameList.value = res.data;
   });
 };
+// 获取版本号
+const getVersion = () => {
+  obtainTheVersion({ projectId: currentProject.value?.id }).then((res) => {
+    versionList.value = res.data;
+  });
+};
+const selectNameVersion = (val, row) => {
+  row.suppliespriceId = undefined;
+  getNameList(val);
+};
 
 onMounted(() => {
   getList();
-  getNameList();
+  // getNameList();
+  getVersion();
 });
 
 //监听项目id刷新数据
diff --git a/src/views/materials/batchPlan/indexEdit.vue b/src/views/materials/batchPlan/indexEdit.vue
index b5656a6..8e3a50d 100644
--- a/src/views/materials/batchPlan/indexEdit.vue
+++ b/src/views/materials/batchPlan/indexEdit.vue
@@ -3,18 +3,13 @@
     <div class="max-w-4xl mx-auto">
       <!-- 顶部按钮区域 -->
       <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
-        <approvalButton
-          @submitForm="submitForm"
-          @approvalVerifyOpen="approvalVerifyOpen"
-          @handleApprovalRecord="handleApprovalRecord"
-          :buttonLoading="buttonLoading"
-          :id="form.mrpBaseBo.id"
-          :status="form.mrpBaseBo.status"
-          :pageType="routeParams.type"
-        />
+        <approvalButton @submitForm="submitForm" @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord" :buttonLoading="buttonLoading" :id="form.mrpBaseBo.id"
+          :status="form.mrpBaseBo.status" :pageType="routeParams.type" />
       </el-card>
       <!-- 表单区域 -->
-      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+      <el-card
+        class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
         <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
           <h3 class="text-lg font-semibold text-gray-800">物资设备批次需求计划</h3>
           <el-row :gutter="20">
@@ -25,7 +20,8 @@
             </el-col>
             <el-col :span="8" :offset="0">
               <el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
-                <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" disabled placeholder="请选择编制日期" />
+                <el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" disabled
+                  placeholder="请选择编制日期" />
               </el-form-item>
             </el-col>
             <el-col :span="8" :offset="0">
@@ -54,14 +50,8 @@
       <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
       <approvalRecord ref="approvalRecordRef"></approvalRecord>
       <!-- 流程选择对话框 -->
-      <el-dialog
-        draggable
-        v-model="dialogVisible.visible"
-        :title="dialogVisible.title"
-        :before-close="handleClose"
-        width="500"
-        class="rounded-lg shadow-lg"
-      >
+      <el-dialog draggable v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose"
+        width="500" class="rounded-lg shadow-lg">
         <div class="p-4">
           <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
           <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
@@ -70,12 +60,10 @@
         </div>
         <template #footer>
           <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
-            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
-              >取消</el-button
-            >
-            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
-              >确认</el-button
-            >
+            <el-button @click="handleClose"
+              class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors">取消</el-button>
+            <el-button type="primary" @click="submitFlow()"
+              class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors">确认</el-button>
           </div>
         </template>
       </el-dialog>
@@ -123,7 +111,7 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 const flowCodeOptions = [
   {
     value: currentProject.value?.id + '_mrp',
-    label: '物资供应总计划审批'
+    label: '物资需求计划审核'
   }
 ];
 
diff --git a/src/views/materials/materialsEquipment/materialIssue/index.vue b/src/views/materials/materialsEquipment/materialIssue/index.vue
index c0c360f..f518d3b 100644
--- a/src/views/materials/materialsEquipment/materialIssue/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/index.vue
@@ -140,16 +140,18 @@
                 <el-row>
                   <el-col :span="12">
                     <el-form-item
-                      :label="index === 0 ? '名称' : ''"
+                      label="名称"
                       :prop="`itemList.${index}.name`"
                       :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]"
                     >
-                      <el-input v-model="item.name" placeholder="请输入名称" />
+                      <el-select v-model="item.name" placeholder="请输入名称" @change="(value) => getNameChange(value, index, item)">
+                        <el-option v-for="item in optionsName" :key="item.id" :label="item.materialsName" :value="item.id" />
+                      </el-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item
-                      :label="index === 0 ? '规格' : ''"
+                      label="规格"
                       :prop="`itemList.${index}.specification`"
                       :rules="[{ required: true, message: '规格不能为空', trigger: 'blur' }]"
                     >
@@ -158,7 +160,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item
-                      :label="index === 0 ? '单位' : ''"
+                      label="单位"
                       :prop="`itemList.${index}.unit`"
                       :rules="[{ required: true, message: '单位不能为空', trigger: 'blur' }]"
                     >
@@ -167,7 +169,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item
-                      :label="index === 0 ? '库存' : ''"
+                      label="库存"
                       :prop="`itemList.${index}.stockQuantity`"
                       :rules="[{ required: true, message: '库存不能为空', trigger: 'blur' }]"
                     >
@@ -176,7 +178,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item
-                      :label="index === 0 ? '领取' : ''"
+                      label="领取"
                       :prop="`itemList.${index}.issuedQuantity`"
                       :rules="[{ required: true, message: '领取数量不能为空', trigger: 'blur' }]"
                     >
@@ -185,7 +187,7 @@
                   </el-col>
                   <el-col :span="12">
                     <el-form-item
-                      :label="index === 0 ? '剩余' : ''"
+                      label="剩余"
                       :prop="`itemList.${index}.remainingQuantity`"
                       :rules="[{ required: true, message: '剩余数量不能为空', trigger: 'blur' }]"
                     >
@@ -193,7 +195,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item :label="index === 0 ? '备注' : ''" prop="remark">
+                    <el-form-item label="备注" prop="remark">
                       <el-input v-model="item.remark" placeholder="请输入内容" />
                     </el-form-item>
                   </el-col>
@@ -249,7 +251,15 @@
 </template>
 
 <script setup name="MaterialIssue" lang="ts">
-import { listMaterialIssue, getMaterialIssue, delMaterialIssue, addMaterialIssue, updateMaterialIssue } from '@/api/materials/materialIssue';
+import {
+  listMaterialIssue,
+  getMaterialIssue,
+  delMaterialIssue,
+  addMaterialIssue,
+  updateMaterialIssue,
+  getMaterialName
+} from '@/api/materials/materialIssue';
+
 import { MaterialIssueVO, MaterialIssueQuery, MaterialIssueForm } from '@/api/materials/materialIssue/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import wordllssue from './word/index.vue';
@@ -345,6 +355,30 @@ const getList = async () => {
   total.value = res.total;
   loading.value = false;
 };
+const optionsName: any = ref([]);
+
+//获取一起名称
+const getName = async () => {
+  const res = await getMaterialName(currentProject.value.id);
+  console.log(res);
+  if (res.code == 200) {
+    optionsName.value = res.data;
+  }
+};
+
+const getNameChange = (value, index, item) => {
+  // 这里可以添加处理逻辑
+  console.log(value);
+
+  const data = optionsName.value.find((item) => item.id == value);
+  console.log(data);
+
+  form.value.itemList[index].name = data.materialsName;
+  form.value.itemList[index].materialsId = data.id;
+  form.value.itemList[index].specification = data.typeSpecificationName;
+  form.value.itemList[index].unit = data.weightId;
+  form.value.itemList[index].stockQuantity = data.inventoryNumber;
+};
 
 /** 取消按钮 */
 const cancel = () => {
@@ -447,6 +481,7 @@ const handleView = (row) => {
 };
 onMounted(() => {
   getList();
+  getName();
 });
 //监听项目id刷新数据
 const listeningProject = watch(
diff --git a/src/views/materials/materialsEquipment/materialIssue/word/index.vue b/src/views/materials/materialsEquipment/materialIssue/word/index.vue
index 4cfb5d9..7298339 100644
--- a/src/views/materials/materialsEquipment/materialIssue/word/index.vue
+++ b/src/views/materials/materialsEquipment/materialIssue/word/index.vue
@@ -54,31 +54,32 @@
             </tbody>
             <thead>
               <tr>
-                <th width="150">序号</th>
-                <th width="150">名称</th>
-                <th width="150">规格</th>
-                <th width="150">单位</th>
-                <th width="150">库存</th>
-                <th width="150">领取</th>
-                <th width="150">剩余</th>
-                <th width="150">备注</th>
+                <!-- 去掉重复的 width 属性，统一用 CSS 控制 -->
+                <th style="width: 80px; word-wrap: break-word">序号</th>
+                <th style="width: 120px; word-wrap: break-word">名称</th>
+                <th style="width: 120px; word-wrap: break-word">规格</th>
+                <th style="width: 80px; word-wrap: break-word">单位</th>
+                <th style="width: 80px; word-wrap: break-word">库存</th>
+                <th style="width: 80px; word-wrap: break-word">领取</th>
+                <th style="width: 80px; word-wrap: break-word">剩余</th>
+                <th style="width: 120px; word-wrap: break-word">备注</th>
               </tr>
             </thead>
             <tbody>
               <tr v-for="(item, i) of formData.itemList" :key="i">
-                <th width="150">{{ i + 1 }}</th>
-                <th width="150">{{ item.name }}</th>
-                <th width="150">{{ item.specification }}</th>
-                <th width="150">{{ item.unit }}</th>
-                <th width="150">{{ item.stockQuantity }}</th>
-                <th width="150">{{ item.issuedQuantity }}</th>
-                <th width="150">{{ item.remainingQuantity }}</th>
-                <th width="150">{{ item.remark }}</th>
+                <td width="150">{{ i + 1 }}</td>
+                <td width="150">{{ item.name }}</td>
+                <td width="150">{{ item.specification }}</td>
+                <td width="150">{{ item.unit }}</td>
+                <td width="150">{{ item.stockQuantity }}</td>
+                <td width="150">{{ item.issuedQuantity }}</td>
+                <td width="150">{{ item.remainingQuantity }}</td>
+                <td width="150">{{ item.remark }}</td>
               </tr>
             </tbody>
             <tbody>
               <tr>
-                <td colspan="7">
+                <td colspan="7" style="word-wrap: break-word">
                   <div style="margin-bottom: 10px">缺陷情况:</div>
                   {{ formData.defectDescription }}
                 </td>
@@ -296,5 +297,6 @@ tbody {
   box-shadow: 0px 0px 10px #ddd;
   padding: 20px;
   position: relative;
+  /* overflow: auto; */
 }
 </style>
diff --git a/src/views/materials/materialsEquipment/materialReceive/index.vue b/src/views/materials/materialsEquipment/materialReceive/index.vue
index 6e14b99..ab997cf 100644
--- a/src/views/materials/materialsEquipment/materialReceive/index.vue
+++ b/src/views/materials/materialsEquipment/materialReceive/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -11,7 +12,8 @@
               <el-input v-model="queryParams.projectName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="材料名称" prop="materialName">
-              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.materialName" placeholder="请输入设备材料名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="合同名称" prop="contractName">
               <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable @keyup.enter="handleQuery" />
@@ -23,9 +25,11 @@
               <el-input v-model="queryParams.supplierUnit" placeholder="请输入供货单位" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialReceive:list']" icon="Search"
+                @click="handleQuery">搜索</el-button>
 
-              <el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']" @click="resetQuery">重置</el-button>
+              <el-button icon="Refresh" v-hasPermi="['materials:materialReceive:list']"
+                @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -36,18 +40,12 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materialReceive:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['materials:materialReceive:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Delete"
-              :disabled="multiple"
-              @click="handleDelete()"
-              v-hasPermi="['materials:materialReceive:remove']"
-              >删除</el-button
-            >
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+              v-hasPermi="['materials:materialReceive:remove']">删除</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -70,24 +68,21 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="查看" placement="top">
-              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['materials:materialReceive:query']"></el-button>
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)"
+                v-hasPermi="['materials:materialReceive:query']"></el-button>
             </el-tooltip>
             <!-- <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialReceive:edit']"></el-button>
             </el-tooltip> -->
             <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['materials:materialReceive:remove']"
-              ></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['materials:materialReceive:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改物料接收单对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
@@ -106,11 +101,10 @@
               <el-input v-model="form.formCode" placeholder="请输入表单编号" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"
-            ><el-form-item label="采购单编号" prop="docId"
-              ><el-select @change="handleSelect" v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
-                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode" :value="item.id"></el-option> </el-select
-            ></el-form-item>
+          <el-col :span="12"><el-form-item label="采购单编号" prop="docId"><el-select @change="handleSelect"
+                v-model="form.docId" filterable placeholder="请选择采购单" style="width: 100%">
+                <el-option v-for="item in purchaseDocList" :key="item.id" :label="item.docCode"
+                  :value="item.id"></el-option> </el-select></el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="供货单位" prop="supplierUnit">
@@ -122,8 +116,7 @@
               <el-input v-model="form.orderingUnit" placeholder="请输入订货单位" />
             </el-form-item>
           </el-col>
-          <el-col :span="12"
-            ><el-form-item label="工程名称" prop="projectName">
+          <el-col :span="12"><el-form-item label="工程名称" prop="projectName">
               <el-input v-model="form.projectName" placeholder="请输入工程名称" />
             </el-form-item>
           </el-col>
@@ -146,53 +139,38 @@
               <div v-for="(item, index) in form.itemList" :key="index" class="detail-item">
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item
-                      disabled
-                      label="名称"
-                      :prop="`itemList.${index}.name`"
-                      :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }"
-                    >
+                    <el-form-item disabled label="名称" :prop="`itemList.${index}.name`"
+                      :rules="{ required: true, message: '名称不能为空', trigger: 'blur' }">
                       <el-input disabled v-model="item.name" placeholder="请输入名称" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
-                      label="规格"
-                      :prop="`itemList.${index}.specification`"
-                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }"
-                    >
+                    <el-form-item label="规格" :prop="`itemList.${index}.specification`"
+                      :rules="{ required: true, message: '规格不能为空', trigger: 'blur' }">
                       <el-input disabled v-model="item.specification" placeholder="请输入规格" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="单位" :prop="`itemList.${index}.unit`" :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
+                    <el-form-item label="单位" :prop="`itemList.${index}.unit`"
+                      :rules="{ required: true, message: '单位不能为空', trigger: 'blur' }">
                       <el-input disabled v-model="item.unit" placeholder="请输入单位" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
-                      label="数量"
-                      :prop="`itemList.${index}.quantity`"
-                      :rules="{ required: true, message: '数量不能为空', trigger: 'blur' }"
-                    >
+                    <el-form-item label="数量" :prop="`itemList.${index}.quantity`"
+                      :rules="{ required: true, message: '数量不能为空', trigger: 'blur' }">
                       <el-input disabled type="number" v-model="item.quantity" placeholder="请输入数量" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
-                      label="验收"
-                      :prop="`itemList.${index}.acceptedQuantity`"
-                      :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }"
-                    >
+                    <el-form-item label="验收" :prop="`itemList.${index}.acceptedQuantity`"
+                      :rules="{ required: true, message: '验收数量不能为空', trigger: 'blur' }">
                       <el-input type="number" v-model="item.acceptedQuantity" placeholder="请输入验收" />
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item
-                      label="缺件"
-                      :prop="`itemList.${index}.shortageQuantity`"
-                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }"
-                    >
+                    <el-form-item label="缺件" :prop="`itemList.${index}.shortageQuantity`"
+                      :rules="{ required: true, message: '缺件数量不能为空', trigger: 'blur' }">
                       <el-input type="number" v-model="item.shortageQuantity" placeholder="自动计算（数量-验收数量）" readonly />
                       <span class="tips">*自动计算（数量-验收数量）</span>
                     </el-form-item>
@@ -232,12 +210,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <span style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
+            <span
+              style="color: #ff0000ab; margin-bottom: 10px; display: block">注意：请上传doc/xls/ppt/txt/pdf/png/jpg/jpeg/zip格式文件</span>
           </el-col>
           <el-col :span="24">
             <el-form-item label="设备材料入库/移交" prop="storageType">
               <el-radio-group v-model="form.storageType">
-                <el-radio v-for="dict in storage_type" :key="dict.value" :label="dict.value">
+                <el-radio v-for="dict in storage_type.slice(0, 1)" :key="dict.value" :label="dict.value">
                   {{ dict.label }}
                 </el-radio>
               </el-radio-group>
@@ -246,9 +225,7 @@
                   {{ dict.label }}
                 </el-checkbox>
               </el-checkbox-group> -->
-            </el-form-item> </el-col
-          ><el-col :span="24"
-            ><el-form-item label="备注" prop="remark">
+            </el-form-item> </el-col><el-col :span="24"><el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
diff --git a/src/views/materials/materialsInventory/index.vue b/src/views/materials/materialsInventory/index.vue
index dc7b9ec..5cba59e 100644
--- a/src/views/materials/materialsInventory/index.vue
+++ b/src/views/materials/materialsInventory/index.vue
@@ -1,16 +1,20 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="材料名称" prop="materialsName">
-              <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.materialsName" placeholder="请输入材料名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" v-hasPermi="['materials:materialsInventory:list']" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button type="primary" v-hasPermi="['materials:materialsInventory:list']" icon="Search"
+                @click="handleQuery">搜索</el-button>
 
-              <el-button icon="Refresh" v-hasPermi="['materials:materialsInventory:list']" @click="resetQuery">重置</el-button>
+              <el-button icon="Refresh" v-hasPermi="['materials:materialsInventory:list']"
+                @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -21,7 +25,8 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:materialsInventory:export']">
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+              v-hasPermi="['materials:materialsInventory:export']">
               导出
             </el-button>
           </el-col>
@@ -29,8 +34,23 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="materialsInventoryList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+      <el-table v-loading="loading" :data="materialsInventoryList" @expand-change="handleExpandChange">
+        <el-table-column type="expand">
+          <template #default="props">
+            <div style="margin-left: 60px">
+              <el-table :data="materialsUseRecordList" border v-loading="loadingChild">
+                <el-table-column label="序号" align="center" type="index" width="60" />
+                <el-table-column label="使用数量" align="center" prop="useNumber" />
+                <el-table-column label="剩余量" align="center" prop="residueNumber" />
+                <el-table-column label="使用部位" align="center" prop="usePart" />
+                <el-table-column label="备注" align="center" prop="remark" />
+              </el-table>
+              <pagination v-show="totalChild > 0" :total="totalChild" v-model:page="queryParamsChild.pageNum"
+                v-model:limit="queryParamsChild.pageSize" @pagination="getListChild" />
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="序号" type="index" width="60" align="center" />
         <el-table-column label="物资名称" align="center" prop="materialsName" />
         <el-table-column label="计划数量" align="center" prop="quantityCount" />
@@ -95,7 +115,8 @@
           </template>
         </el-table-column> -->
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改材料出/入库对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -109,7 +130,8 @@
           <el-input v-model="form.number" placeholder="请输入出/入库的数量" />
         </el-form-item>
         <el-form-item label="出/入库操作时间" prop="outPutTime">
-          <el-date-picker clearable v-model="form.outPutTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出/入库操作时间">
+          <el-date-picker clearable v-model="form.outPutTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择出/入库操作时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="剩余库存数量" prop="residue">
@@ -154,7 +176,9 @@ import {
 } from '@/api/materials/materialsInventory';
 import { MaterialsInventoryForm, MaterialsInventoryQuery, MaterialsInventoryVO } from '@/api/materials/materialsInventory/types';
 import { useUserStoreHook } from '@/store/modules/user';
-
+import {
+  listMaterialsUseRecord,
+} from '@/api/materials/materialsUseRecord';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { out_put_type } = toRefs<any>(proxy?.useDict('out_put_type'));
 
@@ -170,7 +194,9 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const loadingChild = ref(true);
+const totalChild = ref(0);
+const materialsUseRecordList = ref<any[]>([]);
 const queryFormRef = ref<ElFormInstance>();
 const materialsInventoryFormRef = ref<ElFormInstance>();
 
@@ -194,7 +220,7 @@ const initFormData: MaterialsInventoryForm = {
   shipper: undefined,
   remark: undefined
 };
-const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>({
+const data = reactive({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
@@ -212,14 +238,38 @@ const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
     shipper: undefined,
     params: {}
   },
+  queryParamsChild: {
+    pageNum: 1,
+    pageSize: 10,
+    inventoryId: undefined,
+    usePart: undefined,
+    useNumber: undefined,
+    residueNumber: undefined
+  },
   rules: {
     id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
     materialsId: [{ required: true, message: '材料id不能为空', trigger: 'blur' }]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules, queryParamsChild } = toRefs(data);
 const materialsOptions = ref([]);
+/** 处理外层表格展开/折叠：记录当前展开行的inventoryId */
+const handleExpandChange = (row: any) => {
+  queryParamsChild.value.inventoryId = row.id;
+  getListChild();
+};
+/** 查询材料子级登记列表（内层列表） */
+const getListChild = async () => {
+  loadingChild.value = true;
+  try {
+    const res = await listMaterialsUseRecord(queryParamsChild.value);
+    materialsUseRecordList.value = res.rows;
+    totalChild.value = res.total;
+  } finally {
+    loadingChild.value = false;
+  }
+};
 
 /** 查询材料出/入库列表 */
 const getList = async () => {
diff --git a/src/views/materials/materialsUseRecord/index.vue b/src/views/materials/materialsUseRecord/index.vue
new file mode 100644
index 0000000..18c0679
--- /dev/null
+++ b/src/views/materials/materialsUseRecord/index.vue
@@ -0,0 +1,317 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave"> </transition>
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="使用部位" prop="usePart">
+              <el-input v-model="queryParams.usePart" placeholder="请输入使用部位" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <!-- 外层表格：添加ref用于控制展开状态 -->
+      <el-table ref="outerTableRef" v-loading="loading" :data="materialsUseInventoryList"
+        @expand-change="handleExpandChange" border>
+        <el-table-column type="expand">
+          <template #default="props">
+            <div style="margin-left: 60px">
+              <el-table :data="materialsUseRecordList" border v-loading="loadingChild">
+                <el-table-column label="序号" align="center" type="index" width="60" />
+                <el-table-column label="使用数量" align="center" prop="useNumber" />
+                <el-table-column label="剩余量" align="center" prop="residueNumber" />
+                <el-table-column label="使用部位" align="center" prop="usePart" />
+                <el-table-column label="备注" align="center" prop="remark" />
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                  <template #default="scope">
+                    <el-button link type="primary" icon="delete" v-if="scope.row.ishow" @click="handleDelete(scope.row)"
+                      v-hasPermi="['materials:materialsUseRecord:remove']">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <pagination v-show="totalChild > 0" :total="totalChild" v-model:page="queryParamsChild.pageNum"
+                v-model:limit="queryParamsChild.pageSize" @pagination="getListChild" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" align="center" type="index" width="60" />
+        <el-table-column label="物资名称" align="center" prop="materialsName" />
+        <el-table-column label="交接单位" align="center" prop="recipient" />
+        <el-table-column label="计划数量" align="center" prop="quantityCount" />
+        <el-table-column label="数量" align="center" prop="number" />
+        <el-table-column label="出库人" align="center" prop="operator" />
+        <el-table-column label="领用人" align="center" prop="shipper" />
+        <el-table-column label="剩余量" align="center" prop="residue" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+              v-hasPermi="['materials:materialsUseRecord:add']">添加登记</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改材料使用登记对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="materialsUseRecordFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="使用数量" prop="useNumber">
+          <el-input v-model="form.useNumber" type="number" placeholder="请输入使用数量" />
+        </el-form-item>
+        <el-form-item label="使用部位" prop="usePart">
+          <el-input v-model="form.usePart" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MaterialsUseRecord" lang="ts">
+import {
+  listMaterialsUseRecord,
+  listMaterialsUseInventory,
+  getMaterialsUseRecord,
+  delMaterialsUseRecord,
+  addMaterialsUseRecord,
+  updateMaterialsUseRecord
+} from '@/api/materials/materialsUseRecord';
+import { MaterialsUseRecordVO, MaterialsUseRecordQuery, MaterialsUseRecordForm } from '@/api/materials/materialsUseRecord/types';
+import { getCurrentInstance, ComponentInternalInstance, onMounted, ref, reactive, toRefs, computed } from 'vue';
+import { ElFormInstance, ElTable } from 'element-plus';
+import useUserStore from '@/store/modules/user';
+import { get } from 'lodash';
+
+// 类型定义补充（若项目中无全局DialogOption类型需添加）
+interface DialogOption {
+  visible: boolean;
+  title: string;
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const userStore = useUserStore();
+const currentProject = computed(() => userStore.selectedProject);
+
+// 核心数据响应式定义
+const materialsUseRecordList = ref<MaterialsUseRecordVO[]>([]);
+const materialsUseInventoryList = ref<any[]>([]); // 外层列表数据类型可根据实际接口返回调整
+const buttonLoading = ref(false);
+const loading = ref(true);
+const loadingChild = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const totalChild = ref(0);
+
+// 组件Ref定义
+const queryFormRef = ref<ElFormInstance>();
+const materialsUseRecordFormRef = ref<ElFormInstance>();
+const outerTableRef = ref<InstanceType<typeof ElTable> | undefined>(undefined); // 外层表格Ref（控制展开）
+const currentExpandInventoryId = ref<number | undefined>(undefined); // 存储当前展开行的inventoryId
+
+// 对话框与表单数据
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  inventoryId: undefined,
+  usePart: undefined,
+  useNumber: undefined,
+  residueNumber: undefined,
+  remark: undefined
+};
+const data = reactive({
+  form: { ...initFormData } as MaterialsUseRecordForm,
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    projectId: currentProject.value?.id,
+    outPut: 1,
+    usePart: undefined // 补充usePart字段（与表单prop对应）
+  } as MaterialsUseRecordQuery & { outPut?: number; usePart?: string },
+  queryParamsChild: {
+    pageNum: 1,
+    pageSize: 10,
+    inventoryId: undefined,
+    usePart: undefined,
+    useNumber: undefined,
+    residueNumber: undefined
+  } as MaterialsUseRecordQuery,
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+    inventoryId: [{ required: true, message: '库存ID不能为空', trigger: 'blur' }],
+    usePart: [{ required: true, message: '使用部位不能为空', trigger: 'blur' }],
+    useNumber: [{ required: true, message: '使用数量不能为空', trigger: 'blur' }],
+    residueNumber: [{ required: true, message: '剩余量不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules, queryParamsChild } = toRefs(data);
+
+/** 查询材料使用登记列表（外层列表） */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listMaterialsUseInventory(queryParams.value);
+    materialsUseInventoryList.value = res.rows;
+    total.value = res.total;
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 处理外层表格展开/折叠：记录当前展开行的inventoryId */
+const handleExpandChange = (row: any) => {
+  currentExpandInventoryId.value = row.id; // 记录展开行ID
+  queryParamsChild.value.inventoryId = row.id;
+  getListChild();
+};
+
+/** 查询材料子级登记列表（内层列表） */
+const getListChild = async () => {
+  loadingChild.value = true;
+  try {
+    const res = await listMaterialsUseRecord(queryParamsChild.value);
+    materialsUseRecordList.value = res.rows;
+    // 控制首行删除按钮显示
+    if (res.rows.length > 0) {
+      materialsUseRecordList.value[0].ishow = true;
+    }
+    totalChild.value = res.total;
+  } finally {
+    loadingChild.value = false;
+  }
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  materialsUseRecordFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据（当前模板未使用，保留原逻辑） */
+const handleSelectionChange = (selection: MaterialsUseRecordVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = async (row: any) => {
+  reset();
+  form.value.inventoryId = row.id;
+  dialog.visible = true;
+  dialog.title = '添加材料使用登记';
+};
+
+/** 修改按钮操作（当前模板未使用，保留原逻辑） */
+const handleUpdate = async (row?: MaterialsUseRecordVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getMaterialsUseRecord(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改材料使用登记';
+};
+
+/** 提交按钮：核心优化逻辑（刷新外层列表+保留展开状态） */
+const submitForm = () => {
+  materialsUseRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      try {
+        // 1. 执行添加/修改接口请求
+        await addMaterialsUseRecord(form.value);
+        // 2. 刷新外层列表（确保外层数据同步，如剩余量）
+        await getList();
+        // 3. 刷新当前展开行的子列表
+        await getListChild();
+        // 4. 恢复展开状态：根据记录的inventoryId重新展开行
+        if (currentExpandInventoryId.value && outerTableRef.value) {
+          const targetRow = materialsUseInventoryList.value.find((item) => item.id === currentExpandInventoryId.value);
+          if (targetRow) {
+            outerTableRef.value.toggleRowExpansion(targetRow, true);
+          }
+        }
+        proxy?.$modal.msgSuccess('操作成功');
+        dialog.visible = false;
+      } finally {
+        buttonLoading.value = false;
+      }
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MaterialsUseRecordVO) => {
+  const _ids = row?.id || ids.value;
+  try {
+    await proxy?.$modal.confirm(`是否确认删除材料使用登记编号为"${_ids}"的数据项？`);
+    await delMaterialsUseRecord(_ids);
+    await getList();
+    await getListChild();
+    if (currentExpandInventoryId.value && outerTableRef.value) {
+      const targetRow = materialsUseInventoryList.value.find((item) => item.id === currentExpandInventoryId.value);
+      if (targetRow) {
+        outerTableRef.value.toggleRowExpansion(targetRow, true);
+      }
+    }
+    proxy?.$modal.msgSuccess('删除成功');
+    await getListChild();
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 导出按钮操作（保留原逻辑） */
+const handleExport = () => {
+  proxy?.download('materials/materialsUseRecord/export', { ...queryParams.value }, `materialsUseRecord_${new Date().getTime()}.xlsx`);
+};
+
+/** 页面挂载时加载外层列表 */
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/materials/usageMaterials/purchase/index.vue b/src/views/materials/usageMaterials/purchase/index.vue
index f8e60ea..84d24cb 100644
--- a/src/views/materials/usageMaterials/purchase/index.vue
+++ b/src/views/materials/usageMaterials/purchase/index.vue
@@ -1,37 +1,25 @@
 <template>
   <div style="padding: 20px">
     <el-card class="mb-5">
-      <el-button
-        type="primary"
-        v-hasPermi="['cailiaoshebei:physicalsupply:add']"
-        icon="Plus"
-        @click="handleAdd"
-        class="transition-all duration-200 hover:shadow-md"
-      >
+      <el-button type="primary" v-hasPermi="['cailiaoshebei:physicalsupply:add']" icon="Plus" @click="handleAdd"
+        class="transition-all duration-200 hover:shadow-md">
         新增
       </el-button>
-      <el-button
-        v-hasPermi="['cailiaoshebei:physicalsupply:list']"
-        icon="Refresh"
-        @click="refreshData"
-        class="transition-all duration-200 hover:shadow-md"
-      >
+      <el-button v-hasPermi="['cailiaoshebei:physicalsupply:list']" icon="Refresh" @click="refreshData"
+        class="transition-all duration-200 hover:shadow-md">
         刷新
       </el-button>
     </el-card>
 
     <!-- 数据表格 -->
     <div class="bg-white rounded-lg shadow-sm overflow-hidden transition-all duration-300 hover:shadow-md">
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        border
-        stripe
+      <el-table v-loading="loading" :data="tableData" border stripe
         style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)"
         :header-cell-style="{ 'background-color': '#f5f7fa', 'font-weight': 'bold' }"
-        :row-class-name="tableRowClassName"
-      >
-        <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column>
+        :row-class-name="tableRowClassName">
+        <!-- <el-table-column prop="id" label="ID" width="180" align="center"></el-table-column> -->
+        <el-table-column type="index" label="序号" align="center" width="60"></el-table-column>
+
         <el-table-column prop="name" label="材料名称" align="center"></el-table-column>
         <el-table-column prop="specification" label="规格" align="center"></el-table-column>
         <el-table-column prop="supplier" label="供应商" align="center"></el-table-column>
@@ -55,49 +43,25 @@
         </el-table-column>
         <el-table-column label="操作" width="240" align="center" fixed="right">
           <template #default="scope">
-            <el-button
-              v-hasPermi="['cailiaoshebei:physicalsupplySon:add']"
-              size="small"
-              icon="Plus"
-              @click="handleAddSon(scope.row)"
-              class="text-blue-600 hover:text-blue-800 transition-colors"
-            ></el-button>
-            <el-button
-              v-hasPermi="['cailiaoshebei:physicalsupply:edit']"
-              size="small"
-              icon="Edit"
-              @click="handleEdit(scope.row)"
-              class="text-blue-600 hover:text-blue-800 transition-colors"
-            ></el-button>
-            <el-button
-              v-hasPermi="['cailiaoshebei:physicalsupplySon:list']"
-              size="small"
-              icon="View"
-              @click="jumpRouter(scope.row)"
-              class="text-blue-600 hover:text-blue-800 transition-colors"
-            ></el-button>
-            <el-button
-              v-hasPermi="['cailiaoshebei:physicalsupply:remove']"
-              size="small"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              class="text-red-600 hover:text-red-800 transition-colors"
-            ></el-button>
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupplySon:add']" size="small" icon="Plus"
+              @click="handleAddSon(scope.row)" class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupply:edit']" size="small" icon="Edit"
+              @click="handleEdit(scope.row)" class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupplySon:list']" size="small" icon="View"
+              @click="jumpRouter(scope.row)" class="text-blue-600 hover:text-blue-800 transition-colors"></el-button>
+            <el-button v-hasPermi="['cailiaoshebei:physicalsupply:remove']" size="small" icon="Delete"
+              @click="handleDelete(scope.row)" class="text-red-600 hover:text-red-800 transition-colors"></el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 分页 -->
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="fetchData" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="fetchData" />
     </div>
     <!-- 新增/编辑对话框 -->
-    <el-dialog
-      v-model="dialogVisible"
-      :title="dialogType === 'add' ? '新增记录' : '编辑记录'"
-      :width="dialogWidth"
-      :fullscreen="isFullscreen"
-      :before-close="handleDialogClose"
-    >
+    <el-dialog v-model="dialogVisible" :title="dialogType === 'add' ? '新增记录' : '编辑记录'" :width="dialogWidth"
+      :fullscreen="isFullscreen" :before-close="handleDialogClose">
       <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" class="space-y-4">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -141,12 +105,8 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="合同签订时间" prop="contractSigning">
-              <el-date-picker
-                v-model="formData.contractSigning"
-                type="datetime"
-                placeholder="选择合同签订时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-              ></el-date-picker>
+              <el-date-picker v-model="formData.contractSigning" type="datetime" placeholder="选择合同签订时间"
+                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -159,7 +119,8 @@
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="供货要求" prop="supplyRequirements">
-              <el-input v-model="formData.supplyRequirements" placeholder="请输入供货要求" type="textarea" :rows="3"></el-input>
+              <el-input v-model="formData.supplyRequirements" placeholder="请输入供货要求" type="textarea"
+                :rows="3"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index ff6efb9..82af6af 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -1,135 +1,120 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="上报日期" prop="reportDate">
-              <el-date-picker clearable v-model="queryParams.reportDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择上报日期" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
+  <template>
+    <div class="p-2">
+      <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+        :leave-active-class="proxy?.animate.searchAnimate.leave">
+        <div v-show="showSearch" class="mb-[10px]">
+          <el-card shadow="hover">
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+              <el-form-item label="上报日期" prop="reportDate">
+                <el-date-picker clearable v-model="queryParams.reportDate" type="date" value-format="YYYY-MM-DD"
+                  placeholder="请选择上报日期" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+        </div>
+      </transition>
 
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:constructionValue:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:constructionValue:remove']"
-              >删除</el-button
-            >
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
+      <el-card shadow="never">
+        <template #header>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                v-hasPermi="['out:constructionValue:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                v-hasPermi="['out:constructionValue:remove']">删除</el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          </el-row>
+        </template>
 
-      <el-table v-loading="loading" :data="constructionValueList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <!-- <el-table-column label="主键ID" align="center" prop="id" v-if="true" /> -->
-        <el-table-column label="上报日期" align="center" prop="reportDate" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="项目子项" align="center" prop="subProjectName" />
-        <el-table-column label="分部工程" align="center" prop="categoryName" />
-        <el-table-column label="分项工程" align="center" prop="progressCategoryName" />
-        <el-table-column label="人工填报数量" align="center" prop="artificialNum" />
-        <el-table-column label="无人机识别数量" align="center" prop="uavNum" />
-        <el-table-column label="确认数量" align="center" prop="confirmNum" />
-        <el-table-column label="产值" align="center" prop="outValue" />
-        <el-table-column label="流程状态" align="center" prop="status">
-          <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.auditStatus" />
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
-          <template #default="scope">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['out:constructionValue:edit']">修改</el-button>
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['out:constructionValue:remove']"
-              >删除</el-button
-            >
-            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)" v-hasPermi="['out:constructionValue:remove']"
-              >审核</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
+        <el-table v-loading="loading" :data="constructionValueList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <!-- <el-table-column label="主键ID" align="center" prop="id" v-if="true" /> -->
+          <el-table-column label="上报日期" align="center" prop="reportDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目子项" align="center" prop="subProjectName" />
+          <el-table-column label="分部工程" align="center" prop="categoryName" />
+          <el-table-column label="分项工程" align="center" prop="progressCategoryName" />
+          <el-table-column label="人工填报数量" align="center" prop="artificialNum" />
+          <el-table-column label="无人机识别数量" align="center" prop="uavNum" />
+          <el-table-column label="确认数量" align="center" prop="confirmNum" />
+          <el-table-column label="对乙产值" align="center" prop="outValue" />
+          <el-table-column label="对甲产值" align="center" prop="ownerValue" />
+          <el-table-column label="流程状态" align="center" prop="status">
+            <template #default="scope">
+              <dict-tag :options="wf_business_status" :value="scope.row.auditStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
+            <template #default="scope">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['out:constructionValue:edit']">修改</el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['out:constructionValue:remove']">删除</el-button>
+              <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)"
+                v-hasPermi="['out:constructionValue:remove']">审核</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
-    <!-- 添加或修改施工产值对话框 -->
-    <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-cascader
-            :options="matrixOptions"
-            placeholder="请选择"
-            :props="{ value: 'matrixId', label: 'name', emitPath: false }"
-            v-model="form.matrixId"
-            @clear="resetCascader(1)"
-            @change="handleChange"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="分项工程" prop="progressCategoryId" v-if="!form.id">
-          <el-cascader
-            :options="progressCategoryList"
-            v-model="form.progressCategoryId"
-            @clear="resetCascader()"
-            :disabled="!form.matrixId"
-            @change="selectTime"
-            :props="{ expandTrigger: 'hover', value: 'id', label: 'name', emitPath: false }"
-            placeholder="请选择分项工程"
-            clearable
-          >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="计划日期" prop="reportDateId" v-if="!form.id">
-          <el-cascader
-            :options="progressTimeList"
-            v-model="form.reportDateId"
-            :disabled="!form.progressCategoryId"
-            :props="{ expandTrigger: 'hover', value: 'id', label: 'date', emitPath: false }"
-            placeholder="请选择计划日期"
-            @change="submitTime"
-            clearable
-          >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="人工填报数量" prop="artificialNum">
-          <el-input v-model="form.artificialNum" placeholder="请输入人工填报数量" disabled />
-        </el-form-item>
-        <el-form-item label="无人机识别数量" prop="uavNum">
-          <el-input v-model="form.uavNum" placeholder="请输入无人机识别数量" disabled />
-        </el-form-item>
-        <el-form-item label="上报日期" prop="planDate">
-          <el-date-picker v-model="form.planDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择上报日期" />
-        </el-form-item>
-        <el-form-item label="确认数量" prop="confirmNum">
-          <el-input v-model="form.confirmNum" placeholder="请输入确认数量" />
-        </el-form-item>
-        <!-- <el-form-item label="产值" prop="outValue">
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </el-card>
+      <!-- 添加或修改施工产值对话框 -->
+      <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-cascader :options="matrixOptions" placeholder="请选择"
+              :props="{ value: 'matrixId', label: 'name', emitPath: false }" v-model="form.matrixId"
+              @clear="resetCascader(1)" @change="handleChange" clearable />
+          </el-form-item>
+          <el-form-item label="分项工程" prop="progressCategoryId" v-if="!form.id">
+            <el-cascader :options="progressCategoryList" v-model="form.progressCategoryId" @clear="resetCascader()"
+              :disabled="!form.matrixId" @change="selectTime"
+              :props="{ expandTrigger: 'hover', value: 'id', label: 'name', emitPath: false }" placeholder="请选择分项工程"
+              clearable>
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="计划日期" prop="reportDateId" v-if="!form.id">
+            <el-cascader :options="progressTimeList" v-model="form.reportDateId" :disabled="!form.progressCategoryId"
+              :props="{ expandTrigger: 'hover', value: 'id', label: 'date', emitPath: false }" placeholder="请选择计划日期"
+              @change="submitTime" clearable>
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="人工填报数量" prop="artificialNum">
+            <el-input v-model="form.artificialNum" placeholder="请输入人工填报数量" disabled />
+          </el-form-item>
+          <el-form-item label="无人机识别数量" prop="uavNum">
+            <el-input v-model="form.uavNum" placeholder="请输入无人机识别数量" disabled />
+          </el-form-item>
+          <el-form-item label="上报日期" prop="planDate">
+            <el-date-picker v-model="form.planDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择上报日期" />
+          </el-form-item>
+          <el-form-item label="确认数量" prop="confirmNum">
+            <el-input v-model="form.confirmNum" placeholder="请输入确认数量" />
+          </el-form-item>
+          <!-- <el-form-item label="产值" prop="outValue">
           <el-input v-model="form.outValue" disabled />
         </el-form-item> -->
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
+        </el-form>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </template>
 
 <script setup name="ConstructionValue" lang="ts">
 import {
@@ -292,7 +277,7 @@ const handleAdd = async () => {
 const handleChange = async (value: number) => {
   queryParams.value.matrixId = value;
   const res = await listProgressCategory(queryParams.value);
-  const data = proxy?.handleTree<ProgressCategoryVO>(res.data, 'id', 'pid');
+  const data = proxy?.handleTree<ProgressCategoryVO>(res.data, 'id', 'parentId');
   if (data) {
     progressCategoryList.value = data;
     console.log('🚀 ~ handleChange ~ progressCategoryList.value :', progressCategoryList.value);
diff --git a/src/views/out/designCompletion/index.vue b/src/views/out/designCompletion/index.vue
index efc5e82..ecdb6ab 100644
--- a/src/views/out/designCompletion/index.vue
+++ b/src/views/out/designCompletion/index.vue
@@ -1,11 +1,19 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="计划月份" prop="planMonth">
-              <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
+              <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM"
+                placeholder="请选择计划月份" />
+            </el-form-item>
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="queryParams.type" placeholder="请选择类型">
+                <el-option label="对甲" value="1" />
+                <el-option label="对乙" value="2" />
+              </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -22,13 +30,18 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <el-table v-loading="loading" :data="monthPlanList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="计划月份" align="center" prop="planMonth" />
         <el-table-column label="计划产值" align="center" prop="planValue" />
         <el-table-column label="完成产值" align="center" prop="completeValue" />
         <el-table-column label="差额" align="center" prop="differenceValue" />
+        <el-table-column label="类型" align="center">
+          <template #default="scope">
+            <span v-if="scope.row.type == '1'">对甲</span>
+            <span v-else>对乙</span>
+          </template>
+        </el-table-column>
         <el-table-column label="产值类型" align="center" prop="valueType">
           <template #default="scope">
             <dict-tag :options="out_value_type" :value="scope.row.valueType" />
@@ -41,15 +54,16 @@
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
           <template #default="scope">
-            <el-button type="primary" link icon="Edit" @click="handleAdd(scope.row)" v-hasPermi="['out:monthPlan:add']">编辑</el-button>
+            <el-button type="primary" link icon="Edit" @click="handleAdd(scope.row)"
+              v-hasPermi="['out:monthPlan:add']">编辑</el-button>
 
-            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)" v-hasPermi="['out:constructionValue:remove']"
-              >审核</el-button
-            >
+            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)"
+              v-hasPermi="['out:constructionValue:remove']">审核</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -60,14 +74,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="计划月份" prop="planMonth">
-          <el-date-picker
-            v-model="form.planMonth"
-            type="month"
-            value-format="YYYY-MM"
-            disabled
-            placeholder="请选择计划月份"
-            @change="handlePlanMonthChange"
-          />
+          <el-date-picker v-model="form.planMonth" type="month" value-format="YYYY-MM" disabled placeholder="请选择计划月份"
+            @change="handlePlanMonthChange" />
         </el-form-item>
         <el-form-item label="计划产值" prop="planValue">
           <el-input v-model="form.planValue" placeholder="请输入计划产值" disabled />
diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue
index cbeb62f..05a5825 100644
--- a/src/views/out/monthPlan/index.vue
+++ b/src/views/out/monthPlan/index.vue
@@ -1,17 +1,25 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="计划月份" prop="planMonth">
-              <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
+              <el-date-picker v-model="queryParams.planMonth" type="month" value-format="YYYY-MM"
+                placeholder="请选择计划月份" />
             </el-form-item>
             <el-form-item label="产值类型" prop="valueType">
               <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
                 <el-option v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="queryParams.type" placeholder="请选择类型">
+                <el-option label="对甲" value="1" />
+                <el-option label="对乙" value="2" />
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -25,12 +33,12 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['out:monthPlan:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['out:monthPlan:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['out:monthPlan:remove']"
-              >删除</el-button
-            >
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+              v-hasPermi="['out:monthPlan:remove']">删除</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -47,25 +55,40 @@
             <dict-tag :options="out_value_type" :value="scope.row.valueType" />
           </template>
         </el-table-column>
+        <el-table-column label="类型" align="center">
+          <template #default="scope">
+            <span v-if="scope.row.type == '1'">对甲</span>
+            <span v-else>对乙</span>
+          </template>
+        </el-table-column>
         <el-table-column label="流程状态" align="center" prop="planAuditStatus">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.planAuditStatus" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope"
-            ><el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['out:monthPlan:edit']">修改</el-button>
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['out:monthPlan:remove']">删除</el-button>
-            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)" v-hasPermi="['out:monthPlan:remove']">审核</el-button>
+          <template #default="scope"><el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['out:monthPlan:edit']">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['out:monthPlan:remove']">删除</el-button>
+            <el-button link type="primary" icon="Finished" @click="handleAudit(scope.row)"
+              v-hasPermi="['out:monthPlan:remove']">审核</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改月度产值计划对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型" prop="planValue">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option label="对甲" value="1" />
+            <el-option label="对乙" value="2" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="计划产值" prop="planValue">
           <el-input v-model="form.planValue" placeholder="请输入计划产值" type="number" />
         </el-form-item>
@@ -117,7 +140,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const initFormData: MonthPlanForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
   planValue: undefined,
@@ -125,12 +148,12 @@ const initFormData: MonthPlanForm = {
   differenceValue: undefined,
   planMonth: undefined,
   isDesign: true,
-
+  type: '1',
   valueType: undefined,
   planAuditStatus: undefined,
   completeAuditStatus: undefined
 };
-const data = reactive<PageData<MonthPlanForm, MonthPlanQuery>>({
+const data = reactive({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
@@ -143,6 +166,7 @@ const data = reactive<PageData<MonthPlanForm, MonthPlanQuery>>({
     valueType: undefined,
     planAuditStatus: undefined,
     completeAuditStatus: undefined,
+    type: '1',
     params: {}
   },
   rules: {
diff --git a/src/views/out/monthPlan/indexEdit.vue b/src/views/out/monthPlan/indexEdit.vue
index dc05a7d..708f793 100644
--- a/src/views/out/monthPlan/indexEdit.vue
+++ b/src/views/out/monthPlan/indexEdit.vue
@@ -25,29 +25,37 @@
             :disabled="routeParams.type === 'view' || form.status == 'waiting'"
             :model="form"
             :rules="rules"
-            label-width="120px"
+            label-width="80px"
             class="space-y-4"
           >
             <div class="grid grid-cols-1 gap-4">
               <el-row :gutter="20" justify="space-between" v-for="item in form">
-                <el-col :span="8" :offset="0">
+                <el-col :span="6" :offset="0">
                   <el-form-item label="计划产值" prop="planValue">
                     <el-input v-model="item.planValue" placeholder="请输入计划产值" disabled />
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" :offset="0">
+                <el-col :span="6" :offset="0">
                   <el-form-item label="计划月份" prop="planMonth">
                     <el-date-picker v-model="item.planMonth" type="month" value-format="YYYY-MM" disabled placeholder="请选择计划月份" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :offset="0">
+                <el-col :span="6" :offset="0">
                   <el-form-item label="产值类型" prop="valueType">
                     <el-select v-model="item.valueType" placeholder="请选择产值类型" disabled>
                       <el-option v-for="it in out_value_type" :key="it.value" :label="it.label" :value="it.value" />
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="6" :offset="0">
+                  <el-form-item label="类型" prop="valueType">
+                    <el-select v-model="item.type" placeholder="请选择类型" disabled>
+                      <el-option label="对甲" value="1" />
+                      <el-option label="对乙" value="2" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </div>
           </el-form>
diff --git a/src/views/out/outDesignTable/index.vue b/src/views/out/outDesignTable/index.vue
index dff39c3..7464889 100644
--- a/src/views/out/outDesignTable/index.vue
+++ b/src/views/out/outDesignTable/index.vue
@@ -1,44 +1,54 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="计划月份" prop="month">
-              <el-date-picker v-model="queryParams.month" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
-            </el-form-item>
-            <el-form-item label="产值类型" prop="valueType">
-              <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
-                <el-option label="设计" value="1" />
-                <el-option label="采购" value="2" />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
+      <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item.label" :name="item.value">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+          <div v-show="showSearch" class="mb-[10px]">
+            <el-card shadow="hover">
+              <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item label="计划月份" prop="month">
+                  <el-date-picker v-model="queryParams.month" type="month" value-format="YYYY-MM" placeholder="请选择计划月份" />
+                </el-form-item>
+                <el-form-item label="产值类型" prop="valueType">
+                  <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
+                    <el-option label="设计" value="1" />
+                    <el-option label="采购" value="2" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-form>
+            </el-card>
+          </div>
+        </transition>
+        <el-card shadow="never">
+          <template #header>
+            <el-row :gutter="10" class="mb8">
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+            </el-row>
+          </template>
 
-      <el-table v-loading="loading" :data="valueAllocationList">
-        <el-table-column label="项目" align="center" prop="projectName" />
-        <el-table-column label="月预计产值" align="center" prop="monthEstimatedValue" />
-        <el-table-column label="完成产值月合计" align="center" prop="monthCompletionValue" />
-        <el-table-column label="产值差额" align="center" prop="valueDifference" />
-        <el-table-column label="项目总产值" align="center" prop="totalValue" />
-        <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
-        <el-table-column label="项目完成率" align="center" prop="projectCompletionRate" />
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
+          <el-table v-loading="loading" :data="valueAllocationList">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="月预计产值" align="center" prop="monthEstimatedValue" />
+            <el-table-column label="完成产值月合计" align="center" prop="monthCompletionValue" />
+            <el-table-column label="产值差额" align="center" prop="valueDifference" />
+            <el-table-column label="项目总产值" align="center" prop="totalValue" />
+            <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
+            <el-table-column label="项目完成率" align="center" prop="projectCompletionRate" />
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-card>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -66,8 +76,23 @@ const data = reactive({
     month: undefined
   }
 });
-
+const activeTab = ref('1');
 const { queryParams } = toRefs(data);
+const tabList = [
+  {
+    value: '1',
+    label: '对甲采购设计报表'
+  },
+  {
+    value: '2',
+    label: '对乙采购设计报表'
+  }
+];
+const handleTabChange = (tab) => {
+  activeTab.value = tab;
+  data.queryParams.valueType = '1';
+  // data.queryParams.month = '';
+};
 
 /** 查询项目总产值分配列表 */
 const getList = async () => {
diff --git a/src/views/out/outDesignTableVS/index.vue b/src/views/out/outDesignTableVS/index.vue
index eb4b502..4c35765 100644
--- a/src/views/out/outDesignTableVS/index.vue
+++ b/src/views/out/outDesignTableVS/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
+      <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item.label" :name="item.value">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="计划月份" prop="month">
@@ -9,7 +9,9 @@
             </el-form-item>
             <el-form-item label="产值类型" prop="valueType">
               <el-select v-model="queryParams.valueType" placeholder="请选择产值类型">
-                <el-option v-for="item in out_value_type" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option label="设计" value="1" />
+                <el-option label="采购" value="2" />
+                <el-option label="施工" value="3" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -18,68 +20,100 @@
             </el-form-item>
           </el-form>
         </el-card>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="valueAllocationList">
-        <el-table-column label="项目" align="center" prop="projectName" />
-        <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
-        <el-table-column label="累计结算产值" align="center" prop="totalSettlementOutputValue" />
-        <el-table-column label="完工未结算额" align="center" prop="completionUnsettledAmount" />
-        <el-table-column label="完工未结算比例" align="center" prop="completionUnsettledRatio" />
-        <el-table-column label="操作" align="center">
-          <template #default="scope">
-            <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
+        <el-card shadow="never">
+          <el-table v-loading="loading" :data="tableData" v-if="activeTab == '1' || activeTab == '2'">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
+            <el-table-column label="累计结算产值" align="center" prop="totalSettlementOutputValue" />
+            <el-table-column label="完工未结算额" align="center" prop="completionUnsettledAmount" />
+            <el-table-column label="完工未结算比例" align="center" prop="completionUnsettledRatio" />
+            <!-- <el-table-column label="操作" align="center">
+              <template #default="scope">
+                <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
+              </template>
+            </el-table-column> -->
+          </el-table>
+          <el-table v-loading="loading" :data="tableData" v-if="activeTab == '3'">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="累计完工产值" align="center" prop="totalCompletionOutputValue" />
+            <el-table-column label="分包累计结算产值" align="center" prop="subTotalSettlementOutputValue" />
+            <el-table-column label="业主累计结算产值" align="center" prop="ownerTotalSettlementOutputValue" />
+            <el-table-column label="差额" align="center" prop="differenceValue" />
+            <!-- <el-table-column label="操作" align="center">
+              <template #default="scope">
+                <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
+              </template>
+            </el-table-column> -->
+          </el-table>
+          <el-table v-loading="loading" :data="tableData" v-if="activeTab == '4'">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="对甲计划总产值" align="center" prop="ownerTotal" />
+            <el-table-column label="对乙计划总产值" align="center" prop="subTotal" />
+            <el-table-column label="对甲月计划产值" align="center" prop="ownerPlanTotal" />
+            <el-table-column label="对乙月计划产值" align="center" prop="subPlanTotal" />
+            <el-table-column label="对甲月实际产值" align="center" prop="ownerActualTotal" />
+            <el-table-column label="对乙月实际产值" align="center" prop="subActualTotal" />
+            <!-- <el-table-column label="操作" align="center">
+              <template #default="scope">
+                <el-button type="primary" @click="handleEdit(scope.row)" link icon="Position">联查分包结算</el-button>
+              </template>
+            </el-table-column> -->
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-card>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
-<script setup name="ValueAllocation" lang="ts">
-import { listOutTable } from '@/api/out/outDesignTableVS';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+<script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
+import { listOutTable, comparisonOfOutputValue, comparisonOfSettlementValue } from '@/api/out/outDesignTableVS/index';
+
 import { dayjs } from 'element-plus';
-// 获取用户 store
 const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const valueAllocationList = ref([]);
-const loading = ref(true);
-const showSearch = ref(true);
-const total = ref(0);
-const { out_value_type } = toRefs<any>(proxy?.useDict('out_value_type'));
-
-const queryFormRef = ref<ElFormInstance>();
-const data = reactive({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    valueType: '1',
-    projectId: currentProject.value?.id,
-    month: undefined
-  }
+const activeTab = ref('1');
+const queryParams = ref({
+  month: '',
+  valueType: '2',
+  pageNum: 1,
+  pageSize: 10
 });
+const total = ref(0);
+const tableData = ref([]);
+const loading = ref(false);
 
-const { queryParams } = toRefs(data);
+const tabList = [
+  {
+    value: '2',
+    label: '对乙产值和对乙结算'
+  },
+  {
+    value: '3',
+    label: '对甲结算和对乙结算'
+  },
+  {
+    value: '1',
+    label: '对甲产值和对甲结算'
+  },
+  {
+    value: '4',
+    label: '对甲产值和对乙产值'
+  }
+];
 
-/** 查询项目总产值分配列表 */
-const getList = async () => {
-  loading.value = true;
+//切换表单
+const handleTabChange = (tab) => {
+  activeTab.value = tab;
 
-  const res = await listOutTable(queryParams.value);
-  valueAllocationList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+  handleQuery();
 };
 
 /** 搜索按钮操作 */
@@ -88,45 +122,47 @@ const handleQuery = () => {
   getList();
 };
 
-/** 联查分包结算 */
-const handleEdit = (row: any) => {
-  proxy?.$tab.openPage('/out/settlementValueSubcontract');
-};
-
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields();
+  queryParams.value.month = '';
+  queryParams.value.valueType = '';
   handleQuery();
 };
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'out/valueAllocation/export',
-    {
-      ...queryParams.value
-    },
-    `valueAllocation_${new Date().getTime()}.xlsx`
-  );
+// 获取列表
+const getList = async () => {
+  const params = {
+    ...queryParams.value,
+    projectId: currentProject.value?.id,
+    type: activeTab.value
+  };
+  if (activeTab.value == '4') {
+    comparisonOfOutputValue(params).then((res) => {
+      if (res.code == 200) {
+        tableData.value = res.rows;
+        total.value = res.total;
+      }
+    });
+  } else if (activeTab.value == '3') {
+    comparisonOfSettlementValue(params).then((res) => {
+      if (res.code == 200) {
+        tableData.value = res.rows;
+        total.value = res.total;
+      }
+    });
+  } else {
+    const res = await listOutTable(params);
+    if (res.code == 200) {
+      tableData.value = res.rows;
+      total.value = res.total;
+    }
+  }
 };
-
+const handleEdit = (row: any) => {};
 onMounted(() => {
-  // 也可以使用字符串格式（例如 YYYY-MM）
   const currentMonthString = ref(dayjs().format('YYYY-MM'));
   queryParams.value.month = currentMonthString.value;
   getList();
 });
-
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    queryParams.value.projectId = nid;
-    getList();
-  }
-);
-
-onUnmounted(() => {
-  listeningProject();
-});
 </script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/out/outTable/index.vue b/src/views/out/outTable/index.vue
index acf57f8..b0463db 100644
--- a/src/views/out/outTable/index.vue
+++ b/src/views/out/outTable/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
+    <el-tabs type="border-card" @tab-change="handleTabChange" v-model="activeTab">
+      <el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item.label" :name="item.value">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="计划月份" prop="month">
@@ -13,70 +13,68 @@
             </el-form-item>
           </el-form>
         </el-card>
-      </div>
-    </transition>
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="valueAllocationList">
-        <el-table-column label="项目" align="center" prop="projectName" />
-        <el-table-column label="项目总产值" align="center" prop="totalValue" />
-        <el-table-column label="月预计产值" align="center" prop="monthlyEstimatedValue" />
-        <el-table-column label="完成产值(第一周)" align="center" prop="firstWeekCompletionValue" />
-        <el-table-column label="完成产值(第二周)" align="center" prop="secondWeekCompletionValue" />
-        <el-table-column label="完成产值(第三周)" align="center" prop="thirdWeekCompletionValue" />
-        <el-table-column label="完成产值(第四周)" align="center" prop="fourthWeekCompletionValue" />
-        <el-table-column label="完成产值(第五周)" align="center" prop="fifthWeekCompletionValue" />
-        <el-table-column label="完成产值月合计" align="center" prop="totalCompletionValue" />
-        <el-table-column label="产值差额" align="center" prop="valueDifference" />
-        <el-table-column label="预计累计产值" align="center" prop="estimatedAccumulatedValue" />
-        <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
-        <el-table-column label="产值差额" align="center" prop="valueDifferenceAccumulation" />
-        <el-table-column label="项目完成总进度" align="center" prop="totalCompletionProgress" />
-      </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
+        <el-card shadow="never">
+          <el-table v-loading="loading" :data="tableData">
+            <el-table-column label="项目" align="center" prop="projectName" />
+            <el-table-column label="项目总产值" align="center" prop="totalValue" />
+            <el-table-column label="月预计产值" align="center" prop="monthlyEstimatedValue" />
+            <el-table-column label="完成产值(第一周)" align="center" prop="firstWeekCompletionValue" />
+            <el-table-column label="完成产值(第二周)" align="center" prop="secondWeekCompletionValue" />
+            <el-table-column label="完成产值(第三周)" align="center" prop="thirdWeekCompletionValue" />
+            <el-table-column label="完成产值(第四周)" align="center" prop="fourthWeekCompletionValue" />
+            <el-table-column label="完成产值(第五周)" align="center" prop="fifthWeekCompletionValue" />
+            <el-table-column label="完成产值月合计" align="center" prop="totalCompletionValue" />
+            <el-table-column label="产值差额" align="center" prop="valueDifference" />
+            <el-table-column label="预计累计产值" align="center" prop="estimatedAccumulatedValue" />
+            <el-table-column label="累计完成产值" align="center" prop="accumulatedCompletionValue" />
+            <el-table-column label="产值差额" align="center" prop="valueDifferenceAccumulation" />
+            <el-table-column label="项目完成总进度" align="center" prop="totalCompletionProgress" />
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-card>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
-<script setup name="ValueAllocation" lang="ts">
-import { listOutTable } from '@/api/out/outTable';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+<script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
-import { dayjs } from 'element-plus';
-// 获取用户 store
+import { listOutTable } from '@/api/out/outTable';
+
 const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const valueAllocationList = ref([]);
-const loading = ref(true);
-const showSearch = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const data = reactive({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    projectId: currentProject.value?.id,
-    month: undefined
-  }
+const activeTab = ref('1');
+const queryParams = ref({
+  month: '',
+  pageNum: 1,
+  pageSize: 10
 });
+const total = ref(0);
+const tableData = ref([]);
+const loading = ref(false);
 
-const { queryParams } = toRefs(data);
+const tabList = [
+  {
+    value: '1',
+    label: '对甲施工报表'
+  },
+  {
+    value: '2',
+    label: '对乙施工报表'
+  }
+];
 
-/** 查询项目总产值分配列表 */
-const getList = async () => {
-  loading.value = true;
-
-  const res = await listOutTable(queryParams.value);
-  valueAllocationList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+//切换表单
+const handleTabChange = (tab) => {
+  activeTab.value = tab;
+  // queryParams.value.month = '';
+  handleQuery();
 };
 
 /** 搜索按钮操作 */
@@ -87,38 +85,34 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value?.resetFields();
+  queryParams.value.month = '';
   handleQuery();
 };
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'out/valueAllocation/export',
-    {
-      ...queryParams.value
-    },
-    `valueAllocation_${new Date().getTime()}.xlsx`
-  );
+// 获取列表
+const getList = async () => {
+  const params = {
+    ...queryParams.value,
+    projectId: currentProject.value?.id,
+    type: activeTab.value
+  };
+  console.log(params);
+  const res = await listOutTable(params);
+  if (res.code == 200) {
+    tableData.value = res.rows;
+    total.value = res.total;
+  }
 };
-
 onMounted(() => {
-  // 也可以使用字符串格式（例如 YYYY-MM）
-  const currentMonthString = ref(dayjs().format('YYYY-MM'));
-  queryParams.value.month = currentMonthString.value;
+  const currentDate = new Date();
+  const year = currentDate.getFullYear();
+  const month = currentDate.getMonth() + 1; // 月份从0开始，所以需要加1
+
+  // 形成"YYYY-M"格式
+  const formattedDate = `${year}-${String(month).padStart(2, '0')}`;
+  queryParams.value.month = formattedDate;
+
   getList();
 });
-
-//监听项目id刷新数据
-const listeningProject = watch(
-  () => currentProject.value?.id,
-  (nid, oid) => {
-    queryParams.value.projectId = nid;
-    getList();
-  }
-);
-
-onUnmounted(() => {
-  listeningProject();
-});
 </script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/out/purchase/comm/purchPage.vue b/src/views/out/purchase/comm/purchPage.vue
new file mode 100644
index 0000000..52dc92c
--- /dev/null
+++ b/src/views/out/purchase/comm/purchPage.vue
@@ -0,0 +1,181 @@
+<template>
+    <div class="p-2">
+        <el-card shadow="never">
+            <template #header>
+                <el-row :gutter="10" class="mb8">
+                    <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+                </el-row>
+            </template>
+            <el-table height="70vh" v-loading="loading" :data="monthPlanList" @selection-change="handleSelectionChange">
+                <el-table-column type="index" width="80" label="序号" align="center" />
+                <el-table-column label="名称" align="center" prop="name" />
+                <el-table-column label="规格" align="center" prop="specification" />
+                <el-table-column label="单位" align="center" prop="unit" />
+                <el-table-column label="接收数量" align="center" prop="acceptedQuantity" />
+                <el-table-column label="价格" align="center" prop="unitPrice">
+                </el-table-column>
+                <el-table-column label="备注" align="center" prop="remark">
+                </el-table-column>
+                <el-table-column label="操作" align="center" prop="remark" v-if="queryParams.type == '1'">
+                    <template #default="scope">
+                        <el-button type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+        <!-- 添加或修改月度产值计划对话框 -->
+        <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+            <el-form ref="monthPlanFormRef" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="金额" prop="unitPrice">
+                    <el-input v-model="form.unitPrice" placeholder="请输入金额" type="number" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="MonthPlan" lang="ts">
+import { purchaseValueA, purchaseValueAup } from '@/api/out/purchase';
+import { MonthPlanVO } from '@/api/out/monthPlan/types';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+import { useUserStoreHook } from '@/store/modules/user';
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const monthPlanList = ref([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const monthPlanFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+const initFormData = {
+    id: undefined,
+    projectId: currentProject.value?.id,
+    planValue: undefined,
+    completeValue: undefined,
+    differenceValue: undefined,
+    planMonth: undefined,
+    isDesign: true,
+    type: '1',
+    valueType: undefined,
+    planAuditStatus: undefined,
+    completeAuditStatus: undefined,
+    unitPrice: undefined,
+};
+const data = reactive({
+    form: { ...initFormData },
+    queryParams: {
+        projectId: currentProject.value?.id,
+        planValue: undefined,
+        completeValue: undefined,
+        differenceValue: undefined,
+        planMonth: undefined,
+        valueType: undefined,
+        planAuditStatus: undefined,
+        completeAuditStatus: undefined,
+        type: '1',
+        params: {}
+    },
+    rules: {
+        unitPrice: [{ required: true, message: '金额不能为空', trigger: 'change' }]
+    }
+});
+const { queryParams, form, rules } = toRefs(data);
+/** 查询月度产值计划列表 */
+const getList = async (type?) => {
+    if (type) {
+        queryParams.value.type = type;
+    }
+    loading.value = true;
+    const res = await purchaseValueA({ projectId: currentProject.value?.id, type: queryParams.value.type });
+    monthPlanList.value = res.data;
+    console.log(monthPlanList.value);
+
+    total.value = res.total;
+    loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+    reset();
+    dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+    form.value = { ...initFormData };
+    monthPlanFormRef.value?.resetFields();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MonthPlanVO[]) => {
+    ids.value = selection.map((item) => item.id);
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MonthPlanVO) => {
+    reset();
+    Object.assign(form.value, row);
+    dialog.visible = true;
+    dialog.title = '修改采购完工产值';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+    form.value.projectId = currentProject.value?.id;
+    monthPlanFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+            buttonLoading.value = true;
+            form.value.isDesign = true;
+            if (form.value.id) {
+                await purchaseValueAup(form.value).finally(() => (buttonLoading.value = false));
+            }
+            proxy?.$modal.msgSuccess('操作成功');
+            dialog.visible = false;
+            await getList();
+        }
+    });
+};
+
+onMounted(() => {
+    getList();
+});
+
+//监听项目id刷新数据
+const listeningProject = watch(
+    () => currentProject.value?.id,
+    (nid, oid) => {
+        queryParams.value.projectId = nid;
+        form.value.projectId = nid;
+        getList();
+    }
+);
+
+onUnmounted(() => {
+    listeningProject();
+});
+defineExpose({
+    getList
+});
+</script>
diff --git a/src/views/out/purchase/index.vue b/src/views/out/purchase/index.vue
new file mode 100644
index 0000000..eba6578
--- /dev/null
+++ b/src/views/out/purchase/index.vue
@@ -0,0 +1,32 @@
+<template>
+  <div class="p-2">
+    <el-tabs v-model="activeName" class="demo-tabs" type="border-card" @tab-click="handleClick">
+      <el-tab-pane label="对甲" name="1">
+        <purchPage ref="purchPageRef1"></purchPage>
+      </el-tab-pane>
+      <el-tab-pane label="对乙" name="2">
+        <purchPage ref="purchPageRef2"></purchPage>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup name="MonthPlan" lang="ts">
+import { ref, watch, computed } from 'vue';
+import purchPage from './comm/purchPage.vue';
+// 引用子组件
+const activeName = ref('1');
+const purchPageRef1 = ref<InstanceType<typeof purchPage> | null>(null);
+const purchPageRef2 = ref<InstanceType<typeof purchPage> | null>(null);
+const handleClick = (val) => {
+  if (val.props.name == '1') {
+    purchPageRef1.value.getList(val.props.name); //子组件方法
+  } else {
+    purchPageRef2.value.getList(val.props.name); //子组件方法
+
+  }
+};
+onMounted(() => {
+  purchPageRef1.value?.getList('1'); //初始加载
+});
+</script>
diff --git a/src/views/patch/index.vue b/src/views/patch/index.vue
index 149aea8..1aaa708 100644
--- a/src/views/patch/index.vue
+++ b/src/views/patch/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="p-2">
     <!-- 搜索区域 -->
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -21,10 +22,12 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['patch:patch:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['patch:patch:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['patch:patch:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+              v-hasPermi="['patch:patch:export']">导出</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -56,10 +59,10 @@
         <el-table-column label="任务状态" align="center" prop="taskStatus">
           <template #default="scope">
             <span
-              :class="[Number(scope.row.taskStatus) === 0 ? 'text-warning' : Number(scope.row.taskStatus) === 1 ? 'text-success' : 'text-danger']"
-            >
+              :class="[Number(scope.row.taskStatus) === 0 ? 'text-warning' : Number(scope.row.taskStatus) === 1 ? 'text-success' : 'text-danger']">
               {{
-                Number(scope.row.taskStatus) === 0 ? '未完成' : Number(scope.row.taskStatus) === 1 ? '已完成' : `未知状态(${scope.row.taskStatus})`
+                Number(scope.row.taskStatus) === 0 ? '未完成' : Number(scope.row.taskStatus) === 1 ? '已完成' :
+                  `未知状态(${scope.row.taskStatus})`
               }}
             </span>
           </template>
@@ -71,13 +74,15 @@
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['patch:patch:edit']"></el-button>
             </el-tooltip> -->
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['patch:patch:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['patch:patch:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
       <!-- 进度详情弹窗 -->
-      <el-dialog :title="`进度详情（当前总进度：${currentTotalProgress}%）`" v-model="progressDialogVisible" width="1000px" destroy-on-close>
+      <el-dialog :title="`进度详情（当前总进度：${currentTotalProgress}%）`" v-model="progressDialogVisible" width="1000px"
+        destroy-on-close>
         <div class="mb-4">
           <!-- v-hasPermi="['patch:progress:add']" -->
           <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()"> 新增进度 </el-button>
@@ -94,37 +99,28 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
             <template #default="scope">
               <el-tooltip content="修改进度" placement="top">
-                <el-button
-                  link
-                  type="primary"
-                  icon="Edit"
-                  size="small"
-                  @click="handleProgressUpdate(scope.row)"
-                  v-hasPermi="['patch:progress:edit']"
-                ></el-button>
+                <el-button link type="primary" icon="Edit" size="small" @click="handleProgressUpdate(scope.row)"
+                  v-hasPermi="['patch:progress:edit']"></el-button>
               </el-tooltip>
               <el-tooltip content="删除进度" placement="top">
-                <el-button
-                  link
-                  type="primary"
-                  icon="Delete"
-                  size="small"
-                  @click="handleProgressDelete(scope.row)"
-                  v-hasPermi="['patch:progress:remove']"
-                ></el-button>
+                <el-button link type="primary" icon="Delete" size="small" @click="handleProgressDelete(scope.row)"
+                  v-hasPermi="['patch:progress:remove']"></el-button>
               </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
       </el-dialog>
       <!-- 新增/修改进度弹窗 -->
-      <el-dialog :title="progressDialog.title" v-model="progressDialog.visible" width="500px" append-to-body destroy-on-close>
+      <el-dialog :title="progressDialog.title" v-model="progressDialog.visible" width="500px" append-to-body
+        destroy-on-close>
         <el-form ref="progressFormRef" :model="progressForm" :rules="progressRules" label-width="120px">
-          <el-input v-model="progressForm.ordersId" placeholder="关联的任务ID" readonly style="color: #666; background: #f5f7fa" type="hidden" />
+          <el-input v-model="progressForm.ordersId" placeholder="关联的任务ID" readonly
+            style="color: #666; background: #f5f7fa" type="hidden" />
           <el-input v-model="progressForm.projectId" type="hidden" />
           <el-input v-model="progressForm.slaveId" placeholder="请输入执行人ID" v-if="false" />
           <el-form-item label="进度" prop="progress">
-            <el-input v-model="progressForm.progress" placeholder="请输入进度（0-100之间的数字）" type="number" @input="handleProgressInput" />
+            <el-input v-model="progressForm.progress" placeholder="请输入进度（0-100之间的数字）" type="number"
+              @input="handleProgressInput" />
           </el-form-item>
           <el-form-item label="备注" prop="remark">
             <el-input v-model="progressForm.remark" type="textarea" placeholder="请输入备注" rows="3" />
@@ -139,13 +135,15 @@
       </el-dialog>
 
       <!-- 分页组件 -->
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
     <!-- 新增/修改任务弹窗 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body destroy-on-close>
       <el-form ref="masterFormRef" :model="form" :rules="rules" label-width="100px">
-        <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" v-if="false" />
+        <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId"
+          :disabled="!!currentProjectId" v-if="false" />
         <template #help>
           <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
         </template>
@@ -154,14 +152,17 @@
         </el-form-item>
         <el-form-item label="执行人姓名" prop="userId">
           <el-select v-model="form.userId" placeholder="请选择执行人姓名" clearable style="width: 100%">
-            <el-option v-for="item in slaveOptions" :key="item.id" :label="item.nickName" :value="item.userId"></el-option>
+            <el-option v-for="item in slaveOptions" :key="item.id" :label="item.nickName"
+              :value="item.userId"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="计划完成时间" prop="pcd">
-          <el-date-picker clearable v-model="form.pcd" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择计划完成时间" />
+          <el-date-picker clearable v-model="form.pcd" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择计划完成时间" />
         </el-form-item>
         <el-form-item label="实际完成时间" prop="act">
-          <el-date-picker clearable v-model="form.act" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择实际完成时间" />
+          <el-date-picker clearable v-model="form.act" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择实际完成时间" />
         </el-form-item>
         <el-form-item label="任务描述" prop="describe">
           <el-input v-model="form.describe" type="textarea" placeholder="请输入任务描述" />
@@ -243,7 +244,7 @@ interface ProgressDetail {
   updateTime?: string;
   projectId?: string | number;
 }
-interface ProgressForm extends Omit<ProgressDetail, 'updateTime'> {}
+interface ProgressForm extends Omit<ProgressDetail, 'updateTime'> { }
 
 // 4. 获取组件实例
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -631,7 +632,9 @@ const handleProgressInput = () => {
 const handleExport = () => {
   proxy?.download('patch/patch/export', { ...queryParams.value }, `任务列表_${new Date().getTime()}.xlsx`);
 };
-
+onMounted(() => {
+  getList();
+});
 // 监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,
@@ -651,13 +654,16 @@ onUnmounted(() => {
 .mb-4 {
   margin-bottom: 16px;
 }
+
 .el-table .small-padding .cell {
   padding: 0 5px;
 }
+
 .el-table .fixed-width {
   width: 120px !important;
 }
-.el-table-column .el-button--text + .el-button--text {
+
+.el-table-column .el-button--text+.el-button--text {
   margin-left: 10px;
 }
 </style>
diff --git a/src/views/progress/constructionSchedulePlan/index.vue b/src/views/progress/constructionSchedulePlan/index.vue
index 732b3e7..7109158 100644
--- a/src/views/progress/constructionSchedulePlan/index.vue
+++ b/src/views/progress/constructionSchedulePlan/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -9,7 +10,8 @@
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-                <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -25,7 +27,8 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['progress:constructionSchedulePlan:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()"
+              v-hasPermi="['progress:constructionSchedulePlan:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -33,17 +36,12 @@
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-      <el-table
-        ref="constructionSchedulePlanTableRef"
-        v-loading="loading"
-        :data="constructionSchedulePlanList"
-        row-key="id"
-        :default-expand-all="isExpandAll"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      >
+      <el-table ref="constructionSchedulePlanTableRef" v-loading="loading" :data="constructionSchedulePlanList"
+        row-key="id" :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
         <!-- <el-table-column label="序号" type="id" /> -->
         <el-table-column label="节点名称" prop="nodeName" />
-        <el-table-column label="对应项目结构" align="center" prop="projectStructure" />
+        <el-table-column label="对应项目结构" align="center" prop="projectStructureName" />
         <el-table-column label="预计开始时间" align="center" prop="planStartDate" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.planStartDate, '{y}-{m}-{d}') }}</span>
@@ -73,19 +71,16 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['progress:constructionSchedulePlan:edit']" />
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['progress:constructionSchedulePlan:edit']" />
             </el-tooltip>
             <el-tooltip content="新增" placement="top">
-              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['progress:constructionSchedulePlan:add']" />
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+                v-hasPermi="['progress:constructionSchedulePlan:add']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['progress:constructionSchedulePlan:remove']"
-              />
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['progress:constructionSchedulePlan:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -95,48 +90,39 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="constructionSchedulePlanFormRef" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="父节点" prop="parentId">
-          <el-tree-select
-            v-model="form.parentId"
-            :data="constructionSchedulePlanOptions"
-            :props="{ value: 'id', label: 'nodeName', children: 'children' }"
-            value-key="id"
-            placeholder="请选择父节点"
-            check-strictly
-          />
+          <el-tree-select v-model="form.parentId" :data="constructionSchedulePlanOptions"
+            :props="{ value: 'id', label: 'nodeName', children: 'children' }" value-key="id" placeholder="请选择父节点"
+            check-strictly />
         </el-form-item>
         <el-form-item label="节点名称" prop="nodeName">
           <el-input v-model="form.nodeName" placeholder="请输入节点名称" />
         </el-form-item>
         <el-form-item label="对应项目结构" prop="projectStructure">
-          <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" />
+          <el-tree-select v-model="form.projectStructure" :data="ProjectStructureList" @node-click="handleCheckChange"
+            :props="{ value: 'id', label: 'name', children: 'children' }" value-key="id" placeholder="请选择项目结构"
+            check-strictly />
+          <!-- <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" /> -->
         </el-form-item>
         <el-form-item label="预计开始时间" prop="planStartDate">
-          <el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计开始时间" />
+          <el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择预计开始时间" />
         </el-form-item>
         <el-form-item label="预计结束时间" prop="planEndDate">
-          <el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计结束时间" />
+          <el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择预计结束时间" />
         </el-form-item>
         <el-form-item label="实际开始时间" prop="practicalStartDate">
-          <el-date-picker
-            clearable
-            v-model="form.practicalStartDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择实际开始时间"
-          />
+          <el-date-picker clearable v-model="form.practicalStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择实际开始时间" />
         </el-form-item>
         <el-form-item label="实际结束时间" prop="practicalEndDate">
-          <el-date-picker
-            clearable
-            v-model="form.practicalEndDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择实际结束时间"
-          />
+          <el-date-picker clearable v-model="form.practicalEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择实际结束时间" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in project_construction_status" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -159,7 +145,7 @@ import {
   getConstructionSchedulePlan,
   delConstructionSchedulePlan,
   addConstructionSchedulePlan,
-  updateConstructionSchedulePlan
+  updateConstructionSchedulePlan, getProjectStructure
 } from '@/api/progress/constructionSchedulePlan';
 import {
   ConstructionSchedulePlanVO,
@@ -181,6 +167,7 @@ const currentProject = computed(() => userStore.selectedProject);
 const { project_construction_status } = toRefs<any>(proxy?.useDict('project_construction_status'));
 
 const constructionSchedulePlanList = ref<ConstructionSchedulePlanVO[]>([]);
+const ProjectStructureList = ref([]);
 const constructionSchedulePlanOptions = ref<ConstructionSchedulePlanOption[]>([]);
 const buttonLoading = ref(false);
 const showSearch = ref(true);
@@ -196,7 +183,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const initFormData: ConstructionSchedulePlanForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
   parentId: undefined,
@@ -207,7 +194,9 @@ const initFormData: ConstructionSchedulePlanForm = {
   practicalStartDate: undefined,
   practicalEndDate: undefined,
   status: undefined,
-  remark: undefined
+  remark: undefined,
+  projectStructureName: undefined
+
 };
 
 const data = reactive<PageData<ConstructionSchedulePlanForm, ConstructionSchedulePlanQuery>>({
@@ -236,13 +225,21 @@ const getList = async () => {
   loading.value = true;
   const res = await listConstructionSchedulePlan(queryParams.value);
   const data = proxy?.handleTree<ConstructionSchedulePlanVO>(res.data, 'id', 'parentId');
-  console.log('🚀 ~ getList ~ data:', data);
-
   if (data) {
     constructionSchedulePlanList.value = data;
     loading.value = false;
   }
 };
+/** 查询施工进度计划列表 */
+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 getTreeselect = async () => {
@@ -343,6 +340,7 @@ const handleDelete = async (row: ConstructionSchedulePlanVO) => {
 };
 
 onMounted(() => {
+  getProjectStructureList();
   getList();
 });
 
diff --git a/src/views/progress/plan/index.vue b/src/views/progress/plan/index.vue
index 2f22b3f..822c6cb 100644
--- a/src/views/progress/plan/index.vue
+++ b/src/views/progress/plan/index.vue
@@ -288,7 +288,7 @@ const getList = async () => {
         matrixOptions.value = matrixList;
         queryParams.value.matrixId = matrixList[0].children[0].matrixId;
       } catch (error) {
-        proxy?.$modal.msgError('获取方阵失败');
+        // proxy?.$modal.msgError('获取方阵失败');
       }
     }
   }
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index 8537361..224b281 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -8,6 +8,7 @@
               <!-- <el-input v-model="queryParams.pid" placeholder="请选择" clearable /> -->
               <el-cascader
                 :options="matrixOptions"
+                ref="treeRef"
                 placeholder="请选择"
                 @change="handleChange"
                 :props="{ value: 'matrixId', label: 'name' }"
@@ -29,6 +30,20 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <file-upload
+              upload-url="/progress/progressCategory/import"
+              v-model="file"
+              :limit="1"
+              :file-type="['xls', 'xlsx']"
+              :on-upload-success="handleSuccess"
+            >
+              <el-button type="primary" plain icon="Compass">导入</el-button>
+            </file-upload>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Filter" @click="handleExport">导出</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
@@ -44,7 +59,7 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
         <!-- <el-table-column label="父类别id" prop="parentId" /> -->
-        <el-table-column label="类别名称" prop="name" />
+        <el-table-column label="类别名称" prop="name" width="230" />
         <el-table-column label="计量方式" align="center" prop="unitType">
           <template #default="{ row }">
             <dict-tag :options="progress_unit_type" :value="row.unitType" v-if="row.parentId != 0" />
@@ -56,17 +71,27 @@
             {{ row.parentId == 0 ? '' : row.unit }}
           </template>
         </el-table-column>
-        <el-table-column label="综合单价" align="center" prop="unitPrice">
+        <el-table-column label="综合单价(业主)" align="center" prop="ownerPrice">
           <template #default="{ row }">
-            {{ row.parentId == 0 ? '' : row.unitPrice }}
+            {{ row.parentId == 0 ? '' : row.ownerPrice }}
           </template>
         </el-table-column>
-        <el-table-column label="产值金额" align="center" prop="outputValue">
+        <el-table-column label="综合单价(分包)" align="center" prop="constructionPrice">
           <template #default="{ row }">
-            {{ row.parentId == 0 ? '' : row.outputValue }}
+            {{ row.parentId == 0 ? '' : row.constructionPrice }}
           </template>
         </el-table-column>
-        <el-table-column label="总数量/百分比" align="center" prop="total">
+        <el-table-column label="产值金额(业主)" align="center" prop="ownerOutputValue">
+          <template #default="{ row }">
+            {{ row.parentId == 0 ? '' : row.ownerOutputValue }}
+          </template>
+        </el-table-column>
+        <el-table-column label="产值金额(分包)" align="center" prop="constructionOutputValue">
+          <template #default="{ row }">
+            {{ row.parentId == 0 ? '' : row.constructionOutputValue }}
+          </template>
+        </el-table-column>
+        <el-table-column label="总数量" align="center" prop="total">
           <template #default="{ row }">
             {{ row.parentId == 0 ? '' : row.total }}
           </template>
@@ -87,7 +112,7 @@
     </el-card>
     <!-- 添加或修改分项工程单价对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="progressCategoryFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="progressCategoryFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="父类别" prop="parentId" v-if="!form.id">
           <el-tree-select
             v-model="form.parentId"
@@ -109,12 +134,15 @@
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
+        <el-form-item label="综合单价(业主)" prop="ownerPrice">
+          <el-input v-model="form.ownerPrice" placeholder="请输入综合单价(业主)" />
+        </el-form-item>
+        <el-form-item label="综合单价(分包)" prop="constructionPrice">
+          <el-input v-model="form.constructionPrice" placeholder="请输入综合单价(分包)" />
+        </el-form-item>
         <el-form-item label="数量" prop="total" v-if="isDisabled">
           <el-input v-model="form.total" placeholder="请输入数量" />
         </el-form-item>
-        <el-form-item label="综合单价" prop="unitPrice">
-          <el-input v-model="form.unitPrice" placeholder="请输入综合单价" />
-        </el-form-item>
         <el-form-item label="关联数据" prop="workType" v-if="!form.id">
           <el-select v-model="form.workType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_work_type" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -144,7 +172,8 @@ import {
   getProgressCategory,
   delProgressCategory,
   addProgressCategory,
-  updateProgressCategory
+  updateProgressCategory,
+  downloadProgressCategory
 } from '@/api/progress/progressCategory';
 import { ProgressCategoryVO, ProgressCategoryQuery, ProgressCategoryForm } from '@/api/progress/progressCategory/types';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -161,7 +190,7 @@ type ProgressCategoryOption = {
   name: string;
   children?: ProgressCategoryOption[];
 };
-
+const treeRef = ref();
 const matrixOptions = ref([]);
 
 const progressCategoryList = ref<ProgressCategoryVO[]>([]);
@@ -170,7 +199,7 @@ const buttonLoading = ref(false);
 const showSearch = ref(true);
 const isExpandAll = ref(true);
 const loading = ref(false);
-
+const file = ref();
 const queryFormRef = ref<ElFormInstance>();
 const progressCategoryFormRef = ref<ElFormInstance>();
 const progressCategoryTableRef = ref<ElTableInstance>();
@@ -189,6 +218,8 @@ const initFormData: ProgressCategoryForm = {
   name: undefined,
   unitType: undefined,
   unit: undefined,
+  constructionPrice: undefined,
+  ownerPrice: undefined,
   unitPrice: undefined,
   outputValue: undefined,
   total: undefined,
@@ -231,11 +262,14 @@ const data = reactive<PageData<ProgressCategoryForm, ProgressCategoryQuery>>({
     unitPrice: [{ required: true, message: '综合单价不能为空', trigger: 'blur' }],
     outputValue: [{ required: true, message: '产值金额不能为空', trigger: 'blur' }],
     isDelay: [{ required: true, message: '是否超期不能为空', trigger: 'blur' }],
-    status: [{ required: true, message: '完成状态不能为空', trigger: 'change' }]
+    status: [{ required: true, message: '完成状态不能为空', trigger: 'change' }],
+    constructionPrice: [{ required: true, message: '综合单价(分包)不能为空', trigger: 'change' }],
+    ownerPrice: [{ required: true, message: '综合单价(业主)不能为空', trigger: 'change' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
+const matrixIdList = ref([]);
 
 /** 查询分项工程单价列表 */
 const getList = async () => {
@@ -252,7 +286,6 @@ const getList = async () => {
       });
       if (!matrixValue.value) matrixValue.value = matrixList[0].id;
       matrixOptions.value = matrixList;
-      console.log('🚀 ~ getList ~ matrixList:', matrixList);
       queryParams.value.matrixId = matrixList[0].children[0].matrixId;
       form.value.projectId = matrixList[0].projectId;
       form.value.matrixId = matrixList[0].children[0].matrixId;
@@ -271,6 +304,11 @@ const getList = async () => {
   }
 };
 
+const handleSuccess = () => {
+  console.log(111);
+  proxy.$modal.msgSuccess('操作成功');
+};
+
 /** 查询分项工程单价下拉树结构 */
 const getTreeselect = async () => {
   const res = await listProgressCategory(queryParams.value);
@@ -300,9 +338,7 @@ const reset = () => {
 const handleChange = (value: number) => {
   form.value.matrixId = value[1];
   form.value.projectId = value[0];
-
   queryParams.value.matrixId = value[1];
-
   getList();
 };
 
@@ -361,6 +397,19 @@ const handleUpdate = async (row: ProgressCategoryVO) => {
   dialog.title = '修改分项工程单价';
 };
 
+const handleExport = async () => {
+  const ids = treeRef.value.getCheckedNodes()[0].pathNodes[0].childrenData.map((item) => item.matrixId);
+  const fileName = treeRef.value.getCheckedNodes()[0].pathNodes[0].label;
+  proxy?.download(
+    '/progress/progressCategory/export',
+    {
+      ids: ids
+    },
+    `${fileName}分项工程单价导入.xlsx`,
+    true
+  );
+};
+
 /** 提交按钮 */
 const submitForm = () => {
   progressCategoryFormRef.value?.validate(async (valid: boolean) => {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 82bf50f..c9d9247 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -8,11 +9,13 @@
               <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="类别编码" prop="deptCategory">
-              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.deptCategory" placeholder="请输入类别编码" clearable style="width: 240px"
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -28,7 +31,8 @@
       <template #header>
         <el-row :gutter="10">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增 </el-button>
+            <el-button v-hasPermi="['system:dept:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
@@ -37,14 +41,8 @@
         </el-row>
       </template>
 
-      <el-table
-        ref="deptTableRef"
-        v-loading="loading"
-        :data="deptList"
-        row-key="deptId"
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-        :default-expand-all="isExpandAll"
-      >
+      <el-table ref="deptTableRef" v-loading="loading" :data="deptList" row-key="deptId"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :default-expand-all="isExpandAll">
         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
         <el-table-column prop="deptCategory" align="center" label="类别编码" width="200"></el-table-column>
         <el-table-column prop="deptType" align="center" label="部门类型" width="200">
@@ -66,13 +64,16 @@
         <el-table-column fixed="right" align="center" label="操作">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />
+              <el-button v-hasPermi="['system:dept:edit']" link type="primary" icon="Edit"
+                @click="handleUpdate(scope.row)" />
             </el-tooltip>
-            <el-tooltip content="新增" placement="top" v-if="scope.row.deptType != '2' && scope.row.deptType != '4'">
-              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus" @click="handleAdd(scope.row)" />
+            <el-tooltip content="新增" placement="top" v-if="scope.row.deptType != '2' && scope.row.deptType != '5'">
+              <el-button v-hasPermi="['system:dept:add']" link type="primary" icon="Plus"
+                @click="handleAdd(scope.row)" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)" />
+              <el-button v-hasPermi="['system:dept:remove']" link type="primary" icon="Delete"
+                @click="handleDelete(scope.row)" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -84,14 +85,9 @@
         <el-row>
           <el-col v-if="form.parentId !== 0" :span="24">
             <el-form-item label="上级部门" prop="parentId">
-              <el-tree-select
-                v-model="form.parentId"
-                :data="deptOptions"
-                :props="{ value: 'deptId', label: 'deptName', children: 'children' }"
-                value-key="deptId"
-                placeholder="选择上级部门"
-                check-strictly
-              />
+              <el-tree-select v-model="form.parentId" :data="deptOptions"
+                :props="{ value: 'deptId', label: 'deptName', children: 'children' }" value-key="deptId"
+                placeholder="选择上级部门" check-strictly />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -112,7 +108,8 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-select v-model="form.leader" placeholder="请选择负责人">
-                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
+                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName"
+                  :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -129,7 +126,8 @@
           <el-col :span="12">
             <el-form-item label="部门状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+                }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -140,14 +138,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.deptType == '3'">
+          <el-col :span="12" v-if="form.deptType == '4'">
             <el-form-item label="所属项目" prop="projectId">
               <el-select v-model="form.projectId" placeholder="请选择所属项目">
                 <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.deptType == '4'">
+          <el-col :span="12" v-if="form.deptType == '5'">
             <el-form-item label="分包单位" prop="contractorId">
               <el-select v-model="form.contractorId" placeholder="请选择分包单位">
                 <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
@@ -339,10 +337,10 @@ const handleUpdate = async (row: DeptVO) => {
 };
 
 const changeProject = async (val: any) => {
-  if (val == '3' && (!projectList.value || !projectList.value.length)) {
+  if (val == '4' && (!projectList.value || !projectList.value.length)) {
     const res = await getDeptList();
     projectList.value = res.data;
-  } else if (val == '4' && (!contractorList.value || !contractorList.value.length)) {
+  } else if (val == '5' && (!contractorList.value || !contractorList.value.length)) {
     const res = await optionProjectSelect(form.value.rowProjectId);
     contractorList.value = res;
   }
diff --git a/src/views/tender/bidd/index.vue b/src/views/tender/bidd/index.vue
index 8df76ed..531ff49 100644
--- a/src/views/tender/bidd/index.vue
+++ b/src/views/tender/bidd/index.vue
@@ -27,7 +27,7 @@
                   class="upload-demo"
                   :http-request="importExcel"
                   :show-file-list="false"
-                  v-hasPermi="['tender:billofquantitiesLimitList:importExcelFile']"
+                  v-hasPermi="['tender:tenderPlanLimitList:importExcelFile']"
                 >
                   <template #trigger>
                     <el-button type="primary">导入excel</el-button>
@@ -35,7 +35,11 @@
                 </el-upload>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
+                <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:tenderPlanLimitList:export']">导出excel</el-button>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="handleAudit('update')" v-if="versionsData.status == 'draft'">审核</el-button>
+                <el-button type="warning" @click="handleAudit('view')" v-else>查看流程</el-button>
               </el-form-item>
             </el-form>
           </el-card>
@@ -55,6 +59,7 @@
                   :step="0.1"
                   :controls="false"
                   v-if="scope.row.quantity && scope.row.quantity != 0"
+                  :disabled="versionsData.status != 'draft'"
                 />
               </template>
             </el-table-column>
@@ -70,7 +75,7 @@
                   size="small"
                   @click="handleSave(scope.row)"
                   v-if="scope.row.quantity && scope.row.quantity != 0"
-                  v-hasPermi="['tender:billofquantitiesLimitList:edit']"
+                  v-hasPermi="['tender:tenderPlanLimitList:edit']"
                   >确定</el-button
                 >
               </template>
@@ -104,6 +109,8 @@ const queryForm = ref({
   sheet: ''
 });
 
+const versionsData = ref<any>({});
+
 const activeTab = ref('2');
 const sheets = ref([]);
 const options = ref([]);
@@ -118,7 +125,8 @@ const handleTabChange = (tab: string) => {
   getVersionNums();
 };
 //切换版本
-const changeVersions = () => {
+const changeVersions = (value) => {
+  versionsData.value = options.value.find((item) => item.versions == value);
   getSheetName();
 };
 //切换表格
@@ -148,6 +156,8 @@ const getVersionNums = async () => {
       options.value = res.data;
       if (res.data.length > 0) {
         queryForm.value.versions = res.data[0].versions;
+        versionsData.value = options.value.find((item) => item.versions == queryForm.value.versions);
+        console.log('🚀 ~ changeVersions ~ versionsData.value:', versionsData.value);
         getSheetName();
       } else {
         queryForm.value.versions = '';
@@ -261,6 +271,17 @@ const handleSave = (row: any) => {
     loading.value = false;
   }
 };
+
+/** 审核按钮操作 */
+const handleAudit = async (type) => {
+  proxy?.$tab.openPage('/approval/tenderBidd/indexEdit', '审核招标一览', {
+    id: queryForm.value.versions,
+    type,
+    activeTab: activeTab.value,
+    status: versionsData.value.status
+  });
+};
+
 //监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,
diff --git a/src/views/tender/bidd/indexEdit.vue b/src/views/tender/bidd/indexEdit.vue
new file mode 100644
index 0000000..9cfa499
--- /dev/null
+++ b/src/views/tender/bidd/indexEdit.vue
@@ -0,0 +1,409 @@
+<template>
+  <div class="p-4 bg-gray-50">
+    <div class="max-w-4xl mx-auto">
+      <!-- 顶部按钮区域 -->
+      <el-card class="mb-4 rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md">
+        <approvalButton
+          @submitForm="submitForm"
+          @approvalVerifyOpen="approvalVerifyOpen"
+          @handleApprovalRecord="handleApprovalRecord"
+          :buttonLoading="buttonLoading"
+          :id="form.id"
+          :status="form.status"
+          :pageType="routeParams.type"
+        />
+      </el-card>
+      <!-- 表单区域 -->
+      <el-card class="rounded-lg shadow-sm bg-white border border-gray-100 transition-all hover:shadow-md overflow-hidden">
+        <div class="p-4 bg-gradient-to-r from-blue-50 to-indigo-50 border-b border-gray-100">
+          <h3 class="text-lg font-semibold text-gray-800">招标一览</h3>
+        </div>
+        <div class="p-6">
+          <el-form
+            ref="leaveFormRef"
+            v-loading="loading"
+            :disabled="routeParams.type === 'view' || form.status == 'waiting'"
+            :model="form"
+            :rules="rules"
+            label-width="100px"
+            class="space-y-4"
+          >
+            <div class="grid grid-cols-1 gap-4">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="版本号" prop="formNo">
+                    <el-input disabled v-model="form.versions" placeholder="请输入文件名称" />
+                  </el-form-item>
+                  <el-form-item label="表名" prop="formNo">
+                    <el-input disabled v-model="form.sheet" placeholder="请输入文件名称" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </el-form>
+          <el-table :data="tableData" style="width: 100%; margin-bottom: 20px; height: calc(100vh - 305px)" row-key="id" default-expand-all border>
+            <el-table-column prop="num" label="编号" />
+            <el-table-column prop="name" label="工程或费用名称" />
+            <el-table-column prop="unit" label="单位" />
+            <el-table-column prop="quantity" label="数量" />
+            <el-table-column prop="unitPrice" label="单价" align="center" />
+            <el-table-column prop="price" label="总价" align="center">
+              <template #default="scope">
+                {{ scope.row.price }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-card>
+      <!-- 提交组件 -->
+      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
+      <approvalRecord ref="approvalRecordRef"></approvalRecord>
+      <!-- 流程选择对话框 -->
+      <el-dialog
+        draggable
+        v-model="dialogVisible.visible"
+        :title="dialogVisible.title"
+        :before-close="handleClose"
+        width="500"
+        class="rounded-lg shadow-lg"
+      >
+        <div class="p-4">
+          <p class="text-gray-600 mb-4">请选择要启动的流程：</p>
+          <el-select v-model="flowCode" placeholder="请选择流程" style="width: 100%">
+            <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <template #footer>
+          <div class="dialog-footer p-4 border-t border-gray-100 flex justify-end space-x-3">
+            <el-button @click="handleClose" class="px-4 py-2 border border-gray-300 rounded-md text-gray-700 hover:bg-gray-50 transition-colors"
+              >取消</el-button
+            >
+            <el-button type="primary" @click="submitFlow()" class="px-4 py-2 bg-primary text-white rounded-md hover:bg-primary/90 transition-colors"
+              >确认</el-button
+            >
+          </div>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script setup name="Leave" lang="ts">
+import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import ApprovalButton from '@/components/Process/approvalButton.vue';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+const { proxy } = getCurrentInstance() as any;
+import { useUserStoreHook } from '@/store/modules/user';
+const { design_change_reason_type } = toRefs<any>(proxy?.useDict('design_change_reason_type'));
+import { getKnowledgeDocument } from '@/api/design/technicalStandard';
+import { getConstructionValue } from '@/api/out/constructionValue';
+import { workScheduleListDetail } from '@/api/progress/plan';
+import { sheetList } from '@/api/contract';
+import { getApproval, getTableList } from '@/api/tender';
+// 获取用户 store
+const userStore = useUserStoreHook();
+// 从 store 中获取项目列表和当前选中的项目
+const currentProject = computed(() => userStore.selectedProject);
+const buttonLoading = ref(false);
+const loading = ref(true);
+//路由参数
+const routeParams = ref<Record<string, any>>({});
+
+const flowCode = ref<string>('');
+const status = ref<string>('');
+const dialogVisible = reactive<DialogOption>({
+  visible: false,
+  title: '流程定义'
+});
+//提交组件
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+//按钮组件
+const flowCodeOptions = [
+  {
+    value: currentProject.value?.id + '_bLimitEquipmentList',
+    label: '招标一览审批'
+  }
+];
+const sheets = ref([]);
+const queryForm = ref({
+  versions: '',
+  sheet: ''
+});
+const leaveFormRef = ref<ElFormInstance>();
+const dialog = reactive({
+  visible: false,
+  title: '',
+  isEdit: false
+});
+const tableData = ref([]);
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: '',
+  variables: {}
+});
+const taskVariables = ref<Record<string, any>>({});
+
+const initFormData = {
+  id: undefined,
+  projectId: currentProject.value?.id,
+  versions: undefined,
+  sheet: undefined,
+  type: undefined,
+  status: undefined
+};
+const data = reactive({
+  form: { ...initFormData },
+  rules: {}
+});
+
+const handleClose = () => {
+  dialogVisible.visible = false;
+  flowCode.value = '';
+  buttonLoading.value = false;
+};
+const { form, rules } = toRefs(data);
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  leaveFormRef.value?.resetFields();
+};
+
+/** 获取详情 */
+const getInfo = async () => {
+  loading.value = true;
+  buttonLoading.value = false;
+  nextTick(async () => {
+    try {
+      const params = {
+        projectId: currentProject.value?.id,
+        versions: form.value.versions
+      };
+      const res = await sheetList(params);
+      if (res.code == 200) {
+        sheets.value = res.data;
+        if (res.data.length > 0) {
+          queryForm.value.sheet = res.data[0];
+        } else {
+          queryForm.value.sheet = '';
+        }
+        try {
+          const res = await getTableList(form.value);
+          if (res.code == 200) {
+            tableData.value = res.data;
+          }
+        } catch (error) {
+          console.log(error);
+        }
+      }
+    } catch (error) {
+      console.log(error);
+    }
+    getApproval(form.value.versions).then((res) => {
+      form.value.status = res.data.status;
+    });
+    if (routeParams.value.type === 'approval') {
+      form.value.id = routeParams.value.id;
+    } else {
+      form.value.id = routeParams.value.id + '_' + routeParams.value.activeTab;
+    }
+    loading.value = false;
+    buttonLoading.value = false;
+  });
+};
+
+/** 提交按钮 */
+const submitForm = (status1: string) => {
+  status.value = status1;
+  submit(status.value, form.value);
+};
+
+const submitFlow = async () => {
+  handleStartWorkFlow(form.value);
+  dialogVisible.visible = false;
+};
+//提交申请
+const handleStartWorkFlow = async (data: any) => {
+  try {
+    submitFormData.value.flowCode = flowCode.value;
+    submitFormData.value.businessId = data.versions + '_xianjiayilan';
+    //流程变量
+    taskVariables.value = {
+      // leave4/5 使用的流程变量
+      userList: ['1', '3', '4']
+    };
+    submitFormData.value.variables = taskVariables.value;
+    const resp = await startWorkFlow(submitFormData.value);
+    if (submitVerifyRef.value) {
+      buttonLoading.value = false;
+      submitVerifyRef.value.openDialog(resp.data.taskId);
+    }
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+//审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(form.value.id);
+};
+//提交回调
+const submitCallback = async () => {
+  await proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+};
+//审批
+const approvalVerifyOpen = async () => {
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
+};
+// 图纸上传成功之后 开始提交
+const submit = async (status, data) => {
+  form.value = data;
+  if (status === 'draft') {
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('暂存成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+  } else {
+    if ((form.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
+      flowCode.value = flowCodeOptions[0].value;
+      dialogVisible.visible = true;
+      return;
+    }
+    //说明启动过先随意穿个参数
+    if (flowCode.value === '' || flowCode.value === null) {
+      flowCode.value = 'xx';
+    }
+    await handleStartWorkFlow(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(async () => {
+    routeParams.value = proxy.$route.query;
+    console.log('🚀 ~ proxy.$route.query:', proxy.$route.query);
+    reset();
+    loading.value = false;
+    console.log(routeParams.value);
+
+    if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
+      if (routeParams.value.type === 'approval') {
+        form.value.versions = routeParams.value.id.split('_')[0];
+        form.value.type = routeParams.value.id.split('_')[1];
+      } else {
+        form.value.versions = routeParams.value.id;
+        form.value.type = routeParams.value.activeTab;
+      }
+      getInfo();
+    }
+  });
+});
+</script>
+<style scoped lang="scss">
+/* 全局样式 */
+:root {
+  --primary: #409eff;
+  --primary-light: #66b1ff;
+  --primary-dark: #3a8ee6;
+  --success: #67c23a;
+  --warning: #e6a23c;
+  --danger: #f56c6c;
+  --info: #909399;
+}
+
+/* 表单样式优化 */
+.el-form-item {
+  .el-form-item__label {
+    color: #606266;
+    font-weight: 500;
+  }
+
+  .el-input__inner,
+  .el-select .el-input__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+
+  .el-textarea__inner {
+    border-radius: 4px;
+    transition:
+      border-color 0.2s,
+      box-shadow 0.2s;
+
+    &:focus {
+      border-color: var(--primary-light);
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
+    }
+  }
+}
+
+/* 按钮样式优化 */
+.el-button {
+  border-radius: 4px;
+  transition: all 0.2s;
+
+  &.is-primary {
+    background-color: var(--primary);
+    border-color: var(--primary);
+
+    &:hover {
+      background-color: var(--primary-light);
+      border-color: var(--primary-light);
+    }
+
+    &:active {
+      background-color: var(--primary-dark);
+      border-color: var(--primary-dark);
+    }
+  }
+
+  &.is-text {
+    color: var(--primary);
+
+    &:hover {
+      color: var(--primary-light);
+      background-color: rgba(64, 158, 255, 0.05);
+    }
+  }
+}
+
+/* 卡片样式优化 */
+.el-card {
+  transition: all 0.3s ease;
+
+  &:hover {
+    /* transform: translateY(-2px); */
+  }
+}
+
+/* 对话框样式优化 */
+.el-dialog {
+  .el-dialog__header {
+    background-color: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    padding: 15px 20px;
+  }
+
+  .el-dialog__title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #303133;
+  }
+
+  .el-dialog__footer {
+    padding: 15px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+</style>
diff --git a/src/views/tender/plan/comm/planPage.vue b/src/views/tender/plan/comm/planPage.vue
index e73cac6..b4b156c 100644
--- a/src/views/tender/plan/comm/planPage.vue
+++ b/src/views/tender/plan/comm/planPage.vue
@@ -1,74 +1,245 @@
 <template>
-  <el-dialog v-model="dialogVisible" title="招标文件" width="500" draggable>
-    <el-form ref="ruleFormRef" style="max-width: 600px" :model="ruleForm" :rules="rules" label-width="auto">
-      <el-form-item label="招标文件" prop="name">
-        <file-upload
-          v-model="form.costEstimationFile"
-          :fileSize="100"
-          :auto-upload="false"
-          uploadUrl="/tender/biddingPlan/uploadBiddingDocuments"
-          method="put"
-          ref="fileUploadRef"
-          :data="{
-            projectId: currentProject?.id,
-            planType: planType,
-            fileType: '1',
-            bidStatus: '0',
-            id: row.id
-          }"
-          showFileList
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="resetForm()"> 取消 </el-button>
-        <el-button type="primary" @click="submitForm()">确定</el-button>
-      </div>
-    </template>
-  </el-dialog>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <el-card shadow="always">
+        <el-form :model="queryForm" :inline="true">
+          <el-form-item label="表名" prop="sheet">
+            <el-select v-model="queryForm.sheet" placeholder="选择表名" @change="changeSheet">
+              <el-option v-for="item in sheets" :key="item" :label="item" :value="item" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="toggleExpandAll">{{ isExpandAll ? '一键收起' : '一键展开' }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-upload
+              ref="uploadRef"
+              class="upload-demo"
+              :http-request="importExcel"
+              :show-file-list="false"
+              v-hasPermi="['bidding:biddingLimitList:importExcelFile']"
+            >
+              <template #trigger>
+                <el-button type="primary">导入excel</el-button>
+              </template>
+            </el-upload>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+    </transition>
+    <el-card shadow="never" class="mb8">
+      <el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
+        <el-table-column prop="num" label="编号" />
+        <el-table-column prop="name" label="工程或费用名称" />
+        <el-table-column prop="unit" label="单位" />
+        <el-table-column prop="quantity" label="数量" />
+        <el-table-column prop="remark" label="单价" align="center">
+          <template #default="scope">
+            <el-input-number
+              :model-value="scope.row.unitPrice"
+              @change="(val) => (scope.row.unitPrice = val)"
+              :precision="2"
+              :step="0.1"
+              :controls="false"
+              v-if="scope.row.quantity && scope.row.quantity != 0"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="总价" align="center">
+          <template #default="scope">
+            {{ scope.row.price }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="操作" align="center">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleSave(scope.row)"
+              v-if="scope.row.quantity && scope.row.quantity != 0"
+              v-hasPermi="['bidding:biddingLimitList:edit']"
+              >修改</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
-import { id } from 'element-plus/es/locale/index.mjs';
+import { obtainAllVersionNumbers } from '@/api/contract/index';
+import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList } from '@/api/bidding/biddingLimit';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
-const dialogVisible = ref(false);
-const row = ref<any>();
-const planType = ref<any>('');
-const fileUploadRef = ref<any>();
-const ruleForm = ref<any>();
-const rules = ref({
-  costEstimationFile: [{ required: true, message: '请上传招标文件', trigger: ['blur'] }]
+const queryForm = ref({
+  versions: '',
+  sheet: ''
+});
+const loading = ref(false);
+const options = ref<any[]>([]);
+const sheets = ref<any[]>([]);
+const tableData = ref<any[]>([]);
+const isExpandAll = ref(true);
+// 接受父组件传递的参数
+const props = defineProps({
+  type: {
+    type: String,
+    default: ''
+  }
 });
 
-const form = ref({
-  costEstimationFile: ''
-});
+//获取版本号
+const getVersionNums = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id,
+      pageSize: 1000,
+      pageNum: 1
+    };
 
-const open = (rows: any, type: string) => {
-  dialogVisible.value = true;
-  console.log(rows, type);
-  row.value = rows;
-  planType.value = type;
+    const res = await obtainAllVersionNumbers(params);
+    if (res.code == 200) {
+      options.value = res.data;
+      if (res.data.length > 0) {
+        queryForm.value.versions = res.data[0];
+        getSheetName();
+      } else {
+        queryForm.value.versions = '';
+      }
+    }
+  } catch (error) {
+    console.log(error);
+  }
 };
-const resetForm = () => {};
-const submitForm = () => {
-  fileUploadRef.value.submitUpload().then((res) => {
-    if (res == 'noFile') {
+//选择版本号
+const changeVersions = () => {
+  getSheetName();
+};
+
+//选择表名
+const changeSheet = () => {
+  getTableData();
+};
+
+//获取表名
+const getSheetName = async () => {
+  try {
+    const params = {
+      projectId: currentProject.value?.id
+      // versions: queryForm.value.versions
+    };
+    const res = await sheetList(params);
+    if (res.code == 200) {
+      sheets.value = res.data;
+      if (res.data.length > 0) {
+        queryForm.value.sheet = res.data[0];
+      } else {
+        queryForm.value.sheet = '';
+      }
+      getTableData();
+    }
+  } catch (error) {}
+};
+//获取表格
+const getTableData = async () => {
+  loading.value = true;
+  const params = {
+    projectId: currentProject.value?.id,
+    sheet: queryForm.value.sheet,
+    type: props.type
+  };
+  const res = await getTreeLimit(params);
+  loading.value = false;
+  if (res.code == 200) {
+    tableData.value = [res.data[0]];
+  }
+  console.log(loading.value);
+};
+//修改单价
+const handleSave = (row: any) => {
+  try {
+    if (!row.unitPrice) {
       ElMessage({
-        message: '请上传招标文件',
+        message: '请输入单价',
         type: 'warning'
       });
       return;
     }
-    dialogVisible.value = false;
+    loading.value = true;
+    biddingLimitListUpdate(row).then((res) => {
+      if (res.code == 200) {
+        ElMessage({
+          message: '修改成功',
+          type: 'success'
+        });
+        getTableData();
+      }
+    });
+  } catch (error) {
+    ElMessage({
+      message: '修改失败',
+      type: 'error'
+    });
+  }
+};
+const tableRef = ref<any>();
+
+const toggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  console.log(isExpandAll.value);
+
+  tableData.value.forEach((row) => {
+    tableRef.value.toggleRowExpansion(row, isExpandAll.value);
   });
 };
-defineExpose({
-  open
+//导入
+const importExcel = (options: any): any => {
+  let formData = new FormData();
+  formData.append('file', options.file);
+  loading.value = true;
+  BiddingImportExcelFile({ projectId: currentProject.value?.id }, formData)
+    .then((res) => {
+      const { code } = res;
+      if (code == 200) {
+        proxy.$modal.msgSuccess(res.msg || '导入成功');
+        getTableData();
+      }
+    })
+    .catch((err) => {})
+    .finally(() => {
+      loading.value = false;
+    });
+};
+//监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    getVersionNums();
+  }
+);
+const handleExport = () => {
+  proxy?.download(
+    '/bidding/biddingLimitList/export',
+    {
+      projectId: currentProject.value?.id,
+      sheet: queryForm.value.sheet
+    },
+    `限价一览表${queryForm.value.sheet}.xlsx`
+  );
+};
+onUnmounted(() => {
+  listeningProject();
+});
+onMounted(() => {
+  getSheetName();
 });
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped></style>
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 614d97e..914ce32 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -10,11 +10,10 @@
             <el-form-item label="内容" prop="sheet">
               <el-input v-model="queryForm.content" placeholder="请输入内容" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" plain :icon="Plus" @click="openDialog" v-hasPermi="['tender:segmentedIndicatorPlanning:add']">新增</el-button>
+              <el-button type="primary" plain :icon="Plus" @click="openDialog" v-hasPermi="['tender:biddingPlan:add']">新增</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -26,37 +25,105 @@
           </el-table-column>
           <el-table-column prop="name" label="名称" />
           <el-table-column prop="content" label="内容" />
+          <el-table-column prop="price" label="限价" />
           <el-table-column prop="bidd" label="招标文件">
             <template #default="scope">
-              <el-button type="primary" link v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']" @click="biddView(scope.row)"
-                >查看文件</el-button
-              >
+              <el-button type="primary" link v-hasPermi="['tender:biddingPlan:getAnnex']" @click="biddView(scope.row)">查看文件</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center">
+          <el-table-column prop="winningBidder" label="中标单位" />
+          <el-table-column prop="bidFileName" label="中标文件">
             <template #default="scope">
-              <el-date-picker v-model="scope.row.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="选择时间" />
+              <el-button type="primary" link @click="openPdf(scope.row.bidFile)">{{ scope.row.bidFileName }} </el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="price" label="操作" align="center">
+          <el-table-column prop="plannedBiddingTime" label="计划招标时间" align="center" width="250">
+            <template #default="scope">
+              <el-date-picker
+                v-model="scope.row.plannedBiddingTime"
+                @change="
+                  (val: any) => {
+                    changeBiddingTime(val, scope.row);
+                  }
+                "
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择时间"
+                :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:biddingPlan:edit']"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="contractPrice" label="合同金额" align="center" width="200">
+            <template #default="scope">
+              <el-input-number
+                :model-value="scope.row.contractPrice"
+                @change="
+                  (val) => {
+                    scope.row.contractPrice = val;
+                    changeContractPrice(val, scope.row);
+                  }
+                "
+                :precision="2"
+                :step="1"
+                :controls="false"
+                :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:biddingPlan:edit']"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="price" label="操作" align="center" width="400">
             <template #default="scope">
-              <el-button type="primary" link icon="View" @click="handleDetail(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:getMore']"
-                >详情</el-button
-              >
               <el-button
                 type="primary"
                 link
                 icon="FolderOpened"
                 @click="handleSave(scope.row)"
-                v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
-                >上传投标资料
+                v-hasPermi="['tender:biddingPlan:uploadBiddingDocuments']"
+                :disabled="scope.row.bidStatus == 1"
+                >招标上传
               </el-button>
-              <el-button type="primary" link icon="Edit" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
+              <el-button
+                type="primary"
+                link
+                icon="FolderOpened"
+                @click="handleWinTheBid(scope.row)"
+                v-hasPermi="['tender:biddingPlan:uploadBiddingDocuments']"
+                :disabled="scope.row.bidStatus == 1"
+                >中标上传
+              </el-button>
+              <!-- <el-button type="primary" link icon="Edit" @click="handleSave(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:edit']"
                 >信息
-              </el-button>
-              <el-button type="primary" link icon="Delete" @click="delHandle(scope.row)" v-hasPermi="['tender:segmentedIndicatorPlanning:remove']"
+              </el-button> -->
+              <el-button
+                type="primary"
+                link
+                icon="View"
+                @click="handleDetail(scope.row)"
+                :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:biddingPlan:getMore']"
+                >详情</el-button
+              >
+
+              <el-button
+                type="primary"
+                link
+                icon="Delete"
+                @click="delHandle(scope.row)"
+                :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:biddingPlan:remove']"
                 >删除</el-button
               >
+              <el-button
+                type="primary"
+                link
+                icon="Lock"
+                @click="editStatusBtn(scope.row)"
+                :disabled="scope.row.bidStatus == 1"
+                v-hasPermi="['tender:biddingPlan:editStatus']"
+                >确定</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -159,18 +226,29 @@
         </el-table-column>
       </el-table>
     </el-dialog>
-    <information ref="informationRef" />
+
     <el-dialog title="查看文件" v-model="biddDialog" width="45%" draggable>
       <el-table :data="biddViewData" border>
         <el-table-column prop="name" label="文件名" />
         <el-table-column prop="price" label="操作" align="center">
           <template #default="scope">
-            <el-button type="primary" link icon="View" @click="openPdf(scope.row)">查看</el-button>
-            <el-button type="primary" link icon="Delete" @click="delHandlebidd(scope.row)">删除</el-button>
+            <el-button type="primary" link icon="View" @click="openPdf(scope.row.url)">查看</el-button>
+            <el-button
+              type="primary"
+              link
+              icon="Delete"
+              @click="delHandlebidd(scope.row)"
+              v-if="scope.row.bidStatus != 1"
+              v-hasPermi="['tender:biddingPlanAnnex:remove']"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
     </el-dialog>
+    <information ref="informationRef" @success="getList()" />
+
+    <winTheBid ref="winTheBidRef" @success="getList()" />
   </div>
 </template>
 
@@ -179,7 +257,6 @@ import { useUserStoreHook } from '@/store/modules/user';
 import { getDicts } from '@/api/system/dict/data';
 import { Plus } from '@element-plus/icons-vue';
 import { FormInstance } from 'element-plus';
-import information from './comm/planPage.vue';
 import {
   sheetList,
   tenderPlanList,
@@ -190,8 +267,10 @@ import {
   getTenderPlanDetail,
   obtainAllVersionNumbers,
   biddViewLook,
-  delBiddView
+  delBiddView,
+  editStatus
 } from '@/api/tender/index';
+import { it } from 'element-plus/es/locale/index.mjs';
 
 const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
@@ -485,10 +564,44 @@ const submitForm = async (formEl: FormInstance | undefined) => {
     }
   });
 };
-//确定修改
+//修改计划时间
+const changeBiddingTime = (value: any, row: any) => {
+  updateTenderPlan({
+    ...row
+  }).then((res) => {
+    if (res.code == 200) {
+      ElMessage({
+        message: '修改成功',
+        type: 'success'
+      });
+      getList();
+    }
+  });
+};
+//修改合同金额
+const changeContractPrice = (value: any, row: any) => {
+  updateTenderPlan({
+    ...row
+  }).then((res) => {
+    if (res.code == 200) {
+      ElMessage({
+        message: '修改成功',
+        type: 'success'
+      });
+      getList();
+    }
+  });
+};
+
+//上传投标文件
 const handleSave = (row: any) => {
   informationRef.value.open(row, planType.value);
 };
+const winTheBidRef = ref();
+//上传中标文件
+const handleWinTheBid = (row: any) => {
+  winTheBidRef.value.open(row, planType.value);
+};
 //删除
 const delHandle = (row: any) => {
   try {
@@ -540,6 +653,7 @@ const biddView = async (row: any) => {
   };
   const res = await biddViewLook(params);
   if (res.code == 200) {
+    res.data.forEach((item) => (item.bidStatus = biddViewRow.value.bidStatus));
     biddViewData.value = res.data;
   }
 };
@@ -558,9 +672,24 @@ const delHandlebidd = (row: any) => {
     }
   });
 };
+//修改状态
+const editStatusBtn = (row: any) => {
+  editStatus({
+    ...row
+  }).then((res) => {
+    if (res.code == 200) {
+      ElMessage({
+        message: '修改成功',
+        type: 'success'
+      });
+      getList();
+    }
+  });
+};
+
 //查看文件
-const openPdf = (row: any) => {
-  window.open(row.url);
+const openPdf = (url: any) => {
+  window.open(url);
 };
 
 onMounted(() => {
diff --git a/src/views/tender/supplierInput/index.vue b/src/views/tender/supplierInput/index.vue
index 0382169..bbebc86 100644
--- a/src/views/tender/supplierInput/index.vue
+++ b/src/views/tender/supplierInput/index.vue
@@ -323,18 +323,21 @@
 <script setup name="SupplierInput" lang="ts">
 import { ComponentInternalInstance, getCurrentInstance, onMounted, ref, reactive, toRefs, computed } from 'vue';
 import { ElFormInstance } from 'element-plus';
-import { listSupplierInput, getSupplierInput, delSupplierInput } from '@/api/supplierInput/supplierInput';
+import { listSupplierInput, getSupplierInput, delSupplierInput } from '@/api/supplierInput/supplierInput/index';
 import { SupplierInputVO, SupplierInputQuery, SupplierInputForm, PageData, DialogOption } from '@/api/supplierInput/supplierInput/types';
 import Pagination from '@/components/Pagination/index.vue';
 import RightToolbar from '@/components/RightToolbar/index.vue';
 import FileUpload from '@/components/FileUpload/index.vue';
+import { useUserStoreHook } from '@/store/modules/user';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
 // 组件引用
 const fileUploadRef = ref<InstanceType<typeof FileUpload> | null>(null);
 const queryFormRef = ref<ElFormInstance>();
 const supplierInputFormRef = ref<ElFormInstance>();
-
+// 获取用户 store
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
 // 基础数据
 const supplierInputList = ref<SupplierInputVO[]>([]);
 const buttonLoading = ref(false);
@@ -393,6 +396,7 @@ const initFormData: any = {
 const data = reactive<PageData<SupplierInputForm, SupplierInputQuery>>({
   form: { ...initFormData },
   queryParams: {
+    projectId: currentProject.value?.id,
     pageNum: 1,
     pageSize: 10,
     supplierType: undefined,
@@ -506,7 +510,7 @@ const cancel = () => {
 
 /** 表单重置：清空所有字段 */
 const reset = () => {
-  form.value = { ...initFormData };
+  form.value = { ...initFormData, projectId: currentProject.value?.id };
   fileUrl.value = '';
   form.value.inputFile = '';
   supplierInputFormRef.value?.resetFields();
@@ -606,8 +610,6 @@ const handleUpdate = async (row?: SupplierInputVO) => {
 
 /** 提交表单 */
 const submitForm = () => {
-  console.log(1);
-
   supplierInputFormRef.value?.validate(async (valid: boolean) => {
     if (!valid) return;
     if (form.value.supplierType === '劳务') {
@@ -662,10 +664,29 @@ const handleDelete = async (row?: SupplierInputVO) => {
 const handleExport = () => {
   proxy?.download('supplierInput/supplierInput/export', { ...queryParams.value }, `supplierInput_${new Date().getTime()}.xlsx`);
 };
-
-/** 页面挂载时查询列表 */
+//调用projectId并获取列表
 onMounted(() => {
-  getList();
+  // 若需要依赖项目ID，可先判断项目是否已选中，再调用接口
+  if (currentProject.value?.id) {
+    queryParams.value.projectId = currentProject.value.id;
+    form.value.projectId = currentProject.value.id;
+    getList(); // 首次进入自动调取listSupplierInput接口
+  } else {
+    // 若项目未选中，可提示或后续监听项目变化时再加载（已有监听逻辑）
+    getList();
+  }
+});
+// 监听项目id刷新数据
+const listeningProject = watch(
+  () => currentProject.value?.id,
+  (nid, oid) => {
+    queryParams.value.projectId = nid;
+    form.value.projectId = nid;
+    getList();
+  }
+);
+onUnmounted(() => {
+  listeningProject();
 });
 </script>
 
diff --git a/src/views/tender/supplierInput/indexEdit.vue b/src/views/tender/supplierInput/indexEdit.vue
index 38e25e3..fd495ff 100644
--- a/src/views/tender/supplierInput/indexEdit.vue
+++ b/src/views/tender/supplierInput/indexEdit.vue
@@ -437,9 +437,7 @@ onMounted(() => {
   .el-input__inner,
   .el-select .el-input__inner {
     border-radius: 4px;
-    transition:
-      border-color 0.2s,
-      box-shadow 0.2s;
+    transition: border-color 0.2s, box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
@@ -449,9 +447,7 @@ onMounted(() => {
 
   .el-textarea__inner {
     border-radius: 4px;
-    transition:
-      border-color 0.2s,
-      box-shadow 0.2s;
+    transition: border-color 0.2s, box-shadow 0.2s;
 
     &:focus {
       border-color: var(--primary-light);
diff --git a/vite.config.ts.timestamp-1755827449287-2282fd4d0109d.mjs b/vite.config.ts.timestamp-1755827449287-2282fd4d0109d.mjs
new file mode 100644
index 0000000..76dd27e
--- /dev/null
+++ b/vite.config.ts.timestamp-1755827449287-2282fd4d0109d.mjs
@@ -0,0 +1,230 @@
+// vite.config.ts
+import { loadEnv, defineConfig } from "file:///D:/mk_system/node_modules/vite/dist/node/index.js";
+
+// vite/plugins/index.ts
+import vue from "file:///D:/mk_system/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+
+// vite/plugins/unocss.ts
+import UnoCss from "file:///D:/mk_system/node_modules/unocss/dist/vite.mjs";
+var unocss_default = () => {
+  return UnoCss({
+    hmrTopLevelAwait: false
+    // unocss默认是true，低版本浏览器是不支持的，启动后会报错
+  });
+};
+
+// vite/plugins/auto-import.ts
+import AutoImport from "file:///D:/mk_system/node_modules/unplugin-auto-import/dist/vite.js";
+import { ElementPlusResolver } from "file:///D:/mk_system/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver from "file:///D:/mk_system/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname = "D:\\mk_system\\vite\\plugins";
+var auto_import_default = (path3) => {
+  return AutoImport({
+    // 自动导入 Vue 相关函数
+    imports: ["vue", "vue-router", "@vueuse/core", "pinia"],
+    eslintrc: {
+      enabled: false,
+      filepath: "./.eslintrc-auto-import.json",
+      globalsPropValue: true
+    },
+    resolvers: [
+      // 自动导入 Element Plus 相关函数ElMessage, ElMessageBox... (带样式)
+      ElementPlusResolver(),
+      IconsResolver({
+        prefix: "Icon"
+      })
+    ],
+    vueTemplate: true,
+    // 是否在 vue 模板中自动导入
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname, "../../src"), "types", "auto-imports.d.ts")
+  });
+};
+
+// vite/plugins/components.ts
+import Components from "file:///D:/mk_system/node_modules/unplugin-vue-components/dist/vite.js";
+import { ElementPlusResolver as ElementPlusResolver2 } from "file:///D:/mk_system/node_modules/unplugin-vue-components/dist/resolvers.js";
+import IconsResolver2 from "file:///D:/mk_system/node_modules/unplugin-icons/dist/resolver.js";
+var __vite_injected_original_dirname2 = "D:\\mk_system\\vite\\plugins";
+var components_default = (path3) => {
+  return Components({
+    resolvers: [
+      // 自动导入 Element Plus 组件
+      ElementPlusResolver2(),
+      // 自动注册图标组件
+      IconsResolver2({
+        enabledCollections: ["ep"]
+      })
+    ],
+    dts: path3.resolve(path3.resolve(__vite_injected_original_dirname2, "../../src"), "types", "components.d.ts")
+  });
+};
+
+// vite/plugins/icons.ts
+import Icons from "file:///D:/mk_system/node_modules/unplugin-icons/dist/vite.js";
+var icons_default = () => {
+  return Icons({
+    // 自动安装图标库
+    autoInstall: true
+  });
+};
+
+// vite/plugins/svg-icon.ts
+import { createSvgIconsPlugin } from "file:///D:/mk_system/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+var __vite_injected_original_dirname3 = "D:\\mk_system\\vite\\plugins";
+var svg_icon_default = (path3, isBuild) => {
+  return createSvgIconsPlugin({
+    // 指定需要缓存的图标文件夹
+    iconDirs: [path3.resolve(path3.resolve(__vite_injected_original_dirname3, "../../src"), "assets/icons/svg")],
+    // 指定symbolId格式
+    symbolId: "icon-[dir]-[name]",
+    svgoOptions: isBuild
+  });
+};
+
+// vite/plugins/compression.ts
+import compression from "file:///D:/mk_system/node_modules/vite-plugin-compression/dist/index.mjs";
+var compression_default = (env) => {
+  const { VITE_BUILD_COMPRESS } = env;
+  const plugin = [];
+  if (VITE_BUILD_COMPRESS) {
+    const compressList = VITE_BUILD_COMPRESS.split(",");
+    if (compressList.includes("gzip")) {
+      plugin.push(
+        compression({
+          ext: ".gz",
+          deleteOriginFile: false
+        })
+      );
+    }
+    if (compressList.includes("brotli")) {
+      plugin.push(
+        compression({
+          ext: ".br",
+          algorithm: "brotliCompress",
+          deleteOriginFile: false
+        })
+      );
+    }
+  }
+  return plugin;
+};
+
+// vite/plugins/setup-extend.ts
+import setupExtend from "file:///D:/mk_system/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js";
+var setup_extend_default = () => {
+  return setupExtend({});
+};
+
+// vite/plugins/index.ts
+import path from "path";
+var plugins_default = (viteEnv, isBuild = false) => {
+  const vitePlugins = [];
+  vitePlugins.push(vue());
+  vitePlugins.push(unocss_default());
+  vitePlugins.push(auto_import_default(path));
+  vitePlugins.push(components_default(path));
+  vitePlugins.push(compression_default(viteEnv));
+  vitePlugins.push(icons_default());
+  vitePlugins.push(svg_icon_default(path, isBuild));
+  vitePlugins.push(setup_extend_default());
+  return vitePlugins;
+};
+
+// vite.config.ts
+import path2 from "path";
+var __vite_injected_original_dirname4 = "D:\\mk_system";
+var vite_config_default = defineConfig(({ mode, command }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    // 部署生产环境和开发环境下的URL。
+    // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
+    // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+    base: env.VITE_APP_CONTEXT_PATH,
+    resolve: {
+      alias: {
+        "~": path2.resolve(__vite_injected_original_dirname4, "./"),
+        "@": path2.resolve(__vite_injected_original_dirname4, "./src")
+      },
+      extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue", ".tif"]
+    },
+    // https://cn.vitejs.dev/config/#resolve-extensions
+    plugins: plugins_default(env, command === "build"),
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      proxy: {
+        [env.VITE_APP_BASE_API]: {
+          target: "http://localhost:8899",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow-ui": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/warm-flow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/workflow": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        },
+        "/auth": {
+          target: env.VITE_APP_BASE_API,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path3) => path3.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+        }
+      }
+    },
+    css: {
+      preprocessorOptions: {
+        scss: {
+          javascriptEnabled: true
+        }
+      },
+      postcss: {
+        plugins: [
+          {
+            postcssPlugin: "internal:charset-removal",
+            AtRule: {
+              charset: (atRule) => {
+                if (atRule.name === "charset") {
+                  atRule.remove();
+                }
+              }
+            }
+          }
+        ]
+      }
+    },
+    // 预编译
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "@vueuse/core",
+        "echarts",
+        "vue-i18n",
+        "@vueup/vue-quill",
+        "image-conversion",
+        "element-plus/es/components/**/css"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "vite/plugins/index.ts", "vite/plugins/unocss.ts", "vite/plugins/auto-import.ts", "vite/plugins/components.ts", "vite/plugins/icons.ts", "vite/plugins/svg-icon.ts", "vite/plugins/compression.ts", "vite/plugins/setup-extend.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\mk_system\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite.config.ts\";import { UserConfig, ConfigEnv, loadEnv, defineConfig } from 'vite';\r\n\r\nimport createPlugins from './vite/plugins';\r\n\r\nimport path from 'path';\r\nexport default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    // \u90E8\u7F72\u751F\u4EA7\u73AF\u5883\u548C\u5F00\u53D1\u73AF\u5883\u4E0B\u7684URL\u3002\r\n    // \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0Cvite \u4F1A\u5047\u8BBE\u4F60\u7684\u5E94\u7528\u662F\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u57DF\u540D\u7684\u6839\u8DEF\u5F84\u4E0A\r\n    // \u4F8B\u5982 https://www.ruoyi.vip/\u3002\u5982\u679C\u5E94\u7528\u88AB\u90E8\u7F72\u5728\u4E00\u4E2A\u5B50\u8DEF\u5F84\u4E0A\uFF0C\u4F60\u5C31\u9700\u8981\u7528\u8FD9\u4E2A\u9009\u9879\u6307\u5B9A\u8FD9\u4E2A\u5B50\u8DEF\u5F84\u3002\u4F8B\u5982\uFF0C\u5982\u679C\u4F60\u7684\u5E94\u7528\u88AB\u90E8\u7F72\u5728 https://www.ruoyi.vip/admin/\uFF0C\u5219\u8BBE\u7F6E baseUrl \u4E3A /admin/\u3002\r\n    base: env.VITE_APP_CONTEXT_PATH,\r\n    resolve: {\r\n      alias: {\r\n        '~': path.resolve(__dirname, './'),\r\n        '@': path.resolve(__dirname, './src')\r\n      },\r\n      extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue', '.tif']\r\n    },\r\n    // https://cn.vitejs.dev/config/#resolve-extensions\r\n    plugins: createPlugins(env, command === 'build'),\r\n    server: {\r\n      host: '0.0.0.0',\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true,\r\n      proxy: {\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: 'http://localhost:8899',\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow-ui': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/warm-flow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n        '/workflow': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        },\r\n         '/auth': {\r\n          target: env.VITE_APP_BASE_API,\r\n          changeOrigin: true,\r\n          ws: true,\r\n          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')\r\n        }\r\n      }\r\n    },\r\n    css: {\r\n      preprocessorOptions: {\r\n        scss: {\r\n          javascriptEnabled: true\r\n        }\r\n      },\r\n      postcss: {\r\n        plugins: [\r\n          {\r\n            postcssPlugin: 'internal:charset-removal',\r\n            AtRule: {\r\n              charset: (atRule) => {\r\n                if (atRule.name === 'charset') {\r\n                  atRule.remove();\r\n                }\r\n              }\r\n            }\r\n          }\r\n        ]\r\n      }\r\n    },\r\n    // \u9884\u7F16\u8BD1\r\n    optimizeDeps: {\r\n      include: [\r\n        'vue',\r\n        'vue-router',\r\n        'pinia',\r\n        'axios',\r\n        '@vueuse/core',\r\n        'echarts',\r\n        'vue-i18n',\r\n        '@vueup/vue-quill',\r\n        'image-conversion',\r\n        'element-plus/es/components/**/css'\r\n      ]\r\n    }\r\n  };\r\n});\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\index.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/index.ts\";import vue from '@vitejs/plugin-vue';\r\nimport createUnoCss from './unocss';\r\nimport createAutoImport from './auto-import';\r\nimport createComponents from './components';\r\nimport createIcons from './icons';\r\nimport createSvgIconsPlugin from './svg-icon';\r\nimport createCompression from './compression';\r\nimport createSetupExtend from './setup-extend';\r\nimport path from 'path';\r\n\r\nexport default (viteEnv: any, isBuild = false): [] => {\r\n  const vitePlugins: any = [];\r\n  vitePlugins.push(vue());\r\n  vitePlugins.push(createUnoCss());\r\n  vitePlugins.push(createAutoImport(path));\r\n  vitePlugins.push(createComponents(path));\r\n  vitePlugins.push(createCompression(viteEnv));\r\n  vitePlugins.push(createIcons());\r\n  vitePlugins.push(createSvgIconsPlugin(path, isBuild));\r\n  vitePlugins.push(createSetupExtend());\r\n  return vitePlugins;\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\unocss.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/unocss.ts\";import UnoCss from 'unocss/vite';\r\n\r\nexport default () => {\r\n  return UnoCss({\r\n    hmrTopLevelAwait: false // unocss\u9ED8\u8BA4\u662Ftrue\uFF0C\u4F4E\u7248\u672C\u6D4F\u89C8\u5668\u662F\u4E0D\u652F\u6301\u7684\uFF0C\u542F\u52A8\u540E\u4F1A\u62A5\u9519\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\auto-import.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/auto-import.ts\";import AutoImport from 'unplugin-auto-import/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return AutoImport({\r\n    // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\r\n    imports: ['vue', 'vue-router', '@vueuse/core', 'pinia'],\r\n    eslintrc: {\r\n      enabled: false,\r\n      filepath: './.eslintrc-auto-import.json',\r\n      globalsPropValue: true\r\n    },\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570ElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n      ElementPlusResolver(),\r\n      IconsResolver({\r\n        prefix: 'Icon'\r\n      })\r\n    ],\r\n    vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'auto-imports.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\components.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/components.ts\";import Components from 'unplugin-vue-components/vite';\r\nimport { ElementPlusResolver } from 'unplugin-vue-components/resolvers';\r\nimport IconsResolver from 'unplugin-icons/resolver';\r\n\r\nexport default (path: any) => {\r\n  return Components({\r\n    resolvers: [\r\n      // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n      ElementPlusResolver(),\r\n      // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n      IconsResolver({\r\n        enabledCollections: ['ep']\r\n      })\r\n    ],\r\n    dts: path.resolve(path.resolve(__dirname, '../../src'), 'types', 'components.d.ts')\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\icons.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/icons.ts\";import Icons from 'unplugin-icons/vite';\r\n\r\nexport default () => {\r\n  return Icons({\r\n    // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n    autoInstall: true\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\svg-icon.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/svg-icon.ts\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';\r\nexport default (path: any, isBuild: boolean) => {\r\n  return createSvgIconsPlugin({\r\n    // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n    iconDirs: [path.resolve(path.resolve(__dirname, '../../src'), 'assets/icons/svg')],\r\n    // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n    symbolId: 'icon-[dir]-[name]',\r\n    svgoOptions: isBuild\r\n  });\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\compression.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/compression.ts\";import compression from 'vite-plugin-compression';\r\n\r\nexport default (env: any) => {\r\n  const { VITE_BUILD_COMPRESS } = env;\r\n  const plugin: any[] = [];\r\n  if (VITE_BUILD_COMPRESS) {\r\n    const compressList = VITE_BUILD_COMPRESS.split(',');\r\n    if (compressList.includes('gzip')) {\r\n      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n      plugin.push(\r\n        compression({\r\n          ext: '.gz',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n    if (compressList.includes('brotli')) {\r\n      plugin.push(\r\n        compression({\r\n          ext: '.br',\r\n          algorithm: 'brotliCompress',\r\n          deleteOriginFile: false\r\n        })\r\n      );\r\n    }\r\n  }\r\n  return plugin;\r\n};\r\n", "const __vite_injected_original_dirname = \"D:\\\\mk_system\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"D:\\\\mk_system\\\\vite\\\\plugins\\\\setup-extend.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/mk_system/vite/plugins/setup-extend.ts\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite';\r\n\r\nexport default () => {\r\n  return setupExtend({});\r\n};\r\n"],
  "mappings": ";AAA0N,SAAgC,SAAS,oBAAoB;;;ACA9B,OAAO,SAAS;;;ACAd,OAAO,YAAY;AAE9Q,IAAO,iBAAQ,MAAM;AACnB,SAAO,OAAO;AAAA,IACZ,kBAAkB;AAAA;AAAA,EACpB,CAAC;AACH;;;ACNqQ,OAAO,gBAAgB;AAC5R,SAAS,2BAA2B;AACpC,OAAO,mBAAmB;AAF1B,IAAM,mCAAmC;AAIzC,IAAO,sBAAQ,CAACA,UAAc;AAC5B,SAAO,WAAW;AAAA;AAAA,IAEhB,SAAS,CAAC,OAAO,cAAc,gBAAgB,OAAO;AAAA,IACtD,UAAU;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,kBAAkB;AAAA,IACpB;AAAA,IACA,WAAW;AAAA;AAAA,MAET,oBAAoB;AAAA,MACpB,cAAc;AAAA,QACZ,QAAQ;AAAA,MACV,CAAC;AAAA,IACH;AAAA,IACA,aAAa;AAAA;AAAA,IACb,KAAKA,MAAK,QAAQA,MAAK,QAAQ,kCAAW,WAAW,GAAG,SAAS,mBAAmB;AAAA,EACtF,CAAC;AACH;;;ACvBmQ,OAAO,gBAAgB;AAC1R,SAAS,uBAAAC,4BAA2B;AACpC,OAAOC,oBAAmB;AAF1B,IAAMC,oCAAmC;AAIzC,IAAO,qBAAQ,CAACC,UAAc;AAC5B,SAAO,WAAW;AAAA,IAChB,WAAW;AAAA;AAAA,MAETC,qBAAoB;AAAA;AAAA,MAEpBC,eAAc;AAAA,QACZ,oBAAoB,CAAC,IAAI;AAAA,MAC3B,CAAC;AAAA,IACH;AAAA,IACA,KAAKF,MAAK,QAAQA,MAAK,QAAQG,mCAAW,WAAW,GAAG,SAAS,iBAAiB;AAAA,EACpF,CAAC;AACH;;;AChByP,OAAO,WAAW;AAE3Q,IAAO,gBAAQ,MAAM;AACnB,SAAO,MAAM;AAAA;AAAA,IAEX,aAAa;AAAA,EACf,CAAC;AACH;;;ACP+P,SAAS,4BAA4B;AAApS,IAAMC,oCAAmC;AACzC,IAAO,mBAAQ,CAACC,OAAW,YAAqB;AAC9C,SAAO,qBAAqB;AAAA;AAAA,IAE1B,UAAU,CAACA,MAAK,QAAQA,MAAK,QAAQC,mCAAW,WAAW,GAAG,kBAAkB,CAAC;AAAA;AAAA,IAEjF,UAAU;AAAA,IACV,aAAa;AAAA,EACf,CAAC;AACH;;;ACTqQ,OAAO,iBAAiB;AAE7R,IAAO,sBAAQ,CAAC,QAAa;AAC3B,QAAM,EAAE,oBAAoB,IAAI;AAChC,QAAM,SAAgB,CAAC;AACvB,MAAI,qBAAqB;AACvB,UAAM,eAAe,oBAAoB,MAAM,GAAG;AAClD,QAAI,aAAa,SAAS,MAAM,GAAG;AAEjC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AACA,QAAI,aAAa,SAAS,QAAQ,GAAG;AACnC,aAAO;AAAA,QACL,YAAY;AAAA,UACV,KAAK;AAAA,UACL,WAAW;AAAA,UACX,kBAAkB;AAAA,QACpB,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;;;AC3BuQ,OAAO,iBAAiB;AAE/R,IAAO,uBAAQ,MAAM;AACnB,SAAO,YAAY,CAAC,CAAC;AACvB;;;APIA,OAAO,UAAU;AAEjB,IAAO,kBAAQ,CAAC,SAAc,UAAU,UAAc;AACpD,QAAM,cAAmB,CAAC;AAC1B,cAAY,KAAK,IAAI,CAAC;AACtB,cAAY,KAAK,eAAa,CAAC;AAC/B,cAAY,KAAK,oBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,mBAAiB,IAAI,CAAC;AACvC,cAAY,KAAK,oBAAkB,OAAO,CAAC;AAC3C,cAAY,KAAK,cAAY,CAAC;AAC9B,cAAY,KAAK,iBAAqB,MAAM,OAAO,CAAC;AACpD,cAAY,KAAK,qBAAkB,CAAC;AACpC,SAAO;AACT;;;ADjBA,OAAOC,WAAU;AAJjB,IAAMC,oCAAmC;AAKzC,IAAO,sBAAQ,aAAa,CAAC,EAAE,MAAM,QAAQ,MAA6B;AACxE,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA;AAAA;AAAA;AAAA,IAIL,MAAM,IAAI;AAAA,IACV,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAKC,MAAK,QAAQC,mCAAW,IAAI;AAAA,QACjC,KAAKD,MAAK,QAAQC,mCAAW,OAAO;AAAA,MACtC;AAAA,MACA,YAAY,CAAC,QAAQ,OAAO,OAAO,QAAQ,QAAQ,SAAS,QAAQ,MAAM;AAAA,IAC5E;AAAA;AAAA,IAEA,SAAS,gBAAc,KAAK,YAAY,OAAO;AAAA,IAC/C,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA,MACN,OAAO;AAAA,QACL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ;AAAA,UACR,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACD,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,iBAAiB;AAAA,UACf,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,cAAc;AAAA,UACZ,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACA,aAAa;AAAA,UACX,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,QACC,SAAS;AAAA,UACR,QAAQ,IAAI;AAAA,UACZ,cAAc;AAAA,UACd,IAAI;AAAA,UACJ,SAAS,CAACA,UAASA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA,QAC7E;AAAA,MACF;AAAA,IACF;AAAA,IACA,KAAK;AAAA,MACH,qBAAqB;AAAA,QACnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,QACrB;AAAA,MACF;AAAA,MACA,SAAS;AAAA,QACP,SAAS;AAAA,UACP;AAAA,YACE,eAAe;AAAA,YACf,QAAQ;AAAA,cACN,SAAS,CAAC,WAAW;AACnB,oBAAI,OAAO,SAAS,WAAW;AAC7B,yBAAO,OAAO;AAAA,gBAChB;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "path", "ElementPlusResolver", "IconsResolver", "__vite_injected_original_dirname", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname", "path", "__vite_injected_original_dirname"]
}
