From 4d4fd6c9b15c775fb132f9e7aa58de5d3597fc61 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 04 一月 2024 17:25:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/系统管理/用户管理/Gy_UserCustomer_ImportByExcel.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserCustomer_ImportByExcel.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserCustomer_ImportByExcel.html"
index bd43ab5..324fbf8 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserCustomer_ImportByExcel.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Gy_UserCustomer_ImportByExcel.html"
@@ -131,7 +131,7 @@
} else {
var reConfirmBar = 1;
for (var i = 0; i < option.data.length; i++) {
- if (option.data[i].鍒ゅ畾缁撴灉 != "" && option.data[i].鍒ゅ畾缁撴灉 != "鐢ㄦ埛宸茬粡鍏宠仈璇ュ鎴凤紱") {
+ if ( (option.data[i].鍒ゅ畾缁撴灉 != "" && option.data[i].鍒ゅ畾缁撴灉 != "鐢ㄦ埛宸茬粡鍏宠仈璇ュ鎴凤紱") || (option.data[i].瀹㈡埛鍐呯爜 === null || option.data[i].瀹㈡埛鍐呯爜 == "") ) {
reConfirmBar = 0;
break;
}
@@ -139,7 +139,7 @@
if (reConfirmBar == 1) {
set_AddNew(data, 1);
} else {
- layer.msg("淇濆瓨澶辫触锛屾暟鎹湭閫氳繃鏍￠獙锛岃鍦ㄤ慨鏀瑰悗閲嶆柊鏍￠獙锛�")
+ layer.msg("淇濆瓨澶辫触锛屾暟鎹湭閫氳繃鏍￠獙锛岃鍦ㄤ慨鏀瑰悗閲嶆柊鏍￠獙锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
}
})
@@ -150,7 +150,7 @@
if (confirmBar == 1) {
set_AddNew(data, 2);
} else {
- layer.msg("淇濆瓨澶辫触锛屾暟鎹湭閫氳繃鏍￠獙锛岃鍦ㄤ慨鏀瑰悗閲嶆柊鏍￠獙锛�")
+ layer.msg("淇濆瓨澶辫触锛屾暟鎹湭閫氳繃鏍￠獙锛岃鍦ㄤ慨鏀瑰悗閲嶆柊鏍￠獙锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
})
//#endregion
--
Gitblit v1.9.1