From a3d3518af36d676d1fd21ebda0963c5385b5a676 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 11 十一月 2021 19:01:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/PublicPage/PowerInformation.html | 228 +++++++++++++++++++++++++++++++--------------
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 1
WebTM/views/系统管理/用户管理/Xt_UserList.html | 46 +++------
3 files changed, 172 insertions(+), 103 deletions(-)
diff --git a/WebTM/views/PublicPage/PowerInformation.html b/WebTM/views/PublicPage/PowerInformation.html
index cb931f3..58bfdef 100644
--- a/WebTM/views/PublicPage/PowerInformation.html
+++ b/WebTM/views/PublicPage/PowerInformation.html
@@ -33,7 +33,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鎺堟潈</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -72,7 +72,7 @@
var TreeFlag = true;//鎿嶄綔绫诲瀷
} else {
debugger;
- var TreeFlag = params[params[0]];//鎿嶄綔绫诲瀷
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
@@ -96,13 +96,12 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- if (TreeFlag == "false")
- {
+ var sGnbm = "";
+ if (TreeFlag == "false") {
//$(".layui-col-xs3").css("display", "none"); //闅愯棌鏍戝瀷
//$(".layui-col-xs9").css("width", "100%"); //璁剧疆瀹藉害
}
- else
- {
+ else {
tree.render({
elem: '#treeUser',
data: getData(),
@@ -111,8 +110,8 @@
isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
- isopen: true, //鍔犺浇瀹屾瘯鍚庣殑灞曞紑鐘舵�侊紝榛樿鍊硷細true
- accordion: true,
+ isopen: false, //鍔犺浇瀹屾瘯鍚庣殑灞曞紑鐘舵�侊紝榛樿鍊硷細true
+ accordion: false,
click: function (obj) {
//鐐瑰嚮楂樺厜
if (obj.data.id !== treeCkData.id) {
@@ -128,26 +127,8 @@
// TagId = "";
// TagParentId = "";
//}
-
-
- $.ajax({
- url: GetWEBURL() + '/PublicPageMethod/PowerList',
- type: "GET",
- data: { "czybm": "998", "sGnbm": obj.data.id},
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ sGnbm = obj.data.id;
+ get_Display(sGnbm);
}
});
}
@@ -155,77 +136,178 @@
var option = {
- elem: '#mainTable'
+ id: 'mainTable'
+ ,elem: '#mainTable'
//, toolbar: '#toolbarDemo'
, height: '650'
, limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
, page: false
, cellMinWidth: 90
, cols: [[
+ { type: 'checkbox', fixed: 'left', width: 60 }
, { field: 'hid', title: 'hid', sort: true, hide: true }
, { field: 'gnbm', title: 'gnbm', sort: true, hide: true }
+ , { field: 'AuthorityHID', title: 'AuthorityHID', edit: 'text', sort: true, hide: true }
, {
- field: '鏄惁鏉冮檺', title: '鏄惁鏉冮檺', templet: function (row) {
- console.log(row);
- var html = "<input type='checkbox' lay-skin='primary' lay-filter='checkboxIsSelected' table-index='" + row.LAY_TABLE_INDEX + "' class='checkboxIsSelected' value='" + row.鏄惁鏉冮檺 + "' ";
- if (row.鏄惁鏉冮檺 == 1) {
- html += " checked ";
+ field: 'AuthorityID', title: '鏄惁鏉冮檺', templet: function (row) {
+ if (row.AuthorityID == 1) {
+ return "<span style='color:green;'>鏄�</span>";
}
- html += ">";
- return html;
- }}
- , { field: '鍔熻兘璇存槑', title: '鍔熻兘璇存槑' }
- ]]
+ else {
+ return "鍚�";
+ }
+ }
+ }
+ //, {
+ // field: 'AuthorityHID', title: '鏄惁鏉冮檺', templet: function (row) {
+ // var html = "<input type='checkbox' lay-skin='primary' lay-filter='checkboxIsSelected' table-index='" + row.LAY_TABLE_INDEX + "' class='checkboxIsSelected' value='" + row.AuthorityHID + "' ";
+ // if (row.AuthorityID == 1) {
+ // html += " checked ";
+ // }
+ // html += ">";
+ // return html;
+ // }}
+ , { field: 'gnms', title: '鍔熻兘璇存槑' }
+ ]], done: function (res, page, count) {
+
+ //鍙互鑷娣诲姞鍒ゆ柇鐨勬潯浠舵槸鍚﹂�変腑
+ //杩欏彞鎵嶆槸鐪熸閫変腑锛岄�氳繃璁剧疆鍏抽敭瀛桳AY_CHECKED涓簍rue閫変腑锛岃繖閲屽彧瀵圭涓�琛岄�変腑
+ for (var i = 0; i < res.data.length; i++) {
+ if (res.data[i].AuthorityID == 1) {
+ res.data[i]["LAY_CHECKED"] = 'true';
+ //涓嬮潰涓夊彞鏄�氳繃鏇存敼css鏉ュ疄鐜伴�変腑鐨勬晥鏋�
+ var index = res.data[i]['LAY_TABLE_INDEX'];
+ $('tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
+ $('tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
+ }
+ }
+
+ }
};
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/PublicPageMethod/PowerList',
- type: "GET",
- data: { "czybm": "998","sGnbm":"" },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ get_Display(sGnbm);
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
if (OperationType == 1) {
- Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
- }
- else if (OperationType == 3) {
- Pub_Close(closeType);
- }
- else {
+ //鍏抽棴椤电
Pub_Close(2);
}
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+
+ //鐩戝惉閫変腑鏁版嵁
+ table.on('checkbox(mainTable)', function (obj) {
+ //console.log(obj.checked); //褰撳墠鏄惁閫変腑鐘舵��
+ //console.log(obj.data); //閫変腑琛岀殑鐩稿叧鏁版嵁
+ //console.log(obj.type); //濡傛灉瑙﹀彂鐨勬槸鍏ㄩ�夛紝鍒欎负锛歛ll锛屽鏋滆Е鍙戠殑鏄崟閫夛紝鍒欎负锛歰ne
+ if (obj.type == 'one') {
+ if (obj.checked) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ AuthorityHID: 1,
+ });
+ }
+ else {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ AuthorityHID: 0,
+ });
+ }
+ }
+ else {
+ if (obj.checked) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ tableBak[i].AuthorityHID = 1;
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
+ }
+ else {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ var tableBak = table.cache["mainTable"]; //鑾峰彇琛ㄦ牸鏁版嵁
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ tableBak[i].AuthorityHID = 0;
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
+
+
+ }
+ }
+
});
//淇濆瓨
form.on('submit(Saver)', function (data) {
- data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
-
- if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
- {
+ if (TagId == "" || TagId == null) {
+ layer.alert("宸︿晶鐐瑰嚮鏍戝瀷鏁版嵁宸插け鏁�!", { icon: 5 });
return false;
}
-
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = TagId + ';' + sSubStr + ';' + linterid;
+ //console.log(sMainSub);
+ //return false;
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_MaintenanceMode/SaverPower", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ get_Display(sGnbm);
+ });
+ }
+ else {
+ layer.alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err);
+ }
+ });
+
+
+
});
+ //鍔犺浇鏁版嵁琛ㄦ牸
+ function get_Display(sGnbm) {
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/PowerList',
+ type: "GET",
+ data: { "czybm": linterid, "sGnbm": sGnbm },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
@@ -253,11 +335,11 @@
let map = {};
let treeData = [];
data.forEach(it => {
- map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
+ map[it.id.toUpperCase()] = it; //ID涓烘瘡涓妭鐐圭殑id
})
//鐢熸垚缁撴灉闆�
data.forEach(it => {
- const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
+ const parent = map[it.ParentID.toUpperCase()]; //ParentID涓虹埗鑺傜偣鐨刬d
if (parent) {
if (!Array.isArray(parent.children)) parent.children = [];
parent.children.push(it);
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/Xt_UserList.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/Xt_UserList.html"
index 5675178..0467195 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/Xt_UserList.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/Xt_UserList.html"
@@ -308,38 +308,24 @@
var linterid = data[0].鐢ㄦ埛缂栫爜.toString();
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐢ㄦ埛鏉冮檺鍏宠仈',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: ['../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HSupName").val(checkStatus.data[0].HName);
- $("#HSupID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
+ type: 2
+ ,skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鐢ㄦ埛鏉冮檺鍏宠仈'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
end: function () {
-
- },
- success: function (layero, index) {
-
+ //鍒锋柊椤甸潰,
+ location.reload();
}
- });
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 91f60fd..29d0730 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -237,6 +237,7 @@
, { field: 'HSupID', title: 'HSupID', hide: true }
, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 }
, { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }
+ , { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120}
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 100 }
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100 }
--
Gitblit v1.9.1