From da30fcb34b98f4b1476209e2e712d52ba50e49bf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 07 四月 2026 09:00:58 +0800
Subject: [PATCH] 修复 抄送人选择模块 在 后端启用 JWT功能时，没有自动插入 Token 的问题，并 排查 剩余模块中，有无类似 问题
---
WebTM/views/PublicPage/MaterialInfo.html | 193 +++++++++++++++++++++---------------------------
1 files changed, 84 insertions(+), 109 deletions(-)
diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html
index 7554d4b..5996537 100644
--- a/WebTM/views/PublicPage/MaterialInfo.html
+++ b/WebTM/views/PublicPage/MaterialInfo.html
@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/ext/soulTable.css" media="all">
<script src="../../layuiadmin/layui/layui.js"></script>
<script src="../../layuiadmin/treeTable.js"></script>
<script src="../../layuiadmin/Scripts/json2.js"></script>
@@ -47,6 +48,24 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWHNumber" id="HWHNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWHName" id="HWHName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒嗙粍</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HGroup" id="HGroup">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -76,7 +95,7 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tableFilter'], function () {
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -87,57 +106,12 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
+ , soulTable = layui.soulTable
+ , tableFilter = layui.tableFilter
//var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
//var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
var sWhere = " where 1 = 1" + " ";
var sWhere1 = " where 1 = 1" + " ";
-
- //tree.render({
- // elem: '#treePart',
- // data: getData(sWhere),
- // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
- // id: 'demoId',
- // isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
- // showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
- // onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
- // click: function (obj) {
- // //鐐瑰嚮楂樺厜
- // if (obj.data.id !== treeCkData.id) {
- // $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- // treeCkData = obj.data;
- // TagId = obj.data.id;
- // TagParentId = obj.data.ParentID;
- // }
- // else {
- // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- // treeCkData = { id: 0 };
- // TagId = "";
- // TagParentId = "";
- // }
-
-
- // $.ajax({
- // url: GetWEBURL() + '/Gy_MaintenanceMode/PartCX',
- // type: "GET",
- // data: { "HInterID": 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 });
- // }
- // });
- // }
- //});
-
var option = {
elem: '#mainTable'
@@ -146,28 +120,54 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { type: 'radio', fixed: 'left' }
- , { field: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', title: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', sort: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�' }
- , { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�' }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '鎵规', title: '鎵规' }
- , { field: '鏁伴噺', title: '鏁伴噺' }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜' }
- , { field: '浠撳簱', title: '浠撳簱' }
- , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜' }
- , { field: '浠撲綅', title: '浠撲綅' }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
- , { field: '鎵�灞炵粍缁�', title: '鎵�灞炵粍缁�' }
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', title: '鐗╂枡浠撳簱璧勬枡浠ｇ爜', sort: true, filter: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true, filter: true}
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', filter: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', filter: true }
+ , { field: '鍒嗙粍', title: '鍒嗙粍', filter: true }
+ , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', filter: true }
+ , { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�', filter: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', filter: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', filter: true}
+ , { field: '鎵规', title: '鎵规', filter: true }
+ , { field: '鏁伴噺', title: '鏁伴噺', filter: true }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', filter: true}
+ , { field: '浠撳簱', title: '浠撳簱', filter: true }
+ , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', filter: true }
+ , { field: '浠撲綅', title: '浠撲綅', filter: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', filter: true }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', filter: true }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', filter: true}
+ , { field: '鎵�灞炵粍缁�', title: '鎵�灞炵粍缁�', filter: true }
]]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+
+ }
};
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -195,11 +195,23 @@
form.on('submit(btnSearch)', function (data) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ var HWHNumber = $("#HWHNumber").val();
+ var HWHName = $("#HWHName").val()
+ var HGroup = $("#HGroup").val()
if (HNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 = '" + HNumber + "'";
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'";
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+ }
+ if (HWHNumber) {
+ sWhere += " and 浠撳簱浠ｇ爜 like '%" + HWHNumber + "%'";
+ }
+ if (HWHName) {
+ sWhere += " and 浠撳簱 like '%" + HWHName + "%'";
+ }
+ if (HGroup) {
+ sWhere += " and 鍒嗙粍 like '%" + HGroup + "%'";
}
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/MaterialList',
@@ -209,7 +221,7 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -217,50 +229,13 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "where 1=1 ";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = " where 1=1 ";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
});
//浠ヤ笂鏄痩ayui妯″潡
});
- //鏌ヨ鏍戠姸鏁版嵁
- function getData(sWhere) {
- var treeData;
-
- $.ajax({
- url: GetWEBURL() + '/Gy_MaintenanceMode/PartLoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- async: false,
- success: function (result) {
- var data = result.data;
- //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- treeData = LoadTree(data);
-
- }
- });
- return treeData;
- }
- /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
- function LoadTree(data) {
- let map = {};
- let treeData = [];
- data.forEach(it => {
- map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
- })
- //鐢熸垚缁撴灉闆�
- data.forEach(it => {
- const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
- if (parent) {
- if (!Array.isArray(parent.children)) parent.children = [];
- parent.children.push(it);
- } else {
- treeData.push(it)
- }
- })
- return treeData;
- }
-
+
function SeachFilter(sWhere1) {
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
--
Gitblit v1.9.1