From d14dc553c4f0704658b19837344b9aaa6bcf29e3 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 08 十月 2023 09:51:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index 3a3c930..53f4991 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -76,7 +76,7 @@
<input type="text" class="layui-input" id="HMainMaterName" style="width:190px;">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="HMaterNumber" style="width:190px;">
@@ -87,7 +87,7 @@
<div class="layui-input-block">
<input type="text" class="layui-input" id="HMaterName" style="width:190px;">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
@@ -292,18 +292,19 @@
, { field: '閲嶉噺', title: '甯冮噸', width: 160 }
, { field: '姘存瘮', title: '姘存瘮', width: 160 }
, { field: '姘撮噺', title: '姘撮噺', width: 160 }
- , { field: 'hsubid', title: 'hsubid', hide: true }
- , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
- , { field: '鐗╂枡鍏紡', title: '鐗╂枡鍏紡', width: 200 }
- , { field: 'HUnitID', title: 'HUnitID', width: 200, hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
- , { field: '鐢ㄩ噺', title: '鐢ㄩ噺鈥�', width: 200 }
- , { field: '瀹炴敹鏁伴噺', title: '閲嶉噺', width: 200 }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+ , { field: '琛ㄥご澶囨敞', title: '澶囨敞', width: 160 }
+ //, { field: 'hsubid', title: 'hsubid', hide: true }
+ //, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
+ //, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ //, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+ //, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+ //, { field: '鐗╂枡鍏紡', title: '鐗╂枡鍏紡', width: 200 }
+ //, { field: 'HUnitID', title: 'HUnitID', width: 200, hide: true }
+ //, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
+ //, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
+ //, { field: '鐢ㄩ噺', title: '鐢ㄩ噺鈥�', width: 200 }
+ //, { field: '瀹炴敹鏁伴噺', title: '閲嶉噺', width: 200 }
+ //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
, { field: '浠诲姟鍗曞唴鐮�', title: '浠诲姟鍗曞唴鐮�', width: 200, hide: true }
, { field: '浠诲姟鍗曞瓙鍐呯爜', title: '浠诲姟鍗曞瓙鍐呯爜', width: 200, hide: true }
@@ -407,8 +408,8 @@
var HDeptName = $("#HDeptName").val();
var HMainMaterNumber = $("#HMainMaterNumber").val();
var HMainMaterName = $("#HMainMaterName").val();
- var HMaterNumber = $("#HMaterNumber").val();
- var HMaterName = $("#HMaterName").val();
+ //var HMaterNumber = $("#HMaterNumber").val();
+ //var HMaterName = $("#HMaterName").val();
var HMaker = $("#HMaker").val();
//浠绘剰瀛楁杩囨护
@@ -458,12 +459,12 @@
sWhere += " and 涓讳骇鍝佸悕绉� like '%" + HMainMaterName + "%'";
}
- if (HMaterNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
- }
- if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
- }
+ //if (HMaterNumber) {
+ // sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ //}
+ //if (HMaterName) {
+ // sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ //}
if (HMaker) {
sWhere += " and 鍒跺崟浜� like '%" + HMaker + "%'";
@@ -483,8 +484,8 @@
$("#HDeptName").val("");
$("#HMainMaterNumber").val("");
$("#HMainMaterName").val("");
- $("#HMaterNumber").val("");
- $("#HMaterName").val("");
+ //$("#HMaterNumber").val("");
+ //$("#HMaterName").val("");
$("#HMaker").val("");
ColFilter();
@@ -850,6 +851,62 @@
}
//#endregion
+ //#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
+
+ //#region 鍙屽嚮杩涘叆缂栬緫
+ table.on('rowDouble(mainTable)', function (obj) {
+ //閫変腑楂樹寒 鍙屽嚮琛�
+ obj.tr.find(':checkbox').prop('checked', true);
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = true;
+ }
+ });
+
+ var linterid = obj.data["hmainid"];
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鐢熶骇棰嗘枡鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //get_FastQuery(table, option);
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+ //#endregion
+
//#region 鑾峰彇鍒楀
function getColumnsWidth() {
var result = [];
--
Gitblit v1.9.1