diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue new file mode 100644 index 000000000..3ba42a031 --- /dev/null +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -0,0 +1,203 @@ + + + diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts new file mode 100644 index 000000000..43008e207 --- /dev/null +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts @@ -0,0 +1,103 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const PackageRules = reactive({ + number: [required], + itemCode: [required], + itemName: [required], +}) +export const Package = useCrudSchemas(reactive([ + { + label: '标签号', + field: 'number', + sort: 'custom', + isSearch: true, + table: { + fixed: 'left' + } + }, + { + label: '标签类型', + field: 'type', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.LABEL_TYPE, + dictClass: 'string' + }, + // { + // label: '标签模板', + // field: 'template', + // sort: 'custom', + // }, + { + label: '标签状态', + field: 'status', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.LABEL_STATUS, + dictClass: 'string' + }, + { + label: '关联号', + field: 'relateNumber', + sort: 'custom', + }, + { + label: '标签条码字符串', + field: 'barcodeString', + sort: 'custom', + table: { + width: 170, + } + }, + { + label: '打印次数', + field: 'printTimes', + sort: 'custom', + form: { + component: 'InputNumber', + componentProps: { + min: 0 + }, + value: 0 + }, + }, + { + label: '最后打印时间', + field: 'lastPrintTime', + sort: 'custom', + formatter: dateFormatter, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '最后打印人ID', + field: 'lastPrintUserId', + sort: 'custom' + }, + { + label: '最后打印人用户名', + field: 'lastPrintUserName', + sort: 'custom', + table: { + width: 170, + } + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 296e93f68..0e64f1e11 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -35,11 +35,11 @@ export const Package = useCrudSchemas(reactive([ dictType: DICT_TYPE.LABEL_TYPE, dictClass: 'string' }, - { - label: '标签模板', - field: 'template', - sort: 'custom', - }, + // { + // label: '标签模板', + // field: 'template', + // sort: 'custom', + // }, { label: '标签状态', field: 'status', diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index d82ab1f4d..143b0e831 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -37,11 +37,11 @@ export const Package = useCrudSchemas(reactive([ dictType: DICT_TYPE.LABEL_TYPE, dictClass: 'string' }, - { - label: '标签模板', - field: 'template', - sort: 'custom', - }, + // { + // label: '标签模板', + // field: 'template', + // sort: 'custom', + // }, { label: '标签状态', field: 'status', @@ -50,11 +50,11 @@ export const Package = useCrudSchemas(reactive([ dictType: DICT_TYPE.LABEL_STATUS, dictClass: 'string' }, - { - label: '关联号', - field: 'relateNumber', - sort: 'custom', - }, + // { + // label: '关联号', + // field: 'relateNumber', + // sort: 'custom', + // }, { label: '标签条码字符串', field: 'barcodeString', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 98f7f111d..6e565633d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -153,8 +153,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['itemCode'] = val[0]['itemCode'] row['poLine'] = val[0]['poLine'] row['uom'] = val[0]['uom'] + row['planQty'] = val[0]['planQty'] } - } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 8a8097903..e989f3d9a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -585,6 +585,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive