diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 93cdf7936..b9fbf6ca5 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -15,6 +15,15 @@ export const DeliverJobMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + }, { label: '状态', field: 'status', @@ -28,64 +37,60 @@ export const DeliverJobMain = useCrudSchemas(reactive([ }, }, { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', + label: '客户代码', + field: 'customerCode', sort: 'custom', table: { - width: 180 + width: 150 }, }, { - label: '客户发货单号', - field: 'customerDeliverNumber', + label: '发货月台', + field: 'deliverDock', sort: 'custom', table: { - width: 180 + width: 150 }, }, { - label: '客户代码', - field: 'customerCode', + label: '发货类型', + field: 'deliverType', sort: 'custom', + dictType: DICT_TYPE.DELIVER_TYPE, + dictClass: 'string', table: { width: 150 }, }, { - label: '客户月台代码', - field: 'customerDockCode', + label: '发货计划单号', + field: 'deliverPlanNumber', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, }, { - label: '发货月台', - field: 'deliverDock', + label: '客户发货单号', + field: 'customerDeliverNumber', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, }, + { - label: '发货类型', - field: 'deliverType', + label: '客户月台代码', + field: 'customerDockCode', sort: 'custom', - dictType: DICT_TYPE.DELIVER_TYPE, - dictClass: 'string', table: { width: 150 }, + isTable: false, }, + { label: '承运商', field: 'carrierCode', @@ -93,6 +98,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '运输方式', @@ -102,6 +108,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '车牌号', @@ -110,6 +117,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '申请时间', @@ -122,6 +130,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -142,6 +151,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -162,6 +172,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -178,6 +189,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -186,13 +198,14 @@ export const DeliverJobMain = 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 @@ -203,7 +216,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -216,6 +229,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -224,6 +238,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从月台代码', @@ -232,6 +247,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, // { // label: '状态', @@ -248,6 +264,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -259,6 +276,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -270,6 +288,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '部门', @@ -278,13 +297,14 @@ export const DeliverJobMain = 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 @@ -303,7 +323,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -322,7 +342,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -341,7 +361,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -360,7 +380,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -379,7 +399,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -398,7 +418,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -417,7 +437,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -436,7 +456,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -455,7 +475,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -476,6 +496,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承接时间', @@ -488,6 +509,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -504,6 +526,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '完成时间', @@ -516,6 +539,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -532,6 +556,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -544,6 +569,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -560,6 +586,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '最后更新时间', @@ -572,6 +599,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -588,6 +616,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '操作', @@ -676,6 +705,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false }, // { // label: '销售订单号', @@ -716,6 +746,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '物料描述2', @@ -724,6 +755,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '批次', @@ -733,22 +765,6 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '器具号', - field: 'containerNumber', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '数量', field: 'qty', @@ -772,7 +788,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ }, }, { - label: '在途库库位', + label: '在途库位', field: 'onTheWayLocationCode', sort: 'custom', table: { @@ -780,7 +796,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ }, }, { - label: '从库位代码', + label: '从库位', field: 'fromLocationCode', sort: 'custom', table: { @@ -788,19 +804,37 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ }, }, { - label: '到库位代码', + label: '到库位', field: 'toLocationCode', sort: 'custom', table: { width: 150 }, }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, { label: '库存状态', field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -813,6 +847,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '项目代码', @@ -821,6 +856,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -829,6 +865,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -841,6 +878,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -857,6 +895,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, ])) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index a3ca68a6e..298e1bf5a 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -33,16 +33,38 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '发货计划单号', - field: 'deliverPlanNumber', + label: '发货记录单号', + field: 'deliverRecordNumber', sort: 'custom', table: { - width: 180 + width: 150 }, + isSearch: true, }, + // { + // label: '发货计划单号', + // field: 'deliverPlanNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, + // { + // label: '客户发货单号', + // field: 'customerDeliverNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { - label: '客户发货单号', - field: 'customerDeliverNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm: false, sort: 'custom', table: { width: 150 @@ -64,6 +86,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承运商', @@ -72,6 +95,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '运输方式', @@ -80,6 +104,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '车牌号', @@ -88,6 +113,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '申请时间', @@ -100,6 +126,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -120,6 +147,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -140,6 +168,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -160,6 +189,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -177,6 +207,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -185,13 +216,14 @@ export const DeliverRecordMain = 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 @@ -202,7 +234,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -215,6 +247,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -223,6 +256,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从月台代码', @@ -231,6 +265,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '出库事务类型', @@ -239,6 +274,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -247,6 +283,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '业务类型', @@ -255,6 +292,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '部门', @@ -263,13 +301,14 @@ export const DeliverRecordMain = 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 +321,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -294,6 +334,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -310,6 +351,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, // { // label: '代码', @@ -325,7 +367,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -413,6 +455,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false }, // { // label: '销售订单号', @@ -453,6 +496,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '物料描述2', @@ -461,6 +505,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true }, { label: '批次', @@ -479,16 +524,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '从器具号', - field: 'fromContainerNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到器具号', - field: 'toContainerNumber', + label: '包装规格', + field: 'packUnit', sort: 'custom', table: { width: 150 @@ -517,117 +554,144 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '在途库库位', - field: 'onTheWayLocationCode', + label: '单价', + field: 'singlePrice', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + form: { + component: 'InputNumber', + } }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '金额', + field: 'amount', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + form: { + component: 'InputNumber', + } }, { - label: '到库位代码', - field: 'toLocationCode', + label: '在途库库位', + field: 'onTheWayLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '从库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库位', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '从库位组代码', + label: '从库位组', field: 'fromLocationGroupCode', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, }, { - label: '到库位组代码', + label: '到库位组', field: 'toLocationGroupCode', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, }, { - label: '从库区代码', + label: '从库区', field: 'fromAreaCode', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, }, { - label: '到库区代码', + label: '到库区', field: 'toAreaCode', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '从器具号', + field: 'fromContainerNumber', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '项目代码', - field: 'projectCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: false, sort: 'custom', table: { width: 150 }, }, { - label: '单价', - field: 'singlePrice', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } + isTable: false, }, { - label: '金额', - field: 'amount', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } + isTable: false, + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, }, { label: '备注', @@ -636,13 +700,14 @@ export const DeliverRecordDetail = 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 @@ -659,6 +724,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -675,6 +741,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, // { // label: '任务明细ID', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 80acd67bc..e253572c9 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -5,7 +5,8 @@ import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' -import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' +import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' +import { DeliverPlanMain ,DeliverPlanDetail} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' import * as CustomerItemApi from '@/api/wms/customeritem' import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' @@ -69,44 +70,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 180 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本 - searchField: 'number', // 查询弹窗赋值字段 - searchTitle: '发货计划信息', // 查询弹窗标题 - searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类 - searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'status', - value: '6', - isMainValue: false - }] - } - } - }, - { - label: '客户发货单号', - field: 'customerDeliverNumber', - sort: 'custom', - table: { - width: 180 - }, - isForm: false, - }, { label: '客户代码', field: 'customerCode', @@ -134,7 +97,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ } }, { - label: '客户月台代码', + label: '客户月台', field: 'customerDockCode', sort: 'custom', table: { @@ -174,6 +137,46 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '发货计划单号', + field: 'deliverPlanNumber', + sort: 'custom', + table: { + width: 180 + }, + isTable:false, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '发货计划信息', // 查询弹窗标题 + searchAllSchemas: DeliverPlanDetail.allSchemas, // 查询弹窗所需类 + searchPage: DeliverPlanDetailApi.getDeliverPlanDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'status', + value: '6', + isMainValue: false + }] + } + } + }, + { + label: '客户发货单号', + field: 'customerDeliverNumber', + sort: 'custom', + table: { + width: 180 + }, + isTable:false, + isForm: false, + }, { label: '承运商', field: 'carrierCode', @@ -181,6 +184,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -207,6 +211,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '车牌号', @@ -215,6 +220,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '申请时间', @@ -227,6 +233,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -249,6 +256,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -266,6 +274,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -275,6 +284,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -282,7 +292,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -294,7 +304,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -308,6 +318,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -317,6 +328,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -326,6 +338,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -335,6 +348,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { value: 'Deliver', componentProps: { @@ -351,6 +365,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name }, @@ -372,7 +387,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -393,7 +408,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -414,7 +429,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm: false, sort: 'custom', table: { @@ -471,6 +486,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -489,6 +505,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -502,6 +519,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -520,6 +538,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -582,6 +601,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, isTableForm: false, form: { componentProps: { @@ -724,6 +744,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isForm: false, isTableForm: false }, @@ -734,39 +755,10 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isForm: false, isTableForm: false }, - { - label: '批次', - field: 'batch', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '器具号', - field: 'containerNumber', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, { label: '数量', field: 'qty', @@ -808,7 +800,34 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ } }, { - label: '到库位代码', + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '运输方式', + field: 'transferMode', + sort: 'custom', + dictType: DICT_TYPE.TRANSFER_MODE, + dictClass: 'string', + table: { + width: 150 + }, + }, + { + label: '到仓库', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '到库位', field: 'toLocationCode', sort: 'custom', table: { @@ -866,6 +885,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ tableForm: { type: 'Select' }, + hiddenInMain: true, isTableForm: false, isForm: false, }, @@ -876,9 +896,44 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, isForm: false, isTableForm: false }, + + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isTableForm: false, + isForm: false, + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isTableForm: false, + isForm: false, + }, + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isTableForm: false, + isForm: false, + }, { label: '从货主代码', field: 'fromOwnerCode', @@ -886,6 +941,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, isTableForm: false }, @@ -896,6 +952,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, @@ -906,6 +963,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '计划数量', @@ -914,6 +972,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, tableForm: { disabled: true }, @@ -926,6 +985,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, tableForm: { disabled: true }, @@ -942,6 +1002,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -961,6 +1022,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false }, @@ -975,6 +1037,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -994,6 +1057,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false },