From 2e3151cc5d3893f022118ed83cf9af7cbfef7cd8 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 11 Jun 2025 11:49:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-2717=EF=BC=9A=E4=B8=B0=E7=94=B0=E9=9D=9E?= =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E5=AF=BC=E5=85=A5=20=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=20=E4=BB=BB=E5=8A=A1=20=E5=92=8C=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E6=96=B0=E5=A2=9E=E5=92=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverJobMain/deliverJobMain.data.ts | 59 +++++++++++++------ .../deliverRecordMain.data.ts | 58 ++++++++++++------ .../deliverRequestMain.data.ts | 59 ++++++++++++------- 3 files changed, 118 insertions(+), 58 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 5e9281f58..f7193add4 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -97,26 +97,26 @@ export const DeliverJobMain = useCrudSchemas( }, isTable: false }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - search: { - component: 'Input', - }, - isTable: true, - isForm: true, - form: { - component: 'Input', - componentProps: { + // { + // label: '客户订单号', + // field: 'customerOrderNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true, + // search: { + // component: 'Input', + // }, + // isTable: true, + // isForm: true, + // form: { + // component: 'Input', + // componentProps: { - } - } - }, + // } + // } + // }, { label: '承运商', @@ -824,6 +824,27 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + search: { + component: 'Input', + }, + isTable: true, + isForm: true, + form: { + component: 'Input', + componentProps: { + + } + } + }, + { label: '在途库位', field: 'onTheWayLocationCode', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index f98e86bea..8b637059c 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -63,26 +63,26 @@ export const DeliverRecordMain = useCrudSchemas( // width: 150 // }, // }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - search: { - component: 'Input', - }, - isTable: true, - isForm: true, - form: { - component: 'Input', - componentProps: { + // { + // label: '客户订单号', + // field: 'customerOrderNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true, + // search: { + // component: 'Input', + // }, + // isTable: true, + // isForm: true, + // form: { + // component: 'Input', + // componentProps: { - } - } - }, + // } + // } + // }, { label: '状态', field: 'status', @@ -645,6 +645,26 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + search: { + component: 'Input', + }, + isTable: true, + isForm: true, + form: { + component: 'Input', + componentProps: { + + } + } + }, { label: '单价', field: 'singlePrice', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index c2aaa8bc2..907763b58 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -271,26 +271,26 @@ export const DeliverRequestMain = useCrudSchemas( isTable: false, isForm: false, }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - search: { - component: 'Input', - }, - isTable: true, - isForm: true, - form: { - component: 'Input', - componentProps: { + // { + // label: '客户订单号', + // field: 'customerOrderNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true, + // search: { + // component: 'Input', + // }, + // isTable: true, + // isForm: true, + // form: { + // component: 'Input', + // componentProps: { - } - } - }, + // } + // } + // }, { label: '承运商', field: 'carrierCode', @@ -927,7 +927,26 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ disabled: true } } - }, + }, { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + search: { + component: 'Input', + }, + isTable: true, + isForm: true, + form: { + component: 'Input', + componentProps: { + + } + } + }, // { // label: '承运商', // field: 'carrierCode', From 0090c6efed87fb261dd5d8b80df0f28d7f1b1a58 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 11 Jun 2025 16:42:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?YT-2717=EF=BC=9A=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverJobMain/deliverJobMain.data.ts | 41 ++++++------- .../deliverRecordMain.data.ts | 41 ++++++------- .../deliverRequestMain.data.ts | 41 ++++++------- .../deliverRecordMain.data.ts | 55 +++++++++++------- .../deliverRecordMain.data.ts | 42 +++++++++----- .../deliverRecordMain.data.ts | 57 ++++++++++++------- 6 files changed, 163 insertions(+), 114 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index f7193add4..a591f7083 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -761,6 +761,26 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + search: { + component: 'Input', + }, + isTable: true, + isForm: true, + form: { + component: 'Input', + componentProps: { + + } + } + }, { label: '品番', field: 'itemCode', @@ -824,26 +844,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - search: { - component: 'Input', - }, - isTable: true, - isForm: true, - form: { - component: 'Input', - componentProps: { - - } - } - }, + { label: '在途库位', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 8b637059c..94a57af0c 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -553,6 +553,26 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + search: { + component: 'Input', + }, + isTable: true, + isForm: true, + form: { + component: 'Input', + componentProps: { + + } + } + }, { label: '品番', field: 'itemCode', @@ -645,26 +665,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - search: { - component: 'Input', - }, - isTable: true, - isForm: true, - form: { - component: 'Input', - componentProps: { - - } - } - }, + { label: '单价', field: 'singlePrice', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 907763b58..306351131 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -819,6 +819,26 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ // } // } // }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + search: { + component: 'Input', + }, + isTable: true, + isForm: true, + form: { + component: 'Input', + componentProps: { + + } + } + }, { label: '品番', field: 'itemCode', @@ -927,26 +947,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ disabled: true } } - }, { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - search: { - component: 'Input', - }, - isTable: true, - isForm: true, - form: { - component: 'Input', - componentProps: { - - } - } - }, + }, // { // label: '承运商', // field: 'carrierCode', diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 818eaf5f8..021d72ca1 100644 --- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -55,20 +55,20 @@ export const DeliverRecordMain = useCrudSchemas( isTable: true, isForm: false, }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - isTable: true, - isForm: false, - search: { - component: 'Input', - } - }, + // { + // label: '客户订单号', + // field: 'customerOrderNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true, + // isTable: true, + // isForm: false, + // search: { + // component: 'Input', + // } + // }, { label: '车牌号', field: 'vehiclePlateNumber', @@ -252,14 +252,21 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, + { - label: '到库位', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + isTable: true, + isForm: false, + search: { + component: 'Input', + } }, - }, { label: '品番', field: 'itemCode', @@ -411,6 +418,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, hiddenInMain: true, }, + { + label: '到库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '到库位组', field: 'toLocationGroupCode', diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 79238e5c7..52082814e 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -50,20 +50,20 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: true }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - isTable: true, - isForm: true, - search: { - component: 'Input', - } - }, + // { + // label: '客户订单号', + // field: 'customerOrderNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true, + // isTable: true, + // isForm: true, + // search: { + // component: 'Input', + // } + // }, { label: '车牌号', field: 'vehiclePlateNumber', @@ -306,6 +306,20 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + isTable: true, + isForm: true, + search: { + component: 'Input', + } + }, { label: '品番', field: 'itemCode', diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 05fbe7009..d38f17876 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -4,6 +4,7 @@ import * as CustomerApi from '@/api/wms/customer' import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import { truncate } from 'fs' /** @@ -55,20 +56,20 @@ export const DeliverRecordMain = useCrudSchemas( isTable: true, isForm: false, }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - isTable: true, - isForm: false, - search: { - component: 'Input', - } - }, + // { + // label: '客户订单号', + // field: 'customerOrderNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isSearch: true, + // isTable: true, + // isForm: false, + // search: { + // component: 'Input', + // } + // }, { label: '车牌号', field: 'vehiclePlateNumber', @@ -244,14 +245,21 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, + { - label: '到库位', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + isTable: true, + isForm: false, + search: { + component: 'Input', + } }, - }, { label: '品番', field: 'itemCode', @@ -350,6 +358,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, hiddenInMain: true, }, + { label: '单价', field: 'singlePrice', @@ -402,6 +411,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, hiddenInMain: true, }, + { + label: '到库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '到库位组', field: 'toLocationGroupCode',