From cc170291673472d3cda8d7ea77f6bd3a3b5dbb83 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 09 九月 2024 14:06:09 +0800
Subject: [PATCH] 增加了一些统计修改

---
 CoreCms.Net.Web.Admin/wwwroot/views/liao.js |   72 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 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..5ed1075 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,50 @@
             : ("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}$/;
+  // 浣跨敤姝e垯琛ㄨ揪寮忔ā寮忔祴璇曞瓧绗︿覆
+  return dateTimePattern.test(str);
+}
+
+/**
+ * 鏍煎紡鍖栧晢鍝佸垎绫婚�夋嫨杈撳叆妗�
+ * @param {object} coreHelper 鏍稿績杈呭姪瀵硅薄锛岀敤浜庡彂閫佽姹傜瓑鎿嶄綔
+ * @param {object} form 琛ㄥ崟瀵硅薄锛岀敤浜庨噸鏂版覆鏌搒elect鍏冪礌
+ * @param {string} idname 杈撳叆妗嗙殑id鍚嶇О
+ * @param {string} selectedID 榛樿閫変腑鐨勫垎绫籌D锛屼负绌烘椂榛樿涓嶉�変腑浠讳綍椤�
+ */
+function formatGoodsCategorySelInPut(coreHelper, form, idname,selectedID="") {
+
+    // 鍚戞湇鍔″櫒鍙戦�佽姹傦紝鑾峰彇鐢ㄦ埛鍒楄〃
+    coreHelper.PostForm("Api/CommonAPI/GetGoodsCategory", {  }, function (data) {
+        if (debug) { console.log(data); } // 濡傛灉澶勪簬璋冭瘯妯″紡锛屾墦鍗拌繑鍥炵殑鏁版嵁
+
+        if (data.code == 0) {
+            // 鑾峰彇鎸囧畾 id 鐨� select 鍏冪礌
+            var selectElement = document.getElementById(idname);
+
+            // 閬嶅巻杩斿洖鐨勭敤鎴锋暟鎹紝涓� select 鍏冪礌鍒涘缓骞舵坊鍔犳柊鐨� option 閫夐」
+            for (var i = 0; i < data.data.length; i++) {
+                var option = document.createElement('option');
+                option.value = data.data[i].id;
+                if(selectedID==data.data[i].id){
+                    option.selected=true;
+                }
+                option.innerHTML = data.data[i].name;
+                selectElement.appendChild(option);
+            }
+           
+            // 閲嶆柊娓叉煋 select 鍏冪礌锛岀‘淇濇柊鐨勯�夐」鐢熸晥
+            form.render('select');
+        }
+    })
+}
\ No newline at end of file

--
Gitblit v1.9.1