合并

src/views/tender/plan/index.vue

@@ -3,7 +3,7 @@
     <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 ref="queryFormRef" :model="queryParams" :inline="true" label-width="110px">
             <el-form-item label="分包类型名称" prop="dictName">
               <el-input v-model="queryParams.dictName" placeholder="请输入分包类型名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -19,8 +19,11 @@
                 placeholder="请选择计划招标时间"
               />
             </el-form-item>
-            <el-form-item label="招标方式(公招，邀标)" prop="plannedBiddingMethod">
+            <el-form-item label="招标方式" prop="plannedBiddingMethod">
-              <el-input v-model="queryParams.plannedBiddingMethod" placeholder="请输入招标方式(公招，邀标)" clearable @keyup.enter="handleQuery" />
+              <el-select v-model="queryParams.plannedBiddingMethod" placeholder="请选择招标方式" clearable @change="handleQuery">
+                <el-option label="公招" value="公招"></el-option>
+                <el-option label="邀标" value="邀标"></el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="总价" prop="price">
               <el-input v-model="queryParams.price" placeholder="请输入总价" clearable @keyup.enter="handleQuery" />
@@ -68,7 +71,17 @@
             <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="plannedBiddingMethod">
+          <template #default="scope">
+            {{
+              ['1', 1].includes(scope.row.plannedBiddingMethod)
+                ? '公招'
+                : ['2', 2].includes(scope.row.plannedBiddingMethod)
+                ? '邀标'
+                : scope.row.plannedBiddingMethod || '-'
+            }}
+          </template>
+        </el-table-column>
         <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" />
@@ -157,8 +170,8 @@
         </el-form-item>
 
         <!-- 限价输入：添加@input事件，实时触发招标方式判断 -->
-        <el-form-item label="限价" prop="limitPrice">
+        <el-form-item label="限价(单位万元)" prop="limitPrice">
-          <el-input v-model.number="form.limitPrice" placeholder="请输入限价" type="number" @input="autoSetBiddingMethod" />
+          <el-input v-model.number="form.limitPrice" placeholder="请输入限价(单位万元)" type="number" @input="autoSetBiddingMethod" />
         </el-form-item>
 
         <el-form-item label="合同额" prop="contractPrice">

src/views/tender/supplierInput/index.vue

@@ -5,7 +5,7 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="企业登记注册类型" prop="supplierType">
+            <el-form-item label="企业登记注册类型" prop="supplierType" label-width="140px">
               <el-select v-model="queryParams.supplierType" placeholder="请选择类型" clearable>
                 <el-option label="劳务" value="劳务"></el-option>
                 <el-option label="技术服务" value="技术服务"></el-option>
@@ -63,7 +63,7 @@
 
       <!-- 数据表格 -->
       <el-table v-loading="loading" :data="supplierInputList" @selection-change="handleSelectionChange" border>
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="selection" width="100%" align="center" />
         <el-table-column label="ID" align="center" prop="id" width="80" />
         <el-table-column label="企业登记注册类型" align="center" prop="supplierType" width="140" />
         <el-table-column label="企业名称" align="center" prop="supplierName" width="180" />
@@ -82,7 +82,9 @@
         </el-table-column>
         <el-table-column label="入库资料" align="center" prop="inputFile" width="120">
           <template #default="scope">
-            <el-link v-if="scope.row.inputFile" :href="scope.row.inputFile" target="_blank" underline>查看文件</el-link>
+            <el-link v-if="scope.row.inputFile" :href="scope.row.inputFile" target="_blank" :style="{ textDecoration: 'none', color: '#409eff' }">
+              查看文件
+            </el-link>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
@@ -216,7 +218,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="发证日期" prop="issueDate">
-              <el-date-picker v-model="form.issueDate" type="date" placeholder="请选择发证日期" />
+              <el-date-picker v-model="form.issueDate" type="date" placeholder="请选择发证日期" value-format="YYYY-MM-DD" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -225,7 +227,7 @@
         <el-row :gutter="20" class="mb-4">
           <el-col :span="12">
             <el-form-item label="证书有效期" prop="certificateValidity">
-              <el-date-picker v-model="form.certificateValidity" type="date" placeholder="请选择证书有效期" />
+              <el-date-picker v-model="form.certificateValidity" type="date" placeholder="请选择证书有效期" value-format="YYYY-MM-DD" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -252,8 +254,8 @@
         <!-- 第十行：安全生产许可证有效期（仅劳务类型显示） -->
         <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
           <el-col :span="12">
-            <el-form-item label="安全生产许可证有效期" prop="safeCertificateValidity">
+            <el-form-item label="安全生产许可证发证日期" prop="safeCertificateValidity">
-              <el-input v-model="form.safeCertificateValidity" placeholder="请输入有效期" clearable />
+              <el-date-picker v-model="form.safeCertificateValidity" type="date" placeholder="请选择发证日期" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -285,17 +287,17 @@
         <!-- 第十二行：职称人员数量（仅劳务类型显示） -->
         <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
           <el-col :span="12">
-            <el-form-item label="职称人员数量" prop="personnelNumber1">
+            <el-form-item label="高级工程师人数" prop="personnelNumber1">
-              <el-input v-model="form.personnelNumber1" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber1" placeholder="请输高级工程师数量" clearable />
             </el-form-item>
-            <el-form-item label="职称人员数量" prop="personnelNumber2">
+            <el-form-item label="工程师数量" prop="personnelNumber2">
-              <el-input v-model="form.personnelNumber2" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber2" placeholder="请输入工程师数量" clearable />
             </el-form-item>
-            <el-form-item label="职称人员数量" prop="personnelNumber3">
+            <el-form-item label="助理工程师数量" prop="personnelNumber3">
-              <el-input v-model="form.personnelNumber3" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber3" placeholder="请输入助理工程师数量" clearable />
             </el-form-item>
-            <el-form-item label="职称人员数量" prop="personnelNumber4">
+            <el-form-item label="其他人员数量" prop="personnelNumber4">
-              <el-input v-model="form.personnelNumber4" placeholder="请输入职称人员数量" clearable />
+              <el-input v-model="form.personnelNumber4" placeholder="请输入其他人员数量" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -303,22 +305,6 @@
           </el-col>
         </el-row>
 
-        <!-- 第十三行：审核状态 -->
-        <el-row :gutter="20" class="mb-4">
-          <el-col :span="12">
-            <!-- 空列占位，保持布局对称 -->
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="审核状态" prop="state" v-if="dialog.title === '修改供应商入库'">
-              <el-select v-model="form.state" disabled>
-                <el-option label="待审核" value="0"></el-option>
-                <el-option label="已通过" value="1"></el-option>
-                <el-option label="未通过" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <!-- 第十四行：入库资料上传 -->
         <el-row class="mb-4">
           <el-col :span="24">
@@ -347,7 +333,7 @@
                   >
                     <li style="margin-top: 10px" class="el-upload-list__item ele-upload-list__item-content">
                       <el-link :href="`${fileUrl}`" :underline="false" target="_blank">
-                        <el-button class="el-icon-document"> 下载文件 </el-button>
+                        <el-button class="el-icon-document"> 查看文件 </el-button>
                       </el-link>
                     </li>
                   </transition-group>
@@ -372,7 +358,7 @@
 <script setup name="SupplierInput" lang="ts">
 import { ComponentInternalInstance, getCurrentInstance, onMounted, ref, reactive, toRefs, computed } from 'vue';
 import { ElFormInstance } from 'element-plus';
-import { listSupplierInput, getSupplierInput, delSupplierInput, addSupplierInput, updateSupplierInput } from '@/api/supplierInput/supplierInput';
+import { listSupplierInput, getSupplierInput, delSupplierInput } from '@/api/supplierInput/supplierInput';
 import { SupplierInputVO, SupplierInputQuery, SupplierInputForm, PageData, DialogOption } from '@/api/supplierInput/supplierInput/types';
 import Pagination from '@/components/Pagination/index.vue';
 import RightToolbar from '@/components/RightToolbar/index.vue';
@@ -403,7 +389,7 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-// 初始化表单数据
+// 初始化表单数据：新增build1-build4、personnelNumber1-personnelNumber4字段（用于拆分拼接字符串）
 const initFormData: any = {
   id: undefined,
   supplierType: undefined,
@@ -425,13 +411,21 @@ const initFormData: any = {
   safeCode: undefined,
   safeCodeData: undefined,
   safeCertificateValidity: undefined,
-  registeredNumber: undefined,
+  registeredNumber: undefined, // 后端返回的拼接字符串（如“1,2,3,4”）
-  personnelNumber: undefined,
+  personnelNumber: undefined, // 后端返回的拼接字符串（如“5,6,7,8”）
   fileId: undefined,
   inputFile: undefined,
-  state: '0' // 新增默认待审核
+  state: '0', // 新增默认待审核
+  // 新增：用于表单输入的单独字段
+  build1: undefined, // 一建建造师
+  build2: undefined, // 二建建造师
+  build3: undefined, // 注册造价工程师
+  build4: undefined, // 其他注册人员
+  personnelNumber1: undefined, // 高级工程师
+  personnelNumber2: undefined, // 工程师
+  personnelNumber3: undefined, // 助理工程师
+  personnelNumber4: undefined // 其他职称人员
 };
-
 // 核心数据（表单+查询参数）
 const data = reactive<PageData<SupplierInputForm, SupplierInputQuery>>({
   form: { ...initFormData },
@@ -442,6 +436,8 @@ const data = reactive<PageData<SupplierInputForm, SupplierInputQuery>>({
     supplierName: undefined,
     state: undefined,
     inputFile: undefined,
+    registeredNumber: undefined,
+    personnelNumber: undefined,
     params: {}
   }
 });
@@ -462,7 +458,14 @@ const rules = computed(() => {
       { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
     ],
     id: [{ required: true, message: 'ID不能为空', trigger: 'blur' }],
-    build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }]
+    build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }],
+    build2: [{ required: true, message: '请输入二建建造师数量', trigger: 'change' }],
+    build3: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'change' }],
+    build4: [{ required: true, message: '请输入其他数量', trigger: 'change' }],
+    personnelNumber1: [{ required: true, message: '请输入高级工程师数量', trigger: 'change' }],
+    personnelNumber2: [{ required: true, message: '请输入工程师数量', trigger: 'change' }],
+    personnelNumber3: [{ required: true, message: '请输入助理工程师数量', trigger: 'change' }],
+    personnelNumber4: [{ required: true, message: '请输入其他数量', trigger: 'change' }]
   };
 
   // 仅当类型为"劳务"时，添加安全生产许可证+人员数量校验
@@ -472,10 +475,17 @@ const rules = computed(() => {
       // 安全生产许可证相关校验
       safeCode: [{ required: true, message: '请输入安全生产许可证编号', trigger: 'blur' }],
       safeCodeData: [{ required: true, message: '请选择安全生产许可证发证日期', trigger: 'change' }],
-      safeCertificateValidity: [{ required: true, message: '请输入安全生产许可证有效期', trigger: 'blur' }],
+      safeCertificateValidity: [{ required: true, message: '请选择安全生产许可证有效期', trigger: 'change' }],
-      // 人员数量相关校验
+      // 注册人员数量校验
-      registeredNumber: [{ required: true, message: '请输入注册人员数量', trigger: 'blur' }]
+      build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'blur' }],
-      // personnelNumber: [{ required: true, message: '请输入职称人员数量', trigger: 'blur' }]
+      build2: [{ required: true, message: '请输入二建建造师数量', trigger: 'blur' }],
+      build3: [{ required: true, message: '请输入注册造价工程师数量', trigger: 'blur' }],
+      build4: [{ required: true, message: '请输入其他注册人员数量', trigger: 'blur' }],
+      // 职称人员数量校验
+      personnelNumber1: [{ required: true, message: '请输入高级工程师数量', trigger: 'blur' }],
+      personnelNumber2: [{ required: true, message: '请输入工程师数量', trigger: 'blur' }],
+      personnelNumber3: [{ required: true, message: '请输入助理工程师数量', trigger: 'blur' }],
+      personnelNumber4: [{ required: true, message: '请输入其他职称人员数量', trigger: 'blur' }]
     };
   }
 
@@ -491,9 +501,24 @@ const handleTypeChange = () => {
     form.value.safeCertificateValidity = undefined;
     form.value.registeredNumber = undefined;
     form.value.personnelNumber = undefined;
+    // 清空表单单独字段
+    form.value.build1 = form.value.build2 = form.value.build3 = form.value.build4 = undefined;
+    form.value.personnelNumber1 = form.value.personnelNumber2 = form.value.personnelNumber3 = form.value.personnelNumber4 = undefined;
   }
   // 重置隐藏字段的校验状态，避免错误提示残留
-  supplierInputFormRef.value?.clearValidate(['safeCode', 'safeCodeData', 'safeCertificateValidity', 'registeredNumber', 'personnelNumber']);
+  supplierInputFormRef.value?.clearValidate([
+    'safeCode',
+    'safeCodeData',
+    'safeCertificateValidity',
+    'build1',
+    'build2',
+    'build3',
+    'build4',
+    'personnelNumber1',
+    'personnelNumber2',
+    'personnelNumber3',
+    'personnelNumber4'
+  ]);
 };
 
 /** 查询供应商入库列表 */
@@ -536,14 +561,23 @@ const resetQuery = () => {
   handleQuery();
 };
 
-/** 文件上传成功回调 */
+const splitBackEndStrToForm = (resData: any) => {
-// const handleUploadSuccess = () => {
+  if (resData.registeredNumber) {
-//   proxy?.$modal.msgSuccess('操作成功');
+    const registeredArr = resData.registeredNumber.split(',');
-//   dialog.visible = false;
+    form.value.build1 = registeredArr[0] || undefined; // 一建建造师
-//   buttonLoading.value = false;
+    form.value.build2 = registeredArr[1] || undefined; // 二建建造师
-//   getList();
+    form.value.build3 = registeredArr[2] || undefined; // 注册造价工程师
-// };
+    form.value.build4 = registeredArr[3] || undefined; // 其他注册人员
+  }
 
+  if (resData.personnelNumber) {
+    const personnelArr = resData.personnelNumber.split(',');
+    form.value.personnelNumber1 = personnelArr[0] || undefined; // 高级工程师
+    form.value.personnelNumber2 = personnelArr[1] || undefined; // 工程师
+    form.value.personnelNumber3 = personnelArr[2] || undefined; // 助理工程师
+    form.value.personnelNumber4 = personnelArr[3] || undefined; // 其他职称人员
+  }
+};
 /** 文件选择变更 */
 const change = () => {
   fileUrl.value = '';
@@ -563,7 +597,6 @@ const handleAdd = () => {
   dialog.title = '添加供应商入库';
 };
 
-/** 修改操作 */
 const handleUpdate = async (row?: SupplierInputVO) => {
   reset();
   const _id = row?.id || ids.value[0];
@@ -571,8 +604,14 @@ const handleUpdate = async (row?: SupplierInputVO) => {
 
   try {
     const res = await getSupplierInput(_id);
-    form.value = { ...form.value, ...res.data, inputFile: '' };
+    const resData = res.data || {};
-    fileUrl.value = res.data.inputFile;
+    // 1. 基础字段回显
+    form.value = { ...form.value, ...resData, inputFile: '' };
+    // 2. 核心修复：拆分后端拼接字符串到表单单独字段
+    splitBackEndStrToForm(resData);
+    // 3. 文件地址回显
+    fileUrl.value = resData.inputFile || '';
+    // 4. 打开对话框
     dialog.visible = true;
     dialog.title = '修改供应商入库';
   } catch (error) {
@@ -586,8 +625,15 @@ const submitForm = () => {
 
   supplierInputFormRef.value?.validate(async (valid: boolean) => {
     if (!valid) return;
-    form.value.registeredNumber = `${form.value.build1},${form.value.build2},${form.value.build3},${form.value.build4}`;
+    if (form.value.supplierType === '劳务') {
-    form.value.personnelNumber = `${form.value.personnelNumber1},${form.value.personnelNumber2},${form.value.personnelNumber3},${form.value.personnelNumber4}`;
+      form.value.registeredNumber = [form.value.build1, form.value.build2, form.value.build3, form.value.build4].join(',');
+      form.value.personnelNumber = [
+        form.value.personnelNumber1,
+        form.value.personnelNumber2,
+        form.value.personnelNumber3,
+        form.value.personnelNumber4
+      ].join(',');
+    }
     buttonLoading.value = true;
     try {
       if (fileUploadRef.value) {