From c2b4e7c86e790d3880a8da9adeffafb3e6c12145 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 五月 2024 09:46:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/liao.js | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
index b03b48e..9aca275 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
@@ -3,7 +3,7 @@
* @Author: 灏忛渚�
* @Date: 2024-03-01 09:11:24
* @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-01 12:39:54
+ * @LastEditTime: 2024-04-26 13:25:48
* Copyright: 2024 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
*/
@@ -78,6 +78,7 @@
*/
function formatAreaInPut(coreHelper, idname, areaid = "") {
let area = 0;
+
if ((areaid !== "")&&(areaid!==null) &&(areaid!==0))
area = areaid.split(",").reverse()[0];
@@ -87,20 +88,37 @@
$.each(data, function (i, n) {
str += `<select lay-ignore name='${idname}_` + (i + 1) + "' dep='" + (i + 1) + "' class='select-address'>";
str += "<option value='' >璇烽�夋嫨</option>";
- $.each(n.list, function (h, z) {
+
+ if(n?.list?.length>0)
+ {
+ $.each(n.list, function (h, z) {
if (n.hasOwnProperty('info') && n.info?.id == z.id) {
str += "<option value='" + z.id + "' selected='selected'>" + z.name + "</option>";
} else {
str += "<option value='" + z.id + "' >" + z.name + "</option>";
}
});
+ }
+ else
+ {
+ $.each(n.thisList, function (h, z) {
+ if (n.hasOwnProperty('info') && n.info?.id == z.id) {
+ str += "<option value='" + z.id + "' selected='selected'>" + z.name + "</option>";
+ } else {
+ str += "<option value='" + z.id + "' >" + z.name + "</option>";
+ }
+ });
+ }
str += "</select>";
});
$(`input[name='${idname}']`).after(str);
//浠ヤ笂鏁版嵁杈撳嚭瀹岋紝浠ヤ笅缁戝畾浜嬩欢
$.each(data, function (i, n) {
if (i < (data.length)) {
- $(`select[name='${idname}_` + (i + 1) + "']").change(function () {
+ // $(`select[name='${idname}_` + (i + 1) + "']").change(function () {
+ // changeareaIdArea(i + 1, data.length, idname);
+ // });
+ $(`select[name='${idname}_` + (i + 1) + "']").click(function () {
changeareaIdArea(i + 1, data.length, idname);
});
}
@@ -215,4 +233,16 @@
: ("00" + o[k]).substr(("" + o[k]).length)
);
return fmt;
- };
\ No newline at end of file
+ };
+
+/**
+ * 妫�鏌ョ粰瀹氱殑瀛楃涓叉槸鍚︿负鏃ユ湡鏃堕棿鏍煎紡
+ * @param {string} str - 闇�瑕佹鏌ョ殑瀛楃涓�
+ * @return {boolean} 杩斿洖涓�涓竷灏斿�硷紝鎸囩ず瀛楃涓叉槸鍚︾鍚堟棩鏈熸椂闂存牸寮�
+ */
+function isDateTimeString(str) {
+ // 瀹氫箟鏃ユ湡鏃堕棿鐨勬鍒欒〃杈惧紡妯″紡
+ const dateTimePattern = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔ā寮忔祴璇曞瓧绗︿覆
+ return dateTimePattern.test(str);
+}
\ No newline at end of file
--
Gitblit v1.9.1