From b3cb4f7b08ddc02bb79905bbc17c0eb3d5e4f2c3 Mon Sep 17 00:00:00 2001 From: chenfang Date: Sun, 28 Apr 2024 13:39:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=AD=90=E8=A1=A8page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 5802e5e1a..1109357bf 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -66,7 +66,7 @@ :detailAllSchemasRules="ProductreceiptRequestDetailRules" :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail" :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail" - :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage" + :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble" :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail" @searchTableSuccessDetail="searchTableSuccessDetail" :buttondataTable="buttondataTable" From 4b1e6488523988d66f98edc7114c6b243d55f2bf Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sun, 28 Apr 2024 13:48:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 1109357bf..743c1eccd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -163,7 +163,7 @@ const isCreateLabel = ref(false) const formLabelRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ - getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage + getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble }) const { getList:getDetailList } = detatableMethods From 7a4cb054301c98de745cca0c5b1d692d05204f9a Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sun, 28 Apr 2024 13:58:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnJobMain.data.ts | 97 +++++++++-- .../customerreturnRecordMain.data.ts | 162 ++++++++++++++---- .../customerreturnRequestMain.data.ts | 74 +++++++- 3 files changed, 283 insertions(+), 50 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index b2b761c6c..e696397f7 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -34,6 +34,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, isSearch: true, }, { @@ -51,6 +52,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, + }, { label: '客户代码', @@ -67,6 +70,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '收货月台', @@ -75,6 +80,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '承运商', @@ -83,6 +90,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '运输方式', @@ -92,6 +100,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isSearch: true, }, { @@ -101,6 +110,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '申请时间', @@ -113,6 +124,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -133,6 +145,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -153,6 +166,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -169,6 +183,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -177,13 +192,14 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -194,7 +210,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -215,6 +231,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -223,6 +240,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到月台代码', @@ -231,6 +249,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '优先级', @@ -239,6 +258,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -250,6 +270,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -261,6 +282,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '部门', @@ -269,6 +291,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -277,13 +300,14 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '自动完成', field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -302,7 +326,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -321,7 +345,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -340,7 +364,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -359,7 +383,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -378,7 +402,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -397,7 +421,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -416,7 +440,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -435,7 +459,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -454,7 +478,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -479,6 +503,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -495,6 +520,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '完成时间', @@ -507,6 +533,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -523,6 +550,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -535,6 +563,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -551,6 +580,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '最后更新时间', @@ -563,6 +593,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -579,6 +610,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '操作', @@ -670,6 +702,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, // { // label: '销售订单号', @@ -710,6 +743,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, }, { label: '物料描述2', @@ -718,6 +752,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, }, { label: '批次', @@ -742,6 +777,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '数量', @@ -765,6 +801,34 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + isForm:false, + }, + { + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, + sort: 'custom', + table: { + width: 150 + }, + isForm:false, + }, + { + label: '车牌号', + field: 'vehiclePlateNumber', + sort: 'custom', + table: { + width: 150 + }, + isForm:false, + }, { label: '从库位代码', field: 'fromLocationCode', @@ -772,6 +836,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库位代码', @@ -780,13 +845,14 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '库存状态', field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -799,6 +865,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '货主代码', @@ -807,6 +874,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -815,6 +883,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -827,6 +896,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -843,6 +913,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, ])) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 45e23fed6..b4cf0d581 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -15,6 +15,19 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isTable: true, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, { label: '申请单号', field: 'requestNumber', @@ -22,6 +35,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, isSearch: true }, { @@ -31,6 +45,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '发货记录单号', @@ -47,6 +62,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '客户代码', @@ -64,6 +80,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承运商', @@ -72,6 +89,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '运输方式', @@ -80,6 +98,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '车牌号', @@ -88,6 +107,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '申请时间', @@ -100,6 +120,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -120,6 +141,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -140,6 +162,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -160,6 +183,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -177,6 +201,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -185,13 +210,14 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -204,13 +230,14 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -223,6 +250,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到月台代码', @@ -231,6 +259,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '出库事务类型', @@ -239,6 +268,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -247,6 +277,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '业务类型', @@ -255,6 +286,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '部门', @@ -263,13 +295,14 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -282,6 +315,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -294,6 +328,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -310,6 +345,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, // { // label: '代码', @@ -325,7 +361,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -416,6 +452,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, }, // { // label: '销售订单号', @@ -456,6 +493,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain:true, }, { label: '物料描述2', @@ -464,85 +502,132 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain:true, }, { - label: '从批次', - field: 'fromBatch', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '到批次', - field: 'toBatch', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到包装号', - field: 'toPackingNumber', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '包装号', - field: 'packingNumber', + label: '承运商', + field: 'carrierCode', sort: 'custom', table: { width: 150 }, + isForm:false, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 }, + isForm:false, }, { - label: '到器具号', - field: 'toContainerNumber', + label: '车牌号', + field: 'vehiclePlateNumber', sort: 'custom', table: { width: 150 }, + isForm:false, }, { - label: '数量', - field: 'qty', + label: '从批次', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } + isTable: false, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + + { + label: '从器具号', + field: 'fromContainerNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', table: { width: 150 }, + isTable: false, }, + { label: '从库位代码', field: 'fromLocationCode', @@ -550,6 +635,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到库位代码', @@ -558,13 +644,14 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '库存状态', field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -577,6 +664,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到库位组代码', @@ -585,6 +673,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '从库区代码', @@ -593,6 +682,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到库区代码', @@ -601,6 +691,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '从货主代码', @@ -609,6 +700,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到货主代码', @@ -617,6 +709,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '单价', @@ -625,6 +718,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -636,6 +730,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -647,6 +742,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, // { // label: '任务明细ID', @@ -669,11 +765,12 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 }, + }, { label: '备注', @@ -682,6 +779,8 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, + }, { label: '创建时间', @@ -694,6 +793,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -710,6 +810,8 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, + }, ])) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index a224d783a..d76ff8722 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -69,7 +69,6 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false, isSearch: true, }, { @@ -135,6 +134,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isSearch: true, form: { componentProps: { @@ -149,6 +149,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -179,6 +180,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -204,6 +206,8 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + }, { label: '车牌号', @@ -212,6 +216,8 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + }, { label: '申请时间', @@ -224,6 +230,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -246,6 +253,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -263,6 +271,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -272,6 +281,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -281,6 +291,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -288,7 +299,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -300,7 +311,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -314,6 +325,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -323,6 +335,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -338,6 +351,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ disabled: true } }, + isTable:false, isForm: false, }, { @@ -348,6 +362,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name }, @@ -378,7 +393,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, isForm: false, sort: 'custom', table: { @@ -399,7 +414,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, isForm: false, sort: 'custom', table: { @@ -420,7 +435,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, isForm: false, sort: 'custom', table: { @@ -468,6 +483,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -486,6 +502,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false }, { @@ -499,6 +516,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -517,6 +535,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false }, { @@ -576,6 +595,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 180 }, + isTable:false, isTableForm: false, form: { componentProps: { @@ -690,6 +710,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -700,6 +721,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -770,6 +792,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive tableForm: { disabled: true }, + isTable:false, form: { componentProps: { disabled: true @@ -816,6 +839,34 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } } }, + { + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + isForm:false, + }, + { + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, + sort: 'custom', + table: { + width: 150 + }, + isForm:false, + }, + { + label: '车牌号', + field: 'vehiclePlateNumber', + sort: 'custom', + table: { + width: 150 + }, + isForm:false, + }, { label: '从库位代码', field: 'fromLocationCode', @@ -823,6 +874,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, tableForm: { disabled: true }, @@ -853,7 +905,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -875,6 +927,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, isTableForm: false, isForm: false }, @@ -886,6 +939,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, isTableForm: false, isForm: false }, @@ -896,6 +950,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, isTableForm: false, isForm: false }, @@ -906,6 +961,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, tableForm: { disabled: true }, @@ -926,6 +982,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -945,6 +1002,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, isTableForm: false, isForm: false }, @@ -959,6 +1017,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -978,6 +1037,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, isTableForm: false, isForm: false }, From 00c9bc7f051e33cfc55d6d13b764435ffd7498ce Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sun, 28 Apr 2024 13:58:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleJobMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index e8f8bc2ea..9d561de4e 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -555,6 +555,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'action', isDetail: false, isForm: false, + isTable:false, table: { width: 120, fixed: 'right'