From 46f40d704e64ee3b1b1663fab95ba8726e30b409 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 10 Aug 2024 09:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8D=95=E5=8F=B7=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countJobMain/countJobMain.data.ts | 19 ++++++------ .../customerreturnJobMain.data.ts | 20 ++++++------- .../customerreturnRecordMain.data.ts | 30 +++++++++---------- .../stockupMainJob/stockupMainJob.data.ts | 9 +++--- .../stockupMainRecord.data.ts | 19 ++++++------ .../packageoverRecordMain.data.ts | 9 +++++- .../packageoverRetrospect.data.ts | 8 +++++ .../scrap/scrapJobMain/scrapJobMain.data.ts | 18 +++++------ .../unplannedissueJobMain.data.ts | 19 ++++++------ .../unplannedreceiptJobMain.data.ts | 18 +++++------ .../inventorymoveJobMain.data.ts | 16 +++++----- 11 files changed, 100 insertions(+), 85 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index cb40fc97f..ab4268e03 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -15,6 +15,15 @@ export const CountJobMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true + }, { label: '状态', field: 'status', @@ -62,15 +71,7 @@ export const CountJobMain = useCrudSchemas(reactive([ width: 180 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, + { label: '阶段', field: 'stage', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index af95c27c6..a91f98ef4 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -19,6 +19,16 @@ export const CustomerreturnJobMain = useCrudSchemas( }, isSearch: true }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + isSearch: true + }, { label: '状态', field: 'status', @@ -31,16 +41,6 @@ export const CustomerreturnJobMain = useCrudSchemas( width: 150 } }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: true, - isSearch: true - }, { label: '发货记录单号', field: 'deliverRecordNumber', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 4f55dbf93..3701bc82c 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -19,20 +19,6 @@ export const CustomerreturnRecordMain = useCrudSchemas( }, isSearch: true }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: false, - isTable: false, - isDetail: false, - isForm: false, - sort: 'custom', - table: { - width: 150 - } - }, { label: '申请单号', field: 'requestNumber', @@ -50,8 +36,22 @@ export const CustomerreturnRecordMain = useCrudSchemas( table: { width: 180 }, - isTable: false }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: false, + isTable: false, + isDetail: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + } + }, + { label: '发货记录单号', field: 'deliverRecordNumber', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index 4915327f5..ca49c1657 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -17,8 +17,8 @@ export const StockupMainJob = useCrudSchemas(reactive([ }, }, { - label: '发货计划单号', - field: 'deliverPlanNumber', + label: '申请单号', + field: 'requestNumber', sort: 'custom', isForm: false, table: { @@ -26,14 +26,13 @@ export const StockupMainJob = useCrudSchemas(reactive([ }, }, { - label: '申请单号', - field: 'requestNumber', + label: '发货计划单号', + field: 'deliverPlanNumber', sort: 'custom', isForm: false, table: { width: 180 }, - isTable: false }, { label: '从仓库', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index f18b2f050..1c5048bc9 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -17,34 +17,33 @@ export const StockupMainRecord = useCrudSchemas(reactive([ }, }, { - label: '发货计划单号', - field: 'deliverPlanNumber', + label: '申请单号', + field: 'requestNumber', sort: 'custom', - isForm: false, + // isSearch: true, table: { width: 180 }, }, { - label: '申请单号', - field: 'requestNumber', + label: '任务单号', + field: 'jobNumber', sort: 'custom', // isSearch: true, table: { width: 180 }, - isTable: false, }, { - label: '任务单号', - field: 'jobNumber', + label: '发货计划单号', + field: 'deliverPlanNumber', sort: 'custom', - // isSearch: true, + isForm: false, table: { width: 180 }, - isTable: false, }, + { label: '从仓库', field: 'fromWarehouseCode', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index 97aa03bf5..201c967b3 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -11,11 +11,18 @@ export const PackageoverMain = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '任务单据号', field: 'jobNumber', sort: 'custom', - isTable: false, isSearch: true, table: { width: 180 diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts index 1939227f8..9b488202c 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts @@ -15,6 +15,14 @@ export const PackageoverRetrospect = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '任务单据号', field: 'jobNumber', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index 7afec161a..d4ca52289 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -20,6 +20,15 @@ export const ScrapJobMain = useCrudSchemas( }, isSearch: true }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true + }, { label: '状态', field: 'status', @@ -32,15 +41,6 @@ export const ScrapJobMain = useCrudSchemas( width: 150 } }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, { label: 'Q3通知单号', field: 'q3Number', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 38fc8f66d..a4e52122e 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -25,6 +25,15 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, { label: '状态', field: 'status', @@ -55,15 +64,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, + { label: '申请时间', field: 'requestTime', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index 21f5cc04a..b9264c3fa 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -27,6 +27,15 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + }, { label: '状态', field: 'status', @@ -39,15 +48,6 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - }, { label: '申请时间', field: 'requestTime', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index 1a9a2419c..030403897 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -16,20 +16,20 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { width: 150 }, }, { - label: '申请单号', - field: 'requestNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150