From 5af4eae63f81f19e043d3dd889e95ff14d3f5ee1 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 9 Aug 2024 22:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F=EF=BC=9A?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=8F=B7=E3=80=81=E7=94=B3=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/issueJobMain/issueJobMain.data.ts | 2 +- .../issueRecordMain/issueRecordMain.data.ts | 26 +++++------ .../productionreceiptRecordMain.data.ts | 18 ++++---- .../productionreturnJobMain.data.ts | 19 ++++---- .../productionreturnRecordMain.data.ts | 43 +++++++++---------- .../repleinshJobMain/repleinshJobMain.data.ts | 2 +- 6 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index 5f14338ab..e1cd898bf 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -24,7 +24,7 @@ export const IssueJobMain = useCrudSchemas( table: { width: 180 }, - isTable: false + sortTableDefault: 1 }, { label: '供应商代码', diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index f10bde9f7..5d2cb4d01 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -18,34 +18,34 @@ export const IssueRecordMain = useCrudSchemas( isSearch: true }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isTable: false, + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { - width: 150 + width: 180 }, sortTableDefault: 1 }, { - label: '申请单号', - field: 'requestNumber', + label: '任务单号', + field: 'jobNumber', sort: 'custom', table: { width: 180 }, - isTable: false + sortTableDefault: 1 }, { - label: '任务单号', - field: 'jobNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isTable: false, sort: 'custom', table: { - width: 180 + width: 150 }, - isTable: false + sortTableDefault: 1 }, { label: '供应商代码', diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index 2ff6a2c2f..20a9e64ae 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -16,6 +16,15 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive sortSearchDefault:1, isSearch: true }, + { + label: '发料记录单号', + field: 'issueRecordNumber', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 1 + }, { label: '状态', field: 'status', @@ -28,15 +37,6 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive }, sortTableDefault:1, }, - { - label: '发料记录单号', - field: 'issueRecordNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - }, { label: '任务单号', field: 'jobNumber', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts index f83b7e195..e04e55394 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts @@ -15,6 +15,15 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + }, { label: '状态', field: 'status', @@ -35,16 +44,6 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - isTable: false, - }, { label: '从仓库代码', field: 'fromWarehouseCode', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index 3092425ed..eb831ae71 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -15,26 +15,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( }, isSearch: true }, - // { - // label: '状态', - // field: 'status', - // dictType: DICT_TYPE.REQUEST_STATUS, - // dictClass: 'string', - // isForm: false, - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '车间代码', - field: 'workshopCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '申请单号', field: 'requestNumber', @@ -42,7 +22,6 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, isSearch: true }, @@ -53,10 +32,30 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, isSearch: true }, + // { + // label: '状态', + // field: 'status', + // dictType: DICT_TYPE.REQUEST_STATUS, + // dictClass: 'string', + // isForm: false, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '车间代码', + field: 'workshopCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { label: '出库事务类型', field: 'outTransactionType', diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index 2506e3e2d..b20659f86 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -23,7 +23,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + sortTableDefault: 1, }, { label: '供应商代码',