diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue
new file mode 100644
index 000000000..0f08e0c3f
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/index.vue
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
new file mode 100644
index 000000000..6ff6650f4
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
@@ -0,0 +1,2028 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+
+
+/**
+ * @returns {Array} 采购收货记录主表
+ */
+export const PurchasereceiptRecordMain = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ isSearch: true,
+ sortSearchDefault:1,
+ sortTableDefault:1
+
+ },
+ {
+ label: '申请单号',
+ field: 'requestNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortTableDefault:2
+ },
+ {
+ label: '任务单号',
+ field: 'jobNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortTableDefault:3
+ },
+ {
+ label: '备注',
+ field: 'mainRemark',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: false,
+ sortTableDefault:3
+ },
+ {
+ label: '明细备注',
+ field: 'remark',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: false,
+ sortTableDefault:3
+ },
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortTableDefault:4,
+ isSearch: true
+ },
+ {
+ label: 'ERP单据号(无用)',
+ field: 'erpNumber',
+ isTable:false,
+ isTableForm:false,
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ },
+ {
+ label: 'ERP单据号',
+ field: 'qadNumber',
+ sort: 'custom',
+ table: {
+ width: 200
+ },
+ sortTableDefault:5,
+ },
+ {
+ label: '要货计划单号',
+ field: 'ppNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable:false
+ },
+ {
+ label: '供应商代码',
+ field: 'supplierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true,
+ sortSearchDefault:2,
+ isTable:false
+ },
+ {
+ label: '到月台代码',
+ field: 'toDockCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '承运商',
+ field: 'carrierCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '运输方式',
+ field: 'transferMode',
+ dictType: DICT_TYPE.TRANSFER_MODE,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '数据来源',
+ field: 'sourceType',
+ dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ value: 'ASN_ExternalReceipt',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isSearch: false,
+ },
+ {
+ label: '车牌号',
+ field: 'vehiclePlateNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '从库区类型范围',
+ field: 'fromAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '到库区类型范围',
+ field: 'toAreaTypes',
+ dictType: DICT_TYPE.AREA_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '从库区代码范围',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '到库区代码范围',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '出库事务类型',
+ field: 'outTransaction',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '入库事务类型',
+ field: 'inTransaction',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false
+ },
+ {
+ label: '执行时间',
+ field: 'executeTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable:false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '生效日期',
+ field: 'activeDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable:false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '申请时间',
+ field: 'requestTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable:false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '截止时间',
+ field: 'dueTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable:false,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ },
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ },
+ // {
+ // label: '备注',
+ // field: 'mainRemark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable:true,
+ // },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isTable: false,
+ 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')]
+ }
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ }
+ },
+ {
+
+ label: '是否可用',
+ field: 'available',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: 'TRUE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ }
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isDetail: false,
+ isForm: false,
+ table: {
+ width: 400,
+ fixed: 'right'
+ },
+ },
+ {
+ label: '批次', // 实际是子表的从批次,为了不影响页面,单独放上面
+ field: 'fromBatch',
+ sort: 'custom',
+ isForm:false,
+ isTableForm:false,
+ table: {
+ width: 150
+ },
+ sortTableDefault:12,
+ },
+ {
+ label: '包装号', // 实际是子表的从包装号,为了不影响页面,单独放上面
+ field: 'fromPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:16,
+ },
+ {
+ label: '检验申请单号',
+ field: 'inspectNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:6,
+ },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:12,
+ },
+ {
+ 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: 'updateTime',
+ sort: 'custom',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width:'100%'},
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ }
+ },
+ {
+ label: '最后更新者',
+ field: 'updater',
+ isDetail: true,
+ isForm: false,
+ isTable: false,
+ table: {
+ width: 150
+ }
+ },
+]))
+
+// 表单校验
+export const PurchasereceiptRecordMainRules = reactive({
+ requestNumber: [
+ { required: true, message: '请选择申请单号', trigger: 'change' }
+ ],
+ supplierCode: [
+ { required: true, message: '请选择供应商代码', trigger: 'change' }
+ ],
+ toWarehouseCode: [
+ { required: true, message: '请选择到仓库代码', trigger: 'change' }
+ ],
+ toAreaTypes: [
+ { required: true, message: '请选择到库位类型服务', trigger: 'change' }
+ ],
+ outTransaction: [
+ { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+ ],
+ inTransaction: [
+ { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+ ],
+ executeTime: [
+ { required: true, message: '请输入执行时间', trigger: 'change' }
+ ],
+ activeDate: [
+ { required: true, message: '请输入生效日期', trigger: 'change' }
+ ],
+ available: [
+ { required: true, message: '请输入是否可用', trigger: 'blur' }
+ ],
+ departmentCode: [
+ { required: true, message: '请输入部门', trigger: 'blur' }
+ ],
+ interfaceType: [
+ { required: true, message: '请选择接口类型', trigger: 'change' }
+ ],
+ number: [
+ { required: true, message: '请输入单据号', trigger: 'blur' }
+ ],
+ businessType: [
+ { required: true, message: '请输入业务类型', trigger: 'blur' }
+ ],
+ createTime: [
+ { required: true, message: '请选择创建时间', trigger: 'change' }
+ ],
+ creator: [
+ { required: true, message: '请输入创建者', trigger: 'blur' }
+ ],
+})
+
+/**
+ * @returns {Array} 采购收货记录子表
+ */
+export const PurchasereceiptRecordDetail = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ },
+ sortTableDefault:1998,
+ hiddenInMain:true
+ },
+ {
+ label: '检验申请单号',
+ field: 'inspectNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ sortTableDefault:6,
+ },
+ {
+ label: '采购订单号',
+ field: 'poNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortSearchDefault:5,
+ sortTableDefault:7,
+ isSearch: true
+ },
+ {
+ label: '订单行',
+ field: 'poLine',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortSearchDefault:5,
+ sortTableDefault:8,
+ },
+ {
+ label: '行类型',
+ field: 'poLineType',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ sortTableDefault:9,
+ hiddenInMain:true,
+ isForm: false,
+ tableForm:{
+ disabled: true
+ },
+ },
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:10,
+ isSearch: true
+ },
+ {
+ label: '是否已发送检验申请',
+ field: 'inspectRequestFlag',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ isTableForm:false,
+ isForm:false,
+ form: {
+ value: 'ALL',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isSearch: true,
+ },
+ {
+ label: '是否已生成上架申请',
+ field: 'putawayRequestFlag',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ isTableForm:false,
+ isForm:false,
+ form: {
+ value: 'ALL',
+ componentProps: {
+ disabled: true
+ }
+ },
+ isSearch: true,
+ },
+ {
+ label: '物料类型',
+ field: 'itemType',
+ sort: 'custom',
+ dictType: DICT_TYPE.ITEM_TYPE,
+ dictClass: 'string',
+ isSearch: true,
+ isTable:false,
+ isDetail:false,
+ search:{
+ componentProps:{
+ multiple:true,
+ }
+ }
+
+ },
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:10,
+ },
+ {
+ label: '物料描述1',
+ field: 'itemDesc1',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:11,
+ hiddenInMain:true
+ },
+ {
+ label: '物料描述2',
+ field: 'itemDesc2',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:11,
+ hiddenInMain:true
+ },
+ {
+ label: '从批次',
+ field: 'fromBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:14,
+ hiddenInMain:true
+ },
+ {
+ label: '到批次',
+ field: 'toBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:14,
+ hiddenInMain:true
+ },
+ // {
+ // label: '替代批次',
+ // field: 'altBatch',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable:false,
+ // hiddenInMain:true
+ // },
+ {
+ label: '从包装号',
+ field: 'fromPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:15,
+ hiddenInMain:true
+ },
+ {
+ label: '到包装号',
+ field: 'toPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:15,
+ hiddenInMain:true
+ },
+ // {
+ // label: '从器具号',
+ // field: 'fromContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable:false,
+ // hiddenInMain:true
+ // },
+ // {
+ // label: '到器具号',
+ // field: 'toContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable:false,
+ // hiddenInMain:true
+ // },
+ {
+ label: '订单数量',
+ field: 'orderQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ hiddenInMain:true,
+ sortTableDefault:1004
+ },
+ {
+ label: '收货数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain:true,
+ sortTableDefault:12,
+ },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ form: {
+ component: 'InputNumber',
+ },
+ sortTableDefault:12,
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:13,
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:16,
+ },
+ {
+ label: '包装数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ },
+ tableForm: {
+ disabled: true,
+ },
+ isForm:false,
+ sortTableDefault:16,
+ },
+ {
+ label: '供应商计量数量',
+ field: 'supplierQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ },
+ sortTableDefault:24,
+ hiddenInMain:true
+ },
+ {
+ label: '供应商计量单位',
+ field: 'supplierUom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:24,
+ hiddenInMain:true
+ },
+
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:18,
+ hiddenInMain:true
+ },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:18,
+
+ },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:18,
+ },
+ {
+ label: '从库位组',
+ field: 'fromLocationGroupCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:19,
+ hiddenInMain:true
+ },
+ {
+ label: '到库位组',
+ field: 'toLocationGroupCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:19,
+ hiddenInMain:true
+ },
+ {
+ label: '从库区',
+ field: 'fromAreaCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:22,
+ hiddenInMain:true,
+ },
+ {
+ label: '到库区',
+ field: 'toAreaCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:22,
+ hiddenInMain:true
+ },
+ {
+ label: '从货主',
+ field: 'fromOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:23,
+ hiddenInMain:true
+ },
+ {
+ label: '到货主',
+ field: 'toOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:23,
+ hiddenInMain:true
+ },
+ {
+ label: '到货日期',
+ field: 'arriveDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ sortTableDefault:17,
+ hiddenInMain:true
+ },
+ {
+ label: '生产日期',
+ field: 'produceDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ sortTableDefault:17,
+ hiddenInMain:true
+ },
+ {
+ label: '过期日期',
+ field: 'expireDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ sortTableDefault:17,
+ hiddenInMain:true
+ },
+ {
+ label: '转换率',
+ field: 'convertRate',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ },
+ sortTableDefault:1997,
+ hiddenInMain:true
+ },
+ {
+ label: '目检结果',
+ field: 'visualInspectResult',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ hiddenInMain:true
+ },
+ {
+ label: '目检照片',
+ field: 'visualInspectPhotos',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ hiddenInMain:true
+ },
+ {
+ label: '不合格原因',
+ field: 'failedReason',
+ dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+ dictClass: 'string',
+ isTable:false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain:true
+ },
+ {
+ label: '单价',
+ field: 'singlePrice',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ },
+ isTable:false,
+ hiddenInMain:true
+ },
+ {
+ label: '金额',
+ field: 'amount',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ },
+ isTable:false,
+ hiddenInMain:true
+ },
+ // {
+ // label: '任务明细ID',
+ // field: 'jobDetailId',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+
+ {
+ label: '项目代码',
+ field: 'projectCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault:1998,
+ hiddenInMain:true
+ },
+ // {
+ // label: '代码',
+ // field: 'code',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTable:false,
+ hiddenInMain:true
+ },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // hiddenInMain:true,
+ // sortTableDefault:2000,
+ // },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain:true,
+ sortTableDefault:2000,
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ hiddenInMain:true,
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'x',
+ }
+ },
+ sortTableDefault:2000,
+ },
+
+ {
+ label: '操作',
+ hiddenInMain:true,
+ field: 'action',
+ isDetail: false,
+ isForm: false ,
+ table: {
+ width: 150,
+ fixed: 'right'
+ },
+ isTableForm:true,
+ }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordDetailRules = reactive({
+ fromPackingNumber: [
+ { required: true, message: '请选择从包装号', trigger: 'change' }
+ ],
+ toPackingNumber: [
+ { required: true, message: '请选择到包装号', trigger: 'change' }
+ ],
+ fromBatch: [
+ { required: true, message: '请输入从批次', trigger: 'blur' }
+ ],
+ toBatch: [
+ { required: true, message: '请输入到批次', trigger: 'blur' }
+ ],
+ arriveDate: [
+ { required: true, message: '请选择到货日期', trigger: 'change' }
+ ],
+ produceDate: [
+ { required: true, message: '请选择生产日期', trigger: 'change' }
+ ],
+ expireDate: [
+ { required: true, message: '请选择过期日期', trigger: 'change' }
+ ],
+ inventoryStatus: [
+ { required: true, message: '请选择库存状态', trigger: 'change' }
+ ],
+ toLocationCode: [
+ { required: true, message: '请选择到库位代码', trigger: 'change' }
+ ],
+ toLocationGroupCode: [
+ { required: true, message: '请选择到库位组代码', trigger: 'change' }
+ ],
+ toAreaCodes: [
+ { required: true, message: '请选择到库区代码', trigger: 'change' }
+ ],
+ poNumber: [
+ { required: true, message: '请选择订单号', trigger: 'change' }
+ ],
+ poLine: [
+ { required: true, message: '请选择订单行', trigger: 'change' }
+ ],
+ packQty: [
+ { required: true, message: '请输入包装数量', trigger: 'blur' }
+ ],
+ packUnit: [
+ { required: true, message: '请选择包装规格', trigger: 'change' }
+ ],
+ convertRate: [
+ { required: true, message: '请输入转换率', trigger: 'blur' }
+ ],
+ visualInspectResult: [
+ { required: true, message: '请选择目检结果', trigger: 'change' }
+ ],
+})
+
+
+/**
+ * @returns {Array} 采购收货记录子表-子包装数据
+ */
+export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ table: {
+ width: 180,
+ fixed: 'left'
+ },
+ hiddenInMain:true,
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '订单号',
+ field: 'poNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '订单行',
+ field: 'poLine',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '物料描述1',
+ field: 'itemDesc1',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '物料描述2',
+ field: 'itemDesc2',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '从批次',
+ field: 'fromBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '到批次',
+ field: 'toBatch',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ // {
+ // label: '替代批次',
+ // field: 'altBatch',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // componentProps: {
+ // disabled:true
+ // }
+ // },
+ // tableForm: {
+ // disabled: true,
+ // }
+ // },
+ {
+ label: '从包装号',
+ field: 'fromPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '到包装号',
+ field: 'toPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ // {
+ // label: '从器具号',
+ // field: 'fromContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // componentProps: {
+ // disabled:true
+ // }
+ // },
+ // tableForm: {
+ // disabled: true,
+ // }
+ // },
+ // {
+ // label: '到器具号',
+ // field: 'toContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // componentProps: {
+ // disabled:true
+ // }
+ // },
+ // tableForm: {
+ // disabled: true,
+ // }
+ // },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+
+ {
+ label: '包装数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+
+ },
+ {
+ label: '供应商计量数量',
+ field: 'supplierQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '供应商计量单位',
+ field: 'supplierUom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ dictType: DICT_TYPE.INVENTORY_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '从库位组代码',
+ field: 'fromLocationGroupCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ sortTableDefault:21,
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '到库位组代码',
+ field: 'toLocationGroupCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ sortTableDefault:21,
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '从库区代码',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '到库区代码',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '从货主代码',
+ field: 'fromOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '到货主代码',
+ field: 'toOwnerCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '到货日期',
+ field: 'arriveDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ disabled: true,
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ tableForm: {
+ disabled: true,
+ type:'FormDate',
+ valueFormat: 'x',
+ }
+ },
+ {
+ label: '生产日期',
+ field: 'produceDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ disabled: true,
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ tableForm: {
+ disabled: true,
+ type:'FormDate',
+ valueFormat: 'x',
+ }
+ },
+ {
+ label: '过期日期',
+ field: 'expireDate',
+ formatter: dateFormatter2,
+ detail: {
+ dateFormat: 'YYYY-MM-DD'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ disabled: true,
+ style: {width: '100%'},
+ type: 'date',
+ dateFormat: 'YYYY-MM-DD',
+ valueFormat: 'x',
+ }
+ },
+ tableForm: {
+ disabled: true,
+ type:'FormDate',
+ valueFormat: 'x',
+ }
+ },
+ {
+ label: '转换率',
+ field: 'convertRate',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '目检结果',
+ field: 'visualInspectResult',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '目检照片',
+ field: 'visualInspectPhotos',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '不合格原因',
+ field: 'failedReason',
+ dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '单价',
+ field: 'singlePrice',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '金额',
+ field: 'amount',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '项目代码',
+ field: 'projectCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ {
+ label: '接口类型',
+ field: 'interfaceType',
+ dictType: DICT_TYPE.INTERFACE_TYPE,
+ dictClass: 'string',
+ isSearch: true,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps: {
+ disabled:true
+ }
+ },
+ tableForm: {
+ disabled: true,
+ }
+ },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // hiddenInMain:true,
+ // form: {
+ // componentProps: {
+ // disabled:true
+ // }
+ // },
+ // tableForm: {
+ // disabled: true,
+ // }
+ // }
+]))
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 159506e85..4d2541053 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -216,6 +216,7 @@ const searchList = (model)=>{
params.itemTypes = ''
params.itemType = ''
}
+ params.orderTypeM = '1'
setSearchParams(params)
}
@@ -343,6 +344,13 @@ const handleExport = async () => {
// 筛选提交
const searchFormClick = (searchData) => {
+ searchData.filters.push(
+ {
+ action: '==',
+ column: 'order_type_m',
+ value: '1'
+ }
+ )
tableObject.params = {
isSearch: true,
filters: searchData.filters
@@ -373,9 +381,15 @@ const changeTabs = (data) =>{
/** 初始化 **/
onMounted(async () => {
+ tableObject.params = {
+ orderTypeM : '1'
+ }
getList()
})
onActivated(() => {
+ tableObject.params = {
+ orderTypeM : '1'
+ }
getList()
})