From d6db3fa707f470fd8a6160c6daf6bcea75b8a6ce Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 06 六月 2024 15:18:45 +0800
Subject: [PATCH] 上下模单优化
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 587 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 524 insertions(+), 63 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 8f12947..972c2ed 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"
@@ -39,6 +39,13 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+ <div class="layui-input-block">
+ <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
@@ -84,15 +91,15 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HDeptID" id="HDeptID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HMangerID" id="HMangerID" style="width:190px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName" style="width:190px;">
</div>
</div>
</div>
@@ -123,6 +130,62 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -141,6 +204,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>
@@ -151,11 +215,12 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<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="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;" 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_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>
@@ -189,8 +254,14 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var HModName = "Xs_SeOrderBill";
+ var HModName = "Xs_SeOrderBillList";
var HBillType = "1401";
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //璁板綍杩囨护鏉′欢鐢ㄤ簬鎺掑簭鏃惰幏鍙栨暟鎹�
+ var sWhere_Bak = "";
+ var get_needClose_Bar = 0;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1401";
@@ -221,6 +292,8 @@
//#region 鐩戝惉浜嬩欢
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ //鏍囪褰撳墠鏁版嵁涓� 鏌ヨ鏁版嵁
+ get_needClose_Bar = 0;
get_FastQuery(table, option);
});
//#endregion
@@ -286,6 +359,10 @@
case 'get_LookDown':
set_LookDown();
break;
+ //寰呭叧闂」
+ case 'get_needClose':
+ get_needClose();
+ break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
@@ -319,6 +396,10 @@
//鎵撳嵃
case 'btn-print': get_PrintReport();
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
@@ -339,6 +420,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
@@ -397,6 +520,30 @@
})
});
//#endregion
+
+ //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //var HEndDate = Date.parse($("#HEndDate").val());
+ //var HBeginDate = Format(new Date(new Date(HEndDate) - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")
+ //$("#HBeginDate").val(HBeginDate);
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+ //#endregion
//#endregion
@@ -404,7 +551,20 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -444,6 +604,10 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, { field: '鏁伴噺', title: '鏁伴噺', sort: true, totalRow: true }
+ , { field: '鐢熶骇鍏ュ簱鏁伴噺', title: '鐢熶骇鍏ュ簱鏁伴噺', sort: true, totalRow: true }
+ , { field: '鎶ュ簾鏁伴噺', title: '鎶ュ簾鏁伴噺', sort: true, totalRow: true }
+ , { field: '鍓╀綑璁㈤噾', title: '鍓╀綑璁㈤噾', sort: true, totalRow: true }
+ , { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true }
@@ -459,7 +623,8 @@
, { field: '閲戦', title: '閲戦', sort: true, totalRow: true }
, { field: '浠风◣鍚堣', title: '浠风◣鍚堣', sort: true, totalRow: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
- , { field: '鍏宠仈鏁伴噺', title: '閿�鍞嚭搴撳叧鑱旀暟閲�', sort: true, totalRow: true }
+ , { field: '鎶曟枡', title: '鎶曟枡', sort: true }
+ , { field: '娣卞姞宸�', title: '娣卞姞宸�', sort: true }
, { field: '鏈叧鑱旀暟閲�', title: '閿�鍞嚭搴撴湭鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鐢熶骇鍏宠仈鏁伴噺', title: '鐢熶骇鍏宠仈鏁伴噺', sort: true, totalRow: true }
, { field: '鐢熶骇鏈叧鑱旀暟閲�', title: '鐢熶骇鏈叧鑱旀暟閲�', sort: true, totalRow: true }
@@ -475,7 +640,8 @@
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
, { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-
+ , { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
+ , { field: '瀛愪粨搴�', title: '瀛愪粨搴�', hide: true, sort: true }
//, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
//, { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125, sort: true }
@@ -484,16 +650,18 @@
//, { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125, sort: true }
//, { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170, sort: true }
//, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
- //, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
- //, { field: '甯佸埆', title: '甯佸埆', sort: true }
- //, { field: '姹囩巼', title: '姹囩巼', sort: true }
+ ////, { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', sort: true }
+ //, { field: '甯佸埆', title: '甯佸埆', hide: true, sort: true }
+ //, { field: '姹囩巼', title: '姹囩巼', hide: true, sort: true }
//, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
- //, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
- //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
- //, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
+ ////, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125, sort: true }
+ //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, hide: true,sort: true }
+ ////, { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�', sort: true }
//, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
- //, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
- //, { field: '涓荤', title: '涓荤', sort: true }
+ ////, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', sort: true }
+ //, { field: '涓荤', title: '涓荤', hide: true, sort: true }
+ //, { field: '涓讳粨搴搃d', title: '涓讳粨搴搃d', hide: true, sort: true }
+ //, { field: '涓讳粨搴�', title: '涓讳粨搴�', hide: true, sort: true }
//, { field: '鎽樿', title: '鎽樿', sort: true }
//, { field: '鎵瑰彿', title: '鎵瑰彿', sort: true }
//, { field: '绋庨', title: '绋庨', sort: true }
@@ -501,12 +669,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');
+ // }
+
+ //});
}
};
}
@@ -548,7 +729,7 @@
option.data = result;
- table.render(option);
+ ins = table.render(option);
layer.close(ajaxLoad);
//鍒锋柊鎸夐挳鏄剧ず
@@ -577,11 +758,20 @@
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
var HCusID = $("#HCusID").val();
- var HDeptID = $("#HDeptID").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterName = $("#HMaterName").val();
var HMangerID = $("#HMangerID").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -604,6 +794,51 @@
}
sWhere += " and " + ColName + " " + com;
}
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
@@ -616,11 +851,11 @@
if (HCusID) {
sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
}
- if (HDeptID) {
- sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
}
- if (HMangerID) {
- sWhere += " and 涓荤 like '%" + HMangerID + "%'";
+ if (HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
}
if (GetDataCols != "") {
sWhere += GetDataCols;
@@ -631,6 +866,8 @@
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
+ sWhere_Bak = sWhere;
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
GetDataCols = "";
@@ -639,15 +876,25 @@
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");//
$("#HCusID").val("");
- $("#HDeptID").val("");
- $("#HMangerID").val("");
+ $("#HMaterNumber").val("");
+ $("#HMaterName").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+
form.render('select');
sWhere = "";
}
@@ -695,8 +942,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) {
@@ -722,8 +973,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 () {
@@ -753,8 +1008,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 () {
@@ -786,8 +1045,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 {
@@ -829,8 +1092,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 () {
@@ -867,8 +1134,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 () {
@@ -906,8 +1177,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 () {
@@ -972,8 +1247,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 {
@@ -998,16 +1277,16 @@
, "HSourceBillType": "1401"
}
dataArray.push(temp);
- if (data[i].鐘舵�� != "宸插鏍�") {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
- layer.alert(err, { icon: 5 });
- return;
- }
+ //if (data[i].鐘舵�� != "宸插鏍�") {
+ // var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].鐘舵�� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ // layer.alert(err, { icon: 5 });
+ // return;
+ //}
- if (data[i].琛岀姸鎬� == "宸插叧闂�") {
- layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
- return;
- }
+ //if (data[i].琛岀姸鎬� == "宸插叧闂�") {
+ // layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + data[i].鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ // return;
+ //}
if (data[i].瀹㈡埛 != HCusName) {
layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛!");
@@ -1034,8 +1313,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 {
@@ -1096,8 +1379,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 {
@@ -1123,8 +1410,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 () {
@@ -1133,6 +1424,70 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ }
+ //#endregion
+
+ //#region 寰呭叧闂」
+ function get_needClose() {
+ //璁板綍杩囨护鏉′欢
+ var temp = sWhere_Bak;
+ //鏍囪褰撳墠鏁版嵁涓� 寰呭叧闂」
+ get_needClose_Bar = 1;
+
+ //涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
+ sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=1000 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
@@ -1161,7 +1516,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 {
@@ -1197,7 +1556,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 {
@@ -1234,7 +1597,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 {
@@ -1270,7 +1637,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 {
@@ -1312,6 +1683,28 @@
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
}
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Xs_SeOrderBillList_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
}
//#endregion
@@ -1427,6 +1820,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 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -1457,6 +1868,30 @@
$("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
}
}
+
+
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //var HEndDate = Date.parse($("#HEndDate").val());
+ //var HBeginDate = Format(new Date(new Date(HEndDate) - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")
+ //$("#HBeginDate").val(HBeginDate);
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+
+
//鎵ц鏌ヨ鏂规硶
get_FastQuery()
form.render("select");
@@ -1703,6 +2138,32 @@
$("#ColName").empty();
$("#ColName").append(Organization);
form.render('select');
+
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ form.render('select');
+
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
}
//#endregion
--
Gitblit v1.9.1