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] 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>