优化

.env.development

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

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'
   });
 };

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

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

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 };

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,25 +66,22 @@
         <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']">
+          <!-- v-hasPermi="['patch:progress:add']" -->
-            新增进度
+          <el-button type="primary" plain icon="Plus" size="small" @click="handleProgressAdd()"> 新增进度 </el-button>
-          </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" />
@@ -144,21 +116,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 +144,20 @@
     <!-- 新增/修改任务弹窗 -->
     <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">
+        <<<<<<< HEAD =======
-          <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" />
+        <el-input v-model="form.projectId" placeholder="请输入项目ID" :readonly="!!currentProjectId" :disabled="!!currentProjectId" v-if="false" />
-          <template #help>
+        <template #help>
-            <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
+          <span v-if="currentProjectId" class="text-success">已自动关联当前选中项目</span>
-          </template>
+        </template>
-        </el-form-item>
+        >>>>>>> 4511145f52e1caf07eea31e374583c6602fdfcfc
         <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 +165,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 +209,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 slaveOptions = ref([]);
-// 在脚本中添加选择变化的处理函数
+const userMap = new Map();
-const handleSlaveChange = (name) => {
-  // 找到选中的用户对象
-  const selectedUser = slaveOptions.value.find((item) => item.name === name);
-  if (selectedUser) {
-    // 自动填充userId到slaveId
-    progressForm.slaveId = selectedUser.id;
-  } else {
-    // 未选中时清空ID
-    progressForm.slaveId = '';
-  }
-};
-
 async function initSlaveOptions() {
   try {
     const response = await getUserName();
-    // 确保获取到正确的数组数据（接口返回在data字段中）
+    console.log(response);
-    const userDataList = Array.isArray(response?.data) ? response.data : [];
+    slaveOptions.value = response.data;
-
+    slaveOptions.value.forEach((item) => {
-    // 转换数据结构，只提取需要的字段（userId作为id，nickName作为name）
+      userMap.set(item.userId, item.nickName);
-    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);
   } catch (error) {
-    console.error('获取用户数据失败:', error);
     slaveOptions.value = []; // 错误时重置为空数组
   }
 }
@@ -344,7 +292,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 +301,9 @@ const initFormData: MasterForm = {
   act: undefined,
   completionProgress: undefined,
   taskStatus: undefined,
-  remark: undefined
+  remark: undefined,
+  userId: '',
+  userName: ''
 };
 
 const data = reactive<PageData<MasterForm, MasterQuery>>({
@@ -372,6 +322,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 +561,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) {

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.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">
+        <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">
+        <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">

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>

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">
+    <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-      <div v-show="showSearch" class="mb-[10px]">
+      <el-tab-pane label="招采工程量" name="first">
-        <el-card shadow="hover">
+        <planPage type="1" ref="planPageRef" />
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+      </el-tab-pane>
-            <el-form-item label="分包类型名称" prop="dictName">
+      <el-tab-pane type="2" label="物资设备清单" name="second"> <planPage /> </el-tab-pane>
-              <el-input v-model="queryParams.dictName" placeholder="请输入分包类型名称" clearable @keyup.enter="handleQuery" />
+    </el-tabs>
-            </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>
   </div>
 </template>
 
-<script setup name="Plan" lang="ts">
+<script setup 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 { obtainAllVersionNumbers } from '@/api/contract/index';
-// 1. 与目标代码一致：从用户Store获取当前选中项目及ID
+import { BiddingImportExcelFile, getTreeLimit, biddingLimitListUpdate, sheetList } from '@/api/bidding/biddingLimit';
-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[]>;
-}
-
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import planPage from './comm/planPage.vue';
 
-const planList = ref<PlanVO[]>([]);
+import type { TabsPaneContext } from 'element-plus';
-const buttonLoading = ref(false);
+const activeName = ref('first');
-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);
 
-const queryFormRef = ref<ElFormInstance>();
+const handleClick = (tab: TabsPaneContext, event: Event) => {
-const planFormRef = ref<ElFormInstance>();
+  console.log(tab, event);
-
-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'
 };
-
-// 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">
+<style scoped></style>
-.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>

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,67 +109,256 @@
         </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-option label="劳务" value="劳务"></el-option>
-        <el-form-item label="负责人电话" prop="personPhone">
+                <el-option label="技术服务" value="技术服务"></el-option>
-          <el-input v-model="form.personPhone" placeholder="请输入负责人电话" maxlength="11" />
+                <el-option label="物资设备" value="物资设备"></el-option>
-        </el-form-item>
+              </el-select>
-        <el-form-item label="供应商类型" prop="supplierType">
+            </el-form-item>
-          <el-select v-model="form.supplierType" placeholder="请选择供应商类型">
+          </el-col>
-            <el-option label="劳务" value="劳务"></el-option>
+          <el-col :span="12">
-            <el-option label="技术服务" value="技术服务"></el-option>
+            <el-form-item label="企业名称" prop="supplierName">
-            <el-option label="物资设备" value="物资设备"></el-option>
+              <el-input v-model="form.supplierName" placeholder="请输入企业名称" clearable />
-          </el-select>
+            </el-form-item>
-        </el-form-item>
+          </el-col>
-        <el-form-item label="入库资料" prop="inputFile">
+        </el-row>
-          <file-upload
+
-            v-model="form.inputFile"
+        <!-- 第二行：企业信息 -->
-            :fileType="['pdf']"
+        <el-row :gutter="20" class="mb-4">
-            :autoUpload="false"
+          <el-col :span="12">
-            ref="fileUploadRef"
+            <el-form-item label="企业法定代表人" prop="supplierPerson">
-            :method="form.id ? 'put' : 'post'"
+              <el-input v-model="form.supplierPerson" placeholder="请输入法定代表人" clearable />
-            :data="{
+            </el-form-item>
-              supplierType: form.supplierType,
+          </el-col>
-              supplierName: form.supplierName,
+          <el-col :span="12">
-              supplierPerson: form.supplierPerson,
+            <el-form-item label="统一社会信用代码" prop="supplierCode">
-              personPhone: form.personPhone,
+              <el-input v-model="form.supplierCode" placeholder="请输入统一社会信用代码" clearable />
-              id: form.id
+            </el-form-item>
-            }"
+          </el-col>
-            uploadUrl="/supplierInput/supplierInput"
+        </el-row>
-            :limit="1"
+
-            :onUploadSuccess="handleUploadSuccess"
+        <!-- 第三行：地址与联系人 -->
-            @handleChange="change"
+        <el-row :gutter="20" class="mb-4">
-            showFileList
+          <el-col :span="12">
-          >
+            <el-form-item label="企业注册地址" prop="supplierAddres">
-            <div>
+              <el-input v-model="form.supplierAddres" placeholder="请输入注册地址" clearable />
-              <el-button type="primary">上传文件</el-button><br />
+            </el-form-item>
-              <transition-group
+          </el-col>
-                class="upload-file-list el-upload-list el-upload-list--text"
+          <el-col :span="12">
-                name="el-fade-in-linear"
+            <el-form-item label="负责人姓名" prop="personName">
-                tag="ul"
+              <el-input v-model="form.personName" placeholder="请输入负责人姓名" clearable />
-                @click.stop
+            </el-form-item>
-                v-if="fileUrl"
+          </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="['doc', 'docx', 'pdf']"
+                :autoUpload="false"
+                ref="fileUploadRef"
+                :method="form.id ? 'put' : 'post'"
+                :data="form"
+                uploadUrl="/supplierInput/supplierInput"
+                :limit="1"
+                :onUploadSuccess="handleUploadSuccess"
+                @handleChange="change"
+                showFileList
               >
-                <li style="margin-top: 10px" class="el-upload-list__item ele-upload-list__item-content">
+                <div>
-                  <el-link :href="`${fileUrl}`" :underline="false" target="_blank">
+                  <el-button type="primary">上传文件</el-button><br />
-                    <el-button class="el-icon-document"> 下载文件 </el-button>
+                  <transition-group
-                  </el-link>
+                    class="upload-file-list el-upload-list el-upload-list--text"
-                </li>
+                    name="el-fade-in-linear"
-              </transition-group>
+                    tag="ul"
-            </div>
+                    @click.stop
-          </file-upload>
+                    v-if="fileUrl"
-        </el-form-item>
+                  >
+                    <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-link>
+                    </li>
+                  </transition-group>
+                </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;
-  const res = await listSupplierInput(queryParams.value);
+  try {
-  supplierInputList.value = res.rows;
+    const res = await listSupplierInput(queryParams.value);
-  total.value = res.total;
+    supplierInputList.value = res.rows;
-  loading.value = false;
+    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];
-  const res = await getSupplierInput(_id);
+  if (!_id) return proxy?.$modal.msgWarning('请选择需要修改的数据');
-  form.value = {
+
-    ...form.value,
+  try {
-    ...res.data,
+    const res = await getSupplierInput(_id);
-    inputFile: '' // 清空文件上传绑定值（保持原有逻辑）
+    form.value = { ...form.value, ...res.data, inputFile: '' };
-  };
+    fileUrl.value = res.data.inputFile;
-  fileUrl.value = res.data.inputFile;
+    dialog.visible = true;
-  // 确保新字段回显（若接口返回字段名一致，可省略此步；若不一致需手动映射）
+    dialog.title = '修改供应商入库';
-  form.value.supplierName = res.data.supplierName;
+  } catch (error) {
-  form.value.supplierPerson = res.data.supplierPerson;
+    proxy?.$modal.msgError('获取数据失败，请重试');
-  form.value.personPhone = res.data.personPhone;
+  }
-  dialog.visible = true;
-  dialog.title = '修改供应商入库';
 };
 
-/** 提交按钮：文件上传携带新字段参数 */
+/** 提交表单 */
 const submitForm = () => {
+  console.log(1);
+
   supplierInputFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
+    if (!valid) return;
-      buttonLoading.value = true;
+    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}`;
-      fileUploadRef.value
+    buttonLoading.value = true;
-        .submitUpload()
+    try {
-        .then(() => {
+      if (fileUploadRef.value) {
+        await fileUploadRef.value.submitUpload().then((res) => {
+          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>