From d3475019350136c3946afcb3a831a5444e97bc17 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 29 三月 2024 09:59:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
index f442610..3ae8d0a 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
@@ -52,7 +52,7 @@
let total = reactive({
pageTotal : 0,
dataTotal : 0,
- pageSize : 2
+ pageSize : 10
})
let filterData = ref({
@@ -503,15 +503,9 @@
ElMessage.error("璇疯緭鍏ユ暟閲�")
return
}
- const materialRequisitionTeam = titleUploadData.value.dateOfManufacture
- if(materialRequisitionTeam === null || materialRequisitionTeam === undefined || materialRequisitionTeam === ''){
- ElMessage.error("璇烽�変腑鐢熶骇鏃ユ湡")
- return
- }
- const orderId = titleUploadData.value.qualityGuaranteePeriod
- if(orderId === null || orderId === undefined || orderId === ''){
- ElMessage.error("璇疯緭鍏ヤ繚璐ㄦ湡")
- return
+ const dateOfManufacture= titleUploadData.value.dateOfManufacture
+ if(dateOfManufacture === null || dateOfManufacture === undefined || dateOfManufacture === ''){
+ titleUploadData.value.dateOfManufacture=null
}
const inventoryArea = titleUploadData.value.inventoryArea
--
Gitblit v1.8.0