From 753739ce057b63425ad6bb74f7149646644d4d0f Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Fri, 28 Jun 2024 14:50:09 +0800 Subject: [PATCH] =?UTF-8?q?WMS=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueRequestMain/issueRequestMain.data.ts | 4 +- .../productdismantleRecordMain.data.ts | 4 +- .../productionMain/productionMain.data.ts | 23 +++++----- .../productionMainAssemble.data.ts | 23 +++++----- .../productionMainAssembleSparePart.data.ts | 23 +++++----- .../productionMainPredictSparePart.data.ts | 23 +++++----- .../qadProductionPlanMain.data.ts | 31 +++++++++++++ .../productreceiptRecordMain.data.ts | 8 ++-- .../productreceiptAssembleRecordMain.data.ts | 4 +- .../productreceiptscrapRecordMain.data.ts | 8 ++-- .../productredressJobMain.data.ts | 4 +- .../productredressRecordMain.data.ts | 4 +- .../productredressRequestMain.data.ts | 4 +- .../productrepairRequestMain.data.ts | 4 +- .../purchasereturnRequestMain.data.ts | 46 +++++++++---------- 15 files changed, 124 insertions(+), 89 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 2c3743059..4a7479093 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -745,7 +745,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, + isSearch: false, isTable:false, sortSearchDefault:6, sortTableDefault:1100, @@ -864,7 +864,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ } } }, - + { label: '备注', field: 'remark', diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts index 75e6b0954..c4ec4ac11 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts @@ -190,7 +190,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( label: '创建者', field: 'creator', sort: 'custom', - isTable: true, + isTable: false, table: { width: 150 }, @@ -206,7 +206,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable: true, + isTable: false, form: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 8919838d3..abb9a9833 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -204,17 +204,17 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '物料代码', - field: 'detailItemCode', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - isTable: false, - isForm: false - }, + // { + // label: '物料代码', + // field: 'detailItemCode', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // isTable: false, + // isForm: false + // }, { label: '计划数量', field: 'detailPlanQty', @@ -610,6 +610,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ label: '物料代码', field: 'itemCode', sort: 'custom', + isSearch: true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 7ef13b457..345ed64c1 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -195,17 +195,17 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '物料代码', - field: 'detailItemCode', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - isTable: false, - isForm: false - }, + // { + // label: '物料代码', + // field: 'detailItemCode', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // isTable: false, + // isForm: false + // }, { label: '计划数量', field: 'detailPlanQty', @@ -601,6 +601,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ label: '物料代码', field: 'itemCode', sort: 'custom', + isSearch: true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index fb83717e3..7b01b6b20 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -195,17 +195,17 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '物料代码', - field: 'detailItemCode', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - isTable: false, - isForm: false - }, + // { + // label: '物料代码', + // field: 'detailItemCode', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // isTable: false, + // isForm: false + // }, { label: '计划数量', field: 'detailPlanQty', @@ -601,6 +601,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ label: '物料代码', field: 'itemCode', sort: 'custom', + isSearch: true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 652609905..4ad8db37b 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -196,17 +196,17 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, - { - label: '物料代码', - field: 'detailItemCode', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - isTable: false, - isForm: false - }, + // { + // label: '物料代码', + // field: 'detailItemCode', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // isTable: false, + // isForm: false + // }, { label: '计划数量', field: 'detailPlanQty', @@ -602,6 +602,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ label: '物料代码', field: 'itemCode', sort: 'custom', + isSearch: true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts index 93884b7a8..e9de6fa60 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts @@ -1,5 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter2 } from '@/utils/formatTime' +import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const QadProductionPlanMainRules = reactive({ @@ -71,6 +72,36 @@ export const QadProductionPlanMain = useCrudSchemas(reactive([ component: 'SelectV2' }, }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, // { // label: '备注', // field: 'remark', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index fcbbb78e5..7253d12da 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -229,7 +229,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: true, + isTable: false, }, { label: '创建时间', @@ -238,7 +238,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - isTable: true, + isTable: false, sort: 'custom', table: { width: 180 @@ -671,7 +671,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -688,7 +688,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable: false, + isTable: true, }, // { // label: '任务明细ID', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 2c9ade555..f447fd858 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -676,7 +676,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -693,7 +693,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable: false, + isTable: true, }, // { // label: '任务明细ID', diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts index 26ad1fd50..745ceb9fb 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts @@ -217,7 +217,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: true, + isTable: false, }, { label: '创建时间', @@ -230,7 +230,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: true, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -665,7 +665,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -682,7 +682,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable: false, + isTable: true, }, // { diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts index 7f65ffdc9..e797d3192 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts @@ -659,7 +659,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, hiddenInMain:true, }, { @@ -673,7 +673,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable:true, hiddenInMain:true, form: { component: 'DatePicker', diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts index 6f5459c3d..43672b0b5 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts @@ -568,7 +568,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, + isTable:true, hiddenInMain: true, }, { @@ -592,7 +592,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( } }, isForm: false, - isTable:false, + isTable:true, hiddenInMain: true, }, { diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 038b6e892..eab66118f 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -575,7 +575,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isForm: false, - isTable:false, + isTable:true, hiddenInMain:true }, { @@ -589,7 +589,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive table: { width: 180 }, - isTable:false, + isTable:true, hiddenInMain:true, form: { component: 'DatePicker', diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 7c7f9db37..45a183c70 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -809,7 +809,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive width: 180 }, hiddenInMain: true, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -830,7 +830,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive width: 150 }, hiddenInMain: true, - isTable: false, + isTable: true, isTableForm: false, isForm: false }, diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index a4eb4c14b..1358415e2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1279,29 +1279,29 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableForm:false, isForm:false }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isSearch: true, - isTable: true, - hiddenInMain: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled:true - }, - isForm:false, - isTableForm:false, - form: { - componentProps:{ - disabled:true - } - }, - }, + // { + // label: '接口类型', + // field: 'interfaceType', + // dictType: DICT_TYPE.INTERFACE_TYPE, + // dictClass: 'string', + // isSearch: true, + // isTable: true, + // hiddenInMain: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // disabled:true + // }, + // isForm:false, + // isTableForm:false, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + // }, { label: '备注', field: 'remark',