From d60e705ef3cf4c8ad335fa5640116370767230aa Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 07 四月 2026 12:43:56 +0800
Subject: [PATCH] 产品器具清单增加子表F7多选返回，条码生产页面点击库存打开页面里面的表格宽度优化，返工流转卡页面优化
---
WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html | 191 +++++++++++++++++++++++++++++++----------------
1 files changed, 125 insertions(+), 66 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
index 01cb2a7..0800fbd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
@@ -113,17 +113,18 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_Edit" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>-->
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_CheckBill" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AbandonCheck" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_CloseBill" lay-event="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_CancelCloseBill" lay-event="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_export" lay-event="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ReadScheme" lay-event="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="HideButton" lay-event="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_SaveScheme" lay-event="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_PushDown" lay-event="set_PushDown"><i class="layui-icon layui-icon-down"></i>涓嬫帹杩斿伐娴佽浆鍗�</button>
</div>
</script>
</form>
@@ -158,7 +159,7 @@
var ins; //鐢ㄤ簬瀵煎嚭excel
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "宸ュ簭杩斿伐鐢宠鍗曞垪琛�";
@@ -198,20 +199,13 @@
case 'set_DeleteBill': set_DeleteBill();
break;
//瀵煎嚭excel
- case 'get_export':
- get_Export();
+ case 'get_export':get_Export();
break;
- ////瀹℃牳
- //case 'set_CheckBill': set_CheckBill();
- // break;
//瀹℃牳
- case 'set_CheckBill':
- set_CheckBill();
- //set_CheckBill(1);
+ case 'set_CheckBill':set_CheckBill(1);
break;
//鍙嶅鏍�
- case 'set_AbandonCheck':
- set_CheckBill(2);
+ case 'set_AbandonCheck':set_CheckBill(2);
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill(1);
@@ -225,8 +219,7 @@
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
//鍒楄缃�
- case 'set_HideColumn':
- get_HideColumn();
+ case 'set_HideColumn':get_HideColumn();
break;
//鎸夐挳璁剧疆
case 'set_HideButton':
@@ -239,6 +232,9 @@
break;
//璇诲彇鏂规
case 'set_ReadScheme': set_ReadScheme();
+ break;
+ //涓嬫帹杩斿伐娴佽浆鍗�
+ case 'set_PushDown': set_PushDown();
break;
};
});
@@ -263,12 +259,12 @@
function set_ClearBill() {
$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
- //鏌ヨ
- get_Display("");
+
//杞﹂棿鍒楄〃
getDept();
- //鍒濆鍖栬〃鏍�
- DisPlay_HideColumn();
+ //鏌ヨ
+ get_FastQuery();
+
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
get_DefaultModule();
}
@@ -293,21 +289,21 @@
}
})
}
- //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ //#region 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
//鍗曟嵁鍙疯秴閾炬帴
if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
, area: ['100%', '100%']
, title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
, closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
, shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: '../宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=-1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
@@ -321,7 +317,29 @@
})
}
});
- //#endregion
+ //#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
+
// 鏌ヨ
function get_Display(sWhere) {
sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
@@ -333,7 +351,6 @@
success: function (data1) {
if (data1.count == 1) {
layer.close(ajaxLoad);
- var totalArray = ["璁㈠崟鏁伴噺", "杩斿伐鏁伴噺"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -346,10 +363,12 @@
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
}
- else if ($.inArray(data[i].name, totalArray) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ },
+ });
}
else {
switch (data[i].Type) {
@@ -431,15 +450,15 @@
sWhere += " and " + ColName + " " + com;
}
-
-
+
+
if (HDate) {
sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
}
if (HDate1) {
sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
}
-
+
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -623,44 +642,84 @@
}
}
- //瀹℃牳
- function set_CheckBill() {
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ var urls = "";
if (checkStatus.data.length === 1) {
- var hmainid = data[0].hmainid;
- layer.confirm("纭瑕佸鏍稿悧锛屽鏍稿悗涓嶈兘鎭㈠", { title: "瀹℃牳纭" }, function (index) {
- var wait = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/Sc_ProcExchWorkBackBill/set_CheckBill',
- type: "GET",
- data: { "HInterID": hmainid, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
+ var hmainid = data[0].hmainid.toString();
+ if (sessionStorage["Organization"] == "娴欐睙鏅轰簯杩堟��") {
+ urls = GetWEBURL() + '/Sc_ProcExchWorkBackBill/CheckSc_ProcExchWorkBackBill'
+ } else {
+ urls = GetWEBURL() + '/Sc_ProcExchWorkBackBill/set_CheckBill';
+ }
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: urls,
+ data: { "HInterID": hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
- layer.close(wait);
- layer.msg(result.Message);
+ layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_FastQuery();
+ $("#btnSearch").trigger('click');
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
- })
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
}
-
}
+ //#endregion
+ // 涓嬫帹杩斿伐娴佽浆鍗�
+ function set_PushDown() {
+ var data = table.checkStatus('mainTable').data;
+ if (data.length == 0) {
+ layer.msg('璇疯嚦灏戦�夋嫨涓�琛屾暟鎹繘琛屼笅鎺紒');
+ return;
+ }
+
+ var firstId = data[0].HMaterID;
+ var err = '';
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].HMaterID != firstId) {
+ err += '绗�' + (i + 1) + '琛屻��' + (data[i].浜у搧浠ｇ爜 || '鏈煡') + '銆戜笉涓�鑷�<br>';
+ }
+ }
+
+ if (err) {
+ layer.alert('涓嬫帹澶辫触锛氱墿鏂欏繀椤讳竴鑷达紒<br><br>' + err);
+ return;
+ }
+
+ var ids = '';
+ for (var i = 0; i < data.length; i++) {
+ ids += data[i].hmainid + ',';
+ }
+ ids = ids.substring(0, ids.length - 1);
+
+ layer.open({
+ type: 2,
+ area: ['100%', '100%'],
+ title: '澶氶�変笅鎺�',
+ content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + ids + '&HEntryID=-1',
+ end: function () { location.reload(); }
+ });
+ }
// 鍒锋柊
function get_Refresh() {
set_ClearQuery();
@@ -738,8 +797,8 @@
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
//闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
document.getElementById("HFilterScheme_Now").style.display = "none";
- //鎵ц鏌ヨ鏂规硶
- get_FastQuery()
+ ////鎵ц鏌ヨ鏂规硶
+ //get_FastQuery()
form.render("select");
}
}, error: function () {
@@ -764,7 +823,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
--
Gitblit v1.9.1