From 9f3e150509cd734920a65f39870040f39ee08a17 Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Wed, 20 Aug 2025 20:03:32 +0800
Subject: [PATCH 1/5] add

---
 src/views/progress/progressCategory/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index 6ff7948..54b6d72 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -88,7 +88,7 @@
     <!-- 添加或修改分项工程单价对话框 -->
     <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-item label="父类别" prop="parentId">
+        <el-form-item label="父类别" prop="parentId" v-if="!form.id">
           <el-tree-select
             v-model="form.parentId"
             :data="progressCategoryOptions"
@@ -98,7 +98,7 @@
             check-strictly
           />
         </el-form-item>
-        <el-form-item label="计量方式" prop="unitType">
+        <el-form-item label="计量方式" prop="unitType" v-if="!form.parentId">
           <el-select v-model="form.unitType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_unit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
@@ -115,12 +115,12 @@
         <el-form-item label="综合单价" prop="unitPrice">
           <el-input v-model="form.unitPrice" placeholder="请输入综合单价" />
         </el-form-item>
-        <el-form-item label="关联数据" prop="workType">
+        <el-form-item label="关联数据" prop="workType" v-if="!form.parentId">
           <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" />
           </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="备注" prop="remark" v-if="!form.parentId">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
         <!-- <el-form-item label="总数量/百分比" prop="total">

From acdd8cf46768cc8b5609ae9f2faedbdc07d6cc7a Mon Sep 17 00:00:00 2001
From: dhr <2216804034@qq.com>
Date: Wed, 20 Aug 2025 21:22:56 +0800
Subject: [PATCH 2/5] 0820

---
 .env.development                |   2 +-
 src/views/tender/plan/index.vue | 461 +++++++++++++++++++++++---------
 2 files changed, 340 insertions(+), 123 deletions(-)

diff --git a/.env.development b/.env.development
index a27fa3f..89cd31f 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.185:8899'
+VITE_APP_BASE_API = 'http://192.168.110.210:8899'
 
 # 无人机接口地址
 
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 26408a7..a4adeec 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -4,28 +4,32 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="分包名称" prop="subpackageName">
-              <el-input v-model="queryParams.subpackageName" placeholder="请输入分包名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="分包类型名称" prop="dictName">
+              <el-input v-model="queryParams.dictName" placeholder="请输入分包类型名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="分包内容" prop="subpackageContext">
-              <el-input v-model="queryParams.subpackageContext" placeholder="请输入分包内容" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="限价" prop="limitPrice">
-              <el-input v-model="queryParams.limitPrice" placeholder="请输入限价" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="计划招标时间" prop="planTenderTime">
-              <el-date-picker clearable
-                v-model="queryParams.planTenderTime"
+            <el-form-item label="计划招标时间" prop="plannedBiddingTime">
+              <el-date-picker
+                clearable
+                v-model="queryParams.plannedBiddingTime"
                 type="date"
                 value-format="YYYY-MM-DD"
                 placeholder="请选择计划招标时间"
               />
             </el-form-item>
-            <el-form-item label="招标方式" prop="tenderMethod">
-              <el-input v-model="queryParams.tenderMethod" placeholder="请输入招标方式" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="招标方式(公招，邀标)" prop="plannedBiddingMethod">
+              <el-input v-model="queryParams.plannedBiddingMethod" placeholder="请输入招标方式(公招，邀标)" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="合同额" prop="contract">
-              <el-input v-model="queryParams.contract" placeholder="请输入合同额" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="总价" prop="price">
+              <el-input v-model="queryParams.price" placeholder="请输入总价" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="限价" prop="limitPrice">
+              <el-input v-model="queryParams.limitPrice" placeholder="请输入限价" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="合同额" prop="contractPrice">
+              <el-input v-model="queryParams.contractPrice" placeholder="请输入合同额" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -39,14 +43,12 @@
     <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="['plan:plan:add']">新增</el-button>
-          </el-col>
           <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['plan:plan:edit']">修改</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['plan:plan:remove']">删除</el-button>
+          <!-- 多文件上传按钮 -->
+          <el-col :span="2">
+            <el-button type="primary" plain icon="Upload" @click="openFileUploadDialog()" v-hasPermi="['plan:plan:upload']"> 上传文件 </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['plan:plan:export']">导出</el-button>
@@ -57,65 +59,104 @@
 
       <el-table v-loading="loading" :data="planList" @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="subpackageType" />
-        <el-table-column label="分包名称" align="center" prop="subpackageName" />
-        <el-table-column label="分包内容" align="center" prop="subpackageContext" />
-        <el-table-column label="限价" align="center" prop="limitPrice" />
-        <el-table-column label="计划招标时间" align="center" prop="planTenderTime" width="180">
+        <el-table-column label="主键ID" align="center" prop="id" v-if="false" />
+        <el-table-column label="项目Id" align="center" prop="projectId" v-if="false" />
+        <el-table-column label="分包类型名称" align="center" prop="dictName" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="计划招标时间" align="center" prop="plannedBiddingTime" width="180" v-if="false">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.planTenderTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.plannedBiddingTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="招标方式" align="center" prop="tenderMethod" />
-        <el-table-column label="招标文件(多个)" align="center" prop="tenderFile" />
-        <el-table-column label="中标文件(单个)" align="center" prop="bidFile" />
-        <el-table-column label="合同额" align="center" prop="contract" />
+        <el-table-column label="招标方式(公招，邀标)" align="center" prop="plannedBiddingMethod" />
+        <el-table-column label="总价" align="center" prop="price" v-if="false" />
+        <el-table-column label="限价" align="center" prop="limitPrice" />
+        <el-table-column label="合同额" align="center" prop="contractPrice" />
+        <el-table-column label="分包内容" align="center" prop="content" />
+        <el-table-column label="中标通知书" align="center" prop="bidFile" />
         <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="['plan:plan:edit']"></el-button>
             </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['plan:plan: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" />
     </el-card>
+
+    <!-- 多文件上传对话框 -->
+    <el-dialog :title="fileUploadDialog.title" v-model="fileUploadDialog.visible" width="600px" append-to-body>
+      <div class="upload-container">
+        <el-upload
+          class="upload-demo"
+          drag
+          action=""
+          :http-request="handleFileUpload"
+          :multiple="true"
+          :on-preview="handleFilePreview"
+          :on-remove="handleFileRemove"
+          :file-list="fileList"
+          :auto-upload="false"
+        >
+          <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+          <div class="el-upload__text">点击或拖拽文件到此处上传</div>
+          <template #tip>
+            <div class="el-upload__tip text-sm text-gray-500">支持上传多个文件，格式不限，单个文件大小不超过10MB</div>
+          </template>
+        </el-upload>
+
+        <div class="mt-4 flex justify-end">
+          <el-button @click="cancelFileUpload">取消</el-button>
+          <el-button type="primary" @click="submitFileUpload" class="ml-2"> 确认上传 </el-button>
+        </div>
+      </div>
+    </el-dialog>
+
     <!-- 添加或修改招标计划对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="planFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="分包名称" prop="subpackageName">
-          <el-input v-model="form.subpackageName" placeholder="请输入分包名称" />
+      <el-form ref="planFormRef" :model="form" :rules="rules" label-width="120px">
+        <!-- 调整项目ID表单项：与目标代码一致，自动关联当前项目并显示提示 -->
+        <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>
+        <el-input v-model="form.id" placeholder="ID" readonly v-if="false" />
+        <el-form-item label="分包类型名称" prop="dictName" v-if="false">
+          <el-input v-model="form.dictName" placeholder="请输入分包类型名称" />
         </el-form-item>
-        <el-form-item label="分包内容" prop="subpackageContext">
-          <el-input v-model="form.subpackageContext" placeholder="请输入分包内容" />
+
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
         </el-form-item>
+
+        <el-form-item label="计划招标时间" prop="plannedBiddingTime" v-if="false">
+          <el-date-picker clearable v-model="form.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划招标时间" />
+        </el-form-item>
+
+        <el-form-item label="招标方式(公招，邀标)" prop="plannedBiddingMethod">
+          <el-input v-model="form.plannedBiddingMethod" placeholder="请输入招标方式(公招，邀标)" />
+        </el-form-item>
+
+        <el-form-item label="总价" prop="price" v-if="false">
+          <el-input v-model="form.price" placeholder="请输入总价" />
+        </el-form-item>
+
         <el-form-item label="限价" prop="limitPrice">
           <el-input v-model="form.limitPrice" placeholder="请输入限价" />
         </el-form-item>
-        <el-form-item label="计划招标时间" prop="planTenderTime">
-          <el-date-picker clearable
-            v-model="form.planTenderTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择计划招标时间">
-          </el-date-picker>
+
+        <el-form-item label="合同额" prop="contractPrice">
+          <el-input v-model="form.contractPrice" placeholder="请输入合同额" />
         </el-form-item>
-        <el-form-item label="招标方式" prop="tenderMethod">
-          <el-input v-model="form.tenderMethod" placeholder="请输入招标方式" />
+
+        <el-form-item label="分包内容" prop="content">
+          <el-input v-model="form.content" type="textarea" placeholder="请输入分包内容" rows="3" />
         </el-form-item>
-        <el-form-item label="招标文件(多个)" prop="tenderFile">
-          <file-upload v-model="form.tenderFile"/>
-        </el-form-item>
-        <el-form-item label="中标文件(单个)" prop="bidFile">
-          <file-upload v-model="form.bidFile"/>
-        </el-form-item>
-        <el-form-item label="合同额" prop="contract">
-          <el-input v-model="form.contract" placeholder="请输入合同额" />
+
+        <el-form-item label="中标通知书" prop="bidFile">
+          <file-upload v-model="form.bidFile" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -131,6 +172,30 @@
 <script setup name="Plan" lang="ts">
 import { listPlan, getPlan, delPlan, addPlan, updatePlan } from '@/api/plan/plan';
 import { PlanVO, PlanQuery, PlanForm } from '@/api/plan/plan/types';
+import { getCurrentInstance, onMounted, ref, reactive, toRefs, computed, watch } from 'vue';
+import type { ElFormInstance } from 'element-plus';
+import { useUserStoreHook } from '@/store/modules/user';
+import { UploadFilled } from '@element-plus/icons-vue';
+import type { UploadFile, UploadRawFile } from 'element-plus';
+// 导入文件上传接口（根据实际项目路径调整）
+import { uploadFile } from '@/api/plan/file';
+
+// 从用户Store获取当前选中项目及ID
+const userStore = useUserStoreHook();
+const currentProject = computed(() => userStore.selectedProject);
+const currentProjectId = computed(() => currentProject.value?.id);
+
+// 类型定义
+interface DialogOption {
+  visible: boolean;
+  title: string;
+}
+
+interface PageData<F, Q> {
+  form: F;
+  queryParams: Q;
+  rules: Record<string, any[]>;
+}
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -151,135 +216,287 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const initFormData: PlanForm = {
-  id: undefined,
-  subpackageType: undefined,
-  subpackageName: undefined,
-  subpackageContext: undefined,
+// 文件上传相关状态
+const fileUploadDialog = reactive({
+  visible: false,
+  title: '上传文件'
+});
+const fileList = ref<UploadFile[]>([]);
+const uploadLoading = ref(false);
+const selectedPlanId = ref<string | number>('');
+
+// 初始化表单数据
+const initFormData: PlanForm & { dictName?: string; content?: string } = {
+  id: '1958116259107012609',
+  projectId: currentProjectId.value,
+  plannedBiddingMethod: undefined,
+  price: undefined,
   limitPrice: undefined,
-  planTenderTime: undefined,
-  tenderMethod: undefined,
-  tenderFile: undefined,
+  contractPrice: undefined,
   bidFile: undefined,
-  contract: undefined,
-}
-const data = reactive<PageData<PlanForm, PlanQuery>>({
-  form: {...initFormData},
+  dictName: '1',
+  name: 'test1',
+  content: 'trhbhbt'
+};
+
+// 页面数据
+const data = reactive<PageData<typeof initFormData, PlanQuery & { dictName?: string; content?: string }>>({
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    subpackageType: undefined,
-    subpackageName: undefined,
-    subpackageContext: undefined,
+    projectId: currentProjectId.value,
+    dictName: undefined,
+    name: undefined,
+    plannedBiddingTime: undefined,
+    plannedBiddingMethod: undefined,
+    price: undefined,
     limitPrice: undefined,
-    planTenderTime: undefined,
-    tenderMethod: undefined,
-    tenderFile: undefined,
+    contractPrice: undefined,
+    content: undefined,
     bidFile: undefined,
-    contract: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    id: [
-      { required: true, message: "招标计划ID不能为空", trigger: "blur" }
-    ],
+    projectId: [{ required: true, message: '请输入项目ID', trigger: 'blur' }],
+    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+    plannedBiddingMethod: [{ required: true, message: '请输入招标方式', trigger: 'blur' }],
+    limitPrice: [{ required: true, message: '请输入限价', trigger: 'blur' }],
+    contractPrice: [{ required: true, message: '请输入合同额', trigger: 'blur' }],
+    content: [{ required: true, message: '请输入分包内容', trigger: 'blur' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
+// 监听当前项目ID变化
+watch(currentProjectId, (newVal) => {
+  queryParams.value.projectId = newVal;
+  if (!form.value.id) {
+    form.value.projectId = newVal;
+  }
+  getList();
+});
+
 /** 查询招标计划列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listPlan(queryParams.value);
-  planList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
+  try {
+    const res = await listPlan(queryParams.value);
+    planList.value = res.rows || [];
+    total.value = res.total || 0;
+  } catch (error) {
+    console.error('获取招标计划列表失败', error);
+    proxy?.$modal.msgError('获取招标计划列表失败');
+  } finally {
+    loading.value = false;
+  }
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData, projectId: currentProjectId.value };
   planFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
+  queryParams.value.projectId = currentProjectId.value;
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: PlanVO[]) => {
-  ids.value = selection.map(item => item.id);
-  single.value = selection.length != 1;
+  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?: PlanVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
-  const res = await getPlan(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = "修改招标计划";
-}
+  const _id = row?.id || ids.value[0];
+  if (!_id) {
+    proxy?.$modal.msgWarning('请选择需要修改的招标计划');
+    return;
+  }
+  try {
+    const res = await getPlan(_id);
+    Object.assign(form.value, res.data, {
+      id: res.data.id || initFormData.id,
+      dictName: res.data.dictName || initFormData.dictName,
+      content: res.data.content || initFormData.content,
+      projectId: res.data.projectId || currentProjectId.value
+    });
+    dialog.visible = true;
+    dialog.title = '修改招标计划';
+  } catch (error) {
+    console.error('获取招标计划详情失败', error);
+    proxy?.$modal.msgError('获取招标计划详情失败');
+  }
+};
 
 /** 提交按钮 */
 const submitForm = () => {
   planFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      if (form.value.id) {
-        await updatePlan(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await addPlan(form.value).finally(() =>  buttonLoading.value = false);
+      try {
+        if (!form.value.id && currentProjectId.value) {
+          form.value.projectId = currentProjectId.value;
+        }
+        if (form.value.id) {
+          await updatePlan(form.value);
+        } else {
+          await addPlan(form.value);
+        }
+        proxy?.$modal.msgSuccess('操作成功');
+        dialog.visible = false;
+        await getList();
+      } catch (error) {
+        console.error('操作失败', error);
+        proxy?.$modal.msgError('操作失败，请重试');
+      } finally {
+        buttonLoading.value = false;
       }
-      proxy?.$modal.msgSuccess("操作成功");
-      dialog.visible = false;
-      await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: PlanVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除招标计划编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
-  await delPlan(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
-  await getList();
-}
+  if (!_ids || (_ids instanceof Array && _ids.length === 0)) {
+    proxy?.$modal.msgWarning('请选择需要删除的招标计划');
+    return;
+  }
+  try {
+    await proxy?.$modal.confirm('是否确认删除选中的招标计划？');
+    await delPlan(_ids);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  } catch (error) {
+    console.error('删除失败', error);
+    if (error !== 'cancel') {
+      proxy?.$modal.msgError('删除失败，请重试');
+    }
+  }
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('plan/plan/export', {
-    ...queryParams.value
-  }, `plan_${new Date().getTime()}.xlsx`)
-}
+  proxy?.download(
+    'plan/plan/export',
+    {
+      ...queryParams.value
+    },
+    `plan_${new Date().getTime()}.xlsx`
+  );
+};
+
+/** 打开文件上传对话框 */
+const openFileUploadDialog = () => {
+  if (ids.value.length !== 1) {
+    proxy?.$modal.msgWarning('请选择单个招标计划进行文件上传');
+    return;
+  }
+  selectedPlanId.value = ids.value[0];
+  fileList.value = [];
+  fileUploadDialog.visible = true;
+};
+
+/** 处理文件上传 */
+const handleFileUpload = async (params: { file: UploadRawFile }) => {
+  const formData = new FormData();
+  formData.append('file', params.file);
+  formData.append('planId', selectedPlanId.value as string);
+
+  try {
+    const response = await uploadFile(formData);
+    return response;
+  } catch (error) {
+    console.error('文件上传失败', error);
+    throw error;
+  }
+};
+
+/** 提交文件上传 */
+const submitFileUpload = async () => {
+  if (fileList.value.length === 0) {
+    proxy?.$modal.msgWarning('请选择需要上传的文件');
+    return;
+  }
+
+  uploadLoading.value = true;
+  try {
+    for (const file of fileList.value) {
+      if (file.raw) {
+        await handleFileUpload({ file: file.raw });
+      }
+    }
+
+    proxy?.$modal.msgSuccess('文件上传成功');
+    fileUploadDialog.visible = false;
+    // 可以在这里刷新文件列表或页面数据
+  } catch (error) {
+    proxy?.$modal.msgError('文件上传失败');
+  } finally {
+    uploadLoading.value = false;
+  }
+};
+
+/** 取消文件上传 */
+const cancelFileUpload = () => {
+  fileList.value = [];
+  fileUploadDialog.visible = false;
+};
+
+/** 文件预览 */
+const handleFilePreview = (file: UploadFile) => {
+  console.log('预览文件:', file);
+  // 实现文件预览逻辑，例如：
+  // if (file.url) {
+  //   window.open(file.url);
+  // }
+};
+
+/** 移除文件 */
+const handleFileRemove = (file: UploadFile) => {
+  console.log('移除文件:', file);
+};
 
 onMounted(() => {
   getList();
 });
 </script>
+
+<style scoped lang="scss">
+.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 {
+  margin-left: 10px;
+}
+.upload-container {
+  padding: 10px 0;
+}
+</style>

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

---
 .env.development                              | 2 +-
 src/api/patch/index.ts                        | 2 +-
 src/views/progress/progressCategory/index.vue | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index 89cd31f..8849f99 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.210:8899'
+VITE_APP_BASE_API = 'http://192.168.110.213:8899'
 
 # 无人机接口地址
 
diff --git a/src/api/patch/index.ts b/src/api/patch/index.ts
index d8ad3e9..1c91045 100644
--- a/src/api/patch/index.ts
+++ b/src/api/patch/index.ts
@@ -94,7 +94,7 @@ export const editProgress = (data) => {
 // 删除进度
 export const deleteProgress = (id) => {
   return request({
-    url: `/removeProgress/{id}`,
+    url: `/patch/removeProgress/${id}`,
     method: 'delete'
   });
 };
diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue
index 54b6d72..8537361 100644
--- a/src/views/progress/progressCategory/index.vue
+++ b/src/views/progress/progressCategory/index.vue
@@ -98,7 +98,7 @@
             check-strictly
           />
         </el-form-item>
-        <el-form-item label="计量方式" prop="unitType" v-if="!form.parentId">
+        <el-form-item label="计量方式" prop="unitType" v-if="!form.id">
           <el-select v-model="form.unitType" placeholder="请选择关联数据">
             <el-option v-for="dict in progress_unit_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
@@ -115,12 +115,12 @@
         <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.parentId">
+        <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" />
           </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="remark" v-if="!form.parentId">
+        <el-form-item label="备注" prop="remark" v-if="!form.id">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
         <!-- <el-form-item label="总数量/百分比" prop="total">

From c8cc1a329b3cb3076958160fa699583892bacffa Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Thu, 21 Aug 2025 01:39:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/patch/index.vue               | 101 ++----
 src/views/tender/plan/comm/planPage.vue | 245 +++++++++++++++
 src/views/tender/plan/index.vue         | 389 +-----------------------
 3 files changed, 284 insertions(+), 451 deletions(-)
 create mode 100644 src/views/tender/plan/comm/planPage.vue

diff --git a/src/views/patch/index.vue b/src/views/patch/index.vue
index 1282df4..b068541 100644
--- a/src/views/patch/index.vue
+++ b/src/views/patch/index.vue
@@ -5,24 +5,9 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="项目ID" prop="projectId">
-              <el-input v-model="queryParams.projectId" placeholder="请输入项目ID" clearable @keyup.enter="handleQuery" v-if="false" />
-            </el-form-item>
             <el-form-item label="任务名称" prop="taskName">
               <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="任务描述" prop="describe">
-              <el-input v-model="queryParams.describe" placeholder="请输入任务描述" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="计划完成时间" prop="pcd">
-              <el-date-picker clearable v-model="queryParams.pcd" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划完成时间" />
-            </el-form-item>
-            <el-form-item label="实际完成时间" prop="act">
-              <el-date-picker clearable v-model="queryParams.act" type="date" value-format="YYYY-MM-DD" placeholder="请选择实际完成时间" />
-            </el-form-item>
-            <el-form-item label="完成进度" prop="completionProgress">
-              <el-input v-model="queryParams.completionProgress" 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>
@@ -31,7 +16,6 @@
         </el-card>
       </div>
     </transition>
-
     <!-- 任务列表卡片 -->
     <el-card shadow="never">
       <template #header>
@@ -39,21 +23,12 @@
           <el-col :span="1.5">
             <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="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['patch:patch:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['patch:patch:remove']"
-              >删除</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-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
-
       <!-- 任务列表表格 -->
       <el-table v-loading="loading" :data="masterList" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" />
@@ -91,22 +66,20 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+            <!-- <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['patch:patch:edit']"></el-button>
-            </el-tooltip>
+            </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-tooltip>
           </template>
         </el-table-column>
       </el-table>
-
       <!-- 进度详情弹窗 -->
       <el-dialog :title="`进度详情（当前总进度：${currentTotalProgress}%）`" v-model="progressDialogVisible" width="1000px" destroy-on-close>
         <div class="mb-4">
-          <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()" v-hasPermi="['patch:progress:add']">
-            新增进度
-          </el-button>
+          <!-- v-hasPermi="['patch:progress:add']" -->
+          <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()"> 新增进度 </el-button>
         </div>
         <el-table v-loading="progressLoading" :data="progressList" border empty-text="暂无进度数据" style="width: 100%">
           <el-table-column prop="slaveId" label="执行人ID" align="center" width="120" />
@@ -144,21 +117,12 @@
           </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-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.projectId" type="hidden" />
-          <!-- 修改执行人姓名选择框 -->
-          <el-form-item label="执行人姓名" prop="slaveName">
-            <el-select v-model="progressForm.slaveName" placeholder="请选择执行人姓名" clearable style="width: 100%" @change="handleSlaveChange">
-              <el-option v-for="item in slaveOptions" :key="item.id" :label="item.name" :value="item.name" :data-id="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-
           <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-form-item>
@@ -181,15 +145,14 @@
     <!-- 新增/修改任务弹窗 -->
     <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-form-item label="项目ID" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" />
-          <template #help>
-            <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
-          </template>
-        </el-form-item>
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </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-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-form-item>
@@ -197,10 +160,10 @@
           <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="请输入任务描述" rows="3" />
+          <el-input v-model="form.describe" type="textarea" placeholder="请输入任务描述" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="3" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -241,37 +204,17 @@ const userStore = useUserStoreHook();
 const currentProject = computed(() => userStore.selectedProject);
 const currentProjectId = computed(() => currentProject.value?.id);
 // 1. 调整类型定义，匹配接口返回的字段
-const slaveOptions = ref<Array<{ id: number; name: string }>>([]);
-// 在脚本中添加选择变化的处理函数
-const handleSlaveChange = (name) => {
-  // 找到选中的用户对象
-  const selectedUser = slaveOptions.value.find((item) => item.name === name);
-  if (selectedUser) {
-    // 自动填充userId到slaveId
-    progressForm.slaveId = selectedUser.id;
-  } else {
-    // 未选中时清空ID
-    progressForm.slaveId = '';
-  }
-};
-
+const slaveOptions = ref([]);
+const userMap = new Map();
 async function initSlaveOptions() {
   try {
     const response = await getUserName();
-    // 确保获取到正确的数组数据（接口返回在data字段中）
-    const userDataList = Array.isArray(response?.data) ? response.data : [];
-
-    // 转换数据结构，只提取需要的字段（userId作为id，nickName作为name）
-    slaveOptions.value = userDataList
-      .filter((item) => item?.userId && item?.nickName) // 过滤有效数据
-      .map((item) => ({
-        id: item.userId, // 使用userId作为选项的id
-        name: item.nickName // 使用nickName作为显示名称
-      }));
-
-    console.log('slaveOptions 已更新:', slaveOptions.value);
+    console.log(response);
+    slaveOptions.value = response.data;
+    slaveOptions.value.forEach((item) => {
+      userMap.set(item.userId, item.nickName);
+    });
   } catch (error) {
-    console.error('获取用户数据失败:', error);
     slaveOptions.value = []; // 错误时重置为空数组
   }
 }
@@ -344,7 +287,7 @@ const queryFormRef = ref<ElFormInstance>();
 const masterFormRef = ref<ElFormInstance>();
 const dialog = reactive<DialogOption>({ visible: false, title: '' });
 
-const initFormData: MasterForm = {
+const initFormData = {
   id: undefined,
   projectId: currentProjectId.value,
   taskName: undefined,
@@ -353,7 +296,9 @@ const initFormData: MasterForm = {
   act: undefined,
   completionProgress: undefined,
   taskStatus: undefined,
-  remark: undefined
+  remark: undefined,
+  userId: '',
+  userName: ''
 };
 
 const data = reactive<PageData<MasterForm, MasterQuery>>({
@@ -372,6 +317,7 @@ const data = reactive<PageData<MasterForm, MasterQuery>>({
   },
   rules: {
     projectId: [{ required: true, message: '请输入项目ID', trigger: 'blur' }],
+    userId: [{ required: true, message: '请选择执行人', trigger: 'blur' }],
     taskName: [{ required: true, message: '请输入任务名称', trigger: 'blur' }],
     completionProgress: [{ required: true, message: '请输入完成进度', trigger: 'blur' }]
   }
@@ -610,6 +556,7 @@ const submitForm = () => {
   masterFormRef.value?.validate(async (valid: boolean) => {
     if (!valid) return;
     buttonLoading.value = true;
+    form.value.userName = userMap.get(form.value.userId);
     try {
       // 确保提交时使用当前项目ID
       if (!form.value.id && currentProjectId.value) {
diff --git a/src/views/tender/plan/comm/planPage.vue b/src/views/tender/plan/comm/planPage.vue
new file mode 100644
index 0000000..b4b156c
--- /dev/null
+++ b/src/views/tender/plan/comm/planPage.vue
@@ -0,0 +1,245 @@
+<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="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 { 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 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 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) {
+        queryForm.value.versions = res.data[0];
+        getSheetName();
+      } else {
+        queryForm.value.versions = '';
+      }
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
+//选择版本号
+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: '请输入单价',
+        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();
+  }
+);
+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></style>
diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue
index 8a0e6f2..0a6ec44 100644
--- a/src/views/tender/plan/index.vue
+++ b/src/views/tender/plan/index.vue
@@ -1,386 +1,27 @@
 <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="dictName">
-              <el-input v-model="queryParams.dictName" placeholder="请输入分包类型名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="计划招标时间" prop="plannedBiddingTime">
-              <el-date-picker
-                clearable
-                v-model="queryParams.plannedBiddingTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择计划招标时间"
-              />
-            </el-form-item>
-            <el-form-item label="招标方式(公招，邀标)" prop="plannedBiddingMethod">
-              <el-input v-model="queryParams.plannedBiddingMethod" placeholder="请输入招标方式(公招，邀标)" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="总价" prop="price">
-              <el-input v-model="queryParams.price" placeholder="请输入总价" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="限价" prop="limitPrice">
-              <el-input v-model="queryParams.limitPrice" placeholder="请输入限价" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="合同额" prop="contractPrice">
-              <el-input v-model="queryParams.contractPrice" 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="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['plan:plan:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['plan:plan:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键ID" align="center" prop="id" v-if="false" />
-        <el-table-column label="项目Id" align="center" prop="projectId" v-if="false" />
-        <el-table-column label="分包类型名称" align="center" prop="dictName" />
-        <el-table-column label="名称" align="center" prop="name" />
-        <el-table-column label="计划招标时间" align="center" prop="plannedBiddingTime" width="180" v-if="false">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.plannedBiddingTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="招标方式(公招，邀标)" align="center" prop="plannedBiddingMethod" />
-        <el-table-column label="总价" align="center" prop="price" v-if="false" />
-        <el-table-column label="限价" align="center" prop="limitPrice" />
-        <el-table-column label="合同额" align="center" prop="contractPrice" />
-        <el-table-column label="分包内容" align="center" prop="content" />
-        <el-table-column label="中标通知书" align="center" prop="bidFile" />
-        <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="['plan:plan:edit']"></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" />
-    </el-card>
-    <!-- 添加或修改招标计划对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="planFormRef" :model="form" :rules="rules" label-width="120px">
-        <!-- 调整项目ID表单项：与目标代码一致，自动关联当前项目并显示提示 -->
-        <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>
-        <el-input v-model="form.id" placeholder="ID" readonly v-if="false" />
-        <el-form-item label="分包类型名称" prop="dictName" v-if="false">
-          <el-input v-model="form.dictName" placeholder="请输入分包类型名称" />
-        </el-form-item>
-
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
-        </el-form-item>
-
-        <el-form-item label="计划招标时间" prop="plannedBiddingTime" v-if="false">
-          <el-date-picker clearable v-model="form.plannedBiddingTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择计划招标时间" />
-        </el-form-item>
-
-        <el-form-item label="招标方式(公招，邀标)" prop="plannedBiddingMethod">
-          <el-input v-model="form.plannedBiddingMethod" placeholder="请输入招标方式(公招，邀标)" />
-        </el-form-item>
-
-        <el-form-item label="总价" prop="price" v-if="false">
-          <el-input v-model="form.price" placeholder="请输入总价" />
-        </el-form-item>
-
-        <el-form-item label="限价" prop="limitPrice">
-          <el-input v-model="form.limitPrice" placeholder="请输入限价" />
-        </el-form-item>
-
-        <el-form-item label="合同额" prop="contractPrice">
-          <el-input v-model="form.contractPrice" placeholder="请输入合同额" />
-        </el-form-item>
-
-        <el-form-item label="分包内容" prop="content">
-          <el-input v-model="form.content" type="textarea" placeholder="请输入分包内容" rows="3" />
-        </el-form-item>
-
-        <el-form-item label="中标通知书" prop="bidFile">
-          <file-upload v-model="form.bidFile" />
-        </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>
+    <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
+      <el-tab-pane label="招采工程量" name="first">
+        <planPage type="1" ref="planPageRef" />
+      </el-tab-pane>
+      <el-tab-pane type="2" label="物资设备清单" name="second"> <planPage /> </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
-<script setup name="Plan" lang="ts">
-import { listPlan, getPlan, delPlan, addPlan, updatePlan } from '@/api/plan/plan';
-import { PlanVO, PlanQuery, PlanForm } from '@/api/plan/plan/types';
-import { getCurrentInstance, onMounted, ref, reactive, toRefs, computed, watch } from 'vue';
-import type { ElFormInstance } from 'element-plus';
+<script setup lang="ts">
 import { useUserStoreHook } from '@/store/modules/user';
-
-// 1. 与目标代码一致：从用户Store获取当前选中项目及ID
-const userStore = useUserStoreHook();
-const currentProject = computed(() => userStore.selectedProject);
-const currentProjectId = computed(() => currentProject.value?.id);
-
-// 2. 类型定义（保持原有基础，新增projectId关联）
-interface DialogOption {
-  visible: boolean;
-  title: string;
-}
-
-interface PageData<F, Q> {
-  form: F;
-  queryParams: Q;
-  rules: Record<string, any[]>;
-}
-
+import { obtainAllVersionNumbers } from '@/api/contract/index';
+import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList } from '@/api/bidding/biddingLimit';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import planPage from './comm/planPage.vue';
 
-const planList = ref<PlanVO[]>([]);
-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);
+import type { TabsPaneContext } from 'element-plus';
+const activeName = ref('first');
 
-const queryFormRef = ref<ElFormInstance>();
-const planFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-// 3. 初始化表单数据：新增projectId，默认关联当前选中项目ID（与目标代码一致）
-const initFormData: PlanForm & { dictName?: string; content?: string } = {
-  id: '1958116259107012609',
-  projectId: currentProjectId.value, // 初始关联当前项目ID
-  plannedBiddingMethod: undefined,
-  price: undefined,
-  limitPrice: undefined,
-  contractPrice: undefined,
-  bidFile: undefined,
-  dictName: '1',
-  name: 'test1',
-  content: 'trhbhbt'
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+  console.log(tab, event);
 };
-
-// 4. 页面数据：查询参数默认携带当前项目ID（与目标代码一致）
-const data = reactive<PageData<typeof initFormData, PlanQuery & { dictName?: string; content?: string }>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    projectId: currentProjectId.value, // 查询参数默认关联当前项目
-    dictName: undefined,
-    name: undefined,
-    plannedBiddingTime: undefined,
-    plannedBiddingMethod: undefined,
-    price: undefined,
-    limitPrice: undefined,
-    contractPrice: undefined,
-    content: undefined,
-    bidFile: undefined,
-    params: {}
-  },
-  rules: {
-    projectId: [{ required: true, message: '请输入项目ID', trigger: 'blur' }], // 新增项目ID必填规则
-    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-    plannedBiddingMethod: [{ required: true, message: '请输入招标方式', trigger: 'blur' }],
-    limitPrice: [{ required: true, message: '请输入限价', trigger: 'blur' }],
-    contractPrice: [{ required: true, message: '请输入合同额', trigger: 'blur' }],
-    content: [{ required: true, message: '请输入分包内容', trigger: 'blur' }]
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-// 5. 与目标代码一致：监听当前项目ID变化，自动更新查询参数、表单数据并刷新列表
-watch(currentProjectId, (newVal) => {
-  // 更新查询参数的项目ID
-  queryParams.value.projectId = newVal;
-  // 新增状态下更新表单项目ID
-  if (!form.value.id) {
-    form.value.projectId = newVal;
-  }
-  // 重新加载列表
-  getList();
-});
-
-/** 查询招标计划列表 */
-const getList = async () => {
-  loading.value = true;
-  try {
-    const res = await listPlan(queryParams.value);
-    planList.value = res.rows || [];
-    total.value = res.total || 0;
-  } catch (error) {
-    console.error('获取招标计划列表失败', error);
-    proxy?.$modal.msgError('获取招标计划列表失败');
-  } finally {
-    loading.value = false;
-  }
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置：重置时保留当前项目ID（与目标代码一致） */
-const reset = () => {
-  form.value = { ...initFormData, projectId: currentProjectId.value };
-  planFormRef.value?.resetFields();
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作：保留当前项目ID（与目标代码一致） */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  queryParams.value.projectId = currentProjectId.value;
-  handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: PlanVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length !== 1;
-  multiple.value = !selection.length;
-};
-
-/** 修改按钮操作：回显数据时保留项目ID */
-const handleUpdate = async (row?: PlanVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  if (!_id) {
-    proxy?.$modal.msgWarning('请选择需要修改的招标计划');
-    return;
-  }
-  try {
-    const res = await getPlan(_id);
-    Object.assign(form.value, res.data, {
-      id: res.data.id || initFormData.id,
-      dictName: res.data.dictName || initFormData.dictName,
-      content: res.data.content || initFormData.content,
-      projectId: res.data.projectId || currentProjectId.value // 确保项目ID正确
-    });
-    dialog.visible = true;
-    dialog.title = '修改招标计划';
-  } catch (error) {
-    console.error('获取招标计划详情失败', error);
-    proxy?.$modal.msgError('获取招标计划详情失败');
-  }
-};
-
-/** 提交按钮：新增时强制携带当前项目ID（与目标代码一致） */
-const submitForm = () => {
-  planFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      try {
-        // 新增时强制使用当前选中项目ID
-        if (!form.value.id && currentProjectId.value) {
-          form.value.projectId = currentProjectId.value;
-        }
-        if (form.value.id) {
-          await updatePlan(form.value);
-        } else {
-          await addPlan(form.value);
-        }
-        proxy?.$modal.msgSuccess('操作成功');
-        dialog.visible = false;
-        await getList();
-      } catch (error) {
-        console.error('操作失败', error);
-        proxy?.$modal.msgError('操作失败，请重试');
-      } finally {
-        buttonLoading.value = false;
-      }
-    }
-  });
-};
-
-/** 删除按钮操作（原有逻辑不变） */
-const handleDelete = async (row?: PlanVO) => {
-  const _ids = row?.id || ids.value;
-  if (!_ids || (_ids instanceof Array && _ids.length === 0)) {
-    proxy?.$modal.msgWarning('请选择需要删除的招标计划');
-    return;
-  }
-  try {
-    await proxy?.$modal.confirm('是否确认删除选中的招标计划？');
-    await delPlan(_ids);
-    proxy?.$modal.msgSuccess('删除成功');
-    await getList();
-  } catch (error) {
-    console.error('删除失败', error);
-    if (error !== 'cancel') {
-      proxy?.$modal.msgError('删除失败，请重试');
-    }
-  }
-};
-
-/** 导出按钮操作（原有逻辑不变） */
-const handleExport = () => {
-  proxy?.download(
-    'plan/plan/export',
-    {
-      ...queryParams.value
-    },
-    `plan_${new Date().getTime()}.xlsx`
-  );
-};
-
-onMounted(() => {
-  getList();
-});
 </script>
 
-<style scoped lang="scss">
-.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 {
-  margin-left: 10px;
-}
-</style>
+<style scoped></style>

From 6dff42a6cbd5e21952030b85ee3f4ca4f5a907f1 Mon Sep 17 00:00:00 2001
From: Teo <2642673902@qq.com>
Date: Thu, 21 Aug 2025 02:25:39 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E5=8D=95=E6=89=BE=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/materials/purchaseDoc/index.vue | 31 +++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue
index 2154d87..0c70dce 100644
--- a/src/views/materials/purchaseDoc/index.vue
+++ b/src/views/materials/purchaseDoc/index.vue
@@ -109,6 +109,7 @@
               v-hasPermi="['cailiaoshebei:purchaseDoc:edit']"
               >修改</el-button
             >
+
             <el-button
               link
               type="primary"
@@ -118,6 +119,9 @@
               v-hasPermi="['cailiaoshebei:purchaseDoc:list']"
               >物流单分享</el-button
             >
+            <el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['cailiaoshebei:purchaseDoc:remove']"
+              >详情</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -239,13 +243,26 @@
         </span>
       </template>
     </el-dialog>
+    <el-dialog title="详情" v-model="detailBASEVisble" width="1000">
+      <div class="text-center">
+        <img :src="detailBASE" class="w200" />
+      </div>
+    </el-dialog>
     <logisticsDetail ref="logisticsDetailRef"></logisticsDetail>
   </div>
 </template>
 
 <script setup name="PurchaseDoc" lang="ts">
 import { getBatch, listBatch } from '@/api/materials/batchPlan';
-import { listPurchaseDoc, getPurchaseDoc, listLink, addPurchaseDoc, updatePurchaseDoc, logisticsDetial } from '@/api/materials/purchaseDoc';
+import {
+  listPurchaseDoc,
+  getPurchaseDoc,
+  listLink,
+  addPurchaseDoc,
+  updatePurchaseDoc,
+  logisticsDetial,
+  getDetailBASE
+} from '@/api/materials/purchaseDoc';
 import { PurchaseDocVO, PurchaseDocQuery, PurchaseDocForm } from '@/api/materials/purchaseDoc/types';
 import { listContractor } from '@/api/project/contractor';
 import { useUserStoreHook } from '@/store/modules/user';
@@ -281,7 +298,8 @@ const dialog = reactive<DialogOption>({
 });
 const batchOptions = ref([]);
 const supplierOptions = ref([]);
-
+const detailBASEVisble = ref(false);
+const detailBASE = ref<any>({});
 const planList = ref([]);
 const initFormData: any = {
   id: undefined,
@@ -366,6 +384,15 @@ const cancel = () => {
   dialog.visible = false;
 };
 
+const handleDetail = async (row?: PurchaseDocVO) => {
+  detailBASEVisble.value = true;
+
+  const res = await getDetailBASE(row.id);
+  detailBASE.value = res.data;
+
+  console.log('🚀 ~ handleDetail ~ res:', res);
+};
+
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };