From 2e5fa01911ee793a7d46541e4457e24a0ed36777 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 9 Aug 2024 17:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueJobMain.data.ts | 6 +++--- .../unplannedissueRecordMain.data.ts | 6 +++--- .../unplannedissueRequestMain.data.ts | 7 +++---- .../unplannedreceiptJobMain.data.ts | 18 +++++++++--------- .../unplannedreceiptRecordMain.data.ts | 6 +++--- .../unplannedreceiptRequestMain.data.ts | 6 +++--- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 689b8a90a..6dd1a6df5 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -367,8 +367,8 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ isTable:false, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', isTable:false, table: { @@ -894,7 +894,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 160b3ee62..fe94f3e9f 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -374,8 +374,8 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -730,7 +730,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 0a39c2256..efea9aa1e 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -496,14 +496,13 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ } }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 }, sortTableDefault: 1000, - isTable: true, }, { label: '直接生成记录', @@ -997,7 +996,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive isTable:false, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 5d1ea6aef..c3133decd 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -350,14 +350,14 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '备注(主)', + field: 'remarkMain', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '自动完成', field: 'autoComplete', @@ -1016,7 +1016,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ }, }, { - label: '备注', + label: '备注(子)', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index a9f5d795b..3527d66e8 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -349,8 +349,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( }, }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', isTable:false, sort: 'custom', table: { @@ -785,7 +785,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive } }, { - label: '备注', - field: 'remark', + label: '备注(主)', + field: 'remarkMain', sort: 'custom', table: { width: 150 @@ -1231,7 +1231,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive