合并

src/api/plan/plan/index.ts

@@ -51,13 +51,9 @@ export const updatePlan = (data: PlanForm) => {
   });
 };
 
-/**
+export const getSegmentedIndicatorPlanning = (id) => {
- * 删除招标计划
- * @param id
- */
-export const delPlan = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/plan/plan/' + id,
+    url: '/tender/segmentedIndicatorPlanning/' + id,
-    method: 'delete'
+    method: 'get'
   });
 };

src/components/FileUpload/index.vue

@@ -360,6 +360,8 @@ const customUpload = async (options: any) => {
       });
       handleUploadSuccess(res.data, options.file);
     } catch (err) {
+      console.log(err, 'err');
+
       handleUploadError();
     }
   } else {

src/views/patch/index.vue

@@ -82,7 +82,6 @@
           <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" />
           <el-table-column prop="slaveName" label="执行人姓名" align="center" width="150" />
           <el-table-column prop="progress" label="进度" align="center" width="120" />
           <el-table-column prop="remark" label="备注" align="center" />
@@ -145,6 +144,12 @@
     <!-- 新增/修改任务弹窗 -->
     <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">
+        <<<<<<< HEAD =======
+        <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>
+        >>>>>>> 4511145f52e1caf07eea31e374583c6602fdfcfc
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>

src/views/tender/supplierInput/index.vue

@@ -1,18 +1,26 @@
 <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="supplierType">
-            <el-form-item label="供应商名称" prop="supplierName">
+              <el-select v-model="queryParams.supplierType" placeholder="请选择类型" clearable>
-              <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" maxlength="50" />
+                <el-option label="劳务" value="劳务"></el-option>
+                <el-option label="技术服务" value="技术服务"></el-option>
+                <el-option label="物资设备" value="物资设备"></el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item label="供应商负责人" prop="supplierPerson">
+            <el-form-item label="企业名称" prop="supplierName">
-              <el-input v-model="queryParams.supplierPerson" placeholder="请输入负责人" maxlength="20" />
+              <el-input v-model="queryParams.supplierName" placeholder="请输入企业名称" clearable style="width: 200px" />
             </el-form-item>
-            <el-form-item label="负责人电话" prop="personPhone">
+            <el-form-item label="审核状态" prop="state">
-              <el-input v-model="queryParams.personPhone" placeholder="请输入负责人电话" maxlength="11" />
+              <el-select v-model="queryParams.state" placeholder="请选择状态" clearable>
+                <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-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -23,6 +31,7 @@
       </div>
     </transition>
 
+    <!-- 列表及操作区域 -->
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
@@ -52,27 +61,31 @@
         </el-row>
       </template>
 
-      <!-- 表格：新增3个字段列 -->
+      <!-- 数据表格 -->
-      <el-table v-loading="loading" :data="supplierInputList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="supplierInputList" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="55" align="center" />
-
+        <el-table-column label="ID" align="center" prop="id" width="80" />
-        <el-table-column label="供应商名称" align="center" prop="supplierName" width="180" />
+        <el-table-column label="企业登记注册类型" align="center" prop="supplierType" width="140" />
-        <el-table-column label="供应商负责人" align="center" prop="supplierPerson" width="150" />
+        <el-table-column label="企业名称" align="center" prop="supplierName" width="180" />
-        <el-table-column label="负责人电话" align="center" prop="personPhone" width="150" />
+        <el-table-column label="法定代表人" align="center" prop="supplierPerson" width="120" />
-        <el-table-column label="供应商类型" align="center" prop="supplierType" width="150" />
+        <el-table-column label="统一社会信用代码" align="center" prop="supplierCode" width="180" />
-        <el-table-column label="状态" align="center" prop="state" width="150">
+        <el-table-column label="负责人" align="center" prop="personName" width="100" />
+        <el-table-column label="负责人电话" align="center" prop="personPhone" width="120" />
+        <el-table-column label="纳税规模" align="center" prop="taxScale" width="120" />
+        <el-table-column label="资质等级" align="center" prop="supplierLivel" width="120" />
+        <el-table-column label="审核状态" align="center" prop="state" width="120">
           <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.state"></dict-tag>
+            <el-tag :type="scope.row.state === '1' ? 'success' : scope.row.state === '2' ? 'danger' : 'warning'">
+              {{ scope.row.state === '1' ? '已通过' : scope.row.state === '2' ? '未通过' : '待审核' }}
+            </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="入库资料" align="center" prop="inputFile" width="200">
+        <el-table-column label="入库资料" align="center" prop="inputFile" width="120">
           <template #default="scope">
-            <el-link :href="scope.row.inputFile" :underline="false" target="_blank" v-if="scope.row.inputFile">
+            <el-link v-if="scope.row.inputFile" :href="scope.row.inputFile" target="_blank" underline>查看文件</el-link>
-              <el-button size="mini" class="el-icon-document">查看文件</el-button>
-            </el-link>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button
@@ -96,42 +109,227 @@
         </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>
 
-    <!-- 新增/修改对话框：添加3个字段表单 -->
+    <!-- 新增/修改对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
-      <el-form ref="supplierInputFormRef" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="supplierInputFormRef" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="供应商名称" prop="supplierName">
+        <!-- 第一行：基础信息（2列布局） -->
-          <el-input v-model="form.supplierName" placeholder="请输入供应商名称" maxlength="50" />
+        <el-row :gutter="20" class="mb-4">
-        </el-form-item>
+          <el-col :span="12">
-        <el-form-item label="供应商负责人" prop="supplierPerson">
+            <el-form-item label="企业登记注册类型" prop="supplierType">
-          <el-input v-model="form.supplierPerson" placeholder="请输入供应商负责人" maxlength="20" />
+              <el-select v-model="form.supplierType" placeholder="请选择供应商类型" @change="handleTypeChange">
-        </el-form-item>
-        <el-form-item label="负责人电话" prop="personPhone">
-          <el-input v-model="form.personPhone" placeholder="请输入负责人电话" maxlength="11" />
-        </el-form-item>
-        <el-form-item label="供应商类型" prop="supplierType">
-          <el-select v-model="form.supplierType" placeholder="请选择供应商类型">
                 <el-option label="劳务" value="劳务"></el-option>
                 <el-option label="技术服务" value="技术服务"></el-option>
                 <el-option label="物资设备" value="物资设备"></el-option>
               </el-select>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业名称" prop="supplierName">
+              <el-input v-model="form.supplierName" placeholder="请输入企业名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第二行：企业信息 -->
+        <el-row :gutter="20" class="mb-4">
+          <el-col :span="12">
+            <el-form-item label="企业法定代表人" prop="supplierPerson">
+              <el-input v-model="form.supplierPerson" placeholder="请输入法定代表人" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码" prop="supplierCode">
+              <el-input v-model="form.supplierCode" placeholder="请输入统一社会信用代码" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第三行：地址与联系人 -->
+        <el-row :gutter="20" class="mb-4">
+          <el-col :span="12">
+            <el-form-item label="企业注册地址" prop="supplierAddres">
+              <el-input v-model="form.supplierAddres" placeholder="请输入注册地址" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人姓名" prop="personName">
+              <el-input v-model="form.personName" placeholder="请输入负责人姓名" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第四行：联系电话与纳税规模 -->
+        <el-row :gutter="20" class="mb-4">
+          <el-col :span="12">
+            <el-form-item label="负责人联系电话" prop="personPhone">
+              <el-input v-model="form.personPhone" placeholder="请输入联系电话" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="纳税规模" prop="taxScale">
+              <el-select v-model="form.taxScale" placeholder="请选择纳税规模">
+                <el-option label="一般纳税人" value="一般纳税人"></el-option>
+                <el-option label="小规模纳税人" value="小规模纳税人"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第五行：银行信息 -->
+        <el-row :gutter="20" class="mb-4">
+          <el-col :span="12">
+            <el-form-item label="开户行户名" prop="bankPersonName">
+              <el-input v-model="form.bankPersonName" placeholder="请输入开户行户名" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户银行" prop="bankName">
+              <el-input v-model="form.bankName" placeholder="请输入开户银行" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第六行：银行账号与经营范围 -->
+        <el-row :gutter="20" class="mb-4">
+          <el-col :span="12">
+            <el-form-item label="开户行账号" prop="bankAccount">
+              <el-input v-model="form.bankAccount" placeholder="请输入开户行账号" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经营范围" prop="scope">
+              <el-input v-model="form.scope" placeholder="请输入经营范围" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第七行：企业资质 -->
+        <el-row :gutter="20" class="mb-4">
+          <el-col :span="12">
+            <el-form-item label="企业资质等级" prop="supplierLivel">
+              <el-input v-model="form.supplierLivel" placeholder="请输入资质等级" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发证日期" prop="issueDate">
+              <el-date-picker v-model="form.issueDate" type="date" placeholder="请选择发证日期" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第八行：证书有效期与营业额 -->
+        <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-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="近三年营业额" prop="pastThreeYears">
+              <el-input v-model="form.pastThreeYears" placeholder="请输入近三年营业额" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第九行：安全生产许可证（仅劳务类型显示） -->
+        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
+          <el-col :span="12">
+            <el-form-item label="安全生产许可证编号" prop="safeCode">
+              <el-input v-model="form.safeCode" placeholder="请输入许可证编号" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安全生产许可证发证日期" prop="safeCodeData">
+              <el-date-picker v-model="form.safeCodeData" type="date" placeholder="请选择发证日期" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第十行：安全生产许可证有效期（仅劳务类型显示） -->
+        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
+          <el-col :span="12">
+            <el-form-item label="安全生产许可证有效期" prop="safeCertificateValidity">
+              <el-input v-model="form.safeCertificateValidity" placeholder="请输入有效期" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <!-- 空列占位 -->
+          </el-col>
+        </el-row>
+
+        <!-- 第十一行：注册人员数量（仅劳务类型显示） -->
+        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
+          <el-col :span="12">
+            <el-form-item label="一建建造师" prop="build1">
+              <el-input v-model="form.build1" placeholder="请输入一建建造师数量" clearable />
+            </el-form-item>
+            <el-form-item label="二建建造师" prop="build2">
+              <el-input v-model="form.build2" placeholder="请输入二建建造师数量" clearable />
+            </el-form-item>
+            <el-form-item label="注册造价工程师" prop="build3">
+              <el-input v-model="form.build3" placeholder="请输入注册造价工程师数量" clearable />
+            </el-form-item>
+            <el-form-item label="其他（分别写）" prop="build4">
+              <el-input v-model="form.build4" placeholder="请输入其他人员数量" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <!-- 空列占位 -->
+          </el-col>
+        </el-row>
+
+        <!-- 第十二行：职称人员数量（仅劳务类型显示） -->
+        <el-row :gutter="20" class="mb-4" v-if="form.supplierType === '劳务'">
+          <el-col :span="12">
+            <el-form-item label="职称人员数量" prop="personnelNumber1">
+              <el-input v-model="form.personnelNumber1" placeholder="请输入职称人员数量" clearable />
+            </el-form-item>
+            <el-form-item label="职称人员数量" prop="personnelNumber2">
+              <el-input v-model="form.personnelNumber2" placeholder="请输入职称人员数量" clearable />
+            </el-form-item>
+            <el-form-item label="职称人员数量" prop="personnelNumber3">
+              <el-input v-model="form.personnelNumber3" placeholder="请输入职称人员数量" clearable />
+            </el-form-item>
+            <el-form-item label="职称人员数量" prop="personnelNumber4">
+              <el-input v-model="form.personnelNumber4" placeholder="请输入职称人员数量" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <!-- 空列占位 -->
+          </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">
             <el-form-item label="入库资料" prop="inputFile">
               <file-upload
                 v-model="form.inputFile"
-            :fileType="['pdf']"
+                :fileType="['doc', 'docx', 'pdf']"
                 :autoUpload="false"
                 ref="fileUploadRef"
                 :method="form.id ? 'put' : 'post'"
-            :data="{
+                :data="form"
-              supplierType: form.supplierType,
-              supplierName: form.supplierName,
-              supplierPerson: form.supplierPerson,
-              personPhone: form.personPhone,
-              id: form.id
-            }"
                 uploadUrl="/supplierInput/supplierInput"
                 :limit="1"
                 :onUploadSuccess="handleUploadSuccess"
@@ -156,7 +354,11 @@
                 </div>
               </file-upload>
             </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
+      <!-- 对话框底部按钮 -->
       <template #footer>
         <div class="dialog-footer">
           <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -168,22 +370,23 @@
 </template>
 
 <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 { SupplierInputVO, SupplierInputQuery, SupplierInputForm } from '@/api/supplierInput/supplierInput/types';
+import { SupplierInputVO, SupplierInputQuery, SupplierInputForm, PageData, DialogOption } from '@/api/supplierInput/supplierInput/types';
-
+import Pagination from '@/components/Pagination/index.vue';
-// 补充类型定义（若types.ts未同步更新，需先在types.ts中添加以下字段）
+import RightToolbar from '@/components/RightToolbar/index.vue';
-interface DialogOption {
+import FileUpload from '@/components/FileUpload/index.vue';
-  visible: boolean;
-  title: string;
-}
-interface PageData<F, Q> {
-  form: F;
-  queryParams: Q;
-  rules: Record<string, any[]>;
-}
 
+// 实例代理
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const fileUploadRef = ref(null);
+
+// 组件引用
+const fileUploadRef = ref<InstanceType<typeof FileUpload> | null>(null);
+const queryFormRef = ref<ElFormInstance>();
+const supplierInputFormRef = ref<ElFormInstance>();
+
+// 基础数据
 const supplierInputList = ref<SupplierInputVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -192,180 +395,269 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const supplierInputFormRef = ref<ElFormInstance>();
 const fileUrl = ref('');
+
+// 对话框配置
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
 });
-const { wf_business_status } = toRefs(proxy.useDict('wf_business_status'));
+
-// 初始化表单：添加3个新字段
+// 初始化表单数据
-const initFormData: SupplierInputForm = {
+const initFormData: any = {
   id: undefined,
-  supplierName: undefined, // 新增
-  supplierPerson: undefined, // 新增
-  personPhone: undefined, // 新增
   supplierType: undefined,
-  inputFile: undefined
+  supplierName: undefined,
+  supplierPerson: undefined,
+  supplierCode: undefined,
+  supplierAddres: undefined,
+  personName: undefined,
+  personPhone: undefined,
+  bankPersonName: undefined,
+  bankName: undefined,
+  bankAccount: undefined,
+  taxScale: undefined,
+  scope: undefined,
+  supplierLivel: undefined,
+  issueDate: undefined,
+  certificateValidity: undefined,
+  pastThreeYears: undefined,
+  safeCode: undefined,
+  safeCodeData: undefined,
+  safeCertificateValidity: undefined,
+  registeredNumber: undefined,
+  personnelNumber: undefined,
+  fileId: undefined,
+  inputFile: undefined,
+  state: '0' // 新增默认待审核
 };
 
+// 核心数据（表单+查询参数）
 const data = reactive<PageData<SupplierInputForm, SupplierInputQuery>>({
   form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    supplierName: undefined, // 新增：搜索参数
-    supplierPerson: undefined, // 新增：搜索参数
-    personPhone: undefined, // 新增：搜索参数
     supplierType: undefined,
+    supplierName: undefined,
+    state: undefined,
     inputFile: undefined,
     params: {}
-  },
-  rules: {
-    // 新增：3个字段的验证规则
-    supplierName: [{ required: true, message: '请输入供应商名称', trigger: 'blur' }],
-    supplierPerson: [{ required: true, message: '请输入供应商负责人', trigger: 'blur' }],
-    personPhone: [
-      { required: true, message: '请输入负责人电话', trigger: 'blur' },
-      { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
-    ],
-    supplierType: [{ required: true, message: '请选择供应商类型', trigger: 'change' }],
-    id: [{ required: true, message: '不能为空', trigger: 'blur' }]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+// 解构响应式数据
+const { queryParams, form } = toRefs(data);
+
+// 动态验证规则：仅劳务类型需要校验【安全生产许可证+人员数量】字段
+const rules = computed(() => {
+  const baseRules = {
+    supplierType: [{ required: true, message: '请选择企业登记注册类型', trigger: 'change' }],
+    supplierName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
+    supplierPerson: [{ required: true, message: '请输入法定代表人', trigger: 'blur' }],
+    supplierCode: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
+    personName: [{ required: true, message: '请输入负责人姓名', trigger: 'blur' }],
+    personPhone: [
+      { required: true, message: '请输入负责人联系电话', trigger: 'blur' },
+      { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号格式', trigger: 'blur' }
+    ],
+    id: [{ required: true, message: 'ID不能为空', trigger: 'blur' }],
+    build1: [{ required: true, message: '请输入一建建造师数量', trigger: 'change' }]
+  };
+
+  // 仅当类型为"劳务"时，添加安全生产许可证+人员数量校验
+  if (form.value.supplierType === '劳务') {
+    return {
+      ...baseRules,
+      // 安全生产许可证相关校验
+      safeCode: [{ required: true, message: '请输入安全生产许可证编号', trigger: 'blur' }],
+      safeCodeData: [{ required: true, message: '请选择安全生产许可证发证日期', trigger: 'change' }],
+      safeCertificateValidity: [{ required: true, message: '请输入安全生产许可证有效期', trigger: 'blur' }],
+      // 人员数量相关校验
+      registeredNumber: [{ required: true, message: '请输入注册人员数量', trigger: 'blur' }]
+      // personnelNumber: [{ required: true, message: '请输入职称人员数量', trigger: 'blur' }]
+    };
+  }
+
+  return baseRules;
+});
+
+/** 企业类型变更时的处理：清空隐藏字段数据+重置校验 */
+const handleTypeChange = () => {
+  // 非劳务类型：清空安全生产许可证+人员数量字段
+  if (form.value.supplierType !== '劳务') {
+    form.value.safeCode = undefined;
+    form.value.safeCodeData = undefined;
+    form.value.safeCertificateValidity = undefined;
+    form.value.registeredNumber = undefined;
+    form.value.personnelNumber = undefined;
+  }
+  // 重置隐藏字段的校验状态，避免错误提示残留
+  supplierInputFormRef.value?.clearValidate(['safeCode', 'safeCodeData', 'safeCertificateValidity', 'registeredNumber', 'personnelNumber']);
+};
 
 /** 查询供应商入库列表 */
 const getList = async () => {
   loading.value = true;
+  try {
     const res = await listSupplierInput(queryParams.value);
     supplierInputList.value = res.rows;
     total.value = res.total;
+  } catch (error) {
+    proxy?.$modal.msgError('查询失败，请重试');
+  } finally {
     loading.value = false;
+  }
 };
 
-/** 取消按钮 */
+/** 取消操作 */
 const cancel = () => {
   reset();
   dialog.visible = false;
 };
 
-/** 表单重置 */
+/** 表单重置：清空所有字段 */
 const reset = () => {
   form.value = { ...initFormData };
   fileUrl.value = '';
+  form.value.inputFile = '';
   supplierInputFormRef.value?.resetFields();
 };
 
-/** 搜索按钮操作 */
+/** 搜索操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
 };
 
-/** 重置按钮操作 */
+/** 重置搜索 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
 };
 
 /** 文件上传成功回调 */
-const handleUploadSuccess = () => {
+// const handleUploadSuccess = () => {
-  proxy?.$modal.msgSuccess('操作成功');
+//   proxy?.$modal.msgSuccess('操作成功');
-  dialog.visible = false;
+//   dialog.visible = false;
-  buttonLoading.value = false;
+//   buttonLoading.value = false;
-  getList();
+//   getList();
-};
+// };
 
-/** 文件选择变更回调 */
+/** 文件选择变更 */
-const change = (fileList) => {
+const change = () => {
   fileUrl.value = '';
 };
 
-/** 多选框选中数据 */
+/** 表格多选回调 */
 const handleSelectionChange = (selection: SupplierInputVO[]) => {
   ids.value = selection.map((item) => item.id);
   single.value = selection.length !== 1;
   multiple.value = selection.length === 0;
 };
 
-/** 新增按钮操作 */
+/** 新增操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
   dialog.title = '添加供应商入库';
 };
 
-/** 修改按钮操作：回显3个新字段数据 */
+/** 修改操作 */
 const handleUpdate = async (row?: SupplierInputVO) => {
   reset();
   const _id = row?.id || ids.value[0];
+  if (!_id) return proxy?.$modal.msgWarning('请选择需要修改的数据');
+
+  try {
     const res = await getSupplierInput(_id);
-  form.value = {
+    form.value = { ...form.value, ...res.data, inputFile: '' };
-    ...form.value,
-    ...res.data,
-    inputFile: '' // 清空文件上传绑定值（保持原有逻辑）
-  };
     fileUrl.value = res.data.inputFile;
-  // 确保新字段回显（若接口返回字段名一致，可省略此步；若不一致需手动映射）
-  form.value.supplierName = res.data.supplierName;
-  form.value.supplierPerson = res.data.supplierPerson;
-  form.value.personPhone = res.data.personPhone;
     dialog.visible = true;
     dialog.title = '修改供应商入库';
+  } catch (error) {
+    proxy?.$modal.msgError('获取数据失败，请重试');
+  }
 };
 
-/** 提交按钮：文件上传携带新字段参数 */
+/** 提交表单 */
 const submitForm = () => {
+  console.log(1);
+
   supplierInputFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
+    if (!valid) return;
+    form.value.registeredNumber = `${form.value.build1},${form.value.build2},${form.value.build3},${form.value.build4}`;
+    form.value.personnelNumber = `${form.value.personnelNumber1},${form.value.personnelNumber2},${form.value.personnelNumber3},${form.value.personnelNumber4}`;
     buttonLoading.value = true;
-      // 提交文件时携带所有表单参数（含新字段）
+    try {
-      fileUploadRef.value
+      if (fileUploadRef.value) {
-        .submitUpload()
+        await fileUploadRef.value.submitUpload().then((res) => {
-        .then(() => {
+          console.log(res);
+          if (res == 'noFile') {
+            proxy?.$modal.msgError('请上传文件');
+            return;
+          }
           proxy?.$modal.msgSuccess('操作成功');
           dialog.visible = false;
-          buttonLoading.value = false;
           getList();
-        })
-        .catch(() => {
-          buttonLoading.value = false; // 上传失败重置加载状态
         });
       }
+    } catch (error) {
+      proxy?.$modal.msgError('提交失败，请重试');
+    } finally {
+      buttonLoading.value = false;
+    }
   });
 };
 
-/** 删除按钮操作 */
+/** 删除操作 */
 const handleDelete = async (row?: SupplierInputVO) => {
   const _ids = row?.id || ids.value;
+  if (!_ids || (Array.isArray(_ids) && _ids.length === 0)) {
+    return proxy?.$modal.msgWarning('请选择需要删除的数据');
+  }
+
   try {
     await proxy?.$modal.confirm(`是否确认删除供应商入库编号为"${_ids}"的数据项？`);
     await delSupplierInput(_ids);
     proxy?.$modal.msgSuccess('删除成功');
-    await getList();
+    getList();
   } catch (error) {
-    // 取消删除不处理
+    proxy?.$modal.msgError('删除失败，请重试');
-  } finally {
-    loading.value = false;
   }
 };
 
-/** 导出按钮操作：携带新字段搜索参数 */
+/** 导出操作 */
 const handleExport = () => {
   proxy?.download('supplierInput/supplierInput/export', { ...queryParams.value }, `supplierInput_${new Date().getTime()}.xlsx`);
 };
 
-/** 页面挂载时加载列表 */
+/** 页面挂载时查询列表 */
 onMounted(() => {
   getList();
 });
 </script>
 
 <style scoped lang="scss">
+/* 文件上传样式 */
+.upload-file-list {
+  margin: 0;
+  .el-upload-list__item {
+    border: 1px solid #e4e7ed;
+    line-height: 2;
+    margin-bottom: 0;
+    position: relative;
+  }
+}
+
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+/* PDF预览样式（若有） */
 .pdf {
   display: flex;
   justify-content: center;
@@ -387,23 +679,6 @@ onMounted(() => {
   }
 }
 
-.upload-file-list {
-  margin: 0;
-  .el-upload-list__item {
-    border: 1px solid #e4e7ed;
-    line-height: 2;
-    margin-bottom: 0;
-    position: relative;
-  }
-}
-
-.upload-file-list .ele-upload-list__item-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  color: inherit;
-}
-
 .Shadow {
   align-items: center;
   background-color: rgba(0, 0, 0, 0.5);
@@ -422,10 +697,7 @@ onMounted(() => {
   z-index: 1;
 }
 
-.ele-upload-list__item-content-action .el-link {
+/* 头像上传样式（备用） */
-  margin-right: 10px;
-}
-
 .el-icon.avatar-uploader-icon {
   border: 1px dashed #cdd0d6;
   border-radius: 6px;
@@ -433,17 +705,31 @@ onMounted(() => {
   position: relative;
   overflow: hidden;
   transition: 0.3s;
-}
-
-.el-icon.avatar-uploader-icon:hover {
-  border-color: #409eff;
-}
-
-.el-icon.avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
   width: 200px;
   height: 178px;
   text-align: center;
+  &:hover {
+    border-color: #409eff;
+  }
+}
+
+/* 表格操作列样式 */
+.small-padding {
+  padding: 0 5px;
+}
+
+.fixed-width {
+  width: 120px;
+}
+
+/* 行间距调整 */
+.mb8 {
+  margin-bottom: 8px;
+}
+
+.mb-4 {
+  margin-bottom: 16px;
 }
 </style>