diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue b/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue
index 0b711cd37..1de90264f 100644
--- a/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue
+++ b/src/views/mes/wm/itemreceipt/ItemReceiptDetailList.vue
@@ -7,7 +7,7 @@
([]) // 明细列表
+const isStock = computed(() => props.formType === 'stock') // 是否为上架模式
/** 查询明细列表 */
const getList = async () => {
diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue b/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue
index 9473da89d..a14e06f5c 100644
--- a/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue
+++ b/src/views/mes/wm/itemreceipt/ItemReceiptForm.vue
@@ -60,6 +60,15 @@
+
+
+
+
+
@@ -88,7 +97,7 @@
保 存
('create') // 表单的类型:create / update / stock / detail
+const formType = ref('create') // 表单的类型:create / update / stock / finish / detail
const formData = ref({
id: undefined as number | undefined,
code: undefined,
@@ -138,6 +147,7 @@ const formData = ref({
vendorId: undefined,
noticeId: undefined,
iqcId: undefined,
+ purchaseOrderCode: undefined,
receiptDate: undefined,
remark: undefined
})
@@ -149,13 +159,15 @@ const formRules = reactive({
const formRef = ref() // 表单 Ref
const isEditable = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
const isStock = computed(() => formType.value === 'stock') // 是否为上架模式
-const isDetail = computed(() => formType.value === 'detail') // 是否为详情模式
-const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) // 是否只读
+const isFinish = computed(() => formType.value === 'finish') // 是否为执行入库模式
+const isDetail = computed(() => ['detail', 'finish'].includes(formType.value)) // 是否为详情模式
+const isHeaderReadonly = computed(() => ['stock', 'detail', 'finish'].includes(formType.value)) // 是否只读
const dialogTitle = computed(() => {
const titles = {
create: '新增采购入库单',
update: '编辑采购入库单',
stock: '执行上架',
+ finish: '执行入库',
detail: '采购入库单详情'
}
return titles[formType.value] || formType.value
@@ -173,6 +185,7 @@ const generateCode = async () => {
const handleNoticeChange = (notice: any) => {
if (notice) {
formData.value.vendorId = notice.vendorId
+ formData.value.purchaseOrderCode = notice.purchaseOrderCode
}
}
@@ -286,6 +299,7 @@ const resetForm = () => {
vendorId: undefined,
noticeId: undefined,
iqcId: undefined,
+ purchaseOrderCode: undefined,
receiptDate: undefined,
remark: undefined
}
diff --git a/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue b/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
index fd3c625f9..f55baddc4 100644
--- a/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
+++ b/src/views/mes/wm/itemreceipt/ItemReceiptLineList.vue
@@ -126,8 +126,8 @@
-
-
+
+
diff --git a/src/views/mes/wm/itemreceipt/index.vue b/src/views/mes/wm/itemreceipt/index.vue
index e80083963..d5087fe8b 100644
--- a/src/views/mes/wm/itemreceipt/index.vue
+++ b/src/views/mes/wm/itemreceipt/index.vue
@@ -118,6 +118,16 @@
>
执行上架
+
+
+ 执行入库
+