From ebef191888d9d2c2a2e7a7f677189164e4eef0b3 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 05 八月 2025 19:04:33 +0800
Subject: [PATCH] 车间委外接收单列表bug处理
---
WebTM/views/车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html | 365 ++++++++++++++++------------------------------------
1 files changed, 112 insertions(+), 253 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
index 6c2bf3c..98615ea 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
@@ -147,7 +147,6 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
-
<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
@@ -175,8 +174,7 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
</div>
</div>
-
- <!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
@@ -202,7 +200,7 @@
<div class="layui-inline">
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
- </div>-->
+ </div>
</div>
</div>
</div>
@@ -358,222 +356,45 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
-
- //var HBeginDate = $("#HBeginDate").val() + ":00:00" ;//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- //var HEndDate = $("#HEndDate").val()+":00:00";//缁撴潫鏃ユ湡
- var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
- var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
- var HProductModel = $("#HProductModel").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 = "";
- switch (Comparator) {
- case "7":
- com = "like ''%" + ColContent + "%''";
- break;
- case "8":
- com = "like ''%" + ColContent + "''";
- break;
- case "9":
- com = "like ''" + ColContent + "%''";
- break;
- case "10":
- com = "not like ''%" + ColContent + "%''";
- break;
- default:
- com = "" + Comparator + " ''" + ColContent + "''";
- break;
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , totalRow: true
+ , height: 'full-70'
+ , cols: [[
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 160 }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 160 }
+ , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', totalRow: true, width: 160 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 160, totalRow: true }
+ ]]
+ , done: function (res) {
+ //var count = 0;
+ //var OnlyID = -1;
+ //for (var i = 0; i < res.data.length; i++) {
+ // if (res.data[i]["鍞竴ID"] != OnlyID) {
+ // count += res.data[i]["鏁存壒"];
+ // OnlyID = res.data[i]["鍞竴ID"];
+ // }
+ //}
+ //var divArr = $(".layui-table-total div.layui-table-cell");
+ //$.each(divArr, function (index, item) {
+ // var _div = $(item);
+ // var content = _div.html();
+ // if (index == 9) {
+ // content = count;
+ // }
+ // _div.html(content);
+ //});
}
- 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;
- // com1 = " 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;
- // }
- // // com2 = " and (" + ColName2 + " " + com2 + ")";
- // sWhere += " and " + ColName2 + " " + com2;
- //}
-
-
-
- sWhere = {
- HBeginDate: HBeginDate
- , HEndDate: HEndDate
- , HMaterNumber: HMaterNumber
- , HBillNo: HBillNo
- , HProductName: HProductName
- , HProductModel: HProductModel
- , RandomSearch: com
- }
- sWhere = JSON.stringify(sWhere);
-
-
- //鍔ㄦ�佸垪-缂撳瓨鍒楄〃
- $.ajax({
- url: GetWEBURL() + "/MaterOutEntryReport/MaterOutEntryReport_Cloth",
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- //async: false,
- success: function (data1) {
-
- if (data1.count == 1) {
- var totalArray = ["浠诲姟鏁伴噺","鐧藉澂鍙戝竷", "娴佽浆鍗℃暟閲�"];
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- var width = data1.list[key].width * 23;
- if (width < 150) {
- width = 150;
- } else if (width > 300) {
- width = 300;
- }
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, "") > -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].ColName == '鐧藉澂鍙戝竷') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow:true });
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
- }
- }
- }
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [col]
- , data: data1.data
- };
- ins = table.render(option);
- } else {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 120
- , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
- , totalRow: true
- , height: 'full-70'
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 160 }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 160 }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
- , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭', width: 160 }
- , { field: '浠诲姟鏁伴噺', title: '浠诲姟鏁伴噺', totalRow: true,width: 160 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 160, totalRow: true }
- ]]
- , done: function (res) {
- //var count = 0;
- //var OnlyID = -1;
- //for (var i = 0; i < res.data.length; i++) {
- // if (res.data[i]["鍞竴ID"] != OnlyID) {
- // count += res.data[i]["鏁存壒"];
- // OnlyID = res.data[i]["鍞竴ID"];
- // }
- //}
- //var divArr = $(".layui-table-total div.layui-table-cell");
- //$.each(divArr, function (index, item) {
- // var _div = $(item);
- // var content = _div.html();
- // if (index == 9) {
- // content = count;
- // }
- // _div.html(content);
- //});
- }
- };
- ins = table.render(option);
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, {
- icon: 5,
- time: 20000
- }, function () {
- //do something
- });
- }
- })
+ };
}
//鍒楁槑鏄剧ず涓嬫媺妗�
@@ -586,14 +407,13 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
- form.render('select');
+
$("#ColName1").empty();
$("#ColName1").append(Organization);
+
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
-
- //$("#ColName2").empty();
- //$("#ColName2").append(Organization);
- //form.render('select');
}
@@ -606,6 +426,45 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
+ var totalArray = ["浠诲姟鏁伴噺", "鐧藉澂鍙戝竷", "娴佽浆鍗℃暟閲�"];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ var width = data1.list[key].width * 23;
+ if (width < 150) {
+ width = 150;
+ } else if (width > 300) {
+ width = 300;
+ }
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -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].ColName == '鐧藉澂鍙戝竷') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+
//璋冩暣鏃ユ湡鏍煎紡锛氭樉绀� 骞存湀鏃� 鍜� 鏃� 鍒�
for (var i = 0; i < data1.data.length; i++) {
if (data1.data[i].鏃ユ湡 != null) {
@@ -682,9 +541,9 @@
var Comparator1 = $("#Comparator1").val()
var ColContent1 = $("#ColContent1").val();
- //var ColName2 = $("#ColName2").val();//澶嶉�夋
- //var Comparator2 = $("#Comparator2").val()
- //var ColContent2 = $("#ColContent2").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
@@ -736,28 +595,28 @@
coms += " and (" + ColName1 + " " + com1 + ")";
}
- //if (ColName2 != 0 && Comparator2 != 0) {
- // ColName2 = "[" + ColName2 + "]";
- // 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;
- // }
- // coms += " and (" + ColName2 + " " + com2 + ")";
- //}
+ if (ColName2 != 0 && Comparator2 != 0) {
+ ColName2 = "[" + ColName2 + "]";
+ 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;
+ }
+ coms += " and (" + ColName2 + " " + com2 + ")";
+ }
var params = get_UrlVars();
if (params[params[0]] != null && detailBar == 0) {
@@ -825,10 +684,10 @@
$("#ColName1").val("0");
$("#Comparator1").val("0");
- //$("#ColContent2").val("");
- //$("#ColName2").val("0");
- //$("#Comparator2").val("0");
- //form.render()
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render()
ColFilter();
sWhere = "";
}
--
Gitblit v1.9.1