From 6bd32fa60d5d2ae389a5705d34f88567e65f27b3 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 27 三月 2024 16:28:58 +0800
Subject: [PATCH] 销售订单：增加 待关闭项 按钮，点击后数据只显示 剩余订金 在(0,500]区间审核状态且没有进行行关闭的记录。 销售订单：同一个单据只有第一条记录显示主表信息 与 layui自带的排序功能 ，问题解决。(使用layui的排序时，触发事件，不在进行同一个单据只有第一条记录显示主表信息处理)
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 268 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 239 insertions(+), 29 deletions(-)
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index faecb34..1abfb42 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -141,6 +141,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="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_LookDown" id="get_LookDown"><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_needClose" id="get_needClose"><i class="layui-icon layui-icon-refresh-3"></i>寰呭叧闂」</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="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="AbandonCheck"><i class="layui-icon layui-icon-form"></i>鍙嶅鏍�</button>
@@ -153,9 +154,9 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="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_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;" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>楂樼骇杩囨护</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_QueryCondition" id="set_QueryCondition"><i class="layui-icon layui-icon-set"></i>楂樼骇杩囨护</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -192,6 +193,10 @@
var HModName = "Xs_SeOrderBill";
var HBillType = "1401";
+ //璁板綍杩囨护鏉′欢鐢ㄤ簬鎺掑簭鏃惰幏鍙栨暟鎹�
+ var sWhere_Bak = "";
+ var get_needClose_Bar = 0;
+
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1401";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -221,6 +226,8 @@
//#region 鐩戝惉浜嬩欢
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ //鏍囪褰撳墠鏁版嵁涓� 鏌ヨ鏁版嵁
+ get_needClose_Bar = 0;
get_FastQuery(table, option);
});
//#endregion
@@ -286,6 +293,10 @@
case 'get_LookDown':
set_LookDown();
break;
+ //寰呭叧闂」
+ case 'get_needClose':
+ get_needClose();
+ break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
@@ -339,6 +350,48 @@
set_QueryCondition();
break;
};
+ });
+ //#endregion
+
+ //#region 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(mainTable)', function (obj) {
+ // 鑾峰彇鎺掑簭瀛楁鍜岀被鍨�
+ var field = obj.field;
+ var type = obj.type;
+ //璁板綍杩囨护鏉′欢
+ var temp = sWhere_Bak;
+
+ //涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
+ sWhere_Bak += " order by " + field + " " + (type == "null" ? "" : type) + " ";
+
+ //鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/sortList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ sWhere_Bak = temp;
});
//#endregion
@@ -502,12 +555,25 @@
//, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', sort: true }
//, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', sort: true }
]]
- , done: function () {
+ , done: function (res, curr, count) {
soulTable.render(this);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //寰幆琛ㄦ暟鎹牴鎹甪lag鐘舵�佺粰琛屼笂鑹�
+ //$.each(res['data'], function (i, j) {
+ // var HIsUsingMoney = j['鍓╀綑璁㈤噾'] * 1;
+ // var HRowCloseMan = j['琛屽叧闂汉'];
+ // var HCloseMan = j['鍏抽棴浜�'];
+ // if ((HIsUsingMoney <= 500 && HIsUsingMoney > 0) && HRowCloseMan == "" && HCloseMan == "") {
+ // Layui_SetDataTableRowColor('table', i + 1, 'red');
+ // } else {
+ // Layui_SetDataTableRowColor('table', i + 1, 'black');
+ // }
+
+ //});
}
};
}
@@ -633,6 +699,8 @@
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
+ sWhere_Bak = sWhere;
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
GetDataCols = "";
@@ -697,8 +765,12 @@
maxmin: true,
content: '../../閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
end: function () {
- //鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
},
success: function (layero, index) {
@@ -724,8 +796,12 @@
, content: '../../閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
- //鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
}
, cancel: function () {
@@ -755,8 +831,12 @@
, content: '../../閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
- //鍒锋柊椤甸潰,
- $("#btnSearch").trigger('click');
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
}
, cancel: function () {
@@ -788,8 +868,12 @@
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
});
} else {
@@ -831,8 +915,12 @@
, content: '../../閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBill.html?OperationType=4&linterid=' + hID + '&HSouceBillType=1401&closeType=1'
, resize: false,
end: function () {
- //鍒锋柊椤甸潰,
- //$("#btnSearch").trigger('click');
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
}
, cancel: function () {
@@ -869,8 +957,12 @@
, content: '../../閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBill.html?OperationType=4&linterid=' + hID + '&HSouceBillType=1401&closeType=1'
, resize: false,
end: function () {
- //鍒锋柊椤甸潰,
- //$("#btnSearch").trigger('click');
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
}
, cancel: function () {
@@ -908,8 +1000,12 @@
, content: '../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html?OperationType=4&linterid=' + hID + '&hsubid=' + hsubid
, resize: false,
end: function () {
- //鍒锋柊椤甸潰,
- //$("#btnSearch").trigger('click');
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
}
, cancel: function () {
@@ -974,8 +1070,12 @@
, btn: [],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- //$("#btnSearch").trigger('click');
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
}
})
} else {
@@ -1036,8 +1136,12 @@
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- //$("#btnSearch").trigger('click');
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
}
})
} else {
@@ -1098,8 +1202,12 @@
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
end: function (index, layero, that) {
- //鍒锋柊椤甸潰
- //$("#btnSearch").trigger('click');
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
}
})
} else {
@@ -1125,8 +1233,12 @@
, content: '../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBill_LookDown.html?linterid=' + hID + '&HSouceBillType=1401&closeType=1'
, resize: false,
end: function () {
- //鍒锋柊椤甸潰,
- /* $("#btnSearch").trigger('click');*/
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
}
, cancel: function () {
@@ -1135,6 +1247,70 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ }
+ //#endregion
+
+ //#region 寰呭叧闂」
+ function get_needClose() {
+ //璁板綍杩囨护鏉′欢
+ var temp = sWhere_Bak;
+ //鏍囪褰撳墠鏁版嵁涓� 寰呭叧闂」
+ get_needClose_Bar = 1;
+
+ //涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
+ sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=500 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' order by 鍗曟嵁鍙� desc";
+
+ //鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Xs_SeOrderBill/sortList',
+ async: false,
+ type: "GET",
+ data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+
+ //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
+ //鑾峰彇瀛愯〃鍒楁暟鎹�
+ var colList = [];
+ for (var i = 0; i < option.cols[0].length; i++) {
+ colList.push(option.cols[0][i].field);
+ }
+ //璁剧疆鏁版嵁
+ var result = data1.data;
+ var temp = "";
+ for (var i = 0; i < result.length; i++) {
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
+ } else {
+ var initIndex = $.inArray("hmainid", colList);
+ var lastIndex = $.inArray("hsubid", colList);
+ for (var j = initIndex + 1; j < lastIndex; j++) {
+ var fieldName = colList[j];
+ result[i][fieldName] = "";
+ }
+ }
+ }
+
+
+ option.data = result;
+ table.render(option);
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ sWhere_Bak = temp;
}
//#endregion
@@ -1163,7 +1339,11 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
});
} else {
@@ -1199,7 +1379,11 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
});
} else {
@@ -1236,7 +1420,11 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
});
} else {
@@ -1272,7 +1460,11 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ } else if (get_needClose_Bar == 1) {
+ $("#get_needClose").trigger('click');
+ }
});
} else {
@@ -1429,6 +1621,24 @@
}
//#endregion
+ //#region 缁檛able琛屼笂鑹�
+ function Layui_SetDataTableRowColor(TabDivId, RowIndex, ColorString) {
+ try {
+ var div = $("[lay-id='mainTable'] tr:eq(" + RowIndex + ")");
+ if (div != null) //鎵惧埌瀵硅薄浜�
+ {
+ // console.log(div);
+ div.css("color", ColorString);
+
+ } else {
+ console.log('娌℃湁鎵惧埌瀵硅薄');
+ }
+ } catch (e) {
+ console.log(e.message);
+ }
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
--
Gitblit v1.9.1