优化

.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 
 # 无人机接口地址
 

src/components/FileUpload/index.vue

@@ -1,11 +1,28 @@
 <template>
   <div class="upload-file">
-    <el-upload ref="fileUploadRef" multiple :action="realUploadUrl" :before-upload="handleBeforeUpload"
+    <el-upload
-      :file-list="fileList" :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed"
+      ref="fileUploadRef"
-      :on-success="handleUploadSuccess" :show-file-list="showFileList" :headers="headers" class="upload-file-uploader"
+      multiple
-      :list-type="isConstruction ? 'picture-card' : 'text'" :accept="accept" :drag="isDarg" :data="data"
+      :action="realUploadUrl"
-      :auto-upload="autoUpload" :on-change="handleChange" :on-remove="handleRemove" :method="method"
+      :before-upload="handleBeforeUpload"
-      :http-request="customUpload">
+      :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"
+          <transition-group
-            class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul" @click.stop>
+            v-if="!isConstruction && !isImportInfo"
-            <li style="margin-top: 10px" v-for="(file, index) in fileList" :key="file.uid"
+            class="upload-file-list el-upload-list el-upload-list--text"
-              class="el-upload-list__item ele-upload-list__item-content">
+            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, () => {
+watch(
+  () => props.defaultFileList,
+  () => {
     if (props.defaultFileList.length === 0) return;
     props.defaultFileList.forEach((item: any) => {
       fileList.value.push(item);
     });
-
+  },
-}, { deep: true, immediate: true });
+  { deep: true, immediate: true }
+);
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: any) => {
   // 校检文件类型

src/views/biddingManagemen/biddingLimit/index.vue

@@ -32,7 +32,7 @@
           <el-form-item>
             <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
           </el-form-item>
-          <el-form-item>
+          <!-- <el-form-item>
             <el-button
               type="primary"
               v-if="versionObj.status == 'draft' || versionObj.status == 'back'"
@@ -51,7 +51,7 @@
               v-if="versionObj.status != 'draft'"
               >查看流程</el-button
             >
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
       </el-card>
     </transition>

src/views/biddingManagemen/listOfWinningBids/index.vue

@@ -89,8 +89,106 @@
           </el-col>
           <!-- 中标通知书（必填，仅中标时显示） -->
           <el-col :span="12" v-if="form.whetherBid == '0'">
-            <el-form-item label="中标通知书" prop="bidFile" class="rounded-lg border border-gray-100 p-1 mb-5">
+            <el-form-item label="中标通知书" prop="bidFileId" 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-upload
+                ref="upload"
+                class="upload-demo"
+                action="http://192.168.110.149:8899/resource/oss/upload"
+                :limit="1"
+                :on-exceed="handleExceed"
+                :on-success="handleUploadSuccess"
+                :file-list="fileList"
+                :auto-upload="true"
+                :headers="headers"
+              >
+                <template #trigger>
+                  <el-button type="primary">上传文件</el-button>
+                </template>
+                <template #tip>
+                  <div class="el-upload__tip text-red">上传pdf文件，仅支持.pdf文件</div>
+                </template>
+              </el-upload> -->
+              <file-upload @onUploadSuccess="handleUploadSuccess" v-model="form.bidFileId" :limit="1" :file-type="['pdf']" :file-size="50" />
+            </el-form-item>
+          </el-col>
+          <!-- 招标代理机构 -->
+          <el-col :span="12">
+            <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="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-col>
+          <!-- 投标截止时间 -->
+          <el-col :span="12">
+            <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="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="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="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="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="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="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" rows="3" placeholder="请输入项目概况" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -122,14 +220,20 @@ 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();
 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,
@@ -151,17 +255,29 @@ const projectInfo = reactive({
 const listOfWinningBidsFormRef = ref<ElFormInstance>();
 const buttonLoading = ref(false);
 const isDisabled = ref(false);
-
+const fileObj = ref({
-// 表单初始数据
+  bidFile: undefined,
+  bidFileName: undefined
+});
+// 表单初始数据（新增招标相关参数）
 const initFormData = {
   id: undefined,
   projectId: currentProject.value?.id,
   whetherBid: '1', // 是否中标：0=中标，1=未中标
   bidPrice: undefined, // 中标价（人民币）
-  bidFile: 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: {
@@ -187,7 +303,7 @@ const data = reactive({
       }
     ],
     // 中标通知书：仅中标时必填
-    bidFile: [
+    bidFileId: [
       {
         required: true,
         message: '请上传中标通知书',
@@ -199,7 +315,25 @@ const data = reactive({
           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>
 });
 
@@ -213,7 +347,18 @@ const getDictLabel = (dictList: any[], value: any) => {
   const dictItem = dictList.find((item) => item.value === value);
   return dictItem ? dictItem.label : '';
 };
+const handleUploadSuccess = (val) => {
+  fileObj.value.bidFile = val.url;
+  fileObj.value.bidFileName = val.fileName;
+};
+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查询已有记录）
  */
@@ -221,6 +366,7 @@ const initData = async () => {
   try {
     if (currentProject.value?.id) {
       const res = await listListOfWinningBids({ projectId: currentProject.value.id });
+      console.log(res);
       if (res.code === 200) {
         resetForm();
         if (res.data) {
@@ -240,7 +386,7 @@ const initData = async () => {
 /**
  * 提交表单（含项目信息更新+中标信息提交）
  */
-const submitForm = () => {
+const submitForm = async () => {
   listOfWinningBidsFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
@@ -248,26 +394,10 @@ const submitForm = () => {
         // 1. 同步项目ID和名称
         form.value.projectId = currentProject.value?.id;
         form.value.projectName = projectInfo.projectName;
-
+        await addListOfWinningBids({ ...form.value, ...projectInfo });
-        // 2. 更新项目基础信息（若有变更）
-        if (currentProject.value?.id) {
-          await updateProject({ id: currentProject.value.id, ...projectInfo });
-        }
-
-        // 3. 提交中标信息（新增/编辑）
-        const isEdit = !!form.value.id;
-        if (isEdit) {
-          await updateListOfWinningBids(form.value);
-        } else {
-          await addListOfWinningBids(form.value);
-        }
-
         // 4. 提交成功后切换为查看状态
         isDisabled.value = true;
-        ElMessage.success(isEdit ? '编辑成功' : '提交成功');
+        ElMessage.success('提交成功');
-      } catch (error) {
-        ElMessage.error('提交失败，请重试');
-        console.error('提交表单失败:', error);
       } finally {
         buttonLoading.value = false;
       }
@@ -282,6 +412,7 @@ const getProjectDetail = async () => {
   try {
     if (currentProject.value?.id) {
       const res = await getProject(currentProject.value.id);
+
       Object.assign(projectInfo, res.data);
     }
   } catch (error) {