From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 161 +++++++++++++++++++++++++----------------------------
1 files changed, 77 insertions(+), 84 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 574df8c..33a468a 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"
@@ -18,7 +18,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
-
+ <script src="../../../layuiadmin/SetColumn.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -61,6 +61,13 @@
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">椤圭洰缂栧彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -262,8 +269,6 @@
var Organization = sessionStorage["Organization"];
var sWhere = "";
var option = [];
- var page = 1;//鍒嗛〉鏁版嵁
- var size = 50;
var HModName = "Xs_SeOrderBillList";
var HBillType = "1401";
@@ -310,10 +315,16 @@
form.on('submit(btnSearch)', function (data) {
//鏍囪褰撳墠鏁版嵁涓� 鏌ヨ鏁版嵁
get_needClose_Bar = 0;
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
+ });
+ //#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
}
});
//#endregion
@@ -323,11 +334,9 @@
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
- if (page != 1) {
- $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
- } else {
- get_FastQuery(table, option);
- }
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
});
//#endregion
@@ -467,45 +476,20 @@
});
//#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() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").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;
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
});
//#endregion
@@ -615,7 +599,8 @@
//鏌ヨ
//get_FastQuery();
//get_Display(" and 1=0 ");
-
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
get_DisplayPage(" and 1=0 ");
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
@@ -756,9 +741,13 @@
if (!first) {
//do something
console.log(obj)
- page = obj.curr;
- size = obj.limit;
- get_FastQuery();
+
+ if (get_needClose_Bar == 0) {
+ get_FastQuery();
+ } else if (get_needClose_Bar == 1) {
+ get_needClose();
+ }
+
}
}
}
@@ -954,10 +943,10 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOrderBill/list_ByPage',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
- if (data1.count != 0) {
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
@@ -998,22 +987,8 @@
}
}
}
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data
- , height: 800
- //, page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
+ option.cols = [col];
+ option.data = data1.data;
//璁剧疆鏁版嵁
var result = data1.data;
var temp = "";
@@ -1043,10 +1018,8 @@
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
- option.data = [];
- table.render(option);
layer.close(ajaxLoad);
- /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -1061,6 +1034,7 @@
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HProjectNumber = $("#HProjectNumber").val(); //椤圭洰缂栧彿
var HCusID = $("#HCusID").val();
var HMaterNumber = $("#HMaterNumber").val();
var HMaterName = $("#HMaterName").val();
@@ -1152,6 +1126,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%''";
}
+ if (HProjectNumber) {
+ sWhere += " and 椤圭洰缂栫爜 like ''%" + HProjectNumber + "%''";
+ }
if (HCusID) {
sWhere += " and 瀹㈡埛 like ''%" + HCusID + "%''";
}
@@ -1189,6 +1166,7 @@
$("#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("");//
+ $("#HProjectNumber").val("");
$("#HCusID").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
@@ -1745,14 +1723,17 @@
function get_needClose() {
//璁板綍杩囨护鏉′欢
var temp = sWhere_Bak;
+
+ if (get_needClose_Bar == 0) {
+ //璁剧疆椤垫暟涓�1
+ optionPage.curr = 1;
+ }
+
//鏍囪褰撳墠鏁版嵁涓� 寰呭叧闂」
get_needClose_Bar = 1;
//涓鸿繃婊ゆ潯浠跺鍔犳帓搴�
//sWhere_Bak += " and 鍓╀綑璁㈤噾>0 and 鍓╀綑璁㈤噾<=1000 and 鍏抽棴浜�='' and 琛屽叧闂汉='' and 鐘舵�� = '宸插鏍�' and HCusID <> 166351 order by 鍗曟嵁鍙� desc";
-
- //璁剧疆椤垫暟涓�1
- page = 1;
//鑾峰彇鎺掑簭鍚庣殑鏁版嵁骞堕噸鏂版覆鏌�
var ajaxLoad = layer.load();
@@ -1760,9 +1741,9 @@
url: GetWEBURL() + '/Xs_SeOrderBill/sortList__ByPage',
async: false,
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
success: function (data1) {
- option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
if (data1.count != 0) {
optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -2278,8 +2259,10 @@
, content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery()
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
}
@@ -2362,6 +2345,15 @@
option.cols[0][i + 1]["fixed"] = "left";
}
}
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
table.render(option);
//鍒锋柊鎸夐挳鏄剧ず
@@ -2406,6 +2398,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
type: "GET",
+ async:false,
data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
success: function (data1) {
if (data1.count == 1) {
--
Gitblit v1.9.1