diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue
index 809b52c..9ba0ed2 100644
--- a/src/components/inventory/purchase/AddOrder.vue
+++ b/src/components/inventory/purchase/AddOrder.vue
@@ -1,6 +1,5 @@
-
@@ -26,28 +25,28 @@
-
+
-
-
-
+
+
+
-
+
@@ -84,37 +83,37 @@
-
+
-
+
-
+
@@ -135,9 +134,9 @@
-
-
-
+
+
+
@@ -149,6 +148,7 @@ import Mask from "@/components/common/Mask.vue";
import {ElMessage} from "element-plus";
import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
import CloseBtn from "@/components/CloseBtn.vue";
+
const orderForm = ref()
const formRules = ref({
shippingCode: [{required: true, message: '请输入货单号', trigger: 'blur'}],
@@ -171,20 +171,22 @@ let inventory_order_data = ref({
const checkProductionDate = (row: any) => {
if (!row.productionDate) {
ElMessage.error('生产日期不能为空');
- return;
+ return false;
}
const productionDate = new Date(row.productionDate);
const currentDate = new Date();
if (productionDate > currentDate) {
ElMessage.error('生产日期不能晚于当前日期');
row.productionDate = null; // 清空无效的生产日期
+ return false;
}
+ return true;
};
const checkExpiryDate = (row: any) => {
if (!row.expiryDate) {
ElMessage.error('有效期不能为空');
- return;
+ return false;
}
const productionDate = new Date(row.productionDate);
const expiryDate = new Date(row.expiryDate);
@@ -193,10 +195,13 @@ const checkExpiryDate = (row: any) => {
if (expiryDate <= currentDate) {
ElMessage.error('有效期不能早于当前日期');
row.expiryDate = null; // 清空无效的有效期
+ return false;
} else if (expiryDate <= productionDate) {
ElMessage.error('有效期必须晚于生产日期');
row.expiryDate = null; // 清空无效的有效期
+ return false;
}
+ return true;
};
const isLoading = ref(false)
@@ -239,19 +244,22 @@ let confirm = async () => {
}
// 检查每个药品的有效期
- table_list.value.forEach((item: any) => {
- checkProductionDate(item)
- checkExpiryDate(item);
- });
-
+ for (let i = 0; i < table_list.value.length; i++) {
+ if (!checkProductionDate(table_list.value[i])) {
+ return
+ }
+ if (!checkExpiryDate(table_list.value[i])) {
+ return
+ }
+ }
let data = {
inventoryOrder: JSON.parse(JSON.stringify(inventory_order_data.value)),
inventoryOrderGoodsList: JSON.parse(JSON.stringify(table_list.value))
}
- isLoading.value = true
post("inventory/order/create", data).then((res: any) => {
exit()
+ isLoading.value = true
})
} catch (error) {
@@ -287,7 +295,7 @@ const getSupplierList = () => {
const query = {
turn: 1
}
- post("inventory/supplier/list", {query:query}).then((res: any) => {
+ post("inventory/supplier/list", {query: query}).then((res: any) => {
supplier_list.value = res.list
supplier_list.value = res.list
})
@@ -375,7 +383,8 @@ onMounted(() => {
right: 10px;
bottom: 10px;
}
-.error{
+
+.error {
background-color: #F00;
}
\ No newline at end of file
diff --git a/src/components/manger/Auth.vue b/src/components/manger/Auth.vue
index 1d59b18..a411976 100644
--- a/src/components/manger/Auth.vue
+++ b/src/components/manger/Auth.vue
@@ -9,69 +9,56 @@
show-word-limit
:autosize="{ minRows: 8, maxRows: 20 }"
type="textarea"
- @input="parsing"
/>
保存
-
-
- {{ decryptedText.fixmedinsCode }}
-
+
+
+
+
+
+
+
+
- {{ decryptedText.createDate }}
+ {{ formatDate(decryptedText.createDate) }}
- {{ decryptedText.expiryDate }}
+ {{ formatDate(decryptedText.expiryDate) }}