direv/admin_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Conversation 0 Commits 85 Files Changed 94 +7 -9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 04728fb7a6 - Show all commits

11
src/modules/supplier/good/GoodListView.vue
View File

@ -132,14 +132,13 @@ const batchRejectForm = reactive({ reason: '' })
const columns = [
{ type: 'selection' as const, label: '', width: 50 },
{ prop: 'supplierGoodId', label: '商品ID', width: 140 },
{ prop: 'title', label: '商品名称', minWidth: 240, slot: 'title' },
{ prop: 'supplierGoodId', label: '商品ID', width: 100 },
{ prop: 'title', label: '商品名称', minWidth: 320, slot: 'title' },
{ prop: 'enterpriseName', label: '供应商', minWidth: 180, showOverflowTooltip: true },
{ prop: 'categoryName', label: '分类', minWidth: 240, slot: 'category' },
{ prop: 'brandName', label: '品牌', width: 120 },
{ prop: 'unitName', label: '单位', width: 80, align: 'center' as const },
{ prop: 'categoryName', label: '分类', minWidth: 180, slot: 'category' },
{ prop: 'brandName', label: '品牌', width: 110 },
{ prop: 'unitName', label: '单位', width: 70, align: 'center' as const },
{ prop: 'onShelf', label: '铺货', width: 100, align: 'center' as const, slot: 'onShelf' },
{ prop: 'checkOpinion', label: '审核意见', minWidth: 160, showOverflowTooltip: true },
{ prop: 'checkStatus', label: '状态', width: 100, align: 'center' as const, slot: 'checkStatus' },
{ prop: 'createDate', label: '申请时间', width: 170 },
{ label: '操作', width: 240, align: 'center' as const, fixed: 'right' as const, slot: 'action' }

5
src/modules/supplier/servicegood/ServiceGoodListView.vue
View File

@ -72,14 +72,13 @@ const checkStats = reactive({ pending: 0, approved: 0, rejected: 0 })
const columns = [
{ type: 'selection' as const, label: '', width: 50 },
{ prop: 'serviceGoodId', label: '服务ID', width: 140 },
{ prop: 'title', label: '服务名称', minWidth: 240, slot: 'title' },
{ prop: 'serviceGoodId', label: '服务ID', width: 100 },
{ prop: 'title', label: '服务名称', minWidth: 320, slot: 'title' },
{ prop: 'enterpriseName', label: '供应商', minWidth: 180 },
{ prop: 'categoryName', label: '分类', width: 160 },
{ prop: 'serviceArea', label: '服务区域', width: 120, align: 'center' as const },
{ prop: 'price', label: '价格', width: 160, align: 'right' as const, slot: 'price' },
{ prop: 'onShelf', label: '铺货', width: 100, align: 'center' as const, slot: 'onShelf' },
{ prop: 'checkOpinion', label: '审核意见', minWidth: 160 },
{ prop: 'checkStatus', label: '状态', width: 100, align: 'center' as const, slot: 'checkStatus' },
{ prop: 'createDate', label: '申请时间', width: 170 },
{ label: '操作', width: 280, align: 'center' as const, fixed: 'right' as const, slot: 'action' }