diff --git a/src/views/mes/wm/outsourceissue/OutsourceIssueDetailForm.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueDetailForm.vue new file mode 100644 index 000000000..6d0749fe5 --- /dev/null +++ b/src/views/mes/wm/outsourceissue/OutsourceIssueDetailForm.vue @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + 确 定 + 取 消 + + + + + diff --git a/src/views/mes/wm/outsourceissue/OutsourceIssueDetailList.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueDetailList.vue new file mode 100644 index 000000000..7f3056ed4 --- /dev/null +++ b/src/views/mes/wm/outsourceissue/OutsourceIssueDetailList.vue @@ -0,0 +1,72 @@ + + + + + + + + + + + + + 编辑 + + 删除 + + + + + + + diff --git a/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue new file mode 100644 index 000000000..acce3b666 --- /dev/null +++ b/src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue @@ -0,0 +1,183 @@ + + + + + + + + + + 生成 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料信息 + + + + + 确 定 + + 取 消 + + + + + diff --git a/src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue b/src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue new file mode 100644 index 000000000..d44bffa99 --- /dev/null +++ b/src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue @@ -0,0 +1,272 @@ + + + + + + 添加物料 + + + + + + openDetailForm('update', scope.row.id, scope.row.itemId, detailId) + " + /> + + + + + + + + + + + + 编辑 + + + 删除 + + + + 添加明细 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确 定 + 取 消 + + + + + + + + diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue new file mode 100644 index 000000000..4d5424e96 --- /dev/null +++ b/src/views/mes/wm/outsourceissue/index.vue @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + + 导出 + + + + + + + + + + + {{ scope.row.code }} + + + + + + + + + + + + + + + + + 编辑 + + + + 删除 + + + 执行出库 + + + + + + + + + + + diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailForm.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailForm.vue index ec5697545..5070e84e2 100644 --- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailForm.vue +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailForm.vue @@ -1,4 +1,4 @@ - + - - - + + + + + + + + import { WmOutsourceReceiptDetailApi, WmOutsourceReceiptDetailVO } from '@/api/mes/wm/outsourcereceipt/detail' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue' -import MdLocationSelect from '@/views/mes/md/location/components/MdLocationSelect.vue' +import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue' +import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue' +import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue' defineOptions({ name: 'OutsourceReceiptDetailForm' }) @@ -67,13 +77,17 @@ const formData = ref({ itemId: undefined as number | undefined, batchCode: undefined, quantity: undefined as number | undefined, + warehouseId: undefined as number | undefined, locationId: undefined as number | undefined, + areaId: undefined as number | undefined, remark: undefined }) const formRules = reactive({ itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }], batchCode: [{ required: true, message: '批次号不能为空', trigger: 'blur' }], - locationId: [{ required: true, message: '库位不能为空', trigger: 'change' }], + warehouseId: [{ required: true, message: '入库仓库不能为空', trigger: 'change' }], + locationId: [{ required: true, message: '库区不能为空', trigger: 'change' }], + areaId: [{ required: true, message: '库位不能为空', trigger: 'change' }], quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }] }) @@ -130,7 +144,9 @@ const resetForm = () => { itemId: undefined, batchCode: undefined, quantity: undefined, + warehouseId: undefined, locationId: undefined, + areaId: undefined, remark: undefined } formRef.value?.resetFields() diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue index 3b277ffc4..9019f8c10 100644 --- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptDetailList.vue @@ -1,4 +1,4 @@ - + diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue index afc74c84a..33b82fe13 100644 --- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptForm.vue @@ -1,5 +1,4 @@ - - + @@ -25,39 +24,38 @@ - + - - - - - - - - - - + + - - + + + + + + + + + @@ -74,7 +72,7 @@ - + 物料信息 @@ -92,7 +90,7 @@ import { generateRandomStr } from '@/utils' import { WmOutsourceReceiptApi, WmOutsourceReceiptVO } from '@/api/mes/wm/outsourcereceipt' import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue' -import MdWarehouseSelect from '@/views/mes/md/warehouse/components/MdWarehouseSelect.vue' +import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue' import OutsourceReceiptLineList from './OutsourceReceiptLineList.vue' defineOptions({ name: 'OutsourceReceiptForm' }) @@ -107,18 +105,14 @@ const formData = ref({ code: undefined, name: undefined, vendorId: undefined, - warehouseId: undefined, + workOrderId: undefined, receiptDate: undefined, remark: undefined }) const formRules = reactive({ - // TODO @AI:name 必填; - code: [{ required: true, message: '收货单编号不能为空', trigger: 'blur' }], - receiptDate: [{ required: true, message: '收货日期不能为空', trigger: 'change' }], - // TODO @AI:供应商非必填; - vendorId: [{ required: true, message: '供应商不能为空', trigger: 'change' }], - // TODO @AI:warehouseId 没有这个字段!!! - warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'change' }] + code: [{ required: true, message: '入库单编号不能为空', trigger: 'blur' }], + name: [{ required: true, message: '入库单名称不能为空', trigger: 'blur' }], + receiptDate: [{ required: true, message: '入库日期不能为空', trigger: 'change' }] }) const formRef = ref() @@ -126,14 +120,14 @@ const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) const isHeaderReadonly = computed(() => ['detail'].includes(formType.value)) const dialogTitle = computed(() => { const titles = { - create: '新增委外收货单', - update: '编辑委外收货单', - detail: '委外收货单详情' + create: '新增外协入库单', + update: '编辑外协入库单', + detail: '外协入库单详情' } return titles[formType.value] || formType.value }) -/** 生成收货单编号 */ +/** 生成入库单编号 */ const generateCode = () => { formData.value.code = 'OR' + generateRandomStr(10) } @@ -183,7 +177,7 @@ const resetForm = () => { code: undefined, name: undefined, vendorId: undefined, - warehouseId: undefined, + workOrderId: undefined, receiptDate: undefined, remark: undefined } diff --git a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue index 835c88911..a3c65e664 100644 --- a/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue +++ b/src/views/mes/wm/outsourcereceipt/OutsourceReceiptLineList.vue @@ -1,4 +1,4 @@ - + @@ -29,12 +29,22 @@ - + - - - - + + + + + + + + + + + + + + 删除 - + @@ -81,7 +91,7 @@ - + - +