diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java
index 5b28ad68..f528d85b 100644
--- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java
+++ b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java
@@ -81,7 +81,11 @@ public class BmsCustomerController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BmsCustomer bmsCustomer)
     {
-        return toAjax(bmsCustomerService.insertBmsCustomer(bmsCustomer));
+        bmsCustomerService.insertBmsCustomer(bmsCustomer);
+        // 返回新主键，供前端新增成功后停留在编辑页继续维护子表/绑定产品
+        AjaxResult ajax = AjaxResult.success("新增成功");
+        ajax.put("customerId", bmsCustomer.getCustomerId());
+        return ajax;
     }
 
     /**
diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java
index b04ba43f..ccbe7aca 100644
--- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java
+++ b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java
@@ -84,7 +84,7 @@ public class CustomerMoneyController extends BaseController
     /**
      * 审核通过收款单：确认后变动客户余额并生成余额流水
      */
-    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:edit')")
+    @PreAuthorize("@ss.hasPermi('customer:balance:review')")
     @Log(title = "客户收款审核", businessType = BusinessType.UPDATE)
     @PutMapping("/receipt/confirm/{id}")
     public AjaxResult confirmReceipt(@PathVariable("id") Long id)
diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java
index 88ea3ade..e61bf8a9 100644
--- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java
+++ b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java
@@ -74,7 +74,11 @@ public class BmsSupplierController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BmsSupplier bmsSupplier)
     {
-        return toAjax(bmsSupplierService.insertBmsSupplier(bmsSupplier));
+        bmsSupplierService.insertBmsSupplier(bmsSupplier);
+        // 返回新主键，供前端新增成功后停留在编辑页继续维护子表
+        AjaxResult ajax = AjaxResult.success("新增成功");
+        ajax.put("supplierId", bmsSupplier.getSupplierId());
+        return ajax;
     }
 
     /** 修改供应商 */
@@ -112,4 +116,20 @@ public class BmsSupplierController extends BaseController
         List<BmsSupplierCompany> list = bmsSupplierService.selectBmsSupplierCompanyList(bmsSupplierCompany);
         return getDataTable(list);
     }
+
+    /** 删除供应商公司主体 */
+    @Log(title = "供应商公司主体", businessType = BusinessType.DELETE)
+    @DeleteMapping("/company/{companyIds}")
+    public AjaxResult removeCompany(@PathVariable Long[] companyIds)
+    {
+        return toAjax(bmsSupplierService.deleteBmsSupplierCompanyByCompanyIds(companyIds));
+    }
+
+    /** 删除供应商联系人 */
+    @Log(title = "供应商联系人", businessType = BusinessType.DELETE)
+    @DeleteMapping("/contact/{contactIds}")
+    public AjaxResult removeContact(@PathVariable Long[] contactIds)
+    {
+        return toAjax(bmsSupplierService.deleteBmsSupplierContactByContactIds(contactIds));
+    }
 }
diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml
index f4d4c91a..619d2f71 100644
--- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml
+++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBmsCustomerList" parameterType="BmsCustomer" resultMap="BmsCustomerResult">
         <include refid="selectBmsCustomerVo"/>
         <where>
+            c.del_flag = '0'
             <if test="customerCode != null  and customerCode != ''"> and c.customer_code = #{customerCode}</if>
             <if test="customerName != null  and customerName != ''"> and c.customer_name like concat('%', #{customerName}, '%')</if>
             <if test="customerCodeDw != null  and customerCodeDw != ''"> and c.customer_code_dw = #{customerCodeDw}</if>
@@ -265,14 +266,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creditCode != null">credit_code = #{creditCode},</if>
             <if test="customerType != null">customer_type = #{customerType},</if>
             <if test="isEnable != null">is_enable = #{isEnable},</if>
-            <if test="salesUserId != null">sales_user_id = #{salesUserId},</if>
-            <if test="salesUser != null">sales_user = #{salesUser},</if>
+            sales_user_id = #{salesUserId},
+            sales_user = #{salesUser},
             <if test="ed != null">ed = #{ed},</if>
             <if test="zq != null">zq = #{zq},</if>
-            <if test="settlementUserId != null">settlement_user_id = #{settlementUserId},</if>
-            <if test="settlementUser != null">settlement_user = #{settlementUser},</if>
-            <if test="serviceUserId != null">service_user_id = #{serviceUserId},</if>
-            <if test="serviceUser != null">service_user = #{serviceUser},</if>
+            settlement_user_id = #{settlementUserId},
+            settlement_user = #{settlementUser},
+            service_user_id = #{serviceUserId},
+            service_user = #{serviceUser},
             <if test="settlementType != null">settlement_type = #{settlementType},</if>
             <if test="tempEd != null">temp_ed = #{tempEd},</if>
             <if test="accountBalance != null">account_balance = #{accountBalance},</if>
diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml
index 46166698..2a4fd951 100644
--- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml
+++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml
@@ -139,12 +139,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creditCode != null">credit_code = #{creditCode},</if>
             <if test="supplierType != null">supplier_type = #{supplierType},</if>
             <if test="isEnable != null">is_enable = #{isEnable},</if>
-            <if test="purchaserUserId != null">purchaser_user_id = #{purchaserUserId},</if>
-            <if test="purchaserUser != null">purchaser_user = #{purchaserUser},</if>
-            <if test="settlementUserId != null">settlement_user_id = #{settlementUserId},</if>
-            <if test="settlementUser != null">settlement_user = #{settlementUser},</if>
-            <if test="serviceUserId != null">service_user_id = #{serviceUserId},</if>
-            <if test="serviceUser != null">service_user = #{serviceUser},</if>
+            purchaser_user_id = #{purchaserUserId},
+            purchaser_user = #{purchaserUser},
+            settlement_user_id = #{settlementUserId},
+            settlement_user = #{settlementUser},
+            service_user_id = #{serviceUserId},
+            service_user = #{serviceUser},
             <if test="ed != null">ed = #{ed},</if>
             <if test="zq != null">zq = #{zq},</if>
             <if test="settlementType != null">settlement_type = #{settlementType},</if>
diff --git a/bms-back/sql/customer+supplier/customer_supplier_menu_perms.sql b/bms-back/sql/customer+supplier/customer_supplier_menu_perms.sql
new file mode 100644
index 00000000..e1fdfa71
--- /dev/null
+++ b/bms-back/sql/customer+supplier/customer_supplier_menu_perms.sql
@@ -0,0 +1,104 @@
+-- ----------------------------
+-- 客户管理 / 供应商管理 菜单按钮权限补全 + 普通角色(role_id=2)初始授权
+-- 幂等：可重复执行；已有记录不会重复插入
+-- 菜单结构：
+--   2309 客户/供应商管理(M)
+--     2313 客户管理(C)        perms -> customersupplier:customerinfo:list
+--       2422 客户余额管理(C,隐藏，静态路由页面，仅作收款审核按钮挂载点)
+--         2423 收款审核(F) customer:balance:review
+--       [新增] 客户查询/新增/修改/删除/导出 5个F按钮
+--     2314 供应商管理(C)      perms -> customersupplier:supplierinfo:list
+--       [新增] 供应商查询/新增/修改/删除/导出 5个F按钮
+-- ----------------------------
+
+-- 1. 两个业务菜单补 list 权限标识（后端列表接口 @PreAuthorize 要求）
+UPDATE `sys_menu` SET `perms` = 'customersupplier:customerinfo:list'
+WHERE `menu_id` = 2313 AND (`perms` IS NULL OR `perms` = '');
+
+UPDATE `sys_menu` SET `perms` = 'customersupplier:supplierinfo:list'
+WHERE `menu_id` = 2314 AND (`perms` IS NULL OR `perms` = '');
+
+-- 2. 客户余额管理为静态路由页面(/customersupplier/customer-money)，侧边栏不应显示，避免死链
+UPDATE `sys_menu` SET `visible` = '1'
+WHERE `menu_id` = 2422 AND `visible` = '0';
+
+-- 3. 补全客户管理 5 个按钮（F），按 perms 幂等
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '客户查询', 2313, 1, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:query', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:query' AND `parent_id` = 2313);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '客户新增', 2313, 2, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:add', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:add' AND `parent_id` = 2313);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '客户修改', 2313, 3, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:edit', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:edit' AND `parent_id` = 2313);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '客户删除', 2313, 4, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:remove', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:remove' AND `parent_id` = 2313);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '客户导出', 2313, 5, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:export', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:export' AND `parent_id` = 2313);
+
+-- 4. 补全供应商管理 5 个按钮（F），按 perms 幂等
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '供应商查询', 2314, 1, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:query', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:query' AND `parent_id` = 2314);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '供应商新增', 2314, 2, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:add', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:add' AND `parent_id` = 2314);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '供应商修改', 2314, 3, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:edit', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:edit' AND `parent_id` = 2314);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '供应商删除', 2314, 4, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:remove', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:remove' AND `parent_id` = 2314);
+
+INSERT INTO `sys_menu`
+(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
+ `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
+SELECT '供应商导出', 2314, 5, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:export', '#', 'admin', NOW(), ''
+WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:export' AND `parent_id` = 2314);
+
+-- 5. 普通角色(role_id=2) 授权：目录 + 2个菜单 + 余额隐藏菜单 + 收款审核 + 10个新按钮（幂等）
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`)
+SELECT 2, m.`menu_id`
+FROM `sys_menu` m
+WHERE (
+  m.`menu_id` IN (2309, 2313, 2314, 2422, 2423)
+  OR m.`perms` IN (
+    'customersupplier:customerinfo:query', 'customersupplier:customerinfo:add',
+    'customersupplier:customerinfo:edit',  'customersupplier:customerinfo:remove',
+    'customersupplier:customerinfo:export',
+    'customersupplier:supplierinfo:query', 'customersupplier:supplierinfo:add',
+    'customersupplier:supplierinfo:edit',  'customersupplier:supplierinfo:remove',
+    'customersupplier:supplierinfo:export'
+  )
+)
+AND NOT EXISTS (
+  SELECT 1 FROM `sys_role_menu` rm WHERE rm.`role_id` = 2 AND rm.`menu_id` = m.`menu_id`
+);
diff --git a/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js b/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js
index e6ad2e91..7aec7caf 100644
--- a/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js
+++ b/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js
@@ -42,3 +42,19 @@ export function delCustomer(customerId) {
     method: 'delete'
   })
 }
+
+// 删除客户公司主体
+export function delCustomerCompany(companyId) {
+  return request({
+    url: '/customersupplier/customerinfo/company/' + companyId,
+    method: 'delete'
+  })
+}
+
+// 删除客户联系人
+export function delCustomerContact(contactId) {
+  return request({
+    url: '/customersupplier/customerinfo/contact/' + contactId,
+    method: 'delete'
+  })
+}
diff --git a/bms-front/src/api/customersuppliermanagement/supplierinfo/supplier.js b/bms-front/src/api/customersuppliermanagement/supplierinfo/supplier.js
index 1f7aefb1..46e17f0e 100644
--- a/bms-front/src/api/customersuppliermanagement/supplierinfo/supplier.js
+++ b/bms-front/src/api/customersuppliermanagement/supplierinfo/supplier.js
@@ -42,3 +42,19 @@ export function delSupplier(supplierId) {
     method: 'delete'
   })
 }
+
+// 删除供应商公司主体
+export function delSupplierCompany(companyId) {
+  return request({
+    url: '/customersupplier/supplierinfo/company/' + companyId,
+    method: 'delete'
+  })
+}
+
+// 删除供应商联系人
+export function delSupplierContact(contactId) {
+  return request({
+    url: '/customersupplier/supplierinfo/contact/' + contactId,
+    method: 'delete'
+  })
+}
diff --git a/bms-front/src/components/ProductSelect/index.vue b/bms-front/src/components/ProductSelect/index.vue
new file mode 100644
index 00000000..fcfaf979
--- /dev/null
+++ b/bms-front/src/components/ProductSelect/index.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="product-select">
+    <el-button type="primary" plain icon="Connection" @click="openDialog">
+      {{ selectedIds.length ? '重新选择产品' : '选择产品' }}
+    </el-button>
+    <span class="ps-summary">
+      已绑定 <b>{{ selectedIds.length }}</b> 个产品
+      <el-button v-if="selectedIds.length" link type="danger" @click="clearSelection">清空</el-button>
+    </span>
+
+    <el-dialog
+      v-model="dialogVisible"
+      title="选择绑定产品"
+      width="960px"
+      append-to-body
+      :close-on-click-modal="false"
+      @open="handleOpen"
+    >
+      <el-form :inline="true" class="ps-filter" @submit.prevent>
+        <el-form-item label="产品代码">
+          <el-input v-model="queryParams.productCode" placeholder="如 WSP037" clearable style="width: 150px" @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="产品名称">
+          <el-input v-model="queryParams.productName" placeholder="产品名称" clearable style="width: 160px" @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="目的区域">
+          <el-input v-model="queryParams.destRegion" placeholder="如 欧盟" clearable style="width: 120px" @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="走货属性">
+          <el-input v-model="queryParams.cargoAttr" placeholder="普货/带电等" clearable style="width: 120px" @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="queryParams.status" placeholder="全部" clearable style="width: 110px">
+            <el-option label="待生效" value="0" />
+            <el-option label="已生效" value="1" />
+            <el-option label="已失效" value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table
+        ref="tableRef"
+        v-loading="loading"
+        :data="filteredList"
+        row-key="productId"
+        height="380"
+        border
+        @select="handleSelect"
+        @select-all="handleSelectAll"
+      >
+        <el-table-column type="selection" width="48" align="center" />
+        <el-table-column label="产品代码" prop="productCode" width="110" show-overflow-tooltip />
+        <el-table-column label="产品名称" prop="productName" min-width="160" show-overflow-tooltip />
+        <el-table-column label="时效等级" prop="serviceLevel" width="90" show-overflow-tooltip />
+        <el-table-column label="走货属性" prop="cargoAttr" width="90" show-overflow-tooltip />
+        <el-table-column label="目的区域" prop="destRegion" width="90" show-overflow-tooltip />
+        <el-table-column label="包税" width="80" align="center">
+          <template #default="{ row }">
+            <el-tag v-if="row.taxMode === 'TAX_INCLUDED'" type="success" size="small">包税</el-tag>
+            <el-tag v-else-if="row.taxMode === 'TAX_EXCLUDED'" type="warning" size="small">不包税</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" width="80" align="center">
+          <template #default="{ row }">
+            <el-tag :type="statusTagType[row.status] || 'info'" size="small">{{ statusMap[row.status] || '未知' }}</el-tag>
+          </template>
+        </el-table-column>
+        <div slot="empty" class="ps-empty">暂无产品数据</div>
+      </el-table>
+
+      <template #footer>
+        <div class="ps-footer">
+          <span>已选 <b>{{ draftIds.size }}</b> 个产品</span>
+          <div>
+            <el-button @click="dialogVisible = false">取消</el-button>
+            <el-button type="primary" @click="confirmSelection">确定</el-button>
+          </div>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ProductSelect">
+import { ref, reactive, computed, watch, nextTick } from 'vue'
+import { useProducts } from './useProducts'
+
+const props = defineProps({
+  /** v-model 绑定值：逗号分隔的产品ID串，如 "3,6" */
+  modelValue: { type: [String, Number], default: '' }
+})
+const emit = defineEmits(['update:modelValue', 'change'])
+
+const { productList, ensureProducts } = useProducts()
+
+const dialogVisible = ref(false)
+const loading = ref(false)
+const tableRef = ref(null)
+const draftIds = reactive(new Set())
+const queryParams = reactive({
+  productCode: '',
+  productName: '',
+  destRegion: '',
+  cargoAttr: '',
+  status: ''
+})
+
+const selectedIds = computed(() =>
+  String(props.modelValue || '').split(',').map(s => s.trim()).filter(Boolean)
+)
+
+const statusMap = { 0: '待生效', 1: '已生效', 2: '已失效' }
+const statusTagType = { 0: 'info', 1: 'success', 2: 'danger' }
+
+const filteredList = computed(() => {
+  return productList.value.filter(p => {
+    if (queryParams.productCode && !(p.productCode || '').toLowerCase().includes(queryParams.productCode.trim().toLowerCase())) return false
+    if (queryParams.productName && !(p.productName || '').includes(queryParams.productName.trim())) return false
+    if (queryParams.destRegion && !(p.destRegion || '').includes(queryParams.destRegion.trim())) return false
+    if (queryParams.cargoAttr && !(p.cargoAttr || '').includes(queryParams.cargoAttr.trim())) return false
+    if (queryParams.status !== '' && queryParams.status !== null && queryParams.status !== undefined && String(p.status) !== String(queryParams.status)) return false
+    return true
+  })
+})
+
+function openDialog() {
+  dialogVisible.value = true
+}
+
+function handleOpen() {
+  loading.value = true
+  draftIds.clear()
+  selectedIds.value.forEach(id => draftIds.add(id))
+  resetQuery(false)
+  // 拉取最新产品后，按 draftIds 全量同步一次勾选（覆盖上次弹窗遗留状态）
+  ensureProducts(true).finally(() => {
+    loading.value = false
+    nextTick(syncSelection)
+  })
+}
+
+/** 按 draftIds 同步当前渲染行的勾选状态（draftIds 为唯一数据源，筛选切换不丢选择） */
+function syncSelection() {
+  if (!tableRef.value) return
+  filteredList.value.forEach(row => {
+    tableRef.value.toggleRowSelection(row, draftIds.has(String(row.productId)))
+  })
+}
+
+/** 数据/筛选变化后同步表格勾选状态 */
+watch(filteredList, () => {
+  if (!dialogVisible.value) return
+  nextTick(syncSelection)
+}, { flush: 'post' })
+
+function handleSelect(selection, row) {
+  const id = String(row.productId)
+  if (draftIds.has(id)) draftIds.delete(id)
+  else draftIds.add(id)
+}
+
+function handleSelectAll(selection) {
+  // selection 为当前过滤后页面被选中的行；长度>0 表示全选，否则取消全选
+  if (selection.length) {
+    filteredList.value.forEach(row => draftIds.add(String(row.productId)))
+  } else {
+    filteredList.value.forEach(row => draftIds.delete(String(row.productId)))
+  }
+}
+
+function handleQuery() {
+  // 纯前端过滤（全量已缓存），watch filteredList 自动同步勾选
+}
+
+function resetQuery(reload = true) {
+  queryParams.productCode = ''
+  queryParams.productName = ''
+  queryParams.destRegion = ''
+  queryParams.cargoAttr = ''
+  queryParams.status = ''
+  if (reload) ensureProducts(true)
+}
+
+function confirmSelection() {
+  const ids = Array.from(draftIds)
+  const value = ids.join(',')
+  emit('update:modelValue', value)
+  emit('change', ids)
+  dialogVisible.value = false
+}
+
+function clearSelection() {
+  emit('update:modelValue', '')
+  emit('change', [])
+}
+
+/** 供父组件预加载产品缓存（tab 内明细表格使用） */
+defineExpose({ ensureProducts })
+</script>
+
+<style scoped>
+.product-select {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+.ps-summary {
+  color: #606266;
+  font-size: 14px;
+}
+.ps-summary b {
+  color: #409eff;
+  font-size: 15px;
+  margin: 0 2px;
+}
+.ps-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.ps-footer b {
+  color: #409eff;
+}
+</style>
diff --git a/bms-front/src/components/ProductSelect/useProducts.js b/bms-front/src/components/ProductSelect/useProducts.js
new file mode 100644
index 00000000..03b7e06b
--- /dev/null
+++ b/bms-front/src/components/ProductSelect/useProducts.js
@@ -0,0 +1,67 @@
+import { ref } from 'vue'
+import { listProduct } from '@/api/price/product'
+
+/**
+ * 产品列表模块级共享缓存：全应用只拉取一次
+ * 用于客户绑定产品的选择与已绑产品名称/明细回显
+ */
+const productList = ref([])
+let loadingPromise = null
+
+/** 逗号分隔 id 串 -> 字符串 id 数组 */
+export function parseProductIds(value) {
+  if (Array.isArray(value)) return value.map(v => String(v)).filter(Boolean)
+  if (value === null || value === undefined) return []
+  return String(value).split(',').map(s => s.trim()).filter(Boolean)
+}
+
+/** id 数组 -> 逗号分隔串（去重，保持原顺序） */
+export function joinProductIds(ids) {
+  const seen = new Set()
+  const out = []
+  ;(ids || []).forEach(id => {
+    const key = String(id)
+    if (key && !seen.has(key)) {
+      seen.add(key)
+      out.push(key)
+    }
+  })
+  return out.join(',')
+}
+
+export function useProducts() {
+  /** 确保产品列表已加载（force=true 强制刷新），拉取全部状态以便回显已失效产品 */
+  function ensureProducts(force = false) {
+    if (!force && loadingPromise) return loadingPromise
+    if (!force && productList.value.length) return Promise.resolve(productList.value)
+    loadingPromise = listProduct({ pageNum: 1, pageSize: 1000 })
+      .then(res => {
+        productList.value = res.rows || []
+        return productList.value
+      })
+      .finally(() => {
+        loadingPromise = null
+      })
+    return loadingPromise
+  }
+
+  /** 按产品ID查产品对象 */
+  function findProduct(productId) {
+    if (productId === null || productId === undefined || productId === '') return null
+    return productList.value.find(p => String(p.productId) === String(productId)) || null
+  }
+
+  /** 产品展示名：代码 + 名称 */
+  function getProductLabel(productId) {
+    const p = findProduct(productId)
+    if (!p) return String(productId)
+    return p.productCode + ' ' + p.productName
+  }
+
+  return {
+    productList,
+    ensureProducts,
+    findProduct,
+    getProductLabel
+  }
+}
diff --git a/bms-front/src/components/UserName/index.vue b/bms-front/src/components/UserName/index.vue
new file mode 100644
index 00000000..7a38a0aa
--- /dev/null
+++ b/bms-front/src/components/UserName/index.vue
@@ -0,0 +1,23 @@
+<template>{{ displayName }}</template>
+
+<script setup name="UserName">
+import { computed, onMounted } from 'vue'
+import { useUsers } from '@/components/UserSelect/useUsers'
+
+const props = defineProps({
+  /** 用户ID */
+  userId: {
+    type: [String, Number],
+    default: null
+  }
+})
+
+const { ensureUsers, getUserName } = useUsers()
+
+// getUserName 内部读取共享 userList，列表加载完成后计算属性自动刷新
+const displayName = computed(() => getUserName(props.userId))
+
+onMounted(() => {
+  ensureUsers()
+})
+</script>
diff --git a/bms-front/src/components/UserSelect/index.vue b/bms-front/src/components/UserSelect/index.vue
new file mode 100644
index 00000000..02869e0a
--- /dev/null
+++ b/bms-front/src/components/UserSelect/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <el-select
+    v-model="innerValue"
+    :placeholder="placeholder"
+    :clearable="clearable"
+    :filterable="filterable"
+    :disabled="disabled"
+    :loading="loading"
+    :size="size"
+    :multiple="false"
+    value-on-clear="null"
+    style="width: 100%;"
+    @change="handleChange"
+  >
+    <el-option
+      v-for="item in options"
+      :key="item.userId"
+      :label="item.nickName || item.userName"
+      :value="String(item.userId)"
+    >
+      <span>{{ item.nickName || item.userName }}</span>
+      <span
+        v-if="showCode && item.userName"
+        class="user-select-sub"
+      >{{ item.userName }}</span>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup name="UserSelect">
+import { computed, onMounted, ref, watch } from 'vue'
+import { useUsers } from './useUsers'
+
+const props = defineProps({
+  /** 绑定值：用户ID（字符串/数字），清空时为 null */
+  modelValue: {
+    type: [String, Number],
+    default: null
+  },
+  placeholder: {
+    type: String,
+    default: '请选择用户'
+  },
+  clearable: {
+    type: Boolean,
+    default: true
+  },
+  filterable: {
+    type: Boolean,
+    default: true
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  size: {
+    type: String,
+    default: ''
+  },
+  /** 选项右侧是否显示登录账号 */
+  showCode: {
+    type: Boolean,
+    default: true
+  }
+})
+
+const emit = defineEmits(['update:modelValue', 'change'])
+
+const { userList, ensureUsers, findUser } = useUsers()
+const loading = ref(false)
+const innerValue = ref(props.modelValue === null || props.modelValue === undefined ? null : String(props.modelValue))
+
+watch(() => props.modelValue, (val) => {
+  innerValue.value = val === null || val === undefined || val === '' ? null : String(val)
+})
+
+/** 兜底：当前值在用户列表中不存在（停用/未加载到）时补占位项，避免显示空白 */
+const options = computed(() => {
+  const list = userList.value
+  if (innerValue.value && !findUser(innerValue.value)) {
+    return [{ userId: innerValue.value, userName: '', nickName: String(innerValue.value) }, ...list]
+  }
+  return list
+})
+
+function handleChange(val) {
+  const value = val === '' ? null : val
+  emit('update:modelValue', value)
+  emit('change', value, value === null ? null : findUser(value))
+}
+
+onMounted(() => {
+  loading.value = true
+  ensureUsers().finally(() => {
+    loading.value = false
+  })
+})
+
+defineExpose({
+  reload: () => ensureUsers(true)
+})
+</script>
+
+<style scoped>
+.user-select-sub {
+  float: right;
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+}
+</style>
diff --git a/bms-front/src/components/UserSelect/useUsers.js b/bms-front/src/components/UserSelect/useUsers.js
new file mode 100644
index 00000000..48b45b69
--- /dev/null
+++ b/bms-front/src/components/UserSelect/useUsers.js
@@ -0,0 +1,45 @@
+import { ref } from 'vue'
+import { listUser } from '@/api/system/user'
+
+/**
+ * 用户列表模块级共享缓存：整个应用只拉取一次，UserSelect / UserName 共用
+ */
+const userList = ref([])
+let loadingPromise = null
+
+export function useUsers() {
+  /** 确保用户列表已加载（force=true 强制刷新） */
+  function ensureUsers(force = false) {
+    if (!force && loadingPromise) return loadingPromise
+    if (!force && userList.value.length) return Promise.resolve(userList.value)
+    loadingPromise = listUser({ pageNum: 1, pageSize: 1000 })
+      .then(res => {
+        userList.value = res.rows || []
+        return userList.value
+      })
+      .finally(() => {
+        loadingPromise = null
+      })
+    return loadingPromise
+  }
+
+  /** 按用户ID查用户对象 */
+  function findUser(userId) {
+    if (userId === null || userId === undefined || userId === '') return null
+    return userList.value.find(u => String(u.userId) === String(userId)) || null
+  }
+
+  /** 按用户ID取显示名（nickName 优先，找不到时回退显示ID本身） */
+  function getUserName(userId) {
+    if (userId === null || userId === undefined || userId === '') return ''
+    const user = findUser(userId)
+    return user ? (user.nickName || user.userName || String(userId)) : String(userId)
+  }
+
+  return {
+    userList,
+    ensureUsers,
+    findUser,
+    getUserName
+  }
+}
diff --git a/bms-front/src/main.js b/bms-front/src/main.js
index bfda28ec..1a33210f 100644
--- a/bms-front/src/main.js
+++ b/bms-front/src/main.js
@@ -50,6 +50,11 @@ import BasicTable from '@/components/BasicTable'
 import SimpleTable from '@/components/SimpleTable'
 // 客户/供应商下拉选择组件
 import CustomerSelect from '@/components/CustomerSelect'
+// 用户选择/用户名称展示组件
+import UserSelect from '@/components/UserSelect'
+import UserName from '@/components/UserName'
+// 产品多选绑定组件
+import ProductSelect from '@/components/ProductSelect'
 
 const app = createApp(App)
 
@@ -76,6 +81,9 @@ app.component('BasicForm', BasicForm)
 app.component('BasicTable', BasicTable)
 app.component('SimpleTable', SimpleTable)
 app.component('CustomerSelect', CustomerSelect)
+app.component('UserSelect', UserSelect)
+app.component('UserName', UserName)
+app.component('ProductSelect', ProductSelect)
 
 app.use(router)
 app.use(store)
diff --git a/bms-front/src/router/index.js b/bms-front/src/router/index.js
index cfca5c30..3b95f7dc 100644
--- a/bms-front/src/router/index.js
+++ b/bms-front/src/router/index.js
@@ -169,7 +169,35 @@ export const dynamicRoutes = [
         path: 'index',
         component: () => import('@/views/customersuppliermanagement/customerinfo/customermoney/index.vue'),
         name: 'CustomerMoney',
-        meta: { title: '客户余额', activeMenu: '/customersupplier/customerinfo' }
+        meta: { title: '客户余额', activeMenu: '/customersuppliermanagement/customerinfo' }
+      }
+    ]
+  },
+  {
+    path: '/customersupplier/customer-edit',
+    component: Layout,
+    hidden: true,
+    permissions: ['customersupplier:customerinfo:list'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/customersuppliermanagement/customerinfo/customeredit/index.vue'),
+        name: 'CustomerEdit',
+        meta: { title: '客户编辑', activeMenu: '/customersuppliermanagement/customerinfo' }
+      }
+    ]
+  },
+  {
+    path: '/customersupplier/supplier-edit',
+    component: Layout,
+    hidden: true,
+    permissions: ['customersupplier:supplierinfo:list'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue'),
+        name: 'SupplierEdit',
+        meta: { title: '供应商编辑', activeMenu: '/customersuppliermanagement/supplierinfo' }
       }
     ]
   }
diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue
new file mode 100644
index 00000000..f85eb700
--- /dev/null
+++ b/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue
@@ -0,0 +1,1080 @@
+<template>
+  <div class="app-container customer-edit-page" v-loading="pageLoading">
+    <!-- 顶部：返回 + 标题 + 保存 -->
+    <el-card shadow="never" class="head-card">
+      <div class="head-bar">
+        <el-button icon="ArrowLeft" @click="goBack">返回</el-button>
+        <div class="head-title">
+          <span class="customer-name">{{ isAdd ? '新增客户' : (form.customerName || '-') }}</span>
+          <el-tag size="small" :type="isAdd ? 'warning' : 'info'">{{ isAdd ? '未保存' : '编辑中' }}</el-tag>
+        </div>
+        <div class="head-code">客户编码：{{ form.customerCode || '保存后可维护子表数据' }}</div>
+        <div class="head-right">
+          <el-button @click="goBack">取 消</el-button>
+          <el-button v-if="isAdd" type="primary" :loading="saving" v-hasPermi="['customersupplier:customerinfo:add']" @click="submitForm">保 存</el-button>
+          <el-button v-else type="primary" :loading="saving" v-hasPermi="['customersupplier:customerinfo:edit']" @click="submitForm">保 存</el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <el-card shadow="never">
+      <el-tabs v-model="activeTab">
+        <!-- ============ 基本信息 ============ -->
+        <el-tab-pane label="基本信息" name="base">
+          <el-form ref="customerRef" :model="form" :rules="rules" label-width="120px" class="customer-form">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="客户编码" prop="customerCode">
+                  <el-input v-model="form.customerCode" placeholder="请输入客户编码" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="客户名称" prop="customerName">
+                  <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="对外代码" prop="customerCodeDw">
+                  <el-input v-model="form.customerCodeDw" placeholder="请输入对外代码" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="统一社会信用代码" prop="creditCode">
+                  <el-input v-model="form.creditCode" placeholder="在「公司主体」页签点绑定客户后自动同步">
+                    <template #append>
+                      <el-tooltip content="由公司主体绑定自动同步，也可手工录入" placement="top">
+                        <el-icon><InfoFilled /></el-icon>
+                      </el-tooltip>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="启用状态" prop="isEnable">
+                  <el-select v-model="form.isEnable" placeholder="请选择启用状态" clearable style="width: 100%;">
+                    <el-option label="正常" value="0" />
+                    <el-option label="停用" value="1" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="业务员" prop="salesUserId">
+                  <user-select
+                    v-model="form.salesUserId"
+                    placeholder="请选择业务员"
+                    @change="(uid, user) => handleUserChange(uid, user, 'salesUser')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="资金额度" prop="ed">
+                  <el-input v-model="form.ed" placeholder="请输入资金额度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="结算方式" prop="settlementType">
+                  <el-select v-model="form.settlementType" placeholder="请选择结算方式" clearable style="width: 100%;">
+                    <el-option
+                      v-for="dict in settlement_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="回款账期" prop="zq">
+                  <el-input v-model="form.zq" placeholder="请输入回款账期" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="结算员" prop="settlementUserId">
+                  <user-select
+                    v-model="form.settlementUserId"
+                    placeholder="请选择结算员"
+                    @change="(uid, user) => handleUserChange(uid, user, 'settlementUser')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="客服" prop="serviceUserId">
+                  <user-select
+                    v-model="form.serviceUserId"
+                    placeholder="请选择客服"
+                    @change="(uid, user) => handleUserChange(uid, user, 'serviceUser')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="临时额度" prop="tempEd">
+                  <el-input v-model="form.tempEd" placeholder="请输入临时额度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="账户余额">
+                  <el-input :model-value="formatBalance(form.accountBalance)" disabled placeholder="0.00">
+                    <template #append>CNY</template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="重量阈值" prop="weightThreshold">
+                  <el-input v-model="form.weightThreshold" placeholder="请输入重量阈值" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="抛比" prop="throwRatio">
+                  <el-input v-model="form.throwRatio" placeholder="请输入抛比" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="信用额度" prop="creditEd">
+                  <el-input v-model="form.creditEd" placeholder="请输入信用额度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="备注说明" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+
+        <!-- ============ 绑定产品 ============ -->
+        <el-tab-pane label="绑定产品" name="product">
+          <div class="pane-toolbar">
+            <product-select v-model="form.productIds" />
+            <span class="pane-tip">绑定结果以产品ID逗号串存入客户主表 product_ids，仅用于产品对接映射</span>
+          </div>
+          <el-table :data="boundProducts" border size="small" class="bound-table">
+            <el-table-column label="序号" type="index" width="55" align="center" />
+            <el-table-column label="产品代码" prop="productCode" width="120" show-overflow-tooltip />
+            <el-table-column label="产品名称" prop="productName" min-width="180" show-overflow-tooltip />
+            <el-table-column label="时效等级" prop="serviceLevel" width="100" show-overflow-tooltip />
+            <el-table-column label="走货属性" prop="cargoAttr" width="100" show-overflow-tooltip />
+            <el-table-column label="目的区域" prop="destRegion" width="100" show-overflow-tooltip />
+            <el-table-column label="包税" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag v-if="row.taxMode === 'TAX_INCLUDED'" type="success" size="small">包税</el-tag>
+                <el-tag v-else-if="row.taxMode === 'TAX_EXCLUDED'" type="warning" size="small">不包税</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag :type="productStatusTagType[row.status] || 'info'" size="small">{{ productStatusMap[row.status] || '未知' }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="生效日期" prop="effectiveDate" width="110" align="center" />
+            <el-table-column label="操作" width="90" align="center">
+              <template #default="{ row }">
+                <el-button link type="danger" size="small" @click="removeProduct(row.productId)">移除</el-button>
+              </template>
+            </el-table-column>
+            <template #empty>
+              <el-empty description="暂未绑定产品，点击上方「选择产品」进行绑定" :image-size="80" />
+            </template>
+          </el-table>
+        </el-tab-pane>
+
+        <!-- ============ 公司主体 ============ -->
+        <el-tab-pane label="公司主体" name="company">
+          <div class="pane-toolbar">
+            <el-button type="primary" plain icon="Plus" size="small" @click="handleAddCompany">新增公司主体</el-button>
+            <span class="pane-tip">点击「绑定客户」后，主表的统一社会信用代码会自动同步为该公司的信用代码</span>
+          </div>
+          <el-table :data="form.companyList" border size="small">
+            <el-table-column label="序号" type="index" width="55" align="center" />
+            <el-table-column label="公司全称" prop="companyNameFull" show-overflow-tooltip />
+            <el-table-column label="统一社会信用代码" prop="creditCode" width="190" show-overflow-tooltip />
+            <el-table-column label="法定代表人" prop="legalPerson" width="110" show-overflow-tooltip />
+            <el-table-column label="当前绑定" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag v-if="row.creditCode && form.creditCode === row.creditCode" type="success" size="small">已绑定</el-tag>
+                <span v-else style="color: #999;">-</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="230" align="center">
+              <template #default="{ row, $index }">
+                <el-button link type="primary" size="small" @click="handleBindCompany(row)">绑定客户</el-button>
+                <el-button link type="primary" size="small" @click="handleEditCompany(row, $index)">编辑</el-button>
+                <el-button link type="danger" size="small" @click="handleDeleteCompany(row, $index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <template #empty>
+              <el-empty description="暂无公司主体，新增后将随客户信息一起保存" :image-size="80" />
+            </template>
+          </el-table>
+        </el-tab-pane>
+
+        <!-- ============ 联系人 ============ -->
+        <el-tab-pane label="联系人" name="contact">
+          <div class="pane-toolbar">
+            <el-button type="primary" plain icon="Plus" size="small" @click="handleAddContact">新增联系人</el-button>
+          </div>
+          <el-table :data="form.contactList" border size="small">
+            <el-table-column label="序号" type="index" width="55" align="center" />
+            <el-table-column label="联系人" prop="contactName" width="120" show-overflow-tooltip />
+            <el-table-column label="职位" prop="position" width="130" show-overflow-tooltip />
+            <el-table-column label="所属部门" prop="department" width="130" show-overflow-tooltip />
+            <el-table-column label="手机号" prop="phone" width="140" show-overflow-tooltip />
+            <el-table-column label="邮箱" prop="email" min-width="180" show-overflow-tooltip />
+            <el-table-column label="默认" width="80" align="center">
+              <template #default="{ row }">
+                <el-tag v-if="row.isDefault === '1'" type="success" size="small">默认</el-tag>
+                <span v-else style="color: #999;">-</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="150" align="center">
+              <template #default="{ row, $index }">
+                <el-button link type="primary" size="small" @click="handleEditContact(row, $index)">编辑</el-button>
+                <el-button link type="danger" size="small" @click="handleDeleteContact(row, $index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <template #empty>
+              <el-empty description="暂无联系人，新增后将随客户信息一起保存" :image-size="80" />
+            </template>
+          </el-table>
+        </el-tab-pane>
+
+        <!-- ============ 附件资料 ============ -->
+        <el-tab-pane label="附件资料" name="attachment">
+          <div class="pane-toolbar">
+            <el-upload
+              :show-file-list="false"
+              :action="uploadFileUrl"
+              :headers="uploadHeaders"
+              :before-upload="handleBeforeAttachmentUpload"
+              :on-success="handleAttachmentUploadSuccess"
+              :on-error="handleAttachmentUploadError"
+              multiple
+            >
+              <el-button type="primary" icon="Upload">上传附件</el-button>
+            </el-upload>
+            <span class="pane-tip">支持 PDF、图片、Word、Excel、压缩包，单个文件不超过 50MB；附件在点「保存」后随客户入库</span>
+          </div>
+          <el-table :data="form.attachmentList" border size="small">
+            <el-table-column label="序号" type="index" width="55" align="center" />
+            <el-table-column label="文件名称" prop="fileName" align="center" show-overflow-tooltip min-width="180">
+              <template #default="{ row }">
+                <el-button link type="primary" @click="handleDownload(row)">{{ row.fileName }}</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="大小" width="100" align="center">
+              <template #default="{ row }">{{ formatFileSize(row.fileSize) }}</template>
+            </el-table-column>
+            <el-table-column label="类型" prop="fileExtension" width="80" align="center" />
+            <el-table-column label="附件分类" width="160" align="center">
+              <template #default="{ row }">
+                <el-select v-model="row.attachmentType" placeholder="请选择">
+                  <el-option v-for="opt in attachmentTypeOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="排序" width="90" align="center">
+              <template #default="{ row }">
+                <el-input v-model="row.sortOrder" type="number" />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="160" align="center">
+              <template #default="{ row }">
+                <el-input v-model="row.remark" placeholder="请输入备注" />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="130" align="center">
+              <template #default="{ row, $index }">
+                <el-button link type="primary" icon="Download" @click="handleDownload(row)">下载</el-button>
+                <el-button link type="danger" icon="Delete" @click="handleDeleteAttachment($index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <template #empty>
+              <el-empty description="暂无附件" :image-size="80" />
+            </template>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+
+    <!-- ====== 公司主体编辑对话框 ====== -->
+    <el-dialog :title="companyDialogTitle" v-model="companyDialogVisible" width="900px" append-to-body>
+      <el-form ref="companyRef" :model="companyForm" label-width="130px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公司全称" prop="companyNameFull">
+              <el-input v-model="companyForm.companyNameFull" placeholder="请输入公司全称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="英文名称" prop="englishName">
+              <el-input v-model="companyForm.englishName" placeholder="请输入英文名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码" prop="creditCode">
+              <el-input v-model="companyForm.creditCode" placeholder="18位统一社会信用代码" maxlength="18" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人" prop="legalPerson">
+              <el-input v-model="companyForm.legalPerson" placeholder="请输入法定代表人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人电话" prop="legalPersonPhone">
+              <el-input v-model="companyForm.legalPersonPhone" placeholder="请输入法定代表人电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人身份证" prop="legalPersonIdCard">
+              <el-input v-model="companyForm.legalPersonIdCard" placeholder="请输入法定代表人身份证号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="注册资本" prop="registeredCapital">
+              <el-input-number v-model="companyForm.registeredCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="币种" prop="capitalCurrency">
+              <el-input v-model="companyForm.capitalCurrency" placeholder="如 人民币/美元" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="实收资本" prop="paidInCapital">
+              <el-input-number v-model="companyForm.paidInCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="成立日期" prop="establishDate">
+              <el-date-picker v-model="companyForm.establishDate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="营业期限起" prop="businessTermStart">
+              <el-date-picker v-model="companyForm.businessTermStart" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="营业期限止" prop="businessTermEnd">
+              <el-date-picker v-model="companyForm.businessTermEnd" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否长期有效" prop="businessTermPermanent">
+              <el-radio-group v-model="companyForm.businessTermPermanent">
+                <el-radio label="0">否</el-radio>
+                <el-radio label="1">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="登记机关" prop="registrationAuthority">
+              <el-input v-model="companyForm.registrationAuthority" placeholder="请输入登记机关" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册号" prop="registrationNumber">
+              <el-input v-model="companyForm.registrationNumber" placeholder="旧版工商注册号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经营状态" prop="operatingStatus">
+              <el-input v-model="companyForm.operatingStatus" placeholder="如 存续/在业/吊销/注销" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="员工人数" prop="employeeCount">
+              <el-input-number v-model="companyForm.employeeCount" :min="0" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="经营范围" prop="businessScope">
+              <el-input v-model="companyForm.businessScope" type="textarea" :rows="3" placeholder="请输入经营范围" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="主要股东" prop="shareholders">
+              <el-input v-model="companyForm.shareholders" type="textarea" :rows="2" placeholder="股东信息（文本或JSON）" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公司电话" prop="companyPhone">
+              <el-input v-model="companyForm.companyPhone" placeholder="请输入公司电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公司传真" prop="companyFax">
+              <el-input v-model="companyForm.companyFax" placeholder="请输入公司传真" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公司网址" prop="companyWebsite">
+              <el-input v-model="companyForm.companyWebsite" placeholder="请输入公司网址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司邮箱" prop="companyEmail">
+              <el-input v-model="companyForm.companyEmail" placeholder="请输入公司邮箱" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="省份" prop="registeredProvince" label-width="60px">
+              <el-input v-model="companyForm.registeredProvince" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="城市" prop="registeredCity" label-width="60px">
+              <el-input v-model="companyForm.registeredCity" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="区县" prop="registeredDistrict" label-width="60px">
+              <el-input v-model="companyForm.registeredDistrict" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="注册详细地址" prop="registeredAddressDetail">
+              <el-input v-model="companyForm.registeredAddressDetail" placeholder="请输入注册详细地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="营业执照" prop="businessLicenseOssId">
+              <image-upload v-model="companyForm.businessLicenseOssId" :limit="1" :size="5" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="其他附件" prop="attachmentIds">
+              <file-upload v-model="companyForm.attachmentIds" :limit="10" :size="50" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx,.xls,.xlsx,.zip,.rar" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="companyForm.remark" type="textarea" :rows="2" placeholder="备注说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitCompanyForm">确 定</el-button>
+          <el-button @click="companyDialogVisible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- ====== 联系人编辑对话框 ====== -->
+    <el-dialog :title="contactDialogTitle" v-model="contactDialogVisible" width="800px" append-to-body>
+      <el-form ref="contactRef" :model="contactForm" :rules="contactRules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人姓名" prop="contactName">
+              <el-input v-model="contactForm.contactName" placeholder="请输入联系人姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="职位" prop="position">
+              <el-input v-model="contactForm.position" placeholder="如 采购经理/财务总监" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="contactForm.phone" placeholder="请输入手机号" maxlength="20" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属部门" prop="department">
+              <el-input v-model="contactForm.department" placeholder="如 采购部/财务部" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="座机" prop="landline">
+              <el-input v-model="contactForm.landline" placeholder="含区号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电子邮箱" prop="email">
+              <el-input v-model="contactForm.email" placeholder="请输入电子邮箱" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="微信号" prop="wechat">
+              <el-input v-model="contactForm.wechat" placeholder="请输入微信号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="QQ号" prop="qq">
+              <el-input v-model="contactForm.qq" placeholder="请输入QQ号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="国家/地区" prop="country" label-width="90px">
+              <el-input v-model="contactForm.country" placeholder="中国" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="省份" prop="province" label-width="60px">
+              <el-input v-model="contactForm.province" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="城市" prop="city" label-width="60px">
+              <el-input v-model="contactForm.city" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="区/县" prop="district" label-width="60px">
+              <el-input v-model="contactForm.district" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮政编码" prop="postalCode">
+              <el-input v-model="contactForm.postalCode" placeholder="请输入邮政编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="详细地址" prop="contactAddress">
+              <el-input v-model="contactForm.contactAddress" placeholder="街道、门牌号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系人类型" prop="contactType">
+              <el-select v-model="contactForm.contactType" placeholder="请选择" clearable>
+                <el-option label="业务联系人" value="0" />
+                <el-option label="财务联系人" value="1" />
+                <el-option label="紧急联系人" value="2" />
+                <el-option label="其他" value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否默认" prop="isDefault">
+              <el-radio-group v-model="contactForm.isDefault">
+                <el-radio label="0">否</el-radio>
+                <el-radio label="1">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="排序" prop="sortOrder">
+              <el-input-number v-model="contactForm.sortOrder" :min="0" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="contactForm.remark" type="textarea" :rows="2" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitContactForm">确 定</el-button>
+          <el-button @click="contactDialogVisible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="CustomerEdit">
+import {
+  listCustomer, getCustomer, addCustomer, updateCustomer,
+  delCustomerCompany, delCustomerContact
+} from '@/api/customersuppliermanagement/customerinfo/customer.js'
+import { getToken } from '@/utils/auth'
+import axios from 'axios'
+import { saveAs } from 'file-saver'
+import { useProducts, parseProductIds } from '@/components/ProductSelect/useProducts'
+
+const { proxy } = getCurrentInstance()
+const route = useRoute()
+const router = useRouter()
+
+const { settlement_type } = useDict('settlement_type')
+const { ensureProducts, findProduct } = useProducts()
+
+const pageLoading = ref(false)
+const saving = ref(false)
+const activeTab = ref('base')
+
+const customerId = computed(() => route.query.customerId ? Number(route.query.customerId) : null)
+const isAdd = computed(() => !customerId.value)
+
+const rules = {
+  customerCode: [{ required: true, message: '客户编码不能为空', trigger: 'blur' }],
+  customerName: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }]
+}
+
+/** 空表单 */
+function buildEmptyForm() {
+  return {
+    customerId: null,
+    customerCode: null,
+    customerName: null,
+    customerCodeDw: null,
+    creditCode: null,
+    customerType: null,
+    isEnable: null,
+    salesUserId: null,
+    salesUser: null,
+    ed: null,
+    zq: null,
+    settlementUserId: null,
+    settlementUser: null,
+    serviceUserId: null,
+    serviceUser: null,
+    settlementType: null,
+    tempEd: null,
+    accountBalance: null,
+    foreignCurrencyBalance: null,
+    weightThreshold: null,
+    throwRatio: null,
+    creditEd: null,
+    productIds: null,
+    attachmentList: [],
+    companyList: [],
+    contactList: [],
+    remark: null,
+    delFlag: null
+  }
+}
+const form = ref(buildEmptyForm())
+
+/* ---------------- 产品绑定 ---------------- */
+const productStatusMap = { 0: '待生效', 1: '已生效', 2: '已失效' }
+const productStatusTagType = { 0: 'info', 1: 'success', 2: 'danger' }
+
+const boundProducts = computed(() =>
+  parseProductIds(form.value.productIds)
+    .map(id => findProduct(id))
+    .filter(Boolean)
+)
+
+function removeProduct(productId) {
+  const ids = parseProductIds(form.value.productIds).filter(id => id !== String(productId))
+  form.value.productIds = ids.join(',')
+}
+
+/* ---------------- 用户冗余姓名 ---------------- */
+function handleUserChange(uid, user, nameField) {
+  form.value[nameField] = user ? (user.nickName || user.userName || null) : null
+}
+
+/* ---------------- 附件上传 ---------------- */
+const baseUrl = import.meta.env.VITE_APP_BASE_API
+const uploadFileUrl = ref(baseUrl + '/common/upload')
+const uploadHeaders = ref({ Authorization: 'Bearer ' + getToken() })
+const attachmentTypeOptions = ref([
+  { value: '0', label: '附件资料' },
+  { value: '1', label: '客户Logo' },
+  { value: '2', label: '合同文件' },
+  { value: '3', label: '其他' }
+])
+const ATTACHMENT_SIZE_LIMIT = 50
+const ATTACHMENT_EXTENSIONS = ['pdf', 'jpg', 'jpeg', 'png', 'doc', 'docx', 'xls', 'xlsx', 'zip', 'rar']
+
+function formatFileSize(bytes) {
+  if (!bytes) return '0 B'
+  const k = 1024
+  const sizes = ['B', 'KB', 'MB', 'GB']
+  const i = Math.floor(Math.log(bytes) / Math.log(k))
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
+}
+
+function formatBalance(val) {
+  const num = Number(val)
+  return isNaN(num) ? '0.00' : num.toFixed(2)
+}
+
+function handleBeforeAttachmentUpload(file) {
+  const ext = (file.name.split('.').pop() || '').toLowerCase()
+  if (ATTACHMENT_EXTENSIONS.indexOf(ext) < 0) {
+    proxy.$modal.msgError(`不支持的文件格式：${ext}`)
+    return false
+  }
+  if (file.name.includes(',')) {
+    proxy.$modal.msgError('文件名不正确，不能包含英文逗号!')
+    return false
+  }
+  if (file.size / 1024 / 1024 >= ATTACHMENT_SIZE_LIMIT) {
+    proxy.$modal.msgError(`上传文件大小不能超过 ${ATTACHMENT_SIZE_LIMIT} MB!`)
+    return false
+  }
+  proxy.$modal.loading('正在上传文件，请稍候...')
+  return true
+}
+
+function handleAttachmentUploadSuccess(res, file) {
+  proxy.$modal.closeLoading()
+  if (res.code === 200) {
+    form.value.attachmentList.push({
+      attachmentId: null,
+      customerId: form.value.customerId || null,
+      fileName: file.name,
+      filePath: res.fileName,
+      fileSize: file.size,
+      fileType: file.type || '',
+      fileExtension: (file.name.split('.').pop() || '').toLowerCase(),
+      attachmentType: '0',
+      isLogo: '0',
+      sortOrder: form.value.attachmentList.length,
+      remark: '',
+      delFlag: '0'
+    })
+  } else {
+    proxy.$modal.msgError(res.msg || '上传文件失败')
+  }
+}
+
+function handleAttachmentUploadError() {
+  proxy.$modal.closeLoading()
+  proxy.$modal.msgError('上传文件失败')
+}
+
+
+function handleDeleteAttachment(index) {
+  form.value.attachmentList.splice(index, 1)
+}
+
+/** 附件下载（携带鉴权头，并以原始文件名保存） */
+function handleDownload(row) {
+  if (!row.filePath) {
+    proxy.$modal.msgWarning('该附件文件路径缺失，无法下载')
+    return
+  }
+  proxy.$modal.loading('正在下载文件，请稍候...')
+  axios({
+    method: 'get',
+    url: import.meta.env.VITE_APP_BASE_API + '/common/download/resource?resource=' + encodeURIComponent(row.filePath),
+    responseType: 'blob',
+    headers: { Authorization: 'Bearer ' + getToken() }
+  }).then(res => {
+    const blob = new Blob([res.data])
+    saveAs(blob, row.fileName)
+  }).catch(() => {
+    proxy.$modal.msgError('下载失败')
+  }).finally(() => {
+    proxy.$modal.closeLoading()
+  })
+}
+
+/* ============ 公司主体子表 ============ */
+const companyDialogVisible = ref(false)
+const companyDialogTitle = ref('')
+const companyForm = ref({})
+const companyEditingIndex = ref(-1)
+
+function resetCompanyForm() {
+  companyForm.value = {
+    companyId: null,
+    customerId: null,
+    companyNameFull: '',
+    englishName: '',
+    creditCode: '',
+    legalPerson: '',
+    legalPersonPhone: '',
+    legalPersonIdCard: '',
+    registeredCapital: 0,
+    capitalCurrency: '人民币',
+    paidInCapital: 0,
+    establishDate: null,
+    businessTermStart: null,
+    businessTermEnd: null,
+    businessTermPermanent: '0',
+    registrationAuthority: '',
+    registrationNumber: '',
+    operatingStatus: '',
+    businessScope: '',
+    shareholders: '',
+    employeeCount: 0,
+    companyPhone: '',
+    companyFax: '',
+    companyWebsite: '',
+    companyEmail: '',
+    registeredProvince: '',
+    registeredCity: '',
+    registeredDistrict: '',
+    registeredAddressDetail: '',
+    businessLicenseOssId: null,
+    attachmentIds: '',
+    remark: ''
+  }
+  proxy.resetForm('companyRef')
+}
+
+/** 新增公司主体：新增客户态下仅存本地数组，保存主表时由后端补 customerId 一并入库 */
+function handleAddCompany() {
+  resetCompanyForm()
+  companyEditingIndex.value = -1
+  companyDialogTitle.value = '新增公司主体'
+  companyDialogVisible.value = true
+}
+
+function handleEditCompany(row, index) {
+  resetCompanyForm()
+  companyForm.value = { ...row }
+  companyEditingIndex.value = index
+  companyDialogTitle.value = '修改公司主体'
+  companyDialogVisible.value = true
+}
+
+/** 删除公司主体：本地新增行直接移除；已入库行先调删除接口 */
+function handleDeleteCompany(row, index) {
+  proxy.$modal.confirm('是否确认删除该条公司主体记录？').then(() => {
+    const doRemove = () => {
+      const removed = form.value.companyList.splice(index, 1)[0]
+      if (removed && form.value.creditCode && removed.creditCode === form.value.creditCode) {
+        form.value.creditCode = ''
+      }
+      proxy.$modal.msgSuccess('删除成功')
+    }
+    if (row.companyId) {
+      delCustomerCompany(row.companyId).then(doRemove)
+    } else {
+      doRemove()
+    }
+  }).catch(() => {})
+}
+
+function handleBindCompany(row) {
+  if (!row.creditCode) {
+    proxy.$modal.msgWarning('该公司主体未填写统一社会信用代码，无法绑定')
+    return
+  }
+  form.value.creditCode = row.creditCode
+  if (row.companyNameFull && !form.value.customerName) {
+    form.value.customerName = row.companyNameFull
+  }
+  proxy.$modal.msgSuccess('绑定成功，主表统一社会信用代码已同步')
+}
+
+function submitCompanyForm() {
+  if (!companyForm.value.companyNameFull) {
+    proxy.$modal.msgWarning('公司全称不能为空')
+    return
+  }
+  if (!Array.isArray(form.value.companyList)) {
+    form.value.companyList = []
+  }
+  if (companyEditingIndex.value >= 0) {
+    form.value.companyList.splice(companyEditingIndex.value, 1, { ...companyForm.value })
+    if (form.value.creditCode && form.value.companyList[companyEditingIndex.value].creditCode !== form.value.creditCode) {
+      form.value.creditCode = form.value.companyList[companyEditingIndex.value].creditCode || form.value.creditCode
+    }
+  } else {
+    form.value.companyList.push({ ...companyForm.value })
+  }
+  companyDialogVisible.value = false
+  proxy.$modal.msgSuccess(companyEditingIndex.value >= 0 ? '修改成功' : '新增成功，保存客户后生效')
+}
+
+/* ============ 联系人子表 ============ */
+const contactDialogVisible = ref(false)
+const contactDialogTitle = ref('')
+const contactForm = ref({})
+const contactEditingIndex = ref(-1)
+const contactRules = {
+  contactName: [{ required: true, message: '联系人姓名不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }]
+}
+
+function resetContactForm() {
+  contactForm.value = {
+    contactId: null,
+    customerId: form.value.customerId || null,
+    contactName: '',
+    position: '',
+    department: '',
+    phone: '',
+    landline: '',
+    email: '',
+    wechat: '',
+    qq: '',
+    country: '中国',
+    province: '',
+    city: '',
+    district: '',
+    contactAddress: '',
+    postalCode: '',
+    isDefault: '0',
+    contactType: '0',
+    sortOrder: 0,
+    remark: ''
+  }
+  proxy.resetForm('contactRef')
+}
+
+function handleAddContact() {
+  resetContactForm()
+  contactEditingIndex.value = -1
+  contactDialogTitle.value = '新增联系人'
+  contactDialogVisible.value = true
+}
+
+function handleEditContact(row, index) {
+  resetContactForm()
+  contactForm.value = { ...row }
+  contactEditingIndex.value = index
+  contactDialogTitle.value = '修改联系人'
+  contactDialogVisible.value = true
+}
+
+/** 删除联系人：本地新增行直接移除；已入库行先调删除接口 */
+function handleDeleteContact(row, index) {
+  proxy.$modal.confirm('是否确认删除该条联系人记录？').then(() => {
+    if (row.contactId) {
+      delCustomerContact(row.contactId).then(() => {
+        form.value.contactList.splice(index, 1)
+        proxy.$modal.msgSuccess('删除成功')
+      })
+    } else {
+      form.value.contactList.splice(index, 1)
+      proxy.$modal.msgSuccess('删除成功')
+    }
+  }).catch(() => {})
+}
+
+function submitContactForm() {
+  if (!contactForm.value.contactName) {
+    proxy.$modal.msgWarning('联系人姓名不能为空')
+    return
+  }
+  if (!contactForm.value.phone) {
+    proxy.$modal.msgWarning('手机号不能为空')
+    return
+  }
+  if (!Array.isArray(form.value.contactList)) {
+    form.value.contactList = []
+  }
+  if (contactEditingIndex.value >= 0) {
+    form.value.contactList.splice(contactEditingIndex.value, 1, { ...contactForm.value })
+  } else {
+    form.value.contactList.push({ ...contactForm.value })
+  }
+  contactDialogVisible.value = false
+  proxy.$modal.msgSuccess(contactEditingIndex.value >= 0 ? '修改成功' : '新增成功，保存客户后生效')
+}
+
+/* ============ 加载 / 保存 ============ */
+/** 重新拉取详情（新增保存后或修改保存后调用，确保子表主键、附件重建结果与库一致） */
+function loadDetail(id) {
+  return getCustomer(id).then(response => {
+    if (!response.data) {
+      proxy.$modal.msgError('该客户不存在或已被删除')
+      return
+    }
+    form.value = response.data
+    form.value.attachmentList = form.value.attachmentList || []
+    form.value.companyList = form.value.companyList || []
+    form.value.contactList = form.value.contactList || []
+  })
+}
+
+/** 保存：新增成功后留在本页（URL 替换为编辑态），可继续维护子表和绑定产品 */
+function submitForm() {
+  proxy.$refs['customerRef'].validate(valid => {
+    if (!valid) {
+      activeTab.value = 'base'
+      return
+    }
+    const nullIfEmpty = v => (v === '' || v === undefined ? null : v)
+    const payload = {
+      ...form.value,
+      accountBalance: null,
+      foreignCurrencyBalance: null,
+      salesUserId: nullIfEmpty(form.value.salesUserId),
+      salesUser: nullIfEmpty(form.value.salesUser),
+      settlementUserId: nullIfEmpty(form.value.settlementUserId),
+      settlementUser: nullIfEmpty(form.value.settlementUser),
+      serviceUserId: nullIfEmpty(form.value.serviceUserId),
+      serviceUser: nullIfEmpty(form.value.serviceUser)
+    }
+    saving.value = true
+    const req = isAdd.value ? addCustomer(payload) : updateCustomer(payload)
+    req.then(res => {
+      if (isAdd.value) {
+        const newId = res.customerId || res.data?.customerId
+        proxy.$modal.msgSuccess('新增成功，已进入编辑页，可继续维护公司主体、联系人、附件和绑定产品')
+        // 替换为编辑态（query 变化触发 watchRoute 自动拉取详情），避免返回/刷新再次新增
+        router.replace({ path: '/customersupplier/customer-edit/index', query: { customerId: newId } })
+        return
+      }
+      proxy.$modal.msgSuccess('保存成功')
+      return loadDetail(form.value.customerId)
+    }).finally(() => {
+      saving.value = false
+    })
+  })
+}
+
+function goBack() {
+  router.push({ path: '/customersuppliermanagement/customerinfo' })
+}
+
+/* ============ 初始化 ============ */
+/** 按当前路由初始化页面：有customerId拉详情，无则空表单（同路由组件复用时靠 watch 触发） */
+function initByRoute() {
+  companyDialogVisible.value = false
+  contactDialogVisible.value = false
+  activeTab.value = 'base'
+  if (customerId.value) {
+    pageLoading.value = true
+    loadDetail(customerId.value).finally(() => { pageLoading.value = false })
+  } else {
+    form.value = buildEmptyForm()
+  }
+}
+
+watch(() => route.query.customerId, (newVal, oldVal) => {
+  if (String(newVal || '') === String(oldVal || '')) return
+  initByRoute()
+})
+
+onMounted(() => {
+  ensureProducts()
+  initByRoute()
+})
+</script>
+
+<style lang="scss" scoped>
+.head-card {
+  margin-bottom: 12px;
+}
+.head-bar {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+}
+.head-title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.customer-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+}
+.head-code {
+  color: #909399;
+  font-size: 13px;
+}
+.head-right {
+  margin-left: auto;
+}
+.pane-toolbar {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 12px;
+  flex-wrap: wrap;
+}
+.pane-tip {
+  color: #909399;
+  font-size: 12px;
+}
+.bound-table {
+  margin-top: 4px;
+}
+</style>
diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue
index d6d7e799..0320fb74 100644
--- a/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue
+++ b/bms-front/src/views/customersuppliermanagement/customerinfo/customermoney/index.vue
@@ -84,7 +84,8 @@
             <el-form-item>
               <el-button type="primary" icon="Search" @click="getReceiptList">搜索</el-button>
               <el-button icon="Refresh" @click="resetReceiptQuery">重置</el-button>
-              <el-button type="success" icon="Plus" @click="handleAddReceipt">登记收款</el-button>
+              <el-button type="success" icon="Plus" @click="handleAddReceipt"
+                v-hasPermi="['customersupplier:customerinfo:add']">登记收款</el-button>
             </el-form-item>
           </el-form>
 
@@ -132,9 +133,9 @@
             <el-table-column label="登记人" align="center" prop="createBy" width="100" />
             <el-table-column label="操作" align="center" width="200" fixed="right">
               <template #default="scope">
-                <el-button v-if="scope.row.status === 'PENDING'" link type="success" size="small" @click="handleConfirmReceipt(scope.row)">审核通过</el-button>
-                <el-button v-if="scope.row.status === 'PENDING'" link type="warning" size="small" @click="handleCancelReceipt(scope.row)">取消</el-button>
-                <el-button link type="primary" size="small" @click="handleViewReceipt(scope.row)">查看</el-button>
+                <el-button v-if="scope.row.status === 'PENDING'" link type="success" size="small" @click="handleConfirmReceipt(scope.row)" v-hasPermi="['customer:balance:review']">审核通过</el-button>
+                <el-button v-if="scope.row.status === 'PENDING'" link type="warning" size="small" @click="handleCancelReceipt(scope.row)" v-hasPermi="['customersupplier:customerinfo:edit']">取消</el-button>
+                <el-button link type="primary" size="small" @click="handleViewReceipt(scope.row)" v-hasPermi="['customersupplier:customerinfo:query']">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -392,6 +393,7 @@
           v-if="viewDialog.data && viewDialog.data.status === 'PENDING'"
           type="success"
           @click="handleConfirmFromView"
+          v-hasPermi="['customer:balance:review']"
         >审核通过</el-button>
         <el-button @click="viewDialog.visible = false">关 闭</el-button>
       </template>
diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue
index c74857c1..e7782250 100644
--- a/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue
+++ b/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue
@@ -8,7 +8,7 @@
           clearable
           @keyup.enter="handleQuery"
         />
-        
+
       </el-form-item>
       <el-form-item label="客户名称" prop="customerName">
         <el-input
@@ -45,56 +45,17 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="业务员姓名" prop="salesUser">
-        <el-select
-          v-model="queryParams.salesUser"
-          placeholder="请选择业务员"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="user in userOptions"
-            :key="user.userId"
-            :label="user.nickName"
-            :value="user.nickName"
-          />
-        </el-select>
+      <el-form-item label="业务员" prop="salesUserId">
+        <user-select v-model="queryParams.salesUserId" placeholder="请选择业务员" @change="handleQuery" />
       </el-form-item>
 
 
 
-      <el-form-item label="结算员姓名" prop="settlementUser">
-        <el-select
-          v-model="queryParams.settlementUser"
-          placeholder="请选择结算员"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="user in userOptions"
-            :key="user.userId"
-            :label="user.nickName"
-            :value="user.nickName"
-          />
-        </el-select>
+      <el-form-item label="结算员" prop="settlementUserId">
+        <user-select v-model="queryParams.settlementUserId" placeholder="请选择结算员" @change="handleQuery" />
       </el-form-item>
-      <el-form-item label="客服姓名" prop="serviceUser">
-        <el-select
-          v-model="queryParams.serviceUser"
-          placeholder="请选择客服"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="user in userOptions"
-            :key="user.userId"
-            :label="user.nickName"
-            :value="user.nickName"
-          />
-        </el-select>
+      <el-form-item label="客服" prop="serviceUserId">
+        <user-select v-model="queryParams.serviceUserId" placeholder="请选择客服" @change="handleQuery" />
       </el-form-item>
 
       <el-form-item>
@@ -169,21 +130,23 @@
           <dict-tag :options="sys_normal_disable" :value="scope.row.isEnable" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="业务员用户ID" align="center" prop="salesUserId" /> -->
-      <el-table-column label="业务员姓名" align="center" prop="salesUser" />
-      
+      <el-table-column label="业务员" align="center" prop="salesUserId">
+        <template #default="scope"><user-name :user-id="scope.row.salesUserId" /></template>
+      </el-table-column>
+
       <el-table-column label="资金额度" align="center" prop="ed" />
       <el-table-column label="回款账期" align="center" prop="zq" />
-      <!-- <el-table-column label="结算员用户ID" align="center" prop="settlementUserId" /> -->
-      <el-table-column label="结算员姓名" align="center" prop="settlementUser" />
-<!--      <el-table-column label="结算员" align="center">-->
-<!--        <template slot-scope="scope">-->
-<!--          {{ getUserName(scope.row.settlementUserId) }}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <!-- <el-table-column label="客服用户ID" align="center" prop="serviceUserId" /> -->
-      <el-table-column label="客服姓名" align="center" prop="serviceUser" />
-      <el-table-column label="结算方式" align="center" prop="settlementType" />
+      <el-table-column label="结算员" align="center" prop="settlementUserId">
+        <template #default="scope"><user-name :user-id="scope.row.settlementUserId" /></template>
+      </el-table-column>
+      <el-table-column label="客服" align="center" prop="serviceUserId">
+        <template #default="scope"><user-name :user-id="scope.row.serviceUserId" /></template>
+      </el-table-column>
+      <el-table-column label="结算方式" align="center" prop="settlementType">
+        <template #default="scope">
+          <dict-tag :options="settlement_type" :value="scope.row.settlementType" />
+        </template>
+      </el-table-column>
       <el-table-column label="临时额度" align="center" prop="tempEd" />
       <el-table-column label="账户余额(CNY)" align="center" prop="accountBalance" width="130">
         <template #default="scope">{{ formatBalance(scope.row.accountBalance) }}</template>
@@ -193,7 +156,7 @@
       <el-table-column label="信用额度" align="center" prop="creditEd" />
       <el-table-column label="绑定产品ID" align="center" prop="productIds" />
       <el-table-column label="备注说明" align="center" prop="remark" />
-      <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="240">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['customersupplier:customerinfo:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['customersupplier:customerinfo:remove']">删除</el-button>
@@ -210,616 +173,23 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改客户主对话框 -->
-    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
-      <el-form ref="customerRef" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-          <el-col :span="12">
-          
-            <el-form-item label="客户编码" prop="customerCode">
-              <el-input v-model="form.customerCode" placeholder="请输入客户编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="对外代码" prop="customerCodeDw">
-              <el-input v-model="form.customerCodeDw" placeholder="请输入对外代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="公司主体" prop="creditCode">
-              <div style="margin-bottom: 8px; display: flex; gap: 8px; align-items: center;">
-                <el-button type="primary" plain icon="Plus" size="small" @click="handleAddCompany">新增公司主体</el-button>
-                <span style="color: #999; font-size: 12px;">点击「绑定客户」后，主表的统一社会信用代码字段会自动同步为该公司的信用代码</span>
-              </div>
-              <el-table :data="form.companyList" border size="small" :max-height="240">
-                <el-table-column label="序号" type="index" width="55" align="center" />
-                <el-table-column label="公司全称" align="center" prop="companyNameFull" show-overflow-tooltip />
-                <el-table-column label="统一社会信用代码" align="center" prop="creditCode" show-overflow-tooltip />
-                <el-table-column label="当前绑定" align="center" width="90">
-                  <template #default="scope">
-                    <el-tag v-if="scope.row.creditCode && form.creditCode === scope.row.creditCode" type="success" size="small">已绑定</el-tag>
-                    <span v-else style="color: #999;">-</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" align="center" width="220">
-                  <template #default="scope">
-                    <el-button link type="primary" size="small" @click="handleBindCompany(scope.row)">绑定客户</el-button>
-                    <el-button link type="primary" size="small" @click="handleEditCompany(scope.row, scope.$index)">编辑</el-button>
-                    <el-button link type="danger" size="small" @click="handleDeleteCompany(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="联系人" prop="contactList">
-              <div style="margin-bottom: 8px;">
-                <el-button type="primary" plain icon="Plus" size="small" @click="handleAddContact">新增联系人</el-button>
-              </div>
-              <el-table :data="form.contactList" border size="small" :max-height="240">
-                <el-table-column label="序号" type="index" width="55" align="center" />
-                <el-table-column label="联系人" align="center" prop="contactName" show-overflow-tooltip />
-                <el-table-column label="职位" align="center" prop="position" show-overflow-tooltip />
-                <el-table-column label="手机号" align="center" prop="phone" show-overflow-tooltip />
-                <el-table-column label="操作" align="center" width="160">
-                  <template #default="scope">
-                    <el-button link type="primary" size="small" @click="handleEditContact(scope.row, scope.$index)">编辑</el-button>
-                    <el-button link type="danger" size="small" @click="handleDeleteContact(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="启用状态" prop="isEnable">
-              <el-select
-                  v-model="form.isEnable"
-                  placeholder="请选择启用状态"
-                  clearable
-              >
-                <el-option label="正常" value="0" />
-                <el-option label="停用" value="1" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="业务员" prop="salesUserId">
-              <el-select
-                v-model="form.salesUserId"
-                placeholder="请选择业务员"
-                clearable
-                filterable
-                @change="(val) => handleUserChange(val, 'salesUser')"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="user in userOptions"
-                  :key="user.userId"
-                  :label="user.nickName"
-                  :value="String(user.userId)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="资金额度" prop="ed">
-              <el-input v-model="form.ed" placeholder="请输入资金额度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="结算方式" prop="settlementType">
-              <el-select
-                  v-model="form.settlementType"
-                  placeholder="请选择结算方式"
-                  clearable
-              >
-                <el-option label="月结" value="0" />
-                <el-option label="周结" value="1" />
-                <el-option label="日结" value="2" />
-                <el-option label="现结" value="3" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="回款账期" prop="zq">
-              <el-input v-model="form.zq" placeholder="请输入回款账期" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="结算员" prop="settlementUserId">
-              <el-select
-                v-model="form.settlementUserId"
-                placeholder="请选择结算员"
-                clearable
-                filterable
-                @change="(val) => handleUserChange(val, 'settlementUser')"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="user in userOptions"
-                  :key="user.userId"
-                  :label="user.nickName"
-                  :value="String(user.userId)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="客服" prop="serviceUserId">
-              <el-select
-                v-model="form.serviceUserId"
-                placeholder="请选择客服"
-                clearable
-                filterable
-                @change="(val) => handleUserChange(val, 'serviceUser')"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="user in userOptions"
-                  :key="user.userId"
-                    :label="user.nickName"
-                    :value="String(user.userId)" 
-                  />
-                <!-- <el-option
-                  v-for="user in userOptions"
-                  :key="user.userId"
-                  :label="user.nickName"
-                  :value="user.userId"
-                /> -->
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="临时额度" prop="tempEd">
-              <el-input v-model="form.tempEd" placeholder="请输入临时额度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账户余额">
-              <el-input :model-value="formatBalance(form.accountBalance)" disabled placeholder="0.00">
-                <template #append>CNY</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="重量阈值" prop="weightThreshold">
-              <el-input v-model="form.weightThreshold" placeholder="请输入重量阈值" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="抛比" prop="throwRatio">
-              <el-input v-model="form.throwRatio" placeholder="请输入抛比" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="信用额度" prop="creditEd">
-              <el-input v-model="form.creditEd" placeholder="请输入信用额度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="绑定产品ID" prop="productIds">
-              <el-input v-model="form.productIds" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-          <!-- ====== 附件资料子表（bms_customer_attachment）====== -->
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="附件资料">
-                <div style="margin-bottom: 8px;">
-                  <el-upload
-                    :show-file-list="false"
-                    :action="uploadFileUrl"
-                    :headers="uploadHeaders"
-                    :before-upload="handleBeforeAttachmentUpload"
-                    :on-success="handleAttachmentUploadSuccess"
-                    :on-error="handleAttachmentUploadError"
-                    multiple
-                  >
-                    <el-button type="primary" icon="Upload">上传附件</el-button>
-                  </el-upload>
-                </div>
-                <el-table :data="form.attachmentList" border size="small" max-height="260">
-                  <el-table-column label="序号" type="index" width="55" align="center" />
-                  <el-table-column label="文件名称" prop="fileName" align="center" show-overflow-tooltip min-width="160" />
-                  <el-table-column label="大小" align="center" width="100">
-                    <template #default="scope">{{ formatFileSize(scope.row.fileSize) }}</template>
-                  </el-table-column>
-                  <el-table-column label="类型" prop="fileExtension" align="center" width="80" />
-                  <el-table-column label="附件分类" align="center" width="150">
-                    <template #default="scope">
-                      <el-select v-model="scope.row.attachmentType" placeholder="请选择">
-                        <el-option v-for="opt in attachmentTypeOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
-                      </el-select>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="排序" align="center" width="80">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.sortOrder" type="number" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" min-width="160">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.remark" placeholder="请输入备注" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width">
-                    <template #default="scope">
-                      <el-button link type="danger" icon="Delete" @click="handleDeleteAttachment(scope.$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div style="color: #999; font-size: 12px; margin-top: 4px;">支持 PDF、图片、Word、Excel、压缩包，单个文件不超过 50MB</div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-col :span="12">
-            <el-form-item label="备注说明" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="删除标记" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标记" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 公司主体编辑对话框 -->
-    <el-dialog :title="companyDialogTitle" v-model="companyDialogVisible" width="900px" append-to-body>
-      <el-form ref="companyRef" :model="companyForm" label-width="130px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="公司全称" prop="companyNameFull">
-              <el-input v-model="companyForm.companyNameFull" placeholder="请输入公司全称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="英文名称" prop="englishName">
-              <el-input v-model="companyForm.englishName" placeholder="请输入英文名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="统一社会信用代码" prop="creditCode">
-              <el-input v-model="companyForm.creditCode" placeholder="18位统一社会信用代码" maxlength="18" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="法定代表人" prop="legalPerson">
-              <el-input v-model="companyForm.legalPerson" placeholder="请输入法定代表人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="法定代表人电话" prop="legalPersonPhone">
-              <el-input v-model="companyForm.legalPersonPhone" placeholder="请输入法定代表人电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="法定代表人身份证" prop="legalPersonIdCard">
-              <el-input v-model="companyForm.legalPersonIdCard" placeholder="请输入法定代表人身份证号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="注册资本" prop="registeredCapital">
-              <el-input-number v-model="companyForm.registeredCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="币种" prop="capitalCurrency">
-              <el-input v-model="companyForm.capitalCurrency" placeholder="如 人民币/美元" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="实收资本" prop="paidInCapital">
-              <el-input-number v-model="companyForm.paidInCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="成立日期" prop="establishDate">
-              <el-date-picker v-model="companyForm.establishDate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="营业期限起" prop="businessTermStart">
-              <el-date-picker v-model="companyForm.businessTermStart" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="营业期限止" prop="businessTermEnd">
-              <el-date-picker v-model="companyForm.businessTermEnd" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否长期有效" prop="businessTermPermanent">
-              <el-radio-group v-model="companyForm.businessTermPermanent">
-                <el-radio label="0">否</el-radio>
-                <el-radio label="1">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="登记机关" prop="registrationAuthority">
-              <el-input v-model="companyForm.registrationAuthority" placeholder="请输入登记机关" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册号" prop="registrationNumber">
-              <el-input v-model="companyForm.registrationNumber" placeholder="旧版工商注册号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经营状态" prop="operatingStatus">
-              <el-input v-model="companyForm.operatingStatus" placeholder="如 存续/在业/吊销/注销" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="员工人数" prop="employeeCount">
-              <el-input-number v-model="companyForm.employeeCount" :min="0" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="经营范围" prop="businessScope">
-              <el-input v-model="companyForm.businessScope" type="textarea" :rows="3" placeholder="请输入经营范围" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="主要股东" prop="shareholders">
-              <el-input v-model="companyForm.shareholders" type="textarea" :rows="2" placeholder="股东信息（文本或JSON）" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="公司电话" prop="companyPhone">
-              <el-input v-model="companyForm.companyPhone" placeholder="请输入公司电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="公司传真" prop="companyFax">
-              <el-input v-model="companyForm.companyFax" placeholder="请输入公司传真" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="公司网址" prop="companyWebsite">
-              <el-input v-model="companyForm.companyWebsite" placeholder="请输入公司网址" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公司邮箱" prop="companyEmail">
-              <el-input v-model="companyForm.companyEmail" placeholder="请输入公司邮箱" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="省份" prop="registeredProvince" label-width="60px">
-              <el-input v-model="companyForm.registeredProvince" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="城市" prop="registeredCity" label-width="60px">
-              <el-input v-model="companyForm.registeredCity" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="区县" prop="registeredDistrict" label-width="60px">
-              <el-input v-model="companyForm.registeredDistrict" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="注册详细地址" prop="registeredAddressDetail">
-              <el-input v-model="companyForm.registeredAddressDetail" placeholder="请输入注册详细地址" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="营业执照" prop="businessLicenseOssId">
-              <image-upload v-model="companyForm.businessLicenseOssId" :limit="1" :size="5" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="其他附件" prop="attachmentIds">
-              <file-upload v-model="companyForm.attachmentIds" :limit="10" :size="50" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx,.xls,.xlsx,.zip,.rar" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="companyForm.remark" type="textarea" :rows="2" placeholder="备注说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitCompanyForm">确 定</el-button>
-          <el-button @click="companyDialogVisible = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 联系人编辑对话框 -->
-    <el-dialog :title="contactDialogTitle" v-model="contactDialogVisible" width="800px" append-to-body>
-      <el-form ref="contactRef" :model="contactForm" :rules="contactRules" label-width="120px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="联系人姓名" prop="contactName">
-              <el-input v-model="contactForm.contactName" placeholder="请输入联系人姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="职位" prop="position">
-              <el-input v-model="contactForm.position" placeholder="如 采购经理/财务总监" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="手机号" prop="phone">
-              <el-input v-model="contactForm.phone" placeholder="请输入手机号" maxlength="20" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属部门" prop="department">
-              <el-input v-model="contactForm.department" placeholder="如 采购部/财务部" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="座机" prop="landline">
-              <el-input v-model="contactForm.landline" placeholder="含区号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱" prop="email">
-              <el-input v-model="contactForm.email" placeholder="请输入电子邮箱" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="微信号" prop="wechat">
-              <el-input v-model="contactForm.wechat" placeholder="请输入微信号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="QQ号" prop="qq">
-              <el-input v-model="contactForm.qq" placeholder="请输入QQ号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="国家/地区" prop="country" label-width="90px">
-              <el-input v-model="contactForm.country" placeholder="中国" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="省份" prop="province" label-width="60px">
-              <el-input v-model="contactForm.province" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="城市" prop="city" label-width="60px">
-              <el-input v-model="contactForm.city" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="区/县" prop="district" label-width="60px">
-              <el-input v-model="contactForm.district" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮政编码" prop="postalCode">
-              <el-input v-model="contactForm.postalCode" placeholder="请输入邮政编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="详细地址" prop="contactAddress">
-              <el-input v-model="contactForm.contactAddress" placeholder="街道、门牌号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="联系人类型" prop="contactType">
-              <el-select v-model="contactForm.contactType" placeholder="请选择" clearable>
-                <el-option label="业务联系人" value="0" />
-                <el-option label="财务联系人" value="1" />
-                <el-option label="紧急联系人" value="2" />
-                <el-option label="其他" value="3" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否默认" prop="isDefault">
-              <el-radio-group v-model="contactForm.isDefault">
-                <el-radio label="0">否</el-radio>
-                <el-radio label="1">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="排序" prop="sortOrder">
-              <el-input-number v-model="contactForm.sortOrder" :min="0" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="contactForm.remark" type="textarea" :rows="2" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitContactForm">确 定</el-button>
-          <el-button @click="contactDialogVisible = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="Customer">
-import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer } from "@/api/customersuppliermanagement/customerinfo/customer.js"
-import { listUser } from "@/api/system/user"
-import { getToken } from "@/utils/auth"
-// import customerSelect from "@/components/customerSelect/index.vue"
+import { listCustomer, delCustomer } from "@/api/customersuppliermanagement/customerinfo/customer.js"
 
 const { proxy } = getCurrentInstance()
 
 const customerList = ref([])
-const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
 const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
-const title = ref("")
 
-const { sys_normal_disable } = useDict("sys_normal_disable")
-const userOptions = ref([])
-
-/** 查询用户下拉列表 */
-function getUserList() {
-  listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
-    userOptions.value = response.rows
-  })
-}
-
-/** 用户下拉变化时同步姓名字段（确保 salesUserId 与 salesUser 等同时保存） */
-function handleUserChange(userId, nameField) {
-  if (!userId) {
-    form.value[nameField] = null
-    return
-  }
-  const user = userOptions.value.find(u => String(u.userId) === String(userId))
-  if (user) {
-    form.value[nameField] = user.nickName || user.userName || ''
-  }
-}
-
-const baseUrl = import.meta.env.VITE_APP_BASE_API
-const uploadFileUrl = ref(baseUrl + "/common/upload")
-const uploadHeaders = ref({ Authorization: "Bearer " + getToken() })
-const attachmentTypeOptions = ref([
-  { value: "0", label: "附件资料" },
-  { value: "1", label: "客户Logo" },
-  { value: "2", label: "合同文件" },
-  { value: "3", label: "其他" }
-])
-const ATTACHMENT_SIZE_LIMIT = 50
-const ATTACHMENT_EXTENSIONS = ["pdf", "jpg", "jpeg", "png", "doc", "docx", "xls", "xlsx", "zip", "rar"]
-
-/** 格式化文件大小 */
-function formatFileSize(bytes) {
-  if (!bytes) return "0 B"
-  const k = 1024
-  const sizes = ["B", "KB", "MB", "GB"]
-  const i = Math.floor(Math.log(bytes) / Math.log(k))
-  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i]
-}
+const { sys_normal_disable, settlement_type } = useDict("sys_normal_disable", "settlement_type")
 
 /** 格式化余额（数据源 customer_account 余额表） */
 function formatBalance(val) {
@@ -827,61 +197,7 @@ function formatBalance(val) {
   return isNaN(num) ? '0.00' : num.toFixed(2)
 }
 
-/** 附件上传前校验 */
-function handleBeforeAttachmentUpload(file) {
-  const ext = (file.name.split('.').pop() || "").toLowerCase()
-  if (ATTACHMENT_EXTENSIONS.indexOf(ext) < 0) {
-    proxy.$modal.msgError(`不支持的文件格式：${ext}`)
-    return false
-  }
-  if (file.name.includes(',')) {
-    proxy.$modal.msgError('文件名不正确，不能包含英文逗号!')
-    return false
-  }
-  if (file.size / 1024 / 1024 >= ATTACHMENT_SIZE_LIMIT) {
-    proxy.$modal.msgError(`上传文件大小不能超过 ${ATTACHMENT_SIZE_LIMIT} MB!`)
-    return false
-  }
-  proxy.$modal.loading("正在上传文件，请稍候...")
-  return true
-}
-
-/** 附件上传成功 */
-function handleAttachmentUploadSuccess(res, file) {
-  proxy.$modal.closeLoading()
-  if (res.code === 200) {
-    form.value.attachmentList.push({
-      attachmentId: null,
-      customerId: form.value.customerId || null,
-      fileName: file.name,
-      filePath: res.fileName,
-      fileSize: file.size,
-      fileType: file.type || '',
-      fileExtension: (file.name.split('.').pop() || "").toLowerCase(),
-      attachmentType: "0",
-      isLogo: "0",
-      sortOrder: form.value.attachmentList.length,
-      remark: "",
-      delFlag: "0"
-    })
-  } else {
-    proxy.$modal.msgError(res.msg || "上传文件失败")
-  }
-}
-
-/** 附件上传失败 */
-function handleAttachmentUploadError() {
-  proxy.$modal.closeLoading()
-  proxy.$modal.msgError("上传文件失败")
-}
-
-/** 删除附件行 */
-function handleDeleteAttachment(index) {
-  form.value.attachmentList.splice(index, 1)
-}
-
 const data = reactive({
-  form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -907,18 +223,10 @@ const data = reactive({
     throwRatio: undefined,
     creditEd: undefined,
     productIds: undefined,
-  },
-  rules: {
-    customerCode: [
-      { required: true, message: "客户编码不能为空", trigger: "blur" }
-    ],
-    customerName: [
-      { required: true, message: "客户名称不能为空", trigger: "blur" }
-    ],
   }
 })
 
-const { queryParams, form, rules } = toRefs(data)
+const { queryParams } = toRefs(data)
 
 /** 查询客户主列表 */
 function getList() {
@@ -930,51 +238,6 @@ function getList() {
   })
 }
 
-/** 取消按钮 */
-function cancel() {
-  open.value = false
-  reset()
-}
-
-/** 表单重置 */
-function reset() {
-  form.value = {
-    customerId: null,
-    customerCode: null,
-    customerName: null,
-    customerCodeDw: null,
-    creditCode: null,
-    customerType: null,
-    isEnable: null,
-    salesUserId: null,
-    salesUser: null,
-    ed: null,
-    zq: null,
-    settlementUserId: null,
-    settlementUser: null,
-    serviceUserId: null,
-    serviceUser: null,
-    settlementType: null,
-    tempEd: null,
-    accountBalance: null,
-    foreignCurrencyBalance: null,
-    weightThreshold: null,
-    throwRatio: null,
-    creditEd: null,
-    productIds: null,
-    attachmentList: [],
-    companyList: [],
-    contactList: [],
-    remark: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null
-  }
-  proxy.resetForm("customerRef")
-}
-
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
@@ -996,52 +259,24 @@ function handleSelectionChange(selection) {
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
+/** 新增：跳转客户编辑页（页签式，无 customerId） */
 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加客户"
+  proxy.$router.push({ path: '/customersupplier/customer-edit/index' })
 }
 
-/** 修改按钮操作 */
+/** 修改：跳转客户编辑页（操作列传 row；工具栏按钮取勾选行） */
 function handleUpdate(row) {
-  reset()
-  const _customerId = row.customerId || ids.value
-  getCustomer(_customerId).then(response => {
-    form.value = response.data
-    if (!form.value.attachmentList) {
-      form.value.attachmentList = []
-    }
-    if (!form.value.companyList) {
-      form.value.companyList = []
-    }
-    if (!form.value.contactList) {
-      form.value.contactList = []
-    }
-    open.value = true
-    title.value = "修改客户"
-  })
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["customerRef"].validate(valid => {
-    if (valid) {
-      // 账户余额/外币余额以 customer_account 余额表为准（收款审核自动变动），提交时不写回主表冗余列
-      const payload = { ...form.value, accountBalance: null, foreignCurrencyBalance: null }
-      if (form.value.customerId != null) {
-        updateCustomer(payload).then(() => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addCustomer(payload).then(() => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
+  const target = (row && row.customerId) ? row : selectedRows.value[0]
+  if (!target || !target.customerId) {
+    proxy.$modal.msgWarning("请先勾选一个客户")
+    return
+  }
+  proxy.$router.push({
+    path: '/customersupplier/customer-edit/index',
+    query: {
+      customerId: target.customerId,
+      customerName: target.customerName,
+      customerCode: target.customerCode
     }
   })
 }
@@ -1082,205 +317,5 @@ function handleExport() {
   }, `customer_${new Date().getTime()}.xlsx`)
 }
 
-/* ============ 公司主体子表 ============ */
-const companyDialogVisible = ref(false)
-const companyDialogTitle = ref("")
-const companyForm = ref({})
-const companyEditingIndex = ref(-1)
-
-/** 重置公司主体表单 */
-function resetCompanyForm() {
-  companyForm.value = {
-    companyId: null,
-    customerId: null,
-    companyNameFull: '',
-    englishName: '',
-    creditCode: '',
-    legalPerson: '',
-    legalPersonPhone: '',
-    legalPersonIdCard: '',
-    registeredCapital: 0,
-    capitalCurrency: '人民币',
-    paidInCapital: 0,
-    establishDate: null,
-    businessTermStart: null,
-    businessTermEnd: null,
-    businessTermPermanent: '0',
-    registrationAuthority: '',
-    registrationNumber: '',
-    operatingStatus: '',
-    businessScope: '',
-    shareholders: '',
-    employeeCount: 0,
-    companyPhone: '',
-    companyFax: '',
-    companyWebsite: '',
-    companyEmail: '',
-    registeredProvince: '',
-    registeredCity: '',
-    registeredDistrict: '',
-    registeredAddressDetail: '',
-    businessLicenseOssId: null,
-    attachmentIds: '',
-    remark: ''
-  }
-  proxy.resetForm("companyRef")
-}
-
-/** 新增公司主体（本地子表，跟随主表一起提交） */
-function handleAddCompany() {
-  resetCompanyForm()
-  companyEditingIndex.value = -1
-  companyDialogTitle.value = "新增公司主体"
-  companyDialogVisible.value = true
-}
-
-/** 编辑公司主体 */
-function handleEditCompany(row, index) {
-  resetCompanyForm()
-  companyForm.value = { ...row }
-  companyEditingIndex.value = index
-  companyDialogTitle.value = "修改公司主体"
-  companyDialogVisible.value = true
-}
-
-/** 删除公司主体（仅从子表移除，未提交主表时不调后端） */
-function handleDeleteCompany(index) {
-  proxy.$modal.confirm('是否确认删除该条公司主体记录？').then(() => {
-    const removed = form.value.companyList.splice(index, 1)[0]
-    // 如果删除的是已绑定的，同步清空主表 creditCode
-    if (removed && form.value.creditCode && removed.creditCode === form.value.creditCode) {
-      form.value.creditCode = ''
-    }
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-/** 绑定客户：将选中公司的 creditCode 同步到主表，并刷新该行展示 */
-function handleBindCompany(row) {
-  if (!row.creditCode) {
-    proxy.$modal.msgWarning("该公司主体未填写统一社会信用代码，无法绑定")
-    return
-  }
-  form.value.creditCode = row.creditCode
-  // 同时将公司全称冗余到主表 customerName（如需）
-  if (row.companyNameFull && !form.value.customerName) {
-    form.value.customerName = row.companyNameFull
-  }
-  proxy.$modal.msgSuccess("绑定成功，主表统一社会信用代码已同步")
-}
-
-/** 提交公司主体表单（本地保存，跟随主表提交一起入库） */
-function submitCompanyForm() {
-  if (!companyForm.value.companyNameFull) {
-    proxy.$modal.msgWarning("公司全称不能为空")
-    return
-  }
-  if (!Array.isArray(form.value.companyList)) {
-    form.value.companyList = []
-  }
-  if (companyEditingIndex.value >= 0) {
-    // 编辑：替换原位置
-    form.value.companyList.splice(companyEditingIndex.value, 1, { ...companyForm.value })
-    // 如果修改的是当前已绑定的公司，同步刷新主表 creditCode
-    if (form.value.creditCode && form.value.companyList[companyEditingIndex.value].creditCode !== form.value.creditCode) {
-      form.value.creditCode = form.value.companyList[companyEditingIndex.value].creditCode || form.value.creditCode
-    }
-  } else {
-    // 新增：追加
-    form.value.companyList.push({ ...companyForm.value })
-  }
-  companyDialogVisible.value = false
-  proxy.$modal.msgSuccess(companyEditingIndex.value >= 0 ? "修改成功" : "新增成功")
-}
-
-/* ============ 联系人子表 ============ */
-const contactDialogVisible = ref(false)
-const contactDialogTitle = ref("")
-const contactForm = ref({})
-const contactEditingIndex = ref(-1)
-const contactRules = {
-  contactName: [{ required: true, message: '联系人姓名不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }]
-}
-
-/** 重置联系人表单 */
-function resetContactForm() {
-  contactForm.value = {
-    contactId: null,
-    customerId: form.value.customerId || null,
-    contactName: '',
-    position: '',
-    department: '',
-    phone: '',
-    landline: '',
-    email: '',
-    wechat: '',
-    qq: '',
-    country: '中国',
-    province: '',
-    city: '',
-    district: '',
-    contactAddress: '',
-    postalCode: '',
-    isDefault: '0',
-    contactType: '0',
-    sortOrder: 0,
-    remark: ''
-  }
-  proxy.resetForm("contactRef")
-}
-
-function getUserName(userId) {
-  if (!userId) return ''
-  const user = this.userOptions.find(u => String(u.userId) === String(userId))
-  return user ? user.nickName : userId
-}
-
-/** 新增联系人（本地子表，跟随主表一起提交） */
-function handleAddContact() {
-  resetContactForm()
-  contactEditingIndex.value = -1
-  contactDialogTitle.value = "新增联系人"
-  contactDialogVisible.value = true
-}
-
-/** 编辑联系人 */
-function handleEditContact(row, index) {
-  resetContactForm()
-  contactForm.value = { ...row }
-  contactEditingIndex.value = index
-  contactDialogTitle.value = "修改联系人"
-  contactDialogVisible.value = true
-}
-
-/** 删除联系人（仅从子表移除；未入库的不调后端，已入库的在主表保存后由后端增量处理） */
-function handleDeleteContact(index) {
-  proxy.$modal.confirm('是否确认删除该条联系人记录？').then(() => {
-    form.value.contactList.splice(index, 1)
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-/** 提交联系人表单（本地保存，跟随主表提交一起入库） */
-function submitContactForm() {
-  if (!contactForm.value.contactName) {
-    proxy.$modal.msgWarning("联系人姓名不能为空")
-    return
-  }
-  if (!Array.isArray(form.value.contactList)) {
-    form.value.contactList = []
-  }
-  if (contactEditingIndex.value >= 0) {
-    form.value.contactList.splice(contactEditingIndex.value, 1, { ...contactForm.value })
-  } else {
-    form.value.contactList.push({ ...contactForm.value })
-  }
-  contactDialogVisible.value = false
-  proxy.$modal.msgSuccess(contactEditingIndex.value >= 0 ? "修改成功" : "新增成功")
-}
-
-
-getUserList()
 getList()
 </script>
diff --git a/bms-front/src/views/customersuppliermanagement/supplierinfo/index.vue b/bms-front/src/views/customersuppliermanagement/supplierinfo/index.vue
index 936840f9..ce4b9383 100644
--- a/bms-front/src/views/customersuppliermanagement/supplierinfo/index.vue
+++ b/bms-front/src/views/customersuppliermanagement/supplierinfo/index.vue
@@ -38,54 +38,15 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="采购员" prop="purchaserUser">
-        <el-select
-          v-model="queryParams.purchaserUser"
-          placeholder="请选择采购员"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="user in userOptions"
-            :key="user.userId"
-            :label="user.nickName"
-            :value="user.nickName"
-          />
-        </el-select>
+      <el-form-item label="采购员" prop="purchaserUserId">
+        <user-select v-model="queryParams.purchaserUserId" placeholder="请选择采购员" @change="handleQuery" />
       </el-form-item>
 
-      <el-form-item label="结算员" prop="settlementUser">
-        <el-select
-          v-model="queryParams.settlementUser"
-          placeholder="请选择结算员"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="user in userOptions"
-            :key="user.userId"
-            :label="user.nickName"
-            :value="user.nickName"
-          />
-        </el-select>
+      <el-form-item label="结算员" prop="settlementUserId">
+        <user-select v-model="queryParams.settlementUserId" placeholder="请选择结算员" @change="handleQuery" />
       </el-form-item>
-      <el-form-item label="跟单员" prop="serviceUser">
-        <el-select
-          v-model="queryParams.serviceUser"
-          placeholder="请选择跟单员"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="user in userOptions"
-            :key="user.userId"
-            :label="user.nickName"
-            :value="user.nickName"
-          />
-        </el-select>
+      <el-form-item label="跟单员" prop="serviceUserId">
+        <user-select v-model="queryParams.serviceUserId" placeholder="请选择跟单员" @change="handleQuery" />
       </el-form-item>
 
       <el-form-item>
@@ -101,6 +62,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
+          v-hasPermi="['customersupplier:supplierinfo:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -150,13 +112,21 @@
           <dict-tag :options="sys_normal_disable" :value="scope.row.isEnable" />
         </template>
       </el-table-column>
-      <el-table-column label="采购员姓名" align="center" prop="purchaserUser" />
+      <el-table-column label="采购员" align="center" prop="purchaserUserId">
+        <template #default="scope"><user-name :user-id="scope.row.purchaserUserId" /></template>
+      </el-table-column>
       <el-table-column label="应付额度" align="center" prop="ed" />
       <el-table-column label="应付账期" align="center" prop="zq" />
-      <el-table-column label="结算员姓名" align="center" prop="settlementUser" />
-      <el-table-column label="跟单员姓名" align="center" prop="serviceUser" />
+      <el-table-column label="结算员" align="center" prop="settlementUserId">
+        <template #default="scope"><user-name :user-id="scope.row.settlementUserId" /></template>
+      </el-table-column>
+      <el-table-column label="跟单员" align="center" prop="serviceUserId">
+        <template #default="scope"><user-name :user-id="scope.row.serviceUserId" /></template>
+      </el-table-column>
       <el-table-column label="结算方式" align="center" prop="settlementType">
-        <template #default="scope">{{ formatOption(settlementTypeOptions, scope.row.settlementType) }}</template>
+        <template #default="scope">
+          <dict-tag :options="settlement_type" :value="scope.row.settlementType" />
+        </template>
       </el-table-column>
       <el-table-column label="临时额度" align="center" prop="tempEd" />
       <el-table-column label="应付余额" align="center" prop="accountBalance" />
@@ -172,7 +142,7 @@
       </el-table-column>
       <el-table-column label="绑定渠道ID" align="center" prop="channelIds" />
       <el-table-column label="备注说明" align="center" prop="remark" />
-      <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="180">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['customersupplier:supplierinfo:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['customersupplier:supplierinfo:remove']">删除</el-button>
@@ -187,616 +157,24 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改供应商对话框 -->
-    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
-      <el-form ref="supplierRef" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商编码" prop="supplierCode">
-              <el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="供应商名称" prop="supplierName">
-              <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="对外代码" prop="supplierCodeDw">
-              <el-input v-model="form.supplierCodeDw" placeholder="请输入对外代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="公司主体" prop="creditCode">
-              <div style="margin-bottom: 8px; display: flex; gap: 8px; align-items: center;">
-                <el-button type="primary" plain icon="Plus" size="small" @click="handleAddCompany">新增公司主体</el-button>
-                <span style="color: #999; font-size: 12px;">点击「绑定供应商」后，主表的统一社会信用代码字段会自动同步为该公司的信用代码</span>
-              </div>
-              <el-table :data="form.companyList" border size="small" :max-height="240">
-                <el-table-column label="序号" type="index" width="55" align="center" />
-                <el-table-column label="公司全称" align="center" prop="companyNameFull" show-overflow-tooltip />
-                <el-table-column label="统一社会信用代码" align="center" prop="creditCode" show-overflow-tooltip />
-                <el-table-column label="当前绑定" align="center" width="90">
-                  <template #default="scope">
-                    <el-tag v-if="scope.row.creditCode && form.creditCode === scope.row.creditCode" type="success" size="small">已绑定</el-tag>
-                    <span v-else style="color: #999;">-</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" align="center" width="220">
-                  <template #default="scope">
-                    <el-button link type="primary" size="small" @click="handleBindCompany(scope.row)">绑定供应商</el-button>
-                    <el-button link type="primary" size="small" @click="handleEditCompany(scope.row, scope.$index)">编辑</el-button>
-                    <el-button link type="danger" size="small" @click="handleDeleteCompany(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="联系人" prop="contactList">
-              <div style="margin-bottom: 8px;">
-                <el-button type="primary" plain icon="Plus" size="small" @click="handleAddContact">新增联系人</el-button>
-              </div>
-              <el-table :data="form.contactList" border size="small" :max-height="240">
-                <el-table-column label="序号" type="index" width="55" align="center" />
-                <el-table-column label="联系人" align="center" prop="contactName" show-overflow-tooltip />
-                <el-table-column label="职位" align="center" prop="position" show-overflow-tooltip />
-                <el-table-column label="手机号" align="center" prop="phone" show-overflow-tooltip />
-                <el-table-column label="操作" align="center" width="160">
-                  <template #default="scope">
-                    <el-button link type="primary" size="small" @click="handleEditContact(scope.row, scope.$index)">编辑</el-button>
-                    <el-button link type="danger" size="small" @click="handleDeleteContact(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="供应商类型" prop="supplierType">
-              <el-select v-model="form.supplierType" placeholder="请选择供应商类型" clearable>
-                <el-option label="生产商" value="0" />
-                <el-option label="代理商" value="1" />
-                <el-option label="个人" value="2" />
-                <el-option label="物流商" value="3" />
-                <el-option label="其他" value="4" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="启用状态" prop="isEnable">
-              <el-select v-model="form.isEnable" placeholder="请选择启用状态" clearable>
-                <el-option label="正常" value="0" />
-                <el-option label="停用" value="1" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采购员" prop="purchaserUserId">
-              <el-select
-                v-model="form.purchaserUserId"
-                placeholder="请选择采购员"
-                clearable
-                filterable
-                @change="(val) => handleUserChange(val, 'purchaserUser')"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="user in userOptions"
-                  :key="user.userId"
-                  :label="user.nickName"
-                  :value="String(user.userId)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="应付额度" prop="ed">
-              <el-input v-model="form.ed" placeholder="请输入应付额度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="应付账期" prop="zq">
-              <el-input v-model="form.zq" placeholder="请输入应付账期(天)" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="结算员" prop="settlementUserId">
-              <el-select
-                v-model="form.settlementUserId"
-                placeholder="请选择结算员"
-                clearable
-                filterable
-                @change="(val) => handleUserChange(val, 'settlementUser')"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="user in userOptions"
-                  :key="user.userId"
-                  :label="user.nickName"
-                  :value="String(user.userId)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="跟单员" prop="serviceUserId">
-              <el-select
-                v-model="form.serviceUserId"
-                placeholder="请选择跟单员"
-                clearable
-                filterable
-                @change="(val) => handleUserChange(val, 'serviceUser')"
-                style="width: 100%;"
-              >
-                <el-option
-                  v-for="user in userOptions"
-                  :key="user.userId"
-                  :label="user.nickName"
-                  :value="String(user.userId)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="结算方式" prop="settlementType">
-              <el-select v-model="form.settlementType" placeholder="请选择结算方式" clearable>
-                <el-option label="月结" value="0" />
-                <el-option label="周结" value="1" />
-                <el-option label="日结" value="2" />
-                <el-option label="票结" value="3" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="临时额度" prop="tempEd">
-              <el-input v-model="form.tempEd" placeholder="请输入临时额度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="应付余额" prop="accountBalance">
-              <el-input v-model="form.accountBalance" placeholder="请输入应付余额" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="外币应付余额" prop="foreignCurrencyBalance">
-              <el-input v-model="form.foreignCurrencyBalance" placeholder="请输入外币应付余额" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="信用额度" prop="creditEd">
-              <el-input v-model="form.creditEd" placeholder="请输入信用额度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="重量阈值" prop="weightThreshold">
-              <el-input v-model="form.weightThreshold" placeholder="请输入重量阈值(kg)" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="抛比" prop="throwRatio">
-              <el-input v-model="form.throwRatio" placeholder="请输入抛比(%)" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="合作开始日期" prop="cooperationStartDate">
-              <el-date-picker v-model="form.cooperationStartDate" type="date" value-format="YYYY-MM-DD" placeholder="选择合作开始日期" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="合作状态" prop="cooperationStatus">
-              <el-select v-model="form.cooperationStatus" placeholder="请选择合作状态" clearable>
-                <el-option label="正常" value="0" />
-                <el-option label="暂停" value="1" />
-                <el-option label="终止" value="2" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="绑定渠道ID" prop="channelIds">
-              <el-input v-model="form.channelIds" type="textarea" placeholder="多个用逗号分隔" />
-            </el-form-item>
-          </el-col>
-          <!-- ====== 附件资料子表（复用 bms_customer_attachment，customer_id 绑 supplier_id）====== -->
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="附件资料">
-                <div style="margin-bottom: 8px;">
-                  <el-upload
-                    :show-file-list="false"
-                    :action="uploadFileUrl"
-                    :headers="uploadHeaders"
-                    :before-upload="handleBeforeAttachmentUpload"
-                    :on-success="handleAttachmentUploadSuccess"
-                    :on-error="handleAttachmentUploadError"
-                    multiple
-                  >
-                    <el-button type="primary" icon="Upload">上传附件</el-button>
-                  </el-upload>
-                </div>
-                <el-table :data="form.attachmentList" border size="small" max-height="260">
-                  <el-table-column label="序号" type="index" width="55" align="center" />
-                  <el-table-column label="文件名称" prop="fileName" align="center" show-overflow-tooltip min-width="160" />
-                  <el-table-column label="大小" align="center" width="100">
-                    <template #default="scope">{{ formatFileSize(scope.row.fileSize) }}</template>
-                  </el-table-column>
-                  <el-table-column label="类型" prop="fileExtension" align="center" width="80" />
-                  <el-table-column label="附件分类" align="center" width="150">
-                    <template #default="scope">
-                      <el-select v-model="scope.row.attachmentType" placeholder="请选择">
-                        <el-option v-for="opt in attachmentTypeOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
-                      </el-select>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="排序" align="center" width="80">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.sortOrder" type="number" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" min-width="160">
-                    <template #default="scope">
-                      <el-input v-model="scope.row.remark" placeholder="请输入备注" />
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width">
-                    <template #default="scope">
-                      <el-button link type="danger" icon="Delete" @click="handleDeleteAttachment(scope.$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div style="color: #999; font-size: 12px; margin-top: 4px;">支持 PDF、图片、Word、Excel、压缩包，单个文件不超过 50MB</div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-col :span="12">
-            <el-form-item label="备注说明" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="删除标记" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除标记" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 公司主体编辑对话框 -->
-    <el-dialog :title="companyDialogTitle" v-model="companyDialogVisible" width="900px" append-to-body>
-      <el-form ref="companyRef" :model="companyForm" label-width="130px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="公司全称" prop="companyNameFull">
-              <el-input v-model="companyForm.companyNameFull" placeholder="请输入公司全称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="英文名称" prop="englishName">
-              <el-input v-model="companyForm.englishName" placeholder="请输入英文名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="统一社会信用代码" prop="creditCode">
-              <el-input v-model="companyForm.creditCode" placeholder="18位统一社会信用代码" maxlength="18" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="法定代表人" prop="legalPerson">
-              <el-input v-model="companyForm.legalPerson" placeholder="请输入法定代表人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="法定代表人电话" prop="legalPersonPhone">
-              <el-input v-model="companyForm.legalPersonPhone" placeholder="请输入法定代表人电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="法定代表人身份证" prop="legalPersonIdCard">
-              <el-input v-model="companyForm.legalPersonIdCard" placeholder="请输入法定代表人身份证号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="注册资本" prop="registeredCapital">
-              <el-input-number v-model="companyForm.registeredCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="币种" prop="capitalCurrency">
-              <el-input v-model="companyForm.capitalCurrency" placeholder="如 人民币/美元" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="实收资本" prop="paidInCapital">
-              <el-input-number v-model="companyForm.paidInCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="成立日期" prop="establishDate">
-              <el-date-picker v-model="companyForm.establishDate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="营业期限起" prop="businessTermStart">
-              <el-date-picker v-model="companyForm.businessTermStart" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="营业期限止" prop="businessTermEnd">
-              <el-date-picker v-model="companyForm.businessTermEnd" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否长期有效" prop="businessTermPermanent">
-              <el-radio-group v-model="companyForm.businessTermPermanent">
-                <el-radio label="0">否</el-radio>
-                <el-radio label="1">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="登记机关" prop="registrationAuthority">
-              <el-input v-model="companyForm.registrationAuthority" placeholder="请输入登记机关" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册号" prop="registrationNumber">
-              <el-input v-model="companyForm.registrationNumber" placeholder="旧版工商注册号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经营状态" prop="operatingStatus">
-              <el-input v-model="companyForm.operatingStatus" placeholder="如 存续/在业/吊销/注销" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="员工人数" prop="employeeCount">
-              <el-input-number v-model="companyForm.employeeCount" :min="0" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="经营范围" prop="businessScope">
-              <el-input v-model="companyForm.businessScope" type="textarea" :rows="3" placeholder="请输入经营范围" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="主要股东" prop="shareholders">
-              <el-input v-model="companyForm.shareholders" type="textarea" :rows="2" placeholder="股东信息（文本或JSON）" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="公司电话" prop="companyPhone">
-              <el-input v-model="companyForm.companyPhone" placeholder="请输入公司电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="公司传真" prop="companyFax">
-              <el-input v-model="companyForm.companyFax" placeholder="请输入公司传真" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="公司网址" prop="companyWebsite">
-              <el-input v-model="companyForm.companyWebsite" placeholder="请输入公司网址" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公司邮箱" prop="companyEmail">
-              <el-input v-model="companyForm.companyEmail" placeholder="请输入公司邮箱" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="省份" prop="registeredProvince" label-width="60px">
-              <el-input v-model="companyForm.registeredProvince" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="城市" prop="registeredCity" label-width="60px">
-              <el-input v-model="companyForm.registeredCity" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="区县" prop="registeredDistrict" label-width="60px">
-              <el-input v-model="companyForm.registeredDistrict" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="注册详细地址" prop="registeredAddressDetail">
-              <el-input v-model="companyForm.registeredAddressDetail" placeholder="请输入注册详细地址" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="营业执照" prop="businessLicenseOssId">
-              <image-upload v-model="companyForm.businessLicenseOssId" :limit="1" :size="5" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="其他附件" prop="attachmentIds">
-              <file-upload v-model="companyForm.attachmentIds" :limit="10" :size="50" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx,.xls,.xlsx,.zip,.rar" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="companyForm.remark" type="textarea" :rows="2" placeholder="备注说明" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitCompanyForm">确 定</el-button>
-          <el-button @click="companyDialogVisible = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 联系人编辑对话框 -->
-    <el-dialog :title="contactDialogTitle" v-model="contactDialogVisible" width="800px" append-to-body>
-      <el-form ref="contactRef" :model="contactForm" :rules="contactRules" label-width="120px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="联系人姓名" prop="contactName">
-              <el-input v-model="contactForm.contactName" placeholder="请输入联系人姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="职位" prop="position">
-              <el-input v-model="contactForm.position" placeholder="如 销售经理/财务总监" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="手机号" prop="phone">
-              <el-input v-model="contactForm.phone" placeholder="请输入手机号" maxlength="20" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属部门" prop="department">
-              <el-input v-model="contactForm.department" placeholder="如 销售部/财务部" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="座机" prop="landline">
-              <el-input v-model="contactForm.landline" placeholder="含区号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱" prop="email">
-              <el-input v-model="contactForm.email" placeholder="请输入电子邮箱" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="微信号" prop="wechat">
-              <el-input v-model="contactForm.wechat" placeholder="请输入微信号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="QQ号" prop="qq">
-              <el-input v-model="contactForm.qq" placeholder="请输入QQ号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="国家/地区" prop="country" label-width="90px">
-              <el-input v-model="contactForm.country" placeholder="中国" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="省份" prop="province" label-width="60px">
-              <el-input v-model="contactForm.province" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="城市" prop="city" label-width="60px">
-              <el-input v-model="contactForm.city" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="区/县" prop="district" label-width="60px">
-              <el-input v-model="contactForm.district" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮政编码" prop="postalCode">
-              <el-input v-model="contactForm.postalCode" placeholder="请输入邮政编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="详细地址" prop="contactAddress">
-              <el-input v-model="contactForm.contactAddress" placeholder="街道、门牌号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="联系人类型" prop="contactType">
-              <el-select v-model="contactForm.contactType" placeholder="请选择" clearable>
-                <el-option label="业务联系人" value="0" />
-                <el-option label="财务联系人" value="1" />
-                <el-option label="紧急联系人" value="2" />
-                <el-option label="其他" value="3" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否默认" prop="isDefault">
-              <el-radio-group v-model="contactForm.isDefault">
-                <el-radio label="0">否</el-radio>
-                <el-radio label="1">是</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="排序" prop="sortOrder">
-              <el-input-number v-model="contactForm.sortOrder" :min="0" controls-position="right" style="width: 100%;" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="contactForm.remark" type="textarea" :rows="2" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitContactForm">确 定</el-button>
-          <el-button @click="contactDialogVisible = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="Supplier">
-import { listSupplier, getSupplier, delSupplier, addSupplier, updateSupplier } from "@/api/customersuppliermanagement/supplierinfo/supplier.js"
-import { listUser } from "@/api/system/user"
-import { getToken } from "@/utils/auth"
+import { listSupplier, delSupplier } from "@/api/customersuppliermanagement/supplierinfo/supplier.js"
 
 const { proxy } = getCurrentInstance()
 
 const supplierList = ref([])
-const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
 const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
-const title = ref("")
 
-const { sys_normal_disable } = useDict("sys_normal_disable")
-const userOptions = ref([])
+const { sys_normal_disable, settlement_type } = useDict("sys_normal_disable", "settlement_type")
 
-/** 查询用户下拉列表 */
-function getUserList() {
-  listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
-    userOptions.value = response.rows
-  })
-}
-
-/** 用户下拉变化时同步姓名字段（确保 purchaserUserId 与 purchaserUser 等同时保存） */
-function handleUserChange(userId, nameField) {
-  if (!userId) {
-    form.value[nameField] = null
-    return
-  }
-  const user = userOptions.value.find(u => String(u.userId) === String(userId))
-  if (user) {
-    form.value[nameField] = user.nickName || user.userName || ''
-  }
-}
-
-const baseUrl = import.meta.env.VITE_APP_BASE_API
-const uploadFileUrl = ref(baseUrl + "/common/upload")
-const uploadHeaders = ref({ Authorization: "Bearer " + getToken() })
-const attachmentTypeOptions = ref([
-  { value: "0", label: "附件资料" },
-  { value: "1", label: "供应商Logo" },
-  { value: "2", label: "合同文件" },
-  { value: "3", label: "其他" }
-])
 const supplierTypeOptions = ref([
   { value: "0", label: "生产商" },
   { value: "1", label: "代理商" },
@@ -804,12 +182,6 @@ const supplierTypeOptions = ref([
   { value: "3", label: "物流商" },
   { value: "4", label: "其他" }
 ])
-const settlementTypeOptions = ref([
-  { value: "0", label: "月结" },
-  { value: "1", label: "周结" },
-  { value: "2", label: "日结" },
-  { value: "3", label: "票结" }
-])
 const cooperationStatusOptions = ref([
   { value: "0", label: "正常" },
   { value: "1", label: "暂停" },
@@ -827,73 +199,8 @@ function formatDateOnly(value) {
   const s = String(value)
   return s.length > 10 ? s.substring(0, 10) : s
 }
-const ATTACHMENT_SIZE_LIMIT = 50
-const ATTACHMENT_EXTENSIONS = ["pdf", "jpg", "jpeg", "png", "doc", "docx", "xls", "xlsx", "zip", "rar"]
-
-/** 格式化文件大小 */
-function formatFileSize(bytes) {
-  if (!bytes) return "0 B"
-  const k = 1024
-  const sizes = ["B", "KB", "MB", "GB"]
-  const i = Math.floor(Math.log(bytes) / Math.log(k))
-  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i]
-}
-
-/** 附件上传前校验 */
-function handleBeforeAttachmentUpload(file) {
-  const ext = (file.name.split('.').pop() || "").toLowerCase()
-  if (ATTACHMENT_EXTENSIONS.indexOf(ext) < 0) {
-    proxy.$modal.msgError(`不支持的文件格式：${ext}`)
-    return false
-  }
-  if (file.name.includes(',')) {
-    proxy.$modal.msgError('文件名不正确，不能包含英文逗号!')
-    return false
-  }
-  if (file.size / 1024 / 1024 >= ATTACHMENT_SIZE_LIMIT) {
-    proxy.$modal.msgError(`上传文件大小不能超过 ${ATTACHMENT_SIZE_LIMIT} MB!`)
-    return false
-  }
-  proxy.$modal.loading("正在上传文件，请稍候...")
-  return true
-}
-
-/** 附件上传成功 */
-function handleAttachmentUploadSuccess(res, file) {
-  proxy.$modal.closeLoading()
-  if (res.code === 200) {
-    form.value.attachmentList.push({
-      attachmentId: null,
-      supplierId: form.value.supplierId || null,
-      fileName: file.name,
-      filePath: res.fileName,
-      fileSize: file.size,
-      fileType: file.type || '',
-      fileExtension: (file.name.split('.').pop() || "").toLowerCase(),
-      attachmentType: "0",
-      isLogo: "0",
-      sortOrder: form.value.attachmentList.length,
-      remark: "",
-      delFlag: "0"
-    })
-  } else {
-    proxy.$modal.msgError(res.msg || "上传文件失败")
-  }
-}
-
-/** 附件上传失败 */
-function handleAttachmentUploadError() {
-  proxy.$modal.closeLoading()
-  proxy.$modal.msgError("上传文件失败")
-}
-
-/** 删除附件行 */
-function handleDeleteAttachment(index) {
-  form.value.attachmentList.splice(index, 1)
-}
 
 const data = reactive({
-  form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -920,18 +227,10 @@ const data = reactive({
     creditEd: undefined,
     cooperationStatus: undefined,
     channelIds: undefined,
-  },
-  rules: {
-    supplierCode: [
-      { required: true, message: "供应商编码不能为空", trigger: "blur" }
-    ],
-    supplierName: [
-      { required: true, message: "供应商名称不能为空", trigger: "blur" }
-    ],
   }
 })
 
-const { queryParams, form, rules } = toRefs(data)
+const { queryParams } = toRefs(data)
 
 /** 查询供应商列表 */
 function getList() {
@@ -943,53 +242,6 @@ function getList() {
   })
 }
 
-/** 取消按钮 */
-function cancel() {
-  open.value = false
-  reset()
-}
-
-/** 表单重置 */
-function reset() {
-  form.value = {
-    supplierId: null,
-    supplierCode: null,
-    supplierName: null,
-    supplierCodeDw: null,
-    creditCode: null,
-    supplierType: null,
-    isEnable: null,
-    purchaserUserId: null,
-    purchaserUser: null,
-    ed: null,
-    zq: null,
-    settlementUserId: null,
-    settlementUser: null,
-    serviceUserId: null,
-    serviceUser: null,
-    settlementType: null,
-    tempEd: null,
-    accountBalance: null,
-    foreignCurrencyBalance: null,
-    weightThreshold: null,
-    throwRatio: null,
-    creditEd: null,
-    cooperationStartDate: null,
-    cooperationStatus: null,
-    channelIds: null,
-    attachmentList: [],
-    companyList: [],
-    contactList: [],
-    remark: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null
-  }
-  proxy.resetForm("supplierRef")
-}
-
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1
@@ -1003,56 +255,32 @@ function resetQuery() {
 }
 
 /** 多选框选中数据 */
+const selectedRows = ref([])
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.supplierId)
+  selectedRows.value = selection
   single.value = selection.length != 1
   multiple.value = !selection.length
 }
 
-/** 新增按钮操作 */
+/** 新增：跳转供应商编辑页（页签式，无 supplierId） */
 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加供应商"
+  proxy.$router.push({ path: '/customersupplier/supplier-edit/index' })
 }
 
-/** 修改按钮操作 */
+/** 修改：跳转供应商编辑页（操作列传 row；工具栏按钮取勾选行） */
 function handleUpdate(row) {
-  reset()
-  const _supplierId = row.supplierId || ids.value
-  getSupplier(_supplierId).then(response => {
-    form.value = response.data
-    if (!form.value.attachmentList) {
-      form.value.attachmentList = []
-    }
-    if (!form.value.companyList) {
-      form.value.companyList = []
-    }
-    if (!form.value.contactList) {
-      form.value.contactList = []
-    }
-    open.value = true
-    title.value = "修改供应商"
-  })
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["supplierRef"].validate(valid => {
-    if (valid) {
-      if (form.value.supplierId != null) {
-        updateSupplier(form.value).then(() => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addSupplier(form.value).then(() => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
+  const target = (row && row.supplierId) ? row : selectedRows.value[0]
+  if (!target || !target.supplierId) {
+    proxy.$modal.msgWarning("请先勾选一个供应商")
+    return
+  }
+  proxy.$router.push({
+    path: '/customersupplier/supplier-edit/index',
+    query: {
+      supplierId: target.supplierId,
+      supplierName: target.supplierName,
+      supplierCode: target.supplierCode
     }
   })
 }
@@ -1075,193 +303,5 @@ function handleExport() {
   }, `supplier_${new Date().getTime()}.xlsx`)
 }
 
-/* ============ 公司主体子表 ============ */
-const companyDialogVisible = ref(false)
-const companyDialogTitle = ref("")
-const companyForm = ref({})
-const companyEditingIndex = ref(-1)
-
-/** 重置公司主体表单 */
-function resetCompanyForm() {
-  companyForm.value = {
-    companyId: null,
-    supplierId: null,
-    companyNameFull: '',
-    englishName: '',
-    creditCode: '',
-    legalPerson: '',
-    legalPersonPhone: '',
-    legalPersonIdCard: '',
-    registeredCapital: 0,
-    capitalCurrency: '人民币',
-    paidInCapital: 0,
-    establishDate: null,
-    businessTermStart: null,
-    businessTermEnd: null,
-    businessTermPermanent: '0',
-    registrationAuthority: '',
-    registrationNumber: '',
-    operatingStatus: '',
-    businessScope: '',
-    shareholders: '',
-    employeeCount: 0,
-    companyPhone: '',
-    companyFax: '',
-    companyWebsite: '',
-    companyEmail: '',
-    registeredProvince: '',
-    registeredCity: '',
-    registeredDistrict: '',
-    registeredAddressDetail: '',
-    businessLicenseOssId: null,
-    attachmentIds: '',
-    remark: ''
-  }
-  proxy.resetForm("companyRef")
-}
-
-/** 新增公司主体（本地子表，跟随主表一起提交） */
-function handleAddCompany() {
-  resetCompanyForm()
-  companyEditingIndex.value = -1
-  companyDialogTitle.value = "新增公司主体"
-  companyDialogVisible.value = true
-}
-
-/** 编辑公司主体 */
-function handleEditCompany(row, index) {
-  resetCompanyForm()
-  companyForm.value = { ...row }
-  companyEditingIndex.value = index
-  companyDialogTitle.value = "修改公司主体"
-  companyDialogVisible.value = true
-}
-
-/** 删除公司主体（仅从子表移除，未提交主表时不调后端） */
-function handleDeleteCompany(index) {
-  proxy.$modal.confirm('是否确认删除该条公司主体记录？').then(() => {
-    const removed = form.value.companyList.splice(index, 1)[0]
-    if (removed && form.value.creditCode && removed.creditCode === form.value.creditCode) {
-      form.value.creditCode = ''
-    }
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-/** 绑定供应商：将选中公司的 creditCode 同步到主表 */
-function handleBindCompany(row) {
-  if (!row.creditCode) {
-    proxy.$modal.msgWarning("该公司主体未填写统一社会信用代码，无法绑定")
-    return
-  }
-  form.value.creditCode = row.creditCode
-  if (row.companyNameFull && !form.value.supplierName) {
-    form.value.supplierName = row.companyNameFull
-  }
-  proxy.$modal.msgSuccess("绑定成功，主表统一社会信用代码已同步")
-}
-
-/** 提交公司主体表单（本地保存，跟随主表提交一起入库） */
-function submitCompanyForm() {
-  if (!companyForm.value.companyNameFull) {
-    proxy.$modal.msgWarning("公司全称不能为空")
-    return
-  }
-  if (!Array.isArray(form.value.companyList)) {
-    form.value.companyList = []
-  }
-  if (companyEditingIndex.value >= 0) {
-    form.value.companyList.splice(companyEditingIndex.value, 1, { ...companyForm.value })
-    if (form.value.creditCode && form.value.companyList[companyEditingIndex.value].creditCode !== form.value.creditCode) {
-      form.value.creditCode = form.value.companyList[companyEditingIndex.value].creditCode || form.value.creditCode
-    }
-  } else {
-    form.value.companyList.push({ ...companyForm.value })
-  }
-  companyDialogVisible.value = false
-  proxy.$modal.msgSuccess(companyEditingIndex.value >= 0 ? "修改成功" : "新增成功")
-}
-
-/* ============ 联系人子表 ============ */
-const contactDialogVisible = ref(false)
-const contactDialogTitle = ref("")
-const contactForm = ref({})
-const contactEditingIndex = ref(-1)
-const contactRules = {
-  contactName: [{ required: true, message: '联系人姓名不能为空', trigger: 'blur' }],
-  phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }]
-}
-
-/** 重置联系人表单 */
-function resetContactForm() {
-  contactForm.value = {
-    contactId: null,
-    supplierId: form.value.supplierId || null,
-    contactName: '',
-    position: '',
-    department: '',
-    phone: '',
-    landline: '',
-    email: '',
-    wechat: '',
-    qq: '',
-    country: '中国',
-    province: '',
-    city: '',
-    district: '',
-    contactAddress: '',
-    postalCode: '',
-    isDefault: '0',
-    contactType: '0',
-    sortOrder: 0,
-    remark: ''
-  }
-  proxy.resetForm("contactRef")
-}
-
-/** 新增联系人（本地子表，跟随主表一起提交） */
-function handleAddContact() {
-  resetContactForm()
-  contactEditingIndex.value = -1
-  contactDialogTitle.value = "新增联系人"
-  contactDialogVisible.value = true
-}
-
-/** 编辑联系人 */
-function handleEditContact(row, index) {
-  resetContactForm()
-  contactForm.value = { ...row }
-  contactEditingIndex.value = index
-  contactDialogTitle.value = "修改联系人"
-  contactDialogVisible.value = true
-}
-
-/** 删除联系人（仅从子表移除；未入库的不调后端，已入库的在主表保存后由后端增量处理） */
-function handleDeleteContact(index) {
-  proxy.$modal.confirm('是否确认删除该条联系人记录？').then(() => {
-    form.value.contactList.splice(index, 1)
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-/** 提交联系人表单（本地保存，跟随主表提交一起入库） */
-function submitContactForm() {
-  if (!contactForm.value.contactName) {
-    proxy.$modal.msgWarning("联系人姓名不能为空")
-    return
-  }
-  if (!Array.isArray(form.value.contactList)) {
-    form.value.contactList = []
-  }
-  if (contactEditingIndex.value >= 0) {
-    form.value.contactList.splice(contactEditingIndex.value, 1, { ...contactForm.value })
-  } else {
-    form.value.contactList.push({ ...contactForm.value })
-  }
-  contactDialogVisible.value = false
-  proxy.$modal.msgSuccess(contactEditingIndex.value >= 0 ? "修改成功" : "新增成功")
-}
-
-getUserList()
 getList()
-</script>
\ No newline at end of file
+</script>
diff --git a/bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue b/bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue
new file mode 100644
index 00000000..9b8c5f43
--- /dev/null
+++ b/bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue
@@ -0,0 +1,1052 @@
+<template>
+  <div class="app-container supplier-edit-page" v-loading="pageLoading">
+    <!-- 顶部：返回 + 标题 + 保存 -->
+    <el-card shadow="never" class="head-card">
+      <div class="head-bar">
+        <el-button icon="ArrowLeft" @click="goBack">返回</el-button>
+        <div class="head-title">
+          <span class="supplier-name">{{ isAdd ? '新增供应商' : (form.supplierName || '-') }}</span>
+          <el-tag size="small" :type="isAdd ? 'warning' : 'info'">{{ isAdd ? '未保存' : '编辑中' }}</el-tag>
+        </div>
+        <div class="head-code">供应商编码：{{ form.supplierCode || '保存后可维护子表数据' }}</div>
+        <div class="head-right">
+          <el-button @click="goBack">取 消</el-button>
+          <el-button type="primary" :loading="saving" v-hasPermi="[isAdd ? 'customersupplier:supplierinfo:add' : 'customersupplier:supplierinfo:edit']" @click="submitForm">保 存</el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <el-card shadow="never">
+      <el-tabs v-model="activeTab">
+        <!-- ============ 基本信息 ============ -->
+        <el-tab-pane label="基本信息" name="base">
+          <el-form ref="supplierRef" :model="form" :rules="rules" label-width="120px" class="supplier-form">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="供应商编码" prop="supplierCode">
+                  <el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="供应商名称" prop="supplierName">
+                  <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="对外代码" prop="supplierCodeDw">
+                  <el-input v-model="form.supplierCodeDw" placeholder="请输入对外代码" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="统一社会信用代码" prop="creditCode">
+                  <el-input v-model="form.creditCode" placeholder="在「公司主体」页签点绑定供应商后自动同步">
+                    <template #append>
+                      <el-tooltip content="由公司主体绑定自动同步，也可手工录入" placement="top">
+                        <el-icon><InfoFilled /></el-icon>
+                      </el-tooltip>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="供应商类型" prop="supplierType">
+                  <el-select v-model="form.supplierType" placeholder="请选择供应商类型" clearable style="width: 100%;">
+                    <el-option v-for="opt in supplierTypeOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="启用状态" prop="isEnable">
+                  <el-select v-model="form.isEnable" placeholder="请选择启用状态" clearable style="width: 100%;">
+                    <el-option label="正常" value="0" />
+                    <el-option label="停用" value="1" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="采购员" prop="purchaserUserId">
+                  <user-select
+                    v-model="form.purchaserUserId"
+                    placeholder="请选择采购员"
+                    @change="(uid, user) => handleUserChange(uid, user, 'purchaserUser')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="应付额度" prop="ed">
+                  <el-input v-model="form.ed" placeholder="请输入应付额度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="应付账期" prop="zq">
+                  <el-input v-model="form.zq" placeholder="请输入应付账期(天)" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="结算员" prop="settlementUserId">
+                  <user-select
+                    v-model="form.settlementUserId"
+                    placeholder="请选择结算员"
+                    @change="(uid, user) => handleUserChange(uid, user, 'settlementUser')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="跟单员" prop="serviceUserId">
+                  <user-select
+                    v-model="form.serviceUserId"
+                    placeholder="请选择跟单员"
+                    @change="(uid, user) => handleUserChange(uid, user, 'serviceUser')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="结算方式" prop="settlementType">
+                  <el-select v-model="form.settlementType" placeholder="请选择结算方式" clearable style="width: 100%;">
+                    <el-option
+                      v-for="dict in settlement_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="临时额度" prop="tempEd">
+                  <el-input v-model="form.tempEd" placeholder="请输入临时额度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="应付余额" prop="accountBalance">
+                  <el-input v-model="form.accountBalance" placeholder="请输入应付余额" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="外币应付余额" prop="foreignCurrencyBalance">
+                  <el-input v-model="form.foreignCurrencyBalance" placeholder="请输入外币应付余额" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="信用额度" prop="creditEd">
+                  <el-input v-model="form.creditEd" placeholder="请输入信用额度" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="重量阈值" prop="weightThreshold">
+                  <el-input v-model="form.weightThreshold" placeholder="请输入重量阈值(kg)" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="抛比" prop="throwRatio">
+                  <el-input v-model="form.throwRatio" placeholder="请输入抛比(%)" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="合作开始日期" prop="cooperationStartDate">
+                  <el-date-picker v-model="form.cooperationStartDate" type="date" value-format="YYYY-MM-DD" placeholder="选择合作开始日期" style="width: 100%;" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="合作状态" prop="cooperationStatus">
+                  <el-select v-model="form.cooperationStatus" placeholder="请选择合作状态" clearable style="width: 100%;">
+                    <el-option v-for="opt in cooperationStatusOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="绑定渠道ID" prop="channelIds">
+                  <el-input v-model="form.channelIds" type="textarea" :rows="2" placeholder="多个渠道ID用英文逗号分隔" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="备注说明" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+
+        <!-- ============ 公司主体 ============ -->
+        <el-tab-pane label="公司主体" name="company">
+          <div class="pane-toolbar">
+            <el-button type="primary" plain icon="Plus" size="small" @click="handleAddCompany">新增公司主体</el-button>
+            <span class="pane-tip">点击「绑定供应商」后，主表的统一社会信用代码会自动同步为该公司的信用代码</span>
+          </div>
+          <el-table :data="form.companyList" border size="small">
+            <el-table-column label="序号" type="index" width="55" align="center" />
+            <el-table-column label="公司全称" prop="companyNameFull" show-overflow-tooltip />
+            <el-table-column label="统一社会信用代码" prop="creditCode" width="190" show-overflow-tooltip />
+            <el-table-column label="法定代表人" prop="legalPerson" width="110" show-overflow-tooltip />
+            <el-table-column label="当前绑定" width="90" align="center">
+              <template #default="{ row }">
+                <el-tag v-if="row.creditCode && form.creditCode === row.creditCode" type="success" size="small">已绑定</el-tag>
+                <span v-else style="color: #999;">-</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="230" align="center">
+              <template #default="{ row, $index }">
+                <el-button link type="primary" size="small" @click="handleBindCompany(row)">绑定供应商</el-button>
+                <el-button link type="primary" size="small" @click="handleEditCompany(row, $index)">编辑</el-button>
+                <el-button link type="danger" size="small" @click="handleDeleteCompany(row, $index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <template #empty>
+              <el-empty description="暂无公司主体，新增后将随供应商信息一起保存" :image-size="80" />
+            </template>
+          </el-table>
+        </el-tab-pane>
+
+        <!-- ============ 联系人 ============ -->
+        <el-tab-pane label="联系人" name="contact">
+          <div class="pane-toolbar">
+            <el-button type="primary" plain icon="Plus" size="small" @click="handleAddContact">新增联系人</el-button>
+          </div>
+          <el-table :data="form.contactList" border size="small">
+            <el-table-column label="序号" type="index" width="55" align="center" />
+            <el-table-column label="联系人" prop="contactName" width="120" show-overflow-tooltip />
+            <el-table-column label="职位" prop="position" width="130" show-overflow-tooltip />
+            <el-table-column label="所属部门" prop="department" width="130" show-overflow-tooltip />
+            <el-table-column label="手机号" prop="phone" width="140" show-overflow-tooltip />
+            <el-table-column label="邮箱" prop="email" min-width="180" show-overflow-tooltip />
+            <el-table-column label="默认" width="80" align="center">
+              <template #default="{ row }">
+                <el-tag v-if="row.isDefault === '1'" type="success" size="small">默认</el-tag>
+                <span v-else style="color: #999;">-</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="150" align="center">
+              <template #default="{ row, $index }">
+                <el-button link type="primary" size="small" @click="handleEditContact(row, $index)">编辑</el-button>
+                <el-button link type="danger" size="small" @click="handleDeleteContact(row, $index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <template #empty>
+              <el-empty description="暂无联系人，新增后将随供应商信息一起保存" :image-size="80" />
+            </template>
+          </el-table>
+        </el-tab-pane>
+
+        <!-- ============ 附件资料 ============ -->
+        <el-tab-pane label="附件资料" name="attachment">
+          <div class="pane-toolbar">
+            <el-upload
+              :show-file-list="false"
+              :action="uploadFileUrl"
+              :headers="uploadHeaders"
+              :before-upload="handleBeforeAttachmentUpload"
+              :on-success="handleAttachmentUploadSuccess"
+              :on-error="handleAttachmentUploadError"
+              multiple
+            >
+              <el-button type="primary" icon="Upload">上传附件</el-button>
+            </el-upload>
+            <span class="pane-tip">支持 PDF、图片、Word、Excel、压缩包，单个文件不超过 50MB；附件在点「保存」后随供应商入库</span>
+          </div>
+          <el-table :data="form.attachmentList" border size="small">
+            <el-table-column label="序号" type="index" width="55" align="center" />
+            <el-table-column label="文件名称" prop="fileName" align="center" show-overflow-tooltip min-width="180">
+              <template #default="{ row }">
+                <el-button link type="primary" @click="handleDownload(row)">{{ row.fileName }}</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="大小" width="100" align="center">
+              <template #default="{ row }">{{ formatFileSize(row.fileSize) }}</template>
+            </el-table-column>
+            <el-table-column label="类型" prop="fileExtension" width="80" align="center" />
+            <el-table-column label="附件分类" width="160" align="center">
+              <template #default="{ row }">
+                <el-select v-model="row.attachmentType" placeholder="请选择">
+                  <el-option v-for="opt in attachmentTypeOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="排序" width="90" align="center">
+              <template #default="{ row }">
+                <el-input v-model="row.sortOrder" type="number" />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="160" align="center">
+              <template #default="{ row }">
+                <el-input v-model="row.remark" placeholder="请输入备注" />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="130" align="center">
+              <template #default="{ row, $index }">
+                <el-button link type="primary" icon="Download" @click="handleDownload(row)">下载</el-button>
+                <el-button link type="danger" icon="Delete" @click="handleDeleteAttachment($index)">删除</el-button>
+              </template>
+            </el-table-column>
+            <template #empty>
+              <el-empty description="暂无附件" :image-size="80" />
+            </template>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+
+    <!-- ====== 公司主体编辑对话框 ====== -->
+    <el-dialog :title="companyDialogTitle" v-model="companyDialogVisible" width="900px" append-to-body>
+      <el-form ref="companyRef" :model="companyForm" label-width="130px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公司全称" prop="companyNameFull">
+              <el-input v-model="companyForm.companyNameFull" placeholder="请输入公司全称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="英文名称" prop="englishName">
+              <el-input v-model="companyForm.englishName" placeholder="请输入英文名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码" prop="creditCode">
+              <el-input v-model="companyForm.creditCode" placeholder="18位统一社会信用代码" maxlength="18" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人" prop="legalPerson">
+              <el-input v-model="companyForm.legalPerson" placeholder="请输入法定代表人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人电话" prop="legalPersonPhone">
+              <el-input v-model="companyForm.legalPersonPhone" placeholder="请输入法定代表人电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人身份证" prop="legalPersonIdCard">
+              <el-input v-model="companyForm.legalPersonIdCard" placeholder="请输入法定代表人身份证号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="注册资本" prop="registeredCapital">
+              <el-input-number v-model="companyForm.registeredCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="币种" prop="capitalCurrency">
+              <el-input v-model="companyForm.capitalCurrency" placeholder="如 人民币/美元" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="实收资本" prop="paidInCapital">
+              <el-input-number v-model="companyForm.paidInCapital" :min="0" :precision="2" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="成立日期" prop="establishDate">
+              <el-date-picker v-model="companyForm.establishDate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="营业期限起" prop="businessTermStart">
+              <el-date-picker v-model="companyForm.businessTermStart" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="营业期限止" prop="businessTermEnd">
+              <el-date-picker v-model="companyForm.businessTermEnd" type="date" value-format="YYYY-MM-DD" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否长期有效" prop="businessTermPermanent">
+              <el-radio-group v-model="companyForm.businessTermPermanent">
+                <el-radio label="0">否</el-radio>
+                <el-radio label="1">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="登记机关" prop="registrationAuthority">
+              <el-input v-model="companyForm.registrationAuthority" placeholder="请输入登记机关" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册号" prop="registrationNumber">
+              <el-input v-model="companyForm.registrationNumber" placeholder="旧版工商注册号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经营状态" prop="operatingStatus">
+              <el-input v-model="companyForm.operatingStatus" placeholder="如 存续/在业/吊销/注销" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="员工人数" prop="employeeCount">
+              <el-input-number v-model="companyForm.employeeCount" :min="0" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="经营范围" prop="businessScope">
+              <el-input v-model="companyForm.businessScope" type="textarea" :rows="3" placeholder="请输入经营范围" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="主要股东" prop="shareholders">
+              <el-input v-model="companyForm.shareholders" type="textarea" :rows="2" placeholder="股东信息（文本或JSON）" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公司电话" prop="companyPhone">
+              <el-input v-model="companyForm.companyPhone" placeholder="请输入公司电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公司传真" prop="companyFax">
+              <el-input v-model="companyForm.companyFax" placeholder="请输入公司传真" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="公司网址" prop="companyWebsite">
+              <el-input v-model="companyForm.companyWebsite" placeholder="请输入公司网址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司邮箱" prop="companyEmail">
+              <el-input v-model="companyForm.companyEmail" placeholder="请输入公司邮箱" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="省份" prop="registeredProvince" label-width="60px">
+              <el-input v-model="companyForm.registeredProvince" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="城市" prop="registeredCity" label-width="60px">
+              <el-input v-model="companyForm.registeredCity" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="区县" prop="registeredDistrict" label-width="60px">
+              <el-input v-model="companyForm.registeredDistrict" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="注册详细地址" prop="registeredAddressDetail">
+              <el-input v-model="companyForm.registeredAddressDetail" placeholder="请输入注册详细地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="营业执照" prop="businessLicenseOssId">
+              <image-upload v-model="companyForm.businessLicenseOssId" :limit="1" :size="5" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="其他附件" prop="attachmentIds">
+              <file-upload v-model="companyForm.attachmentIds" :limit="10" :size="50" accept=".pdf,.jpg,.jpeg,.png,.doc,.docx,.xls,.xlsx,.zip,.rar" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="companyForm.remark" type="textarea" :rows="2" placeholder="备注说明" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitCompanyForm">确 定</el-button>
+          <el-button @click="companyDialogVisible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- ====== 联系人编辑对话框 ====== -->
+    <el-dialog :title="contactDialogTitle" v-model="contactDialogVisible" width="800px" append-to-body>
+      <el-form ref="contactRef" :model="contactForm" :rules="contactRules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人姓名" prop="contactName">
+              <el-input v-model="contactForm.contactName" placeholder="请输入联系人姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="职位" prop="position">
+              <el-input v-model="contactForm.position" placeholder="如 销售经理/财务总监" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="contactForm.phone" placeholder="请输入手机号" maxlength="20" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属部门" prop="department">
+              <el-input v-model="contactForm.department" placeholder="如 销售部/财务部" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="座机" prop="landline">
+              <el-input v-model="contactForm.landline" placeholder="含区号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电子邮箱" prop="email">
+              <el-input v-model="contactForm.email" placeholder="请输入电子邮箱" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="微信号" prop="wechat">
+              <el-input v-model="contactForm.wechat" placeholder="请输入微信号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="QQ号" prop="qq">
+              <el-input v-model="contactForm.qq" placeholder="请输入QQ号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="国家/地区" prop="country" label-width="90px">
+              <el-input v-model="contactForm.country" placeholder="中国" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="省份" prop="province" label-width="60px">
+              <el-input v-model="contactForm.province" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="城市" prop="city" label-width="60px">
+              <el-input v-model="contactForm.city" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="区/县" prop="district" label-width="60px">
+              <el-input v-model="contactForm.district" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮政编码" prop="postalCode">
+              <el-input v-model="contactForm.postalCode" placeholder="请输入邮政编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="详细地址" prop="contactAddress">
+              <el-input v-model="contactForm.contactAddress" placeholder="街道、门牌号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系人类型" prop="contactType">
+              <el-select v-model="contactForm.contactType" placeholder="请选择" clearable>
+                <el-option label="业务联系人" value="0" />
+                <el-option label="财务联系人" value="1" />
+                <el-option label="紧急联系人" value="2" />
+                <el-option label="其他" value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否默认" prop="isDefault">
+              <el-radio-group v-model="contactForm.isDefault">
+                <el-radio label="0">否</el-radio>
+                <el-radio label="1">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="排序" prop="sortOrder">
+              <el-input-number v-model="contactForm.sortOrder" :min="0" controls-position="right" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="contactForm.remark" type="textarea" :rows="2" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitContactForm">确 定</el-button>
+          <el-button @click="contactDialogVisible = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="SupplierEdit">
+import {
+  getSupplier, addSupplier, updateSupplier,
+  delSupplierCompany, delSupplierContact
+} from '@/api/customersuppliermanagement/supplierinfo/supplier.js'
+import { getToken } from '@/utils/auth'
+import axios from 'axios'
+import { saveAs } from 'file-saver'
+
+const { proxy } = getCurrentInstance()
+const route = useRoute()
+const router = useRouter()
+
+const { settlement_type } = useDict('settlement_type')
+
+const pageLoading = ref(false)
+const saving = ref(false)
+const activeTab = ref('base')
+
+const supplierId = computed(() => route.query.supplierId ? Number(route.query.supplierId) : null)
+const isAdd = computed(() => !supplierId.value)
+
+const rules = {
+  supplierCode: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
+  supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }]
+}
+
+const supplierTypeOptions = ref([
+  { value: '0', label: '生产商' },
+  { value: '1', label: '代理商' },
+  { value: '2', label: '个人' },
+  { value: '3', label: '物流商' },
+  { value: '4', label: '其他' }
+])
+const cooperationStatusOptions = ref([
+  { value: '0', label: '正常' },
+  { value: '1', label: '暂停' },
+  { value: '2', label: '终止' }
+])
+
+/** 空表单 */
+function buildEmptyForm() {
+  return {
+    supplierId: null,
+    supplierCode: null,
+    supplierName: null,
+    supplierCodeDw: null,
+    creditCode: null,
+    supplierType: null,
+    isEnable: null,
+    purchaserUserId: null,
+    purchaserUser: null,
+    ed: null,
+    zq: null,
+    settlementUserId: null,
+    settlementUser: null,
+    serviceUserId: null,
+    serviceUser: null,
+    settlementType: null,
+    tempEd: null,
+    accountBalance: null,
+    foreignCurrencyBalance: null,
+    weightThreshold: null,
+    throwRatio: null,
+    creditEd: null,
+    cooperationStartDate: null,
+    cooperationStatus: null,
+    channelIds: null,
+    attachmentList: [],
+    companyList: [],
+    contactList: [],
+    remark: null,
+    delFlag: null
+  }
+}
+const form = ref(buildEmptyForm())
+
+/* ---------------- 用户冗余姓名 ---------------- */
+function handleUserChange(uid, user, nameField) {
+  form.value[nameField] = user ? (user.nickName || user.userName || null) : null
+}
+
+/* ---------------- 附件上传 ---------------- */
+const baseUrl = import.meta.env.VITE_APP_BASE_API
+const uploadFileUrl = ref(baseUrl + '/common/upload')
+const uploadHeaders = ref({ Authorization: 'Bearer ' + getToken() })
+const attachmentTypeOptions = ref([
+  { value: '0', label: '附件资料' },
+  { value: '1', label: '供应商Logo' },
+  { value: '2', label: '合同文件' },
+  { value: '3', label: '其他' }
+])
+const ATTACHMENT_SIZE_LIMIT = 50
+const ATTACHMENT_EXTENSIONS = ['pdf', 'jpg', 'jpeg', 'png', 'doc', 'docx', 'xls', 'xlsx', 'zip', 'rar']
+
+function formatFileSize(bytes) {
+  if (!bytes) return '0 B'
+  const k = 1024
+  const sizes = ['B', 'KB', 'MB', 'GB']
+  const i = Math.floor(Math.log(bytes) / Math.log(k))
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
+}
+
+function handleBeforeAttachmentUpload(file) {
+  const ext = (file.name.split('.').pop() || '').toLowerCase()
+  if (ATTACHMENT_EXTENSIONS.indexOf(ext) < 0) {
+    proxy.$modal.msgError(`不支持的文件格式：${ext}`)
+    return false
+  }
+  if (file.name.includes(',')) {
+    proxy.$modal.msgError('文件名不正确，不能包含英文逗号!')
+    return false
+  }
+  if (file.size / 1024 / 1024 >= ATTACHMENT_SIZE_LIMIT) {
+    proxy.$modal.msgError(`上传文件大小不能超过 ${ATTACHMENT_SIZE_LIMIT} MB!`)
+    return false
+  }
+  proxy.$modal.loading('正在上传文件，请稍候...')
+  return true
+}
+
+function handleAttachmentUploadSuccess(res, file) {
+  proxy.$modal.closeLoading()
+  if (res.code === 200) {
+    form.value.attachmentList.push({
+      attachmentId: null,
+      supplierId: form.value.supplierId || null,
+      fileName: file.name,
+      filePath: res.fileName,
+      fileSize: file.size,
+      fileType: file.type || '',
+      fileExtension: (file.name.split('.').pop() || '').toLowerCase(),
+      attachmentType: '0',
+      isLogo: '0',
+      sortOrder: form.value.attachmentList.length,
+      remark: '',
+      delFlag: '0'
+    })
+  } else {
+    proxy.$modal.msgError(res.msg || '上传文件失败')
+  }
+}
+
+function handleAttachmentUploadError() {
+  proxy.$modal.closeLoading()
+  proxy.$modal.msgError('上传文件失败')
+}
+
+function handleDeleteAttachment(index) {
+  form.value.attachmentList.splice(index, 1)
+}
+
+/** 附件下载（携带鉴权头，并以原始文件名保存） */
+function handleDownload(row) {
+  if (!row.filePath) {
+    proxy.$modal.msgWarning('该附件文件路径缺失，无法下载')
+    return
+  }
+  proxy.$modal.loading('正在下载文件，请稍候...')
+  axios({
+    method: 'get',
+    url: import.meta.env.VITE_APP_BASE_API + '/common/download/resource?resource=' + encodeURIComponent(row.filePath),
+    responseType: 'blob',
+    headers: { Authorization: 'Bearer ' + getToken() }
+  }).then(res => {
+    const blob = new Blob([res.data])
+    saveAs(blob, row.fileName)
+  }).catch(() => {
+    proxy.$modal.msgError('下载失败')
+  }).finally(() => {
+    proxy.$modal.closeLoading()
+  })
+}
+
+/* ============ 公司主体子表 ============ */
+const companyDialogVisible = ref(false)
+const companyDialogTitle = ref('')
+const companyForm = ref({})
+const companyEditingIndex = ref(-1)
+
+function resetCompanyForm() {
+  companyForm.value = {
+    companyId: null,
+    supplierId: null,
+    companyNameFull: '',
+    englishName: '',
+    creditCode: '',
+    legalPerson: '',
+    legalPersonPhone: '',
+    legalPersonIdCard: '',
+    registeredCapital: 0,
+    capitalCurrency: '人民币',
+    paidInCapital: 0,
+    establishDate: null,
+    businessTermStart: null,
+    businessTermEnd: null,
+    businessTermPermanent: '0',
+    registrationAuthority: '',
+    registrationNumber: '',
+    operatingStatus: '',
+    businessScope: '',
+    shareholders: '',
+    employeeCount: 0,
+    companyPhone: '',
+    companyFax: '',
+    companyWebsite: '',
+    companyEmail: '',
+    registeredProvince: '',
+    registeredCity: '',
+    registeredDistrict: '',
+    registeredAddressDetail: '',
+    businessLicenseOssId: null,
+    attachmentIds: '',
+    remark: ''
+  }
+  proxy.resetForm('companyRef')
+}
+
+/** 新增公司主体：新增供应商态下仅存本地数组，保存主表时由后端补 supplierId 一并入库 */
+function handleAddCompany() {
+  resetCompanyForm()
+  companyEditingIndex.value = -1
+  companyDialogTitle.value = '新增公司主体'
+  companyDialogVisible.value = true
+}
+
+function handleEditCompany(row, index) {
+  resetCompanyForm()
+  companyForm.value = { ...row }
+  companyEditingIndex.value = index
+  companyDialogTitle.value = '修改公司主体'
+  companyDialogVisible.value = true
+}
+
+/** 删除公司主体：本地新增行直接移除；已入库行先调删除接口 */
+function handleDeleteCompany(row, index) {
+  proxy.$modal.confirm('是否确认删除该条公司主体记录？').then(() => {
+    const doRemove = () => {
+      const removed = form.value.companyList.splice(index, 1)[0]
+      if (removed && form.value.creditCode && removed.creditCode === form.value.creditCode) {
+        form.value.creditCode = ''
+      }
+      proxy.$modal.msgSuccess('删除成功')
+    }
+    if (row.companyId) {
+      delSupplierCompany(row.companyId).then(doRemove)
+    } else {
+      doRemove()
+    }
+  }).catch(() => {})
+}
+
+function handleBindCompany(row) {
+  if (!row.creditCode) {
+    proxy.$modal.msgWarning('该公司主体未填写统一社会信用代码，无法绑定')
+    return
+  }
+  form.value.creditCode = row.creditCode
+  if (row.companyNameFull && !form.value.supplierName) {
+    form.value.supplierName = row.companyNameFull
+  }
+  proxy.$modal.msgSuccess('绑定成功，主表统一社会信用代码已同步')
+}
+
+function submitCompanyForm() {
+  if (!companyForm.value.companyNameFull) {
+    proxy.$modal.msgWarning('公司全称不能为空')
+    return
+  }
+  if (!Array.isArray(form.value.companyList)) {
+    form.value.companyList = []
+  }
+  if (companyEditingIndex.value >= 0) {
+    form.value.companyList.splice(companyEditingIndex.value, 1, { ...companyForm.value })
+    if (form.value.creditCode && form.value.companyList[companyEditingIndex.value].creditCode !== form.value.creditCode) {
+      form.value.creditCode = form.value.companyList[companyEditingIndex.value].creditCode || form.value.creditCode
+    }
+  } else {
+    form.value.companyList.push({ ...companyForm.value })
+  }
+  companyDialogVisible.value = false
+  proxy.$modal.msgSuccess(companyEditingIndex.value >= 0 ? '修改成功' : '新增成功，保存供应商后生效')
+}
+
+/* ============ 联系人子表 ============ */
+const contactDialogVisible = ref(false)
+const contactDialogTitle = ref('')
+const contactForm = ref({})
+const contactEditingIndex = ref(-1)
+const contactRules = {
+  contactName: [{ required: true, message: '联系人姓名不能为空', trigger: 'blur' }],
+  phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }]
+}
+
+function resetContactForm() {
+  contactForm.value = {
+    contactId: null,
+    supplierId: form.value.supplierId || null,
+    contactName: '',
+    position: '',
+    department: '',
+    phone: '',
+    landline: '',
+    email: '',
+    wechat: '',
+    qq: '',
+    country: '中国',
+    province: '',
+    city: '',
+    district: '',
+    contactAddress: '',
+    postalCode: '',
+    isDefault: '0',
+    contactType: '0',
+    sortOrder: 0,
+    remark: ''
+  }
+  proxy.resetForm('contactRef')
+}
+
+function handleAddContact() {
+  resetContactForm()
+  contactEditingIndex.value = -1
+  contactDialogTitle.value = '新增联系人'
+  contactDialogVisible.value = true
+}
+
+function handleEditContact(row, index) {
+  resetContactForm()
+  contactForm.value = { ...row }
+  contactEditingIndex.value = index
+  contactDialogTitle.value = '修改联系人'
+  contactDialogVisible.value = true
+}
+
+/** 删除联系人：本地新增行直接移除；已入库行先调删除接口 */
+function handleDeleteContact(row, index) {
+  proxy.$modal.confirm('是否确认删除该条联系人记录？').then(() => {
+    if (row.contactId) {
+      delSupplierContact(row.contactId).then(() => {
+        form.value.contactList.splice(index, 1)
+        proxy.$modal.msgSuccess('删除成功')
+      })
+    } else {
+      form.value.contactList.splice(index, 1)
+      proxy.$modal.msgSuccess('删除成功')
+    }
+  }).catch(() => {})
+}
+
+function submitContactForm() {
+  if (!contactForm.value.contactName) {
+    proxy.$modal.msgWarning('联系人姓名不能为空')
+    return
+  }
+  if (!Array.isArray(form.value.contactList)) {
+    form.value.contactList = []
+  }
+  if (contactEditingIndex.value >= 0) {
+    form.value.contactList.splice(contactEditingIndex.value, 1, { ...contactForm.value })
+  } else {
+    form.value.contactList.push({ ...contactForm.value })
+  }
+  contactDialogVisible.value = false
+  proxy.$modal.msgSuccess(contactEditingIndex.value >= 0 ? '修改成功' : '新增成功，保存供应商后生效')
+}
+
+/* ============ 加载 / 保存 ============ */
+/** 重新拉取详情（新增保存后或修改保存后调用，确保子表主键、附件重建结果与库一致） */
+function loadDetail(id) {
+  return getSupplier(id).then(response => {
+    if (!response.data) {
+      proxy.$modal.msgError('该供应商不存在或已被删除')
+      return
+    }
+    form.value = response.data
+    form.value.attachmentList = form.value.attachmentList || []
+    form.value.companyList = form.value.companyList || []
+    form.value.contactList = form.value.contactList || []
+  })
+}
+
+/** 保存：新增成功后留在本页（URL 替换为编辑态），可继续维护子表 */
+function submitForm() {
+  proxy.$refs['supplierRef'].validate(valid => {
+    if (!valid) {
+      activeTab.value = 'base'
+      return
+    }
+    const nullIfEmpty = v => (v === '' || v === undefined ? null : v)
+    const payload = {
+      ...form.value,
+      purchaserUserId: nullIfEmpty(form.value.purchaserUserId),
+      purchaserUser: nullIfEmpty(form.value.purchaserUser),
+      settlementUserId: nullIfEmpty(form.value.settlementUserId),
+      settlementUser: nullIfEmpty(form.value.settlementUser),
+      serviceUserId: nullIfEmpty(form.value.serviceUserId),
+      serviceUser: nullIfEmpty(form.value.serviceUser)
+    }
+    saving.value = true
+    const req = isAdd.value ? addSupplier(payload) : updateSupplier(payload)
+    req.then(res => {
+      if (isAdd.value) {
+        const newId = res.supplierId || res.data?.supplierId
+        proxy.$modal.msgSuccess('新增成功，已进入编辑页，可继续维护公司主体、联系人和附件')
+        // 替换为编辑态（query 变化触发 watch 自动拉取详情），避免返回/刷新再次新增
+        router.replace({ path: '/customersupplier/supplier-edit/index', query: { supplierId: newId } })
+        return
+      }
+      proxy.$modal.msgSuccess('保存成功')
+      return loadDetail(form.value.supplierId)
+    }).finally(() => {
+      saving.value = false
+    })
+  })
+}
+
+function goBack() {
+  router.push({ path: '/customersuppliermanagement/supplierinfo' })
+}
+
+/* ============ 初始化 ============ */
+/** 按当前路由初始化页面：有supplierId拉详情，无则空表单（同路由组件复用时靠 watch 触发） */
+function initByRoute() {
+  companyDialogVisible.value = false
+  contactDialogVisible.value = false
+  activeTab.value = 'base'
+  if (supplierId.value) {
+    pageLoading.value = true
+    loadDetail(supplierId.value).finally(() => { pageLoading.value = false })
+  } else {
+    form.value = buildEmptyForm()
+  }
+}
+
+watch(() => route.query.supplierId, (newVal, oldVal) => {
+  if (String(newVal || '') === String(oldVal || '')) return
+  initByRoute()
+})
+
+onMounted(() => {
+  initByRoute()
+})
+</script>
+
+<style lang="scss" scoped>
+.head-card {
+  margin-bottom: 12px;
+}
+.head-bar {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+}
+.head-title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.supplier-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+}
+.head-code {
+  color: #909399;
+  font-size: 13px;
+}
+.head-right {
+  margin-left: auto;
+}
+.pane-toolbar {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 12px;
+  flex-wrap: wrap;
+}
+.pane-tip {
+  color: #909399;
+  font-size: 12px;
+}
+</style>