From 1920f063fc7e84fff0f729d2ace4df0e7639d5e6 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 24 十月 2026 22:50:12 +0800
Subject: [PATCH] style(table): 调整表格操作列宽度并替换供应商选择组件
---
src/views/wls/productreceipt/data.ts | 2
src/views/erp/purchase/in/data.ts | 2
src/views/aftersales/ticket/data.ts | 2
src/views/wls/stocktaking/plan/data.ts | 2
src/views/wls/transfer/data.ts | 2
src/views/wms/md/item/data.ts | 2
src/views/hrm/training/data.ts | 2
src/packages/effects/plugins/src/vxe-table/style.css | 17 ++++
src/views/mes/qc/ipqc/data.ts | 2
src/views/wls/materialstock/components/stock-adjust-modal.vue | 4
src/views/mes/qc/iqc/data.ts | 2
src/views/wls/arrivalnotice/data.ts | 22 ++---
src/views/system/dict/data.ts | 4
src/views/erp/purchase/order/data.ts | 2
src/views/crm/contract/components/command-list-data.ts | 2
src/views/erp/purchase/request/data.ts | 2
src/views/bpm/task/done/data.ts | 2
src/views/wls/outsourcereceipt/data.ts | 8 +-
src/views/wls/returnissue/data.ts | 2
src/views/erp/sale/return/data.ts | 2
src/views/erp/stock/move/data.ts | 2
src/views/mes/qc/batchtrace/data.ts | 4
src/views/wls/batch/data.ts | 4
src/views/erp/purchase/return/data.ts | 2
src/views/wls/salesnotice/data.ts | 2
src/views/erp/finance/receipt/data.ts | 2
src/views/erp/sale/order/data.ts | 2
src/views/mes/pro/workorder/data.ts | 4
src/views/wls/itemreceipt/data.ts | 8 +-
src/views/wls/returnsales/data.ts | 2
src/views/erp/stock/check/data.ts | 2
src/views/wls/outsourceissue/data.ts | 8 +-
src/views/wls/productissue/data.ts | 2
src/views/erp/stock/out/data.ts | 2
src/views/wls/barcode/data.ts | 4
src/views/crm/saleQuotation/data.ts | 2
src/views/erp/sale/out/data.ts | 2
src/views/wls/miscissue/data.ts | 2
src/views/erp/stock/in/data.ts | 2
src/views/wls/packages/data.ts | 2
src/views/wls/returnvendor/data.ts | 10 +-
src/views/wls/productsales/data.ts | 2
src/views/ai/knowledge/document/data.ts | 2
src/views/mes/qc/rqc/data.ts | 2
src/views/wls/arrivalnotice/modules/po-select-dialog.vue | 24 ++++--
45 files changed, 104 insertions(+), 81 deletions(-)
diff --git a/src/packages/effects/plugins/src/vxe-table/style.css b/src/packages/effects/plugins/src/vxe-table/style.css
index 04ef7e8..0fa4a5d 100644
--- a/src/packages/effects/plugins/src/vxe-table/style.css
+++ b/src/packages/effects/plugins/src/vxe-table/style.css
@@ -84,6 +84,23 @@
box-sizing: border-box;
}
+/* 鎿嶄綔鍒楀幓鎺夊崟鍏冩牸妯悜鍐呰竟璺濓紝閬垮厤鎸夐挳缁勫湪绐勫垪涓瑁佸垏 */
+.vxe-table--render-default .vxe-body--column:has(.table-actions),
+.vxe-table--render-default .vxe-body--column:has(.table-operations) {
+ padding-right: 0;
+ padding-left: 0;
+}
+
+.vxe-table--render-default
+ .vxe-body--column:has(.table-actions)
+ .vxe-cell,
+.vxe-table--render-default
+ .vxe-body--column:has(.table-operations)
+ .vxe-cell {
+ padding-right: 2px !important;
+ padding-left: 2px !important;
+}
+
.vxe-table--render-default .vxe-cell {
min-width: 0;
max-width: 100%;
diff --git a/src/views/aftersales/ticket/data.ts b/src/views/aftersales/ticket/data.ts
index c0baea5..be5671f 100644
--- a/src/views/aftersales/ticket/data.ts
+++ b/src/views/aftersales/ticket/data.ts
@@ -367,7 +367,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'itemActions' },
} as const,
diff --git a/src/views/ai/knowledge/document/data.ts b/src/views/ai/knowledge/document/data.ts
index 5556582..8b118d5 100644
--- a/src/views/ai/knowledge/document/data.ts
+++ b/src/views/ai/knowledge/document/data.ts
@@ -90,7 +90,7 @@
},
{
title: '鎿嶄綔',
- minWidth: 150,
+ minWidth: 240,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/bpm/task/done/data.ts b/src/views/bpm/task/done/data.ts
index 3c5e9f6..c856e33 100644
--- a/src/views/bpm/task/done/data.ts
+++ b/src/views/bpm/task/done/data.ts
@@ -146,7 +146,7 @@
},
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/crm/contract/components/command-list-data.ts b/src/views/crm/contract/components/command-list-data.ts
index 04b43ad..0fd3343 100644
--- a/src/views/crm/contract/components/command-list-data.ts
+++ b/src/views/crm/contract/components/command-list-data.ts
@@ -47,7 +47,7 @@
},
{
title: '鎿嶄綔',
- width: 220,
+ width: 260,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/crm/saleQuotation/data.ts b/src/views/crm/saleQuotation/data.ts
index 109c6e4..cb3460d 100644
--- a/src/views/crm/saleQuotation/data.ts
+++ b/src/views/crm/saleQuotation/data.ts
@@ -484,7 +484,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/erp/finance/receipt/data.ts b/src/views/erp/finance/receipt/data.ts
index a81b7c0..9e6664e 100644
--- a/src/views/erp/finance/receipt/data.ts
+++ b/src/views/erp/finance/receipt/data.ts
@@ -203,7 +203,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/purchase/in/data.ts b/src/views/erp/purchase/in/data.ts
index ef9d96b..c8ae2cb 100644
--- a/src/views/erp/purchase/in/data.ts
+++ b/src/views/erp/purchase/in/data.ts
@@ -291,7 +291,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/purchase/order/data.ts b/src/views/erp/purchase/order/data.ts
index 19ccc26..df47615 100644
--- a/src/views/erp/purchase/order/data.ts
+++ b/src/views/erp/purchase/order/data.ts
@@ -232,7 +232,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index cc4745b..a1b9268 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -208,7 +208,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/purchase/return/data.ts b/src/views/erp/purchase/return/data.ts
index 5bb8b24..68a444f 100644
--- a/src/views/erp/purchase/return/data.ts
+++ b/src/views/erp/purchase/return/data.ts
@@ -291,7 +291,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/sale/order/data.ts b/src/views/erp/sale/order/data.ts
index 9597b94..08272a4 100644
--- a/src/views/erp/sale/order/data.ts
+++ b/src/views/erp/sale/order/data.ts
@@ -511,7 +511,7 @@
},
{
title: '鎿嶄綔',
- width: 260,
+ width: 340,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/erp/sale/out/data.ts b/src/views/erp/sale/out/data.ts
index 298eed3..2e8a760 100644
--- a/src/views/erp/sale/out/data.ts
+++ b/src/views/erp/sale/out/data.ts
@@ -312,7 +312,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/sale/return/data.ts b/src/views/erp/sale/return/data.ts
index 68e9e22..bec912d 100644
--- a/src/views/erp/sale/return/data.ts
+++ b/src/views/erp/sale/return/data.ts
@@ -305,7 +305,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/stock/check/data.ts b/src/views/erp/stock/check/data.ts
index e65fce8..397d2f4 100644
--- a/src/views/erp/stock/check/data.ts
+++ b/src/views/erp/stock/check/data.ts
@@ -148,7 +148,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/stock/in/data.ts b/src/views/erp/stock/in/data.ts
index 353ec6c..6de6c79 100644
--- a/src/views/erp/stock/in/data.ts
+++ b/src/views/erp/stock/in/data.ts
@@ -155,7 +155,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/stock/move/data.ts b/src/views/erp/stock/move/data.ts
index 4a0bac9..68d8ed2 100644
--- a/src/views/erp/stock/move/data.ts
+++ b/src/views/erp/stock/move/data.ts
@@ -146,7 +146,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/erp/stock/out/data.ts b/src/views/erp/stock/out/data.ts
index 524e3a6..06a8d18 100644
--- a/src/views/erp/stock/out/data.ts
+++ b/src/views/erp/stock/out/data.ts
@@ -157,7 +157,7 @@
},
{
title: '鎿嶄綔',
- width: 50,
+ width: 80,
fixed: 'right',
slots: { default: 'actions' },
visible: !disabled,
diff --git a/src/views/hrm/training/data.ts b/src/views/hrm/training/data.ts
index e00aac7..10bb9cf 100644
--- a/src/views/hrm/training/data.ts
+++ b/src/views/hrm/training/data.ts
@@ -235,7 +235,7 @@
{
field: 'action',
title: '鎿嶄綔',
- width: 240,
+ width: 380,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index e046fdf..60ef22a 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -23,7 +23,7 @@
import {
MdItemSelect,
} from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { ErpSaleOrderSelect } from '#/views/erp/sale/order/components';
/** 琛ㄥ崟绫诲瀷 */
@@ -228,7 +228,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
disabled: headerReadonly,
placeholder: '璇烽�夋嫨渚涘簲鍟�',
diff --git a/src/views/mes/qc/batchtrace/data.ts b/src/views/mes/qc/batchtrace/data.ts
index 3013c2e..aae2dcf 100644
--- a/src/views/mes/qc/batchtrace/data.ts
+++ b/src/views/mes/qc/batchtrace/data.ts
@@ -9,7 +9,7 @@
import { MdClientSelect } from '#/views/mes/md/client/components';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
/** 鍒楄〃鐨勬悳绱㈣〃鍗� */
export function useGridFormSchema(): VbenFormSchema[] {
@@ -34,7 +34,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
diff --git a/src/views/mes/qc/ipqc/data.ts b/src/views/mes/qc/ipqc/data.ts
index 58f1e88..d7ece73 100644
--- a/src/views/mes/qc/ipqc/data.ts
+++ b/src/views/mes/qc/ipqc/data.ts
@@ -491,7 +491,7 @@
},
{
title: '鎿嶄綔',
- width: 180,
+ width: 220,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/mes/qc/iqc/data.ts b/src/views/mes/qc/iqc/data.ts
index 40cb523..2e8b359 100644
--- a/src/views/mes/qc/iqc/data.ts
+++ b/src/views/mes/qc/iqc/data.ts
@@ -436,7 +436,7 @@
},
{
title: '鎿嶄綔',
- width: 180,
+ width: 220,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/mes/qc/rqc/data.ts b/src/views/mes/qc/rqc/data.ts
index 92d5e1e..8f98408 100644
--- a/src/views/mes/qc/rqc/data.ts
+++ b/src/views/mes/qc/rqc/data.ts
@@ -417,7 +417,7 @@
},
{
title: '鎿嶄綔',
- width: 180,
+ width: 220,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/system/dict/data.ts b/src/views/system/dict/data.ts
index cfa455a..e8deac4 100644
--- a/src/views/system/dict/data.ts
+++ b/src/views/system/dict/data.ts
@@ -141,7 +141,7 @@
},
{
title: '鎿嶄綔',
- minWidth: 120,
+ minWidth: 160,
fixed: 'right',
slots: { default: 'actions' },
},
@@ -346,7 +346,7 @@
},
{
title: '鎿嶄綔',
- minWidth: 120,
+ minWidth: 160,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/wls/arrivalnotice/data.ts b/src/views/wls/arrivalnotice/data.ts
index 4fd3a0b..a48b230 100644
--- a/src/views/wls/arrivalnotice/data.ts
+++ b/src/views/wls/arrivalnotice/data.ts
@@ -13,7 +13,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getItemPage } from '#/api/mdm/item';
import { getRangePickerDefaultProps } from '#/utils';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { ErpPurchaseOrderSelect } from '#/views/erp/purchase/order/components';
/** 琛ㄥ崟绫诲瀷 */
@@ -102,7 +102,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
disabled: true,
@@ -112,7 +112,7 @@
componentProps: (values) => ({
placeholder: '璇烽�夋嫨渚涘簲鍟�',
disabled: true,
- vendorName: values.vendorName as string,
+ supplierName: values.vendorName as string,
}),
},
rules: 'selectRequired',
@@ -180,21 +180,19 @@
},
},
{
- fieldName: 'purchaseOrderNo',
+ fieldName: 'purchaseOrderId',
label: '閲囪喘璁㈠崟鍙�',
- component: 'Input',
+ component: markRaw(ErpPurchaseOrderSelect),
componentProps: {
- allowClear: true,
- placeholder: '璇疯緭鍏ラ噰璐鍗曞彿',
+ placeholder: '璇烽�夋嫨閲囪喘璁㈠崟',
},
},
{
- fieldName: 'vendorName',
+ fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: 'Input',
+ component: markRaw(SrmSupplierSelect),
componentProps: {
- allowClear: true,
- placeholder: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О',
+ placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
},
{
@@ -332,7 +330,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/arrivalnotice/modules/po-select-dialog.vue b/src/views/wls/arrivalnotice/modules/po-select-dialog.vue
index 6d6d492..35fd59f 100644
--- a/src/views/wls/arrivalnotice/modules/po-select-dialog.vue
+++ b/src/views/wls/arrivalnotice/modules/po-select-dialog.vue
@@ -2,12 +2,16 @@
import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import { markRaw, nextTick } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
import { Page, useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { getPurchaseOrderPage } from '#/api/erp/purchase/order';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
const emit = defineEmits<{
selected: [purchaseOrderId: number];
@@ -26,12 +30,11 @@
},
},
{
- fieldName: 'supplierName',
+ fieldName: 'supplierId',
label: '渚涘簲鍟�',
- component: 'Input',
+ component: markRaw(SrmSupplierSelect),
componentProps: {
- allowClear: true,
- placeholder: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О',
+ placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
},
],
@@ -62,7 +65,7 @@
field: 'totalPrice',
title: '鎬婚噾棰�',
width: 120,
- formatter: 'formatMoney',
+ formatter: 'formatAmount2',
},
{
field: 'status',
@@ -70,11 +73,11 @@
width: 100,
cellRender: {
name: 'CellDict',
- props: { type: 'erp_purchase_order_status' },
+ props: { type: DICT_TYPE.ERP_AUDIT_STATUS },
},
},
],
- height: 'auto',
+ height: 520,
keepSource: true,
proxyConfig: {
ajax: {
@@ -109,7 +112,12 @@
await modalApi.close();
},
async onOpenChange(isOpen: boolean) {
- if (isOpen) {
+ if (!isOpen) {
+ return;
+ }
+ // 棣栨鎵撳紑鏃惰〃鏍煎皻鏈寕杞斤紝绛夊緟鎸傝浇鍚庡啀鍒锋柊
+ await nextTick();
+ if (typeof gridApi.grid?.commitProxy === 'function') {
await gridApi.query();
}
},
diff --git a/src/views/wls/barcode/data.ts b/src/views/wls/barcode/data.ts
index dfd288c..fb7ac7f 100644
--- a/src/views/wls/barcode/data.ts
+++ b/src/views/wls/barcode/data.ts
@@ -21,7 +21,7 @@
import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
import { MdClientSelect } from '#/views/mes/md/client/components';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import {
MdWorkshopSelect,
MdWorkstationSelect,
@@ -262,7 +262,7 @@
{
fieldName: 'bizId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
onChange: (item: any) => syncBizDetail(formApi, item),
},
diff --git a/src/views/wls/batch/data.ts b/src/views/wls/batch/data.ts
index 9af407b..912cbd9 100644
--- a/src/views/wls/batch/data.ts
+++ b/src/views/wls/batch/data.ts
@@ -13,7 +13,7 @@
import { getRangePickerDefaultProps } from '#/utils';
import { MdClientSelect } from '#/views/mes/md/client/components';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
import { ProTaskSelect } from '#/views/mes/pro/task/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
@@ -42,7 +42,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
diff --git a/src/views/wls/itemreceipt/data.ts b/src/views/wls/itemreceipt/data.ts
index 291714f..b3b4f49 100644
--- a/src/views/wls/itemreceipt/data.ts
+++ b/src/views/wls/itemreceipt/data.ts
@@ -19,7 +19,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { ErpSupplierSelect } from '#/views/erp/purchase/supplier/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import {
WmArrivalNoticeLineSelect,
WmArrivalNoticeSelect,
@@ -132,7 +132,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(ErpSupplierSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
onChange: async (supplier?: any) => {
@@ -193,7 +193,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(ErpSupplierSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -458,7 +458,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/materialstock/components/stock-adjust-modal.vue b/src/views/wls/materialstock/components/stock-adjust-modal.vue
index aeb5883..3028b7d 100644
--- a/src/views/wls/materialstock/components/stock-adjust-modal.vue
+++ b/src/views/wls/materialstock/components/stock-adjust-modal.vue
@@ -20,7 +20,7 @@
} from '#/api/mes/wm/materialstock';
import { getItem } from '#/api/mdm/item';
import { MdmItemSelect } from '#/views/basicData/mdm/components';
-import { ErpSupplierSelect } from '#/views/erp/purchase/supplier/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import BatchConfigDisplay from './batch-config-display.vue';
import {
WmWarehouseAreaSelect,
@@ -297,7 +297,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(ErpSupplierSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
diff --git a/src/views/wls/miscissue/data.ts b/src/views/wls/miscissue/data.ts
index 5018e10..e060cee 100644
--- a/src/views/wls/miscissue/data.ts
+++ b/src/views/wls/miscissue/data.ts
@@ -316,7 +316,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/outsourceissue/data.ts b/src/views/wls/outsourceissue/data.ts
index dd70166..df58d7a 100644
--- a/src/views/wls/outsourceissue/data.ts
+++ b/src/views/wls/outsourceissue/data.ts
@@ -20,7 +20,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
import { WmMaterialStockSelect } from '#/views/wls/materialstock/components';
import {
@@ -120,7 +120,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -162,7 +162,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -360,7 +360,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/outsourcereceipt/data.ts b/src/views/wls/outsourcereceipt/data.ts
index 4d336b4..13df461 100644
--- a/src/views/wls/outsourcereceipt/data.ts
+++ b/src/views/wls/outsourcereceipt/data.ts
@@ -21,7 +21,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
import {
WmWarehouseAreaSelect,
@@ -110,7 +110,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -172,7 +172,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -433,7 +433,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/packages/data.ts b/src/views/wls/packages/data.ts
index ec8952a..f1a0364 100644
--- a/src/views/wls/packages/data.ts
+++ b/src/views/wls/packages/data.ts
@@ -543,7 +543,7 @@
},
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
},
diff --git a/src/views/wls/productissue/data.ts b/src/views/wls/productissue/data.ts
index b9d15b9..1c1ca20 100644
--- a/src/views/wls/productissue/data.ts
+++ b/src/views/wls/productissue/data.ts
@@ -393,7 +393,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/productreceipt/data.ts b/src/views/wls/productreceipt/data.ts
index 778bc92..6e46449 100644
--- a/src/views/wls/productreceipt/data.ts
+++ b/src/views/wls/productreceipt/data.ts
@@ -364,7 +364,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/productsales/data.ts b/src/views/wls/productsales/data.ts
index 9522d75..5b742a4 100644
--- a/src/views/wls/productsales/data.ts
+++ b/src/views/wls/productsales/data.ts
@@ -593,7 +593,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/returnissue/data.ts b/src/views/wls/returnissue/data.ts
index 5f7fa15..af3fd0f 100644
--- a/src/views/wls/returnissue/data.ts
+++ b/src/views/wls/returnissue/data.ts
@@ -470,7 +470,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/returnsales/data.ts b/src/views/wls/returnsales/data.ts
index 9b61d3c..c1ad385 100644
--- a/src/views/wls/returnsales/data.ts
+++ b/src/views/wls/returnsales/data.ts
@@ -483,7 +483,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/returnvendor/data.ts b/src/views/wls/returnvendor/data.ts
index 1903c81..c1dd8b9 100644
--- a/src/views/wls/returnvendor/data.ts
+++ b/src/views/wls/returnvendor/data.ts
@@ -13,7 +13,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { ErpPurchaseOrderSelect } from '#/views/erp/purchase/order/components';
import { WmBatchSelect } from '#/views/wls/batch/components';
import { WmMaterialStockSelect } from '#/views/wls/materialstock/components';
@@ -113,7 +113,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
disabled: true,
@@ -123,7 +123,7 @@
componentProps: (values) => ({
placeholder: '璇烽�夋嫨渚涘簲鍟�',
disabled: true,
- vendorName: values.vendorName as string,
+ supplierName: values.vendorName as string,
}),
},
rules: 'selectRequired',
@@ -213,7 +213,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -429,7 +429,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/salesnotice/data.ts b/src/views/wls/salesnotice/data.ts
index 6818446..a6f1147 100644
--- a/src/views/wls/salesnotice/data.ts
+++ b/src/views/wls/salesnotice/data.ts
@@ -340,7 +340,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/stocktaking/plan/data.ts b/src/views/wls/stocktaking/plan/data.ts
index c301458..19d70fc 100644
--- a/src/views/wls/stocktaking/plan/data.ts
+++ b/src/views/wls/stocktaking/plan/data.ts
@@ -336,7 +336,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wls/transfer/data.ts b/src/views/wls/transfer/data.ts
index f32a03b..ae32ac6 100644
--- a/src/views/wls/transfer/data.ts
+++ b/src/views/wls/transfer/data.ts
@@ -562,7 +562,7 @@
? [
{
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
} as const,
diff --git a/src/views/wms/md/item/data.ts b/src/views/wms/md/item/data.ts
index 7f7d81e..206011f 100644
--- a/src/views/wms/md/item/data.ts
+++ b/src/views/wms/md/item/data.ts
@@ -164,7 +164,7 @@
{
field: 'actions',
title: '鎿嶄綔',
- width: 120,
+ width: 160,
fixed: 'right',
slots: { default: 'actions' },
},
--
Gitblit v1.9.3