修改客户信息中erp销售信息部分

src/api/customer/customerFile/customerInfo/types.ts

@@ -138,6 +138,12 @@ export interface CustomerInfoVO {
    */
   remark: string;
 
+  salesPersonId?: string | number;
+
+  serviceStaffId?: string | number;
+
+  belongingDepartmentId?: string | number;
+
   salesPersonName: string;
 
   serviceStaffName: string;
@@ -296,6 +302,12 @@ export interface CustomerInfoForm extends BaseEntity {
    */
   remark?: string;
 
+  salesPersonId?: string | number;
+
+  serviceStaffId?: string | number;
+
+  belongingDepartmentId?: string | number;
+
   /**
    * 工商信息
    */

src/views/customer/customerFile/customerInfo/edit.vue

@@ -16,11 +16,18 @@
         <el-menu-item index="contactInfo">联系人</el-menu-item>
         <el-menu-item index="shippingAddress">收货地址</el-menu-item>
         <el-menu-item index="contractManagement">合同管理</el-menu-item>
+        <el-menu-item index="erpSaleInfo">ERP销售信息</el-menu-item>
         <!-- <el-menu-item index="procurementProfile">采购画像</el-menu-item>
         <el-menu-item index="operationLog">日志管理</el-menu-item> -->
       </el-menu>
       <!-- 动态组件显示区域 -->
-      <component :is="currentComponent" :customer-id="customerId" :customer-no="customerNo" :customer-name="customerName" />
+      <component
+        :is="currentComponent"
+        :customer-id="customerId"
+        :customer-no="customerNo"
+        :customer-name="customerName"
+        :is-view-mode="isViewMode"
+      />
     </el-card>
   </div>
 </template>
@@ -33,6 +40,7 @@ const activeMenu = ref('baseInfo');
 const customerId = ref<string>('');
 const customerNo = ref<string>('');
 const customerName = ref<string>('');
+const isViewMode = ref(false); // 查看模式标志
 
 // 异步加载子组件
 const BaseInfo = defineAsyncComponent(() => import('@/views/customer/customerFile/customerInfo/overview/baseInfo.vue'));
@@ -40,6 +48,7 @@ const OrgStructure = defineAsyncComponent(() => import('@/views/customer/custome
 const ContactInfo = defineAsyncComponent(() => import('@/views/customer/customerFile/customerInfo/overview/contactInfo.vue'));
 const ShippingAddress = defineAsyncComponent(() => import('@/views/customer/customerFile/customerInfo/overview/shippingAddress.vue'));
 const ContractManagement = defineAsyncComponent(() => import('@/views/customer/customerFile/customerInfo/overview/contractManagement.vue'));
+const ErpSaleInfo = defineAsyncComponent(() => import('@/views/customer/customerFile/customerInfo/overview/erpSaleInfo.vue'));
 // const ProcurementProfile = defineAsyncComponent(() => import('@/views/customer/customerFile/customerInfo/overview/procurementProfile.vue'));
 // const OperationLog = defineAsyncComponent(() => import('@/views/customer/customerFile/customerInfo/overview/operationLog.vue'));
 
@@ -49,7 +58,8 @@ const componentMap: Record<string, any> = {
   orgStructure: OrgStructure,
   contactInfo: ContactInfo,
   shippingAddress: ShippingAddress,
-  contractManagement: ContractManagement
+  contractManagement: ContractManagement,
+  erpSaleInfo: ErpSaleInfo
   // procurementProfile: ProcurementProfile,
   // operationLog: OperationLog
 };
@@ -77,6 +87,12 @@ onMounted(async () => {
     activeMenu.value = tab as string;
     currentComponent.value = componentMap[tab as string];
   }
+
+  // 判断是否为查看模式
+  const status = route.query.status;
+  if (status === 'view') {
+    isViewMode.value = true;
+  }
 });
 
 // 加载客户编号

src/views/customer/customerFile/customerInfo/overview/baseInfo.vue

@@ -175,7 +175,6 @@
       <template #header>
         <div class="flex justify-between items-center">
           <span class="font-medium">工商信息</span>
-          <el-button type="primary" @click="handleUpdate">更新</el-button>
         </div>
       </template>
 
@@ -314,27 +313,24 @@
         </el-table-column>
       </el-table>
     </el-card>
-
-    <!-- 销售信息 --改为 ERP数据-->
     <el-card shadow="never" class="mb-4">
       <template #header>
-        <div class="flex justify-between items-center">
-          <span class="font-medium">ERP销售信息</span>
-          <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
-        </div>
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <span style="font-size: 16px; font-weight: 500">销售信息</span>
+        </el-row>
       </template>
-      <el-form ref="salesFormRef" :model="salesForm" :rules="salesRules" label-width="140px">
+      <el-form ref="salesFormRef" :model="form" label-width="140px">
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item label="业务人员" prop="salesPersonId" required>
-              <el-select v-model="salesForm.salesPersonId" placeholder="请选择业务人员" class="w-full" filterable @change="handleSalesPersonChange">
+            <el-form-item label="业务人员" prop="salesPersonId">
+              <el-select v-model="form.salesPersonId" placeholder="请选择业务人员" class="w-full" filterable @change="handleSalesPersonChange">
                 <el-option v-for="item in comStaffList" :key="item.staffId" :label="`${item.staffCode} , ${item.staffName}`" :value="item.staffId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="客服人员" prop="serviceStaffId" required>
-              <el-select v-model="salesForm.serviceStaffId" placeholder="请选择客服人员" class="w-full" filterable>
+            <el-form-item label="客服人员" prop="serviceStaffId">
+              <el-select v-model="form.serviceStaffId" placeholder="请选择客服人员" class="w-full" filterable>
                 <el-option v-for="item in comStaffList" :key="item.staffId" :label="`${item.staffCode} , ${item.staffName}`" :value="item.staffId" />
               </el-select>
             </el-form-item>
@@ -344,131 +340,8 @@
               <el-input v-model="deptName" placeholder="请选择所属部门" class="w-full" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="信用等级" prop="creditManagementId">
-              <el-select v-model="salesForm.creditManagementId" placeholder="请选择信用等级" class="w-full" filterable>
-                <el-option
-                  v-for="item in creditLevelList"
-                  :key="item.id"
-                  :label="`${item.creditLevelNo} , ${item.creditLevelName}`"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="信用额度" prop="creditAmount">
-              <el-input v-model="salesForm.creditAmount" :controls="false" class="w-full" placeholder="请输入信用额度" style="width: 100%" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="可用额度" prop="remainingQuota">
-              <el-input
-                v-model="salesForm.remainingQuota"
-                :controls="false"
-                class="w-full"
-                placeholder="请输入可用额度"
-                style="width: 100%"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="订单审核" prop="orderAudit">
-              <el-select v-model="salesForm.orderAudit" placeholder="请选择" class="w-full" filterable>
-                <el-option v-for="dict in order_check_way" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="支付密码" prop="creditPaymentPassword">
-              <el-input v-model="salesForm.creditPaymentPassword" type="password" placeholder="请输入支付密码" show-password />
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="收款条件" prop="accountPeriod">
-              <el-select v-model="salesForm.accountPeriod" placeholder="请选择收款条件" class="w-full" filterable>
-                <el-option v-for="item in settlementMethodList" :key="item.id" :label="item.settlementName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="结算方式" prop="settlementMethod">
-              <el-select v-model="salesForm.settlementMethod" placeholder="请选择结算方式" class="w-full" filterable>
-                <el-option v-for="item in settlementMethodList" :key="item.id" :label="item.settlementName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="客户来源" prop="payDays">
-              <el-select v-model="salesForm.customerSource" class="w-full" filterable>
-                <el-option v-for="dict in customer_source" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="销售通路" prop="payDays">
-              <el-select v-model="salesForm.sellChannel" class="w-full" filterable>
-                <el-option v-for="dict in sell_channel" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="税码" prop="rateId">
-              <el-select v-model="salesForm.rateId" placeholder="税码" class="w-full" filterable>
-                <el-option v-for="item in taxrateList" :key="item.id" :label="item.taxrateNo" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="交易币别" prop="dealCurrencyId">
-              <el-select v-model="salesForm.dealCurrencyId" placeholder="请选择交易币别" class="w-full" filterable>
-                <el-option v-for="item in currencyList" :key="item.id" :label="item.currencyName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="账款归属" prop="payDays">
-              <el-input v-model="form.customerNo" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="单价含税" prop="payDays">
-              <el-select v-model="salesForm.unitPrice" placeholder="单价含税" class="w-full" filterable>
-                <el-option v-for="item in unitPriceArr" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="账款额度超限" prop="creditLimit">
-              <el-select v-model="salesForm.creditLimit" placeholder="请选择账款额度超限" class="w-full" filterable>
-                <el-option v-for="dict in erp_is_enabled" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="账款超期" prop="creditTimeLimit">
-              <el-select v-model="salesForm.creditTimeLimit" placeholder="请选择账款超期" class="w-full" filterable>
-                <el-option v-for="dict in erp_is_enabled" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
+        </el-row> </el-form
+    ></el-card>
 
     <!-- 添加/编辑开票信息对话框 -->
     <add-invoice-dialog v-model="invoiceDialogVisible" :edit-data="currentInvoice" @confirm="handleInvoiceConfirm" />
@@ -489,7 +362,6 @@
 import { getCustomerInfo, updateCustomerInfo } from '@/api/customer/customerFile/customerInfo';
 import type { CustomerInfoForm } from '@/api/customer/customerFile/customerInfo/types';
 import type { BusinessInfoForm } from '@/api/customer/customerFile/businessInfo/types';
-import type { SalesInfoForm } from '@/api/customer/customerFile/salesInfo/types';
 import type { InvoiceInfoForm } from '@/api/customer/customerFile/invoiceInfo/types';
 import { listInvoiceInfo, getInvoiceInfo, addInvoiceInfo, updateInvoiceInfo, delInvoiceInfo } from '@/api/customer/customerFile/invoiceInfo';
 import { listSettlementMethod } from '@/api/customer/settlementMethod';
@@ -610,7 +482,10 @@ const form = reactive<CustomerInfoForm>({
   regCountyNo: '',
   provincialCityCounty: '',
   status: '0',
-  remark: ''
+  remark: '',
+  salesPersonId: undefined,
+  serviceStaffId: undefined,
+  belongingDepartmentId: undefined
 });
 
 // 工商信息（只读）
@@ -629,28 +504,6 @@ const businessInfo = reactive<BusinessInfoForm>({
   status: '0'
 });
 
-// 销售信息
-const salesForm = reactive<SalesInfoForm>({
-  salesPersonId: undefined,
-  serviceStaffId: undefined,
-  belongingDepartmentId: undefined,
-  creditManagementId: undefined,
-  creditAmount: undefined,
-  remainingQuota: undefined,
-  orderAudit: undefined,
-  creditPaymentPassword: '',
-  accountPeriod: '',
-  payDays: undefined,
-  customerSource: '1',
-  unitPrice: 'True',
-  sellChannel: '1',
-  creditLimit: '1',
-  creditTimeLimit: '1',
-  dealCurrencyId: undefined,
-  settlementMethod: undefined,
-  status: '0'
-});
-
 // 开票信息列表
 const invoiceList = ref<InvoiceInfoForm[]>([]);
 const invoiceDialogVisible = ref(false);
@@ -666,6 +519,105 @@ const uploadHeaders = ref({
   Authorization: 'Bearer ' + localStorage.getItem('token')
 });
 
+// 打开添加开票信息对话框
+const handleAddInvoice = () => {
+  currentInvoice.value = {};
+  currentInvoice.value.taxId = businessInfo.socialCreditCode;
+  currentInvoice.value.address = businessInfo.businessAddress;
+  currentInvoiceIndex.value = -1;
+  invoiceDialogVisible.value = true;
+};
+
+// 更新工商信息
+const handleUpdate = () => {
+  // 触发上传
+  uploadRef.value?.$el.querySelector('input[type="file"]')?.click();
+};
+
+// 上传前验证
+const beforeUpload = (file: File) => {
+  const isImage = file.type.startsWith('image/');
+  const isPDF = file.type === 'application/pdf';
+  const isLt10M = file.size / 1024 / 1024 < 10;
+
+  if (!isImage && !isPDF) {
+    ElMessage.error('只能上传图片或PDF文件！');
+    return false;
+  }
+  if (!isLt10M) {
+    ElMessage.error('文件大小不能超过 10MB！');
+    return false;
+  }
+  uploadLoading.value = true;
+  return true;
+};
+
+// 处理业务人员选择变化
+const handleSalesPersonChange = async (staffId: any) => {
+  // 根据选中的业务人员ID，找到对应的部门ID
+  const selectedStaff = comStaffList.value.find((staff) => staff.staffId === staffId);
+  if (selectedStaff && selectedStaff.deptId) {
+    // 确保 deptId 的类型一致
+    form.belongingDepartmentId = String(selectedStaff.deptId);
+
+    // 如果部门不在列表中，从API获取
+    const deptExists = comDeptList.value.find((d) => String(d.deptId) === String(selectedStaff.deptId));
+    if (!deptExists) {
+      try {
+        const res = await getDept(selectedStaff.deptId);
+        if (res.data) {
+          comDeptList.value.push(res.data as any);
+        }
+      } catch (error) {
+        console.error('获取部门信息失败:', error);
+      }
+    }
+  }
+};
+
+// 上传成功回调
+const handleUploadSuccess = (response: any) => {
+  uploadLoading.value = false;
+  if (response.code === 200) {
+    businessInfo.businessLicense = response.data.url || response.data.fileName;
+    ElMessage.success('上传成功');
+
+    // TODO: 这里可以调用OCR识别接口，自动填充工商信息
+    // 如果后端提供了OCR识别接口，可以在这里调用
+    // recognizeBusinessLicense(response.data.url);
+  } else {
+    ElMessage.error(response.msg || '上传失败');
+  }
+};
+
+// 上传失败回调
+const handleUploadError = () => {
+  uploadLoading.value = false;
+  ElMessage.error('上传失败，请重试');
+};
+
+// 预览营业执照
+const previewLicense = () => {
+  if (businessInfo.businessLicense) {
+    window.open(businessInfo.businessLicense, '_blank');
+  }
+};
+
+// 营业执照选择处理
+const handleBusinessLicenseSelected = (files: any[]) => {
+  if (files && files.length > 0) {
+    const file = files[0]; // 取第一个文件
+    if (file && (file.url || file.path)) {
+      businessInfo.businessLicense = file.url || file.path;
+      ElMessage.success('营业执照选择成功');
+    } else {
+      ElMessage.error('请选择有效的图片文件');
+    }
+  } else {
+    ElMessage.error('请选择有效的图片文件');
+  }
+};
+
 // 表单验证规则
 const rules = {
   belongCompanyId: [{ required: true, message: '请选择所属公司', trigger: 'change' }],
@@ -687,39 +639,8 @@ const rules = {
   industryCategoryId: [{ required: true, message: '请选择行业类别', trigger: 'change' }],
   customerLevelId: [{ required: true, message: '请选择客户等级', trigger: 'change' }],
   address: [{ required: true, message: '请输入详细地址', trigger: 'blur' }]
-};
-
-// 销售信息表单验证规则
-const salesRules = {
-  salesPersonId: [{ required: true, message: '请选择业务人员', trigger: 'change' }],
-  serviceStaffId: [{ required: true, message: '请选择客服人员', trigger: 'change' }]
-};
-
-// 加载币种列表
-const loadCurrencyList = async () => {
-  try {
-    const res = await listComCurrency({
-      isShow: '0',
-      pageNum: 1,
-      pageSize: 1000
-    });
-    currencyList.value = res.rows || [];
-  } catch (error) {
-    console.error('加载币种列表失败:', error);
-    currencyList.value = [];
-  }
-};
-
-// 加载税码列表
-const loadTaxrateList = async () => {
-  try {
-    const res = await listTaxrate({
-      isShow: '0',
-      pageNum: 1,
-      pageSize: 1000
-    });
-    taxrateList.value = res.rows || [];
-  } catch (error) {}
+  // salesPersonId: [{ required: true, message: '请选择业务人员', trigger: 'change' }],
+  // serviceStaffId: [{ required: true, message: '请选择客服人员', trigger: 'change' }]
 };
 
 // 初始化
@@ -735,8 +656,6 @@ onMounted(async () => {
   await loadCustomerTypeList();
   await loadComStaffList();
   await loadComDeptList();
-  await loadCurrencyList();
-  await loadTaxrateList();
 
   // 优先使用props传递的customerId，否则从路由获取
   const id = props.customerId || route.query.id;
@@ -881,7 +800,7 @@ const loadCustomerTypeList = async () => {
 const loadComStaffList = async () => {
   try {
     const query: any = {};
-    const res = await listErpStaff(query);
+    const res = await listComStaff(query);
     comStaffList.value = res.rows || [];
   } catch (error) {
     console.error('加载员工列表失败:', error);
@@ -891,7 +810,7 @@ const loadComStaffList = async () => {
 // 加载部门列表
 const loadComDeptList = async () => {
   try {
-    const res = await listErpDept();
+    const res = await listDept();
     // 处理可能的不同返回结构
     comDeptList.value = res.rows || res.data || [];
   } catch (error) {
@@ -940,26 +859,6 @@ const loadCustomerData = async (id: any) => {
       codeArr.value = [data.regProvincialNo, data.regCityNo, data.regCountyNo] as any;
     }
 
-    // 填充销售信息
-    if (data.customerSalesInfoVo) {
-      Object.assign(salesForm, data.customerSalesInfoVo);
-
-      // 如果有部门ID，且部门不在列表中，从API获取
-      if (salesForm.belongingDepartmentId) {
-        const deptExists = comDeptList.value.find((d) => String(d.deptId) === String(salesForm.belongingDepartmentId));
-        if (!deptExists) {
-          try {
-            const deptRes = await getErpDept(salesForm.belongingDepartmentId);
-            if (deptRes.data) {
-              comDeptList.value.push(deptRes.data);
-            }
-          } catch (error) {
-            console.error('获取部门信息失败:', error);
-          }
-        }
-      }
-    }
-
     // 填充开票信息列表
     loadInvoiceList(id);
   } catch (error) {
@@ -1000,37 +899,6 @@ const getCustomerLevelName = (id: string | number | undefined) => {
 // 部门名称（响应式）
 const deptName = ref('');
 
-// 监听部门ID变化，自动加载部门名称
-watch(
-  () => salesForm.belongingDepartmentId,
-  async (newDeptId) => {
-    if (!newDeptId) {
-      deptName.value = '';
-      return;
-    }
-
-    // 先从列表中查找
-    const dept = comDeptList.value.find((d) => String(d.deptId) === String(newDeptId));
-    if (dept) {
-      deptName.value = dept.deptName;
-      return;
-    }
-
-    // 如果列表中没有，从API获取
-    try {
-      const res = await getDept(newDeptId);
-      if (res.data) {
-        deptName.value = res.data.deptName;
-        comDeptList.value.push(res.data as any);
-      }
-    } catch (error) {
-      console.error('获取部门信息失败:', error);
-      deptName.value = String(newDeptId);
-    }
-  },
-  { immediate: true }
-);
-
 // 处理区域选择变化
 const handleChange = (val: string[]) => {
   // 保存编码
@@ -1065,105 +933,6 @@ const handleChange = (val: string[]) => {
   form.provincialCityCounty = names.join('/');
 };
 
-// 处理业务人员选择变化
-const handleSalesPersonChange = async (staffId: any) => {
-  // 根据选中的业务人员ID，找到对应的部门ID
-  const selectedStaff = comStaffList.value.find((staff) => staff.staffId === staffId);
-  if (selectedStaff && selectedStaff.deptId) {
-    // 确保 deptId 的类型一致
-    salesForm.belongingDepartmentId = String(selectedStaff.deptId);
-
-    // 如果部门不在列表中，从API获取
-    const deptExists = comDeptList.value.find((d) => String(d.deptId) === String(selectedStaff.deptId));
-    if (!deptExists) {
-      try {
-        const res = await getDept(selectedStaff.deptId);
-        if (res.data) {
-          comDeptList.value.push(res.data as any);
-        }
-      } catch (error) {
-        console.error('获取部门信息失败:', error);
-      }
-    }
-  }
-};
-
-// 打开添加开票信息对话框
-const handleAddInvoice = () => {
-  currentInvoice.value = {};
-  currentInvoice.value.taxId = businessInfo.socialCreditCode;
-  currentInvoice.value.address = businessInfo.businessAddress;
-  currentInvoiceIndex.value = -1;
-  invoiceDialogVisible.value = true;
-};
-
-//更新工商信息
-const handleUpdate = () => {
-  // 触发上传
-  uploadRef.value?.$el.querySelector('input[type="file"]')?.click();
-};
-
-// 上传前验证
-const beforeUpload = (file: File) => {
-  const isImage = file.type.startsWith('image/');
-  const isPDF = file.type === 'application/pdf';
-  const isLt10M = file.size / 1024 / 1024 < 10;
-
-  if (!isImage && !isPDF) {
-    ElMessage.error('只能上传图片或PDF文件！');
-    return false;
-  }
-  if (!isLt10M) {
-    ElMessage.error('文件大小不能超过 10MB！');
-    return false;
-  }
-  uploadLoading.value = true;
-  return true;
-};
-
-// 上传成功回调
-const handleUploadSuccess = (response: any) => {
-  uploadLoading.value = false;
-  if (response.code === 200) {
-    businessInfo.businessLicense = response.data.url || response.data.fileName;
-    ElMessage.success('上传成功');
-
-    // TODO: 这里可以调用OCR识别接口，自动填充工商信息
-    // 如果后端提供了OCR识别接口，可以在这里调用
-    // recognizeBusinessLicense(response.data.url);
-  } else {
-    ElMessage.error(response.msg || '上传失败');
-  }
-};
-
-// 上传失败回调
-const handleUploadError = () => {
-  uploadLoading.value = false;
-  ElMessage.error('上传失败，请重试');
-};
-
-// 预览营业执照
-const previewLicense = () => {
-  if (businessInfo.businessLicense) {
-    window.open(businessInfo.businessLicense, '_blank');
-  }
-};
-
-// 营业执照选择处理
-const handleBusinessLicenseSelected = (files: any[]) => {
-  if (files && files.length > 0) {
-    const file = files[0]; // 取第一个文件
-    if (file && (file.url || file.path)) {
-      businessInfo.businessLicense = file.url || file.path;
-      ElMessage.success('营业执照选择成功');
-    } else {
-      ElMessage.error('请选择有效的图片文件');
-    }
-  } else {
-    ElMessage.error('请选择有效的图片文件');
-  }
-};
-
 // 编辑开票信息
 const handleEditInvoice = (row: InvoiceInfoForm, index: number) => {
   currentInvoice.value = { ...row };
@@ -1225,32 +994,13 @@ const removeInvoice = (data: any) => {
 
 // 保存按钮
 const handleSave = async () => {
-  // 1. 先检查 ref 是否存在，避免静默失败
-  if (!formRef.value || !salesFormRef.value) {
-    ElMessage.error('表单组件未加载，请刷新页面');
-    return;
-  }
-
   try {
-    if (!salesForm.salesPersonId) {
-      ElMessage.warning('请选择业务人员！');
-      return;
-    }
-    if (!salesForm.serviceStaffId) {
-      ElMessage.warning('请选择客服人员！');
-      return;
-    }
-    // 2. 串行验证，任何一步失败都会抛出异常，进入 catch
-    // 注意：ElementPlus 的 validate 失败时会 reject 一个包含错误信息的对象
     await formRef.value.validate();
-    await salesFormRef.value.validate();
-
     submitLoading.value = true;
 
     const submitData: CustomerInfoForm = {
       ...form,
       customerBusinessBo: businessInfo,
-      customerSalesInfoBo: salesForm,
       customerInvoiceInfoBoList: invoiceList.value
     };
 
@@ -1260,30 +1010,50 @@ const handleSave = async () => {
 
     // 重新加载数据
     await loadCustomerData(custId.value);
-
-    // 可选：保存成功后重置表单或关闭弹窗
-    // emit('update:visible', false);
   } catch (error) {
-    // 3. 关键优化：区分验证错误和系统错误
-
-    // ElementPlus 的 validate 失败时，error 通常是一个包含 fields 信息的对象
-    // 或者你可以判断 error 是否包含特定的验证失败标记
     const isValidationError = error && typeof error === 'object' && 'fields' in error;
-    // 有些版本可能是 error instanceof Error 且 message 包含特定字样，具体视 EP 版本而定
-    // 最简单的判断：如果是因为 validate 抛出的，通常不需要报全局错误，因为表单上已经红字提示了
 
     if (isValidationError) {
       console.warn('表单验证未通过', error);
-      // 让用户专注于表单上的红色提示，不要弹全局 Toast 干扰用户
       return;
     }
 
-    // 如果是真正的系统错误（如网络断开、后端报错）
     ElMessage.error('保存失败，请稍后重试或联系管理员');
   } finally {
     submitLoading.value = false;
   }
 };
+
+// 监听部门ID变化，自动加载部门名称
+watch(
+  () => form.belongingDepartmentId,
+  async (newDeptId) => {
+    if (!newDeptId) {
+      deptName.value = '';
+      return;
+    }
+
+    // 先从列表中查找
+    const dept = comDeptList.value.find((d) => String(d.deptId) === String(newDeptId));
+    if (dept) {
+      deptName.value = dept.deptName;
+      return;
+    }
+
+    // 如果列表中没有，从API获取
+    try {
+      const res = await getDept(newDeptId);
+      if (res.data) {
+        deptName.value = res.data.deptName;
+        comDeptList.value.push(res.data as any);
+      }
+    } catch (error) {
+      console.error('获取部门信息失败:', error);
+      deptName.value = String(newDeptId);
+    }
+  },
+  { immediate: true }
+);
 </script>
 <style scoped>
 .upload-box:hover {

src/views/customer/customerFile/customerInfo/overview/contactInfo.vue

@@ -2,16 +2,13 @@
   <div class="p-2">
     <el-card shadow="never">
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="20">
-            <span>联系人信息列表</span>
-          </el-col>
-          <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <span style="font-size: 16px; font-weight: 500">联系人信息列表</span>
+          <div style="display: flex; flex-wrap: nowrap; gap: 10px">
             <el-button type="primary" plain icon="Plus" @click="handleAdd">添加联系人</el-button>
-          </el-col>
+          </div>
         </el-row>
       </template>
-
       <el-table v-loading="loading" border :data="customerContactList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="用户ID" align="center" prop="contactNo" />

src/views/customer/customerFile/customerInfo/overview/contractManagement.vue

@@ -31,13 +31,11 @@
 
     <el-card shadow="never">
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="20">
-            <span>合同管理信息列表</span>
-          </el-col>
-          <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <span style="font-size: 16px; font-weight: 500">合同管理信息列表</span>
+          <div style="display: flex; flex-wrap: nowrap; gap: 10px">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['customer:contract:add']">新增合同</el-button>
-          </el-col>
+          </div>
         </el-row>
       </template>
 

src/views/customer/customerFile/customerInfo/overview/erpSaleInfo.vue

@@ -0,0 +1,454 @@
+<template>
+  <div class="p-4">
+    <!-- ERP销售信息 -->
+    <el-card shadow="never" class="mb-4">
+      <template #header>
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <span style="font-size: 16px; font-weight: 500">ERP销售信息</span>
+          <div style="display: flex; flex-wrap: nowrap; gap: 10px">
+            <el-button type="primary" plain icon="Plus" :loading="submitLoading" @click="handleSave">保存</el-button>
+          </div>
+        </el-row>
+      </template>
+      <el-form ref="salesFormRef" :model="salesForm" :rules="salesRules" label-width="140px">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="业务人员" prop="salesPersonId" required>
+              <el-select v-model="salesForm.salesPersonId" placeholder="请选择业务人员" class="w-full" filterable @change="handleSalesPersonChange">
+                <el-option v-for="item in comStaffList" :key="item.staffId" :label="`${item.staffCode} , ${item.staffName}`" :value="item.staffId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客服人员" prop="serviceStaffId" required>
+              <el-select v-model="salesForm.serviceStaffId" placeholder="请选择客服人员" class="w-full" filterable>
+                <el-option v-for="item in comStaffList" :key="item.staffId" :label="`${item.staffCode} , ${item.staffName}`" :value="item.staffId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属部门" prop="belongingDepartmentId">
+              <el-input v-model="deptName" placeholder="请选择所属部门" class="w-full" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="信用等级" prop="creditManagementId">
+              <el-select v-model="salesForm.creditManagementId" placeholder="请选择信用等级" class="w-full" filterable>
+                <el-option
+                  v-for="item in creditLevelList"
+                  :key="item.id"
+                  :label="`${item.creditLevelNo} , ${item.creditLevelName}`"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="信用额度" prop="creditAmount">
+              <el-input v-model="salesForm.creditAmount" :controls="false" class="w-full" placeholder="请输入信用额度" style="width: 100%" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="可用额度" prop="remainingQuota">
+              <el-input
+                v-model="salesForm.remainingQuota"
+                :controls="false"
+                class="w-full"
+                placeholder="请输入可用额度"
+                style="width: 100%"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="订单审核" prop="orderAudit">
+              <el-select v-model="salesForm.orderAudit" placeholder="请选择" class="w-full" filterable>
+                <el-option v-for="dict in order_check_way" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="支付密码" prop="creditPaymentPassword">
+              <el-input v-model="salesForm.creditPaymentPassword" type="password" placeholder="请输入支付密码" show-password />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="结算方式" prop="settlementMethod">
+              <el-select v-model="salesForm.settlementMethod" placeholder="请选择结算方式" class="w-full" filterable>
+                <el-option v-for="item in settlementMethodList" :key="item.id" :label="item.settlementName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户来源" prop="customerSource">
+              <el-select v-model="salesForm.customerSource" class="w-full" filterable>
+                <el-option v-for="dict in customer_source" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="销售通路" prop="sellChannel">
+              <el-select v-model="salesForm.sellChannel" class="w-full" filterable>
+                <el-option v-for="dict in sell_channel" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="税码" prop="rateId">
+              <el-select v-model="salesForm.rateId" placeholder="税码" class="w-full" filterable>
+                <el-option v-for="item in taxrateList" :key="item.id" :label="item.taxrateNo" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="交易币别" prop="dealCurrencyId">
+              <el-select v-model="salesForm.dealCurrencyId" placeholder="请选择交易币别" class="w-full" filterable>
+                <el-option v-for="item in currencyList" :key="item.id" :label="item.currencyName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="账款归属" prop="customerNo">
+              <el-input :model-value="props.customerNo || ''" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="单价含税" prop="unitPrice">
+              <el-select v-model="salesForm.unitPrice" placeholder="单价含税" class="w-full" filterable>
+                <el-option v-for="item in unitPriceArr" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="账款额度超限" prop="creditLimit">
+              <el-select v-model="salesForm.creditLimit" placeholder="请选择账款额度超限" class="w-full" filterable>
+                <el-option v-for="dict in erp_is_enabled" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="账款超期" prop="creditTimeLimit">
+              <el-select v-model="salesForm.creditTimeLimit" placeholder="请选择账款超期" class="w-full" filterable>
+                <el-option v-for="dict in erp_is_enabled" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts" name="ErpSaleInfo">
+import { getCustomerInfo, updateCustomerInfo } from '@/api/customer/customerFile/customerInfo';
+import type { SalesInfoForm } from '@/api/customer/customerFile/salesInfo/types';
+import type { CustomerInfoForm } from '@/api/customer/customerFile/customerInfo/types';
+import { listSettlementMethod } from '@/api/customer/settlementMethod';
+import { SettlementMethodVO } from '@/api/customer/settlementMethod/types';
+import { listCreditLevel } from '@/api/customer/creditLevel';
+import { CreditLevelVO, CreditLevelQuery } from '@/api/customer/creditLevel/types';
+import { listComStaff } from '@/api/company/comStaff';
+import { listErpStaff } from '@/api/erpData/erpStaff';
+import { listErpDept, getErpDept } from '@/api/erpData/erpDept';
+import { listComCurrency } from '@/api/company/comCurrency';
+import { listTaxrate } from '@/api/company/taxrate';
+import { ComCurrencyVO } from '@/api/company/comCurrency/types';
+import { ErpStaffVO } from '@/api/erpData/erpStaff/types';
+import { ErpDeptVO } from '@/api/erpData/erpDept/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { order_check_way, customer_source, sell_channel, erp_is_enabled } = toRefs<any>(
+  proxy?.useDict('order_check_way', 'customer_source', 'sell_channel', 'erp_is_enabled')
+);
+
+// 接收父组件传递的props
+const props = defineProps<{
+  customerId?: string | number;
+  customerNo?: string;
+}>();
+
+const route = useRoute();
+const router = useRouter();
+
+const unitPriceArr = ref([
+  { label: '含税', value: 'True' },
+  { label: '不含税', value: 'False' }
+]);
+
+const salesFormRef = ref<any>(null);
+const custId = ref<string | number>('');
+const customerNumber = ref('');
+const submitLoading = ref(false);
+
+// 下拉框数据列表
+const settlementMethodList = ref<SettlementMethodVO[]>([]);
+const creditLevelList = ref<CreditLevelVO[]>([]);
+const comStaffList = ref<ErpStaffVO[]>([]);
+const comDeptList = ref<ErpDeptVO[]>([]);
+const currencyList = ref<ComCurrencyVO[]>([]);
+const taxrateList = ref<any[]>([]);
+
+// 销售信息
+const salesForm = reactive<SalesInfoForm>({
+  salesPersonId: undefined,
+  serviceStaffId: undefined,
+  belongingDepartmentId: undefined,
+  creditManagementId: undefined,
+  creditAmount: undefined,
+  remainingQuota: undefined,
+  orderAudit: undefined,
+  creditPaymentPassword: '',
+  accountPeriod: '',
+  payDays: undefined,
+  customerSource: '1',
+  unitPrice: 'True',
+  sellChannel: '1',
+  creditLimit: '1',
+  creditTimeLimit: '1',
+  dealCurrencyId: undefined,
+  settlementMethod: undefined,
+  status: '0'
+});
+
+// 销售信息表单验证规则
+const salesRules = {
+  salesPersonId: [{ required: true, message: '请选择业务人员', trigger: 'change' }],
+  serviceStaffId: [{ required: true, message: '请选择客服人员', trigger: 'change' }]
+};
+
+// 部门名称（响应式）
+const deptName = ref('');
+
+// 加载币种列表
+const loadCurrencyList = async () => {
+  try {
+    const res = await listComCurrency({
+      isShow: '0',
+      pageNum: 1,
+      pageSize: 1000
+    });
+    currencyList.value = res.rows || [];
+    if (res.rows && res.rows.length > 0) {
+      salesForm.dealCurrencyId = res.rows[0].id;
+    }
+  } catch (error) {
+    console.error('加载币种列表失败:', error);
+    currencyList.value = [];
+  }
+};
+
+// 加载税码列表
+const loadTaxrateList = async () => {
+  try {
+    const res = await listTaxrate({
+      isShow: '0',
+      pageNum: 1,
+      pageSize: 1000
+    });
+    taxrateList.value = res.rows || [];
+  } catch (error) {}
+};
+
+// 初始化
+onMounted(async () => {
+  // 加载下拉框数据
+  await loadSettlementMethodList();
+  await loadCreditLevelList();
+  await loadComStaffList();
+  await loadComDeptList();
+  await loadCurrencyList();
+  await loadTaxrateList();
+
+  // 优先使用props传递的customerId，否则从路由获取
+  const id = props.customerId || route.query.id;
+  if (id) {
+    custId.value = id as string;
+    await loadCustomerData(id as any);
+  }
+});
+
+// 加载结算方式列表
+const loadSettlementMethodList = async () => {
+  try {
+    const query: any = { isShow: '0' };
+    const res = await listSettlementMethod(query);
+    settlementMethodList.value = res.rows || [];
+  } catch (error) {
+    console.error('加载结算方式列表失败:', error);
+  }
+};
+
+// 加载信用等级列表
+const loadCreditLevelList = async () => {
+  try {
+    const query: any = { dataSource: 'A10' };
+    const res = await listCreditLevel(query);
+    creditLevelList.value = res.rows || [];
+  } catch (error) {
+    console.error('加载信用等级列表失败:', error);
+  }
+};
+
+// 加载员工列表
+const loadComStaffList = async () => {
+  try {
+    const query: any = {};
+    const res = await listErpStaff(query);
+    comStaffList.value = res.rows || [];
+  } catch (error) {
+    console.error('加载员工列表失败:', error);
+  }
+};
+
+// 加载部门列表
+const loadComDeptList = async () => {
+  try {
+    const res = await listErpDept();
+    // 处理可能的不同返回结构
+    comDeptList.value = res.rows || res.data || [];
+  } catch (error) {
+    console.error('加载部门列表失败:', error);
+  }
+};
+
+// 加载客户数据
+const loadCustomerData = async (id: any) => {
+  try {
+    const res = await getCustomerInfo(id);
+    const data = res.data;
+
+    // 填充销售信息
+    if (data.customerSalesInfoVo) {
+      Object.assign(salesForm, data.customerSalesInfoVo);
+
+      // 如果有部门ID，且部门不在列表中，从API获取
+      if (salesForm.belongingDepartmentId) {
+        const deptExists = comDeptList.value.find((d) => String(d.deptId) === String(salesForm.belongingDepartmentId));
+        if (!deptExists) {
+          try {
+            const deptRes = await getErpDept(salesForm.belongingDepartmentId);
+            if (deptRes.data) {
+              comDeptList.value.push(deptRes.data);
+            }
+          } catch (error) {
+            console.error('获取部门信息失败:', error);
+          }
+        }
+      }
+    }
+  } catch (error) {
+    console.error('加载客户数据失败:', error);
+    ElMessage.error('加载客户数据失败');
+  }
+};
+
+// 监听props变化
+watch(
+  () => props.customerId,
+  (newId) => {
+    if (newId) {
+      custId.value = newId;
+      loadCustomerData(newId);
+    }
+  }
+);
+
+// 监听部门ID变化，自动加载部门名称
+watch(
+  () => salesForm.belongingDepartmentId,
+  async (newDeptId) => {
+    if (!newDeptId) {
+      deptName.value = '';
+      return;
+    }
+
+    // 先从列表中查找
+    const dept = comDeptList.value.find((d) => String(d.deptId) === String(newDeptId));
+    if (dept) {
+      deptName.value = dept.deptName;
+      return;
+    }
+
+    // 如果列表中没有，从API获取
+    try {
+      const res = await getErpDept(newDeptId);
+      if (res.data) {
+        deptName.value = res.data.deptName;
+        comDeptList.value.push(res.data as any);
+      }
+    } catch (error) {
+      console.error('获取部门信息失败:', error);
+      deptName.value = String(newDeptId);
+    }
+  },
+  { immediate: true }
+);
+
+// 处理业务人员选择变化
+const handleSalesPersonChange = async (staffId: any) => {
+  // 根据选中的业务人员ID，找到对应的部门ID
+  const selectedStaff = comStaffList.value.find((staff) => staff.staffId === staffId);
+  if (selectedStaff && selectedStaff.deptId) {
+    // 确保 deptId 的类型一致
+    salesForm.belongingDepartmentId = String(selectedStaff.deptId);
+
+    // 如果部门不在列表中，从API获取
+    const deptExists = comDeptList.value.find((d) => String(d.deptId) === String(selectedStaff.deptId));
+    if (!deptExists) {
+      try {
+        const res = await getErpDept(selectedStaff.deptId);
+        if (res.data) {
+          comDeptList.value.push(res.data as any);
+        }
+      } catch (error) {
+        console.error('获取部门信息失败:', error);
+      }
+    }
+  }
+};
+
+// 保存按钮
+const handleSave = async () => {
+  try {
+    await salesFormRef.value.validate();
+    submitLoading.value = true;
+
+    // 准备提交数据，包含销售信息
+    const submitData: CustomerInfoForm = {
+      id: custId.value,
+      customerSalesInfoBo: { ...salesForm }
+    };
+
+    await updateCustomerInfo(submitData);
+
+    ElMessage.success('保存成功');
+
+    // 重新加载数据
+    await loadCustomerData(custId.value);
+  } catch (error) {
+    const isValidationError = error && typeof error === 'object' && 'fields' in error;
+
+    if (isValidationError) {
+      console.warn('表单验证未通过', error);
+      return;
+    }
+
+    ElMessage.error('保存失败，请稍后重试或联系管理员');
+  } finally {
+    submitLoading.value = false;
+  }
+};
+</script>

src/views/customer/customerFile/customerInfo/overview/orgStructure.vue

@@ -2,13 +2,11 @@
   <div class="p-2">
     <el-card shadow="never">
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="22">
-            <span>企业组织结构信息列表</span>
-          </el-col>
-          <el-col :span="2" style="text-align: right">
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <span style="font-size: 16px; font-weight: 500">企业组织结构信息列表</span>
+          <div style="display: flex; flex-wrap: nowrap; gap: 10px">
             <el-button type="primary" plain icon="Plus" @click="handleAdd()">新增部门</el-button>
-          </el-col>
+          </div>
         </el-row>
       </template>
 

src/views/customer/customerFile/customerInfo/overview/shippingAddress.vue

@@ -2,13 +2,11 @@
   <div class="p-2">
     <el-card shadow="never">
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="20">
-            <span>收货地址信息列表</span>
-          </el-col>
-          <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <span style="font-size: 16px; font-weight: 500">收货地址信息列表</span>
+          <div style="display: flex; flex-wrap: nowrap; gap: 10px">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['customer:shippingAddress:add']">添加地址</el-button>
-          </el-col>
+          </div>
         </el-row>
       </template>
       <el-table v-loading="loading" border :data="shippingAddressList" @selection-change="handleSelectionChange">

src/views/order/saleOrder/index.vue

@@ -46,50 +46,37 @@
 
     <el-card shadow="never">
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="13"> 销售订单信息列表 </el-col>
-          <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8" type="flex" justify="space-between" align="middle">
+          <!-- 左侧标题 -->
+          <span style="font-size: 16px; font-weight: 500">销售订单信息列表</span>
+
+          <div style="display: flex; flex-wrap: nowrap; gap: 10px">
             <el-button type="primary" @click="handleCloseOrder()" :disabled="!ids.length" plain>关闭订单</el-button>
-          </el-col>
-          <el-col :span="1.5">
             <el-button type="primary" @click="handleDelete()" :disabled="!ids.length" plain>删除订单</el-button>
-          </el-col>
-          <el-col :span="1.5">
             <el-button type="primary" :disabled="!ids.length" plain>导出订单</el-button>
-          </el-col>
-          <el-col :span="1.5">
             <el-button
               :type="queryParams.orderStatus === undefined ? 'primary' : ''"
               :plain="queryParams.orderStatus !== undefined"
               @click="handleQuery()"
               >全部订单{{ orderStatusStats.totalCount }}</el-button
             >
-          </el-col>
-          <el-col :span="1.5">
+
             <el-button :type="queryParams.orderStatus === '0' ? 'primary' : ''" :plain="queryParams.orderStatus !== '0'" @click="handleQuery('0')"
               >待付款{{ orderStatusStats.pendingPaymentCount }}</el-button
             >
-          </el-col>
-          <el-col :span="1.5">
             <el-button :type="queryParams.orderStatus === '2' ? 'primary' : ''" :plain="queryParams.orderStatus !== '2'" @click="handleQuery('2')"
               >待发货{{ orderStatusStats.pendingShipmentCount }}</el-button
             >
-          </el-col>
-          <el-col :span="1.5">
             <el-button :type="queryParams.orderStatus === '4' ? 'primary' : ''" :plain="queryParams.orderStatus !== '4'" @click="handleQuery('4')"
               >已发货{{ orderStatusStats.shippedCount }}</el-button
             >
-          </el-col>
-          <el-col :span="1.5">
             <el-button :type="queryParams.orderStatus === '5' ? 'primary' : ''" :plain="queryParams.orderStatus !== '5'" @click="handleQuery('5')"
               >已完成{{ orderStatusStats.completedCount }}</el-button
             >
-          </el-col>
-          <el-col :span="1.5">
             <el-button :type="queryParams.orderStatus === '6' ? 'primary' : ''" :plain="queryParams.orderStatus !== '6'" @click="handleQuery('6')"
               >已关闭{{ orderStatusStats.closedCount }}</el-button
             >
-          </el-col>
+          </div>
         </el-row>
       </template>