From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/materialOrder/customsInspection.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 3aa17dc..e9a28fa 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -747,8 +747,10 @@
notificationRawOrder({ifsInventoryId:this.customsInspection.id}).then(res => {
if (res.code === 200) {
if (res.data === 1) {
- this.dialogVisible2 = true
- this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆'
+ if (this.orderType != 1) {
+ this.dialogVisible2 = true
+ this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆'
+ }
} else if (res.data === 2) {
this.dialogVisible2 = true
this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡瓒�20鍚�, 闇�瑕佸绾у娆℃楠�'
@@ -1052,6 +1054,9 @@
this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.addObj.ifsInventoryId = this.customsInspection.id
this.saveLoad = true
+ if (this.addObj.createTime) {
+ delete this.addObj.createTime
+ }
addInsOrder({
insOrder: this.addObj,
sampleList: sampleList.map(a => {
@@ -1892,5 +1897,7 @@
background-color: #ffffff;
}
-
+>>>.warning-row {
+ color: #1890FF;
+}
</style>
--
Gitblit v1.9.3