diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts new file mode 100644 index 000000000..ab7989872 --- /dev/null +++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts @@ -0,0 +1,218 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const UnfinishedShipmentMainRules = reactive({ + orderNumber: [required], + shipmentRecordNumber: [required], + shipmentType: [required], + customerOrderNumber: [required], + available: [required], + concurrencyStamp: [required] +}) + +export const UnfinishedShipmentMain = useCrudSchemas(reactive([ + + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '发货记录单号', + field: 'shipmentRecordNumber', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '发货方式', + field: 'shipmentType', + sort: 'custom', + isSearch: true, + table: { + width: 150, + }, + dictType: DICT_TYPE.DELIVER_METHOD, + dictClass: 'string', + form: { + component: 'SelectV2' + } + }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '操作', + field: 'action', + isForm: false, + isDetail: false, + isTable: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + + +// 表单校验 +export const UnfinishedShipmentDetailRules = reactive({ + materialCode: [required], + materialName: [required], + backNumber: [required], + materialDescription: [required], + shipmentQuantity: [required], + unitPrice: [required], + lockedQuantity: [required], + available: [required], + concurrencyStamp: [required] +}) + +export const UnfinishedShipmentDetail = useCrudSchemas(reactive([ + + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '物料描述', + field: 'itemDescription', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true, + form: { + component: 'Editor', + componentProps: { + valueHtml: '', + height: 200 + } + } + }, + { + label: '发货数量', + field: 'shipmentQuantity', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + } + }, + { + label: '销售单价', + field: 'unitPrice', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '锁定数量', + field: 'lockedQuantity', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + } + }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: true, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + table: { + width: 150 + }, + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false + }, + { + label: '创建人', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // width: 150, + // fixed: 'right' + // } + // } +])) diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue similarity index 97% rename from src/views/wms/deliversettlementManage/unfinishedShipmentMain/index.vue rename to src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue index 38b07140c..f45b7826a 100644 --- a/src/views/wms/deliversettlementManage/unfinishedShipmentMain/index.vue +++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue @@ -67,10 +67,9 @@ diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts new file mode 100644 index 000000000..ab7989872 --- /dev/null +++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts @@ -0,0 +1,218 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const UnfinishedShipmentMainRules = reactive({ + orderNumber: [required], + shipmentRecordNumber: [required], + shipmentType: [required], + customerOrderNumber: [required], + available: [required], + concurrencyStamp: [required] +}) + +export const UnfinishedShipmentMain = useCrudSchemas(reactive([ + + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '发货记录单号', + field: 'shipmentRecordNumber', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '发货方式', + field: 'shipmentType', + sort: 'custom', + isSearch: true, + table: { + width: 150, + }, + dictType: DICT_TYPE.DELIVER_METHOD, + dictClass: 'string', + form: { + component: 'SelectV2' + } + }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '操作', + field: 'action', + isForm: false, + isDetail: false, + isTable: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + + +// 表单校验 +export const UnfinishedShipmentDetailRules = reactive({ + materialCode: [required], + materialName: [required], + backNumber: [required], + materialDescription: [required], + shipmentQuantity: [required], + unitPrice: [required], + lockedQuantity: [required], + available: [required], + concurrencyStamp: [required] +}) + +export const UnfinishedShipmentDetail = useCrudSchemas(reactive([ + + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '物料描述', + field: 'itemDescription', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true, + form: { + component: 'Editor', + componentProps: { + valueHtml: '', + height: 200 + } + } + }, + { + label: '发货数量', + field: 'shipmentQuantity', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + } + }, + { + label: '销售单价', + field: 'unitPrice', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true + }, + { + label: '锁定数量', + field: 'lockedQuantity', + sort: 'custom', + table: { + width: 150, + }, + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + } + }, + // { + // label: '是否可用', + // field: 'available', + // sort: 'custom', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + // isSearch: true, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, + + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + table: { + width: 150 + }, + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false + }, + { + label: '创建人', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // width: 150, + // fixed: 'right' + // } + // } +])) diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail/index.vue b/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/index.vue similarity index 100% rename from src/views/wms/deliversettlementManage/unfinishedShipmentDetail/index.vue rename to src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/index.vue diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail/unfinishedShipmentDetail.data.ts b/src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/unfinishedShipmentDetail.data.ts similarity index 100% rename from src/views/wms/deliversettlementManage/unfinishedShipmentDetail/unfinishedShipmentDetail.data.ts rename to src/views/wms/deliversettlementManage/unfinishedShipmentDetail1/unfinishedShipmentDetail.data.ts diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/unfinishedShipmentMain/unfinishedShipmentMain.data.ts deleted file mode 100644 index c471d42f4..000000000 --- a/src/views/wms/deliversettlementManage/unfinishedShipmentMain/unfinishedShipmentMain.data.ts +++ /dev/null @@ -1,68 +0,0 @@ -import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' - -// 表单校验 -export const UnfinishedShipmentMainRules = reactive({ - orderNumber: [required], - shipmentRecordNumber: [required], - shipmentType: [required], - customerOrderNumber: [required], - available: [required], - concurrencyStamp: [required] -}) - -export const UnfinishedShipmentMain = useCrudSchemas(reactive([ - - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - }, - isSearch: true - }, - { - label: '发货记录单号', - field: 'shipmentRecordNumber', - sort: 'custom', - table: { - width: 150, - }, - isSearch: true - }, - { - label: '发货方式', - field: 'shipmentType', - sort: 'custom', - isSearch: true, - table: { - width: 150, - }, - dictType: DICT_TYPE.DELIVER_METHOD, - dictClass: 'string', - form: { - component: 'SelectV2' - } - }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 150, - }, - isSearch: true - }, - { - label: '操作', - field: 'action', - isForm: false, - isDetail: false, - isTable: false, - table: { - width: 150, - fixed: 'right' - } - } -]))