From 7fdf7d7bd39cd0381c3969ad6302be0e693cad2d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 02 四月 2024 10:56:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/liao.js | 239 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 149 insertions(+), 90 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/liao.js b/CoreCms.Net.Web.Admin/wwwroot/views/liao.js
index ccbced3..b03b48e 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-03-21 09:47:04
+ * @LastEditTime: 2024-04-01 12:39:54
* Copyright: 2024 MinTinge CO.,LTD. All Rights Reserved.
* @Descripttion: 鍐欏叆浣犵殑鎻忚堪
*/
@@ -21,20 +21,20 @@
* @LastEditTime: Do not Edit
*/
function filterTreeWithjQuery(tree, predicate) {
- var results = [];
+ var results = [];
- function traverse(node) {
- if (predicate(node)) {
- results.push(node);
+ function traverse(node) {
+ if (predicate(node)) {
+ results.push(node);
+ }
+ if (node.children && Array.isArray(node.children)) {
+ $.each(node.children, traverse);
+ }
}
- if (node.children && Array.isArray(node.children)) {
- $.each(node.children, traverse);
- }
- }
- $.each(tree, traverse);
+ $.each(tree, traverse);
- return results;
+ return results;
}
/**
* @description: 鍒ゆ柇涓�涓瓧绗︿覆鏄笉鏄暟瀛楀瓧绗︿覆
@@ -46,8 +46,8 @@
* @LastEditTime: Do not Edit
*/
function isNumericString(str) {
- const regex = /^-?\d+(\.\d+)?$/; // 鍖归厤鏁存暟鎴栧皬鏁帮紝鍖呮嫭璐熸暟
- return regex.test(str);
+ const regex = /^-?\d+(\.\d+)?$/; // 鍖归厤鏁存暟鎴栧皬鏁帮紝鍖呮嫭璐熸暟
+ return regex.test(str);
}
@@ -57,18 +57,18 @@
* 褰撲娇鐢ㄤ簡formatAreaInPut 鍚� 鍙娇鐢ㄦ鍑芥暟鑾峰彇涓�涓敱鍦板潃id缁勬垚鐨刟reaId 瀛楃涓诧紝鐢紝鍙峰垎鍓�
* @param {Object} field -琛ㄥ崟銆�
*/
-function GetAreaCodeFormFileid(field,idname) {
- let areaCode="";
- if (isNumericString(field[`${idname}_1`])) {
- areaCode+=`${field[`${idname}_1`]}`;
- if (isNumericString(field[`${idname}_2`]))
- areaCode+=`,${field[`${idname}_2`]}`;
- if (isNumericString(field[`${idname}_3`]))
- areaCode+=`,${field[`${idname}_3`]}`;
- } else {
-
- }
- return areaCode;
+function GetAreaCodeFormFileid(field, idname) {
+ let areaCode = "";
+ if (isNumericString(field[`${idname}_1`])) {
+ areaCode += `${field[`${idname}_1`]}`;
+ if (isNumericString(field[`${idname}_2`]))
+ areaCode += `,${field[`${idname}_2`]}`;
+ if (isNumericString(field[`${idname}_3`]))
+ areaCode += `,${field[`${idname}_3`]}`;
+ } else {
+
+ }
+ return areaCode;
}
/**
@@ -76,84 +76,143 @@
* 浼氱敓鎴愬嚑涓猘reaId-1锛宎reaId-3锛宎reaId-3
* @param {Object} coreHelper - 鏍稿績杈呭姪瀵硅薄锛岀敤浜庢墽琛孒TTP璇锋眰绛夋搷浣溿��
*/
-function formatAreaInPut(coreHelper,idname,areaid="") {
- let area=0;
- if(areaid!=="")
- area= areaid.split(",").reverse()[0];
-
- coreHelper.Post("Api/Tools/GetAreaCheckedList", { id: Number(area) }, function (data) {
- if (debug) { console.log(data); } //寮�鍚皟璇曡繑鍥炴暟鎹�
- var str = "";
- $.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.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>";
+function formatAreaInPut(coreHelper, idname, areaid = "") {
+ let area = 0;
+ if ((areaid !== "")&&(areaid!==null) &&(areaid!==0))
+ area = areaid.split(",").reverse()[0];
+
+ coreHelper.Post("Api/Tools/GetAreaCheckedList", { id: Number(area) }, function (data) {
+ if (debug) { console.log(data); } //寮�鍚皟璇曡繑鍥炴暟鎹�
+ var str = "";
+ $.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.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 () {
+ changeareaIdArea(i + 1, data.length, idname);
+ });
}
});
- str += "</select>";
});
- $(`input[name='${idname}']`).after(str);
- //浠ヤ笂鏁版嵁杈撳嚭瀹岋紝浠ヤ笅缁戝畾浜嬩欢
- $.each(data, function (i, n) {
- if (i < (data.length)) {
- $(`select[name='${idname}_` + (i + 1) + "']").change(function () {
- changeareaIdArea(i + 1, data.length,idname);
- });
+ function changeareaIdArea(i, max_i, idname) {
+ //娓呴櫎鍚庨潰鑺傜偣
+ for (var x = i + 1; x <= 6; x++) { //鏈�澶�6灞傦紝瓒冲浜�
+ $(`select[name='${idname}_` + x + "']").remove();
}
- });
-});
-function changeareaIdArea(i, max_i,idname) {
- //娓呴櫎鍚庨潰鑺傜偣
- for (var x = i + 1; x <= 6; x++) { //鏈�澶�6灞傦紝瓒冲浜�
- $(`select[name='${idname}_` + x + "']").remove();
- }
- var val = $(`select[name='${idname}_` + i + "']").val();
- if (val != "") {
- //鍙栧瓙鑺傜偣鏁版嵁锛岀劧鍚庢樉绀轰笅涓�绾�
- coreHelper.Post("Api/Tools/GetAreaChildren", { id: val }, function (e) {
- if (debug) { console.log(e); } //寮�鍚皟璇曡繑鍥炴暟鎹�
+ var val = $(`select[name='${idname}_` + i + "']").val();
+ if (val != "") {
+ //鍙栧瓙鑺傜偣鏁版嵁锛岀劧鍚庢樉绀轰笅涓�绾�
+ coreHelper.Post("Api/Tools/GetAreaChildren", { id: val }, function (e) {
+ if (debug) { console.log(e); } //寮�鍚皟璇曡繑鍥炴暟鎹�
- if (e.length > 0) {
- var str = "";
- str += `<select lay-ignore name='${idname}_` + (i + 1) + "' dep='" + (i + 1) + "' class='select-address'>";
- str += "<option value='' >璇烽�夋嫨</option>";
- $.each(e, function (h, z) {
- str += "<option value='" + z.id + "' >" + z.name + "</option>";
- });
- str += "</select>";
- $(`select[name='${idname}_` + i + "']").after(str);
- //浠ヤ笂鏁版嵁杈撳嚭瀹岋紝浠ヤ笅缁戝畾浜嬩欢
- $(`select[name='${idname}_` + (i+1) + "']").change(function () {
- changeareaIdArea(i + 1, i + 2,idname);
- });
+ if (e.length > 0) {
+ var str = "";
+ str += `<select lay-ignore name='${idname}_` + (i + 1) + "' dep='" + (i + 1) + "' class='select-address'>";
+ str += "<option value='' >璇烽�夋嫨</option>";
+ $.each(e, function (h, z) {
+ str += "<option value='" + z.id + "' >" + z.name + "</option>";
+ });
+ str += "</select>";
+ $(`select[name='${idname}_` + i + "']").after(str);
+ //浠ヤ笂鏁版嵁杈撳嚭瀹岋紝浠ヤ笅缁戝畾浜嬩欢
+ $(`select[name='${idname}_` + (i + 1) + "']").change(function () {
+ changeareaIdArea(i + 1, i + 2, idname);
+ });
- //濡傛灉鏈夎繑鍥炲�硷紝灏辫鏄庣渷甯傚尯娌℃湁閫夋嫨鍒版渶缁堣妭鐐�
- if (1 == 1) {
- $(`input[name='${idname}']`).val("");
+ //濡傛灉鏈夎繑鍥炲�硷紝灏辫鏄庣渷甯傚尯娌℃湁閫夋嫨鍒版渶缁堣妭鐐�
+ if (1 == 1) {
+ $(`input[name='${idname}']`).val("");
+ } else {
+ $(`input[name='${idname}']`).val($(`select[name='${idname}_` + i + "']").val());
+ }
} else {
$(`input[name='${idname}']`).val($(`select[name='${idname}_` + i + "']").val());
}
- } else {
- $(`input[name='${idname}']`).val($(`select[name='${idname}_` + i + "']").val());
- }
- });
- } else {
- if (1 == 1) {
- $(`input[name='${idname}']`).val("");
+ });
} else {
- //绗竴绾х殑鍏冪礌灏辩洿鎺ヨ祴鍊间负绌哄氨鏄簡
- if (i == 1) {
+ if (1 == 1) {
$(`input[name='${idname}']`).val("");
} else {
- i--;
- $(`input[name='${idname}']`).val($(`select[name='${idname}` + i + "']").val());
- }
+ //绗竴绾х殑鍏冪礌灏辩洿鎺ヨ祴鍊间负绌哄氨鏄簡
+ if (i == 1) {
+ $(`input[name='${idname}']`).val("");
+ } else {
+ i--;
+ $(`input[name='${idname}']`).val($(`select[name='${idname}` + i + "']").val());
+ }
+ }
}
}
}
-}
\ No newline at end of file
+/**
+ * 鏍规嵁鐢ㄦ埛閫夋嫨锛屾牸寮忓寲骞舵洿鏂� select 杈撳叆鍏冪礌涓殑閫夐」銆�
+ * @param {object} coreHelper 鏍稿績杈呭姪瀵硅薄锛岀敤浜庢墽琛� post 璇锋眰绛夋搷浣溿��
+ * @param {object} form 琛ㄥ崟瀵硅薄锛岀敤浜庨噸鏂版覆鏌� select 鍏冪礌銆�
+ * @param {string} idname select 鍏冪礌鐨� id 鍚嶇О銆�
+ */
+
+function formatUserSelInPut(coreHelper, form, idname,selectedID="") {
+
+ // 鍚戞湇鍔″櫒鍙戦�佽姹傦紝鑾峰彇鐢ㄦ埛鍒楄〃
+ coreHelper.PostForm("Api/CommonAPI/GetUserList", { sKey: "" }, 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');
+ }
+ })
+}
+
+Date.prototype.Format = function (fmt) {
+ //author: meizz
+ var o = {
+ "M+": this.getMonth() + 1, //鏈堜唤
+ "d+": this.getDate(), //鏃�
+ "h+": this.getHours(), //灏忔椂
+ "m+": this.getMinutes(), //鍒�
+ "s+": this.getSeconds(), //绉�
+ "q+": Math.floor((this.getMonth() + 3) / 3), //瀛ｅ害
+ };
+ if (/(y+)/.test(fmt))
+ fmt = fmt.replace(
+ RegExp.$1,
+ (this.getFullYear() + "").substr(4 - RegExp.$1.length)
+ );
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt))
+ fmt = fmt.replace(
+ RegExp.$1,
+ RegExp.$1.length == 1
+ ? o[k]
+ : ("00" + o[k]).substr(("" + o[k]).length)
+ );
+ return fmt;
+ };
\ No newline at end of file
--
Gitblit v1.9.1