From 347acc1359360fd7a0f9bf556662ef6d433f317d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 19 四月 2024 14:05:54 +0800
Subject: [PATCH] 生产订单：动态列注释掉
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 170 +++++++++++++++++++++++++++++---------------------------
1 files changed, 87 insertions(+), 83 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 31db48b..febf924 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -173,7 +173,7 @@
</div>
</div>
</div>
- </div>
+ </div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<!--<div class="layui-btn-container">
@@ -262,13 +262,13 @@
var sWhere = "";
var HModName = "Sc_ICMOBillList";
var HDeptID = 0;
-
+
var params = getUrlVars();
var HDeptID = params[params[0]];
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+ var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData = [];
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
@@ -279,10 +279,10 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
- var HClassTag = "ForFilteringSchemes";
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
- window.HModuleName = "鐢熶骇璁㈠崟";
+ window.HModuleName = "鐢熶骇璁㈠崟";
//鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
window.HDefaultFilter = "";
//閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
@@ -470,7 +470,7 @@
});
- //鑾峰彇缁勭粐
+ //鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
@@ -522,13 +522,13 @@
//#endregion
//#region 鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery();
//鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
- get_DefaultModule();
+ get_DefaultModule();
}
//#endregion
@@ -727,64 +727,69 @@
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
- var data = [];
- var col = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- titleData[key] = data1.list[key].ColmCols;
- }
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
+ //var data = [];
+ //var col = [];
+ ////缁欑┖鐨勬暟缁勮祴鍊�
+ //for (var key in data1.list) {
+ // //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ // data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ // //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ // var patrn = new RegExp(/^h/i);
+ // if (patrn.test(data1.list[key].ColmCols)) {
+ // titleData[key] = data1.list[key].ColmCols;
+ // }
+ //}
+ ////鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
+ //for (var i = 0; i < data.length; i++) {
+ // // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ // if ($.inArray(data[i].name, titleData) > -1) {
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ // }
+ // else {
+ // switch (data[i].Type) {
+ // //int
+ // case 'DateTime':
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ // break;
+ // case 'long':
+ // case 'Int32':
+ // case 'Int64':
+ // case 'double':
+ // case 'Decimal':
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ // break;
+ // default:
+ // col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ // }
+ // }
+ //}
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , cols: [col]
- , data: data1.data
- , height: 'full-120'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- , done: function (res, curr, count) {
- soulTable.render(this);
- }
- }
+ ////鍔ㄦ�佹樉绀哄垪鍚�
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , totalRow: true
+ // , cols: [col]
+ // , data: data1.data
+ // , height: 'full-120'
+ // , page: true
+ // , limits: [50, 500, 5000, 50000]
+ // , limit: 50
+ // , cellMinWidth: 90
+ // , done: function (res, curr, count) {
+ // soulTable.render(this);
+ // }
+ //}
+ //ins = table.render(option);
+
+ ////鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+
+ option.data = data1.data;
ins = table.render(option);
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumn();
+ layer.close(ajaxLoad);
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
@@ -795,11 +800,10 @@
ColFilter();
}
layer.close(ajaxLoad);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
- }
+ }
}, error: function () {
layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -904,7 +908,7 @@
if (GetDataCols != "") {
sWhere += GetDataCols;
}
- sWhere += addSWhereByOpenType();
+ sWhere += addSWhereByOpenType();
//鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
sWhere += getSWhereByHUser();
@@ -1084,7 +1088,7 @@
//#endregion
- //#region 涓嬫帹锛堢敓浜у叆搴撳崟锛�
+ //#region 涓嬫帹锛堢敓浜у叆搴撳崟锛�
function set_PushProductInBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1105,7 +1109,7 @@
}
if (data[i].琛岀姸鎬� != "" ) {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
}
@@ -1185,8 +1189,8 @@
}
}
//#endregion
-
- //#region 涓嬫帹锛堢敓浜ч��搴撳崟锛�
+
+ //#region 涓嬫帹锛堢敓浜ч��搴撳崟锛�
function set_PushProductionReturnBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1207,7 +1211,7 @@
}
if (data[i].琛岀姸鎬� != "" ) {
- var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
+ var err = "涓嬫帹澶辫触!鍗曟嵁銆�" + data[i].鍗曟嵁鍙� + "銆戠殑鐘舵�佷负鈥�" + data[0].琛岀姸鎬� + "鈥�,涓嶅厑璁镐笅鎺紒";
layer.alert(err, { icon: 5 });
return;
}
@@ -1339,7 +1343,7 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
- }
+ }
// 澶嶅埗
function set_copy() {
@@ -1705,7 +1709,7 @@
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�*/
+ //var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "璁㈠崟鍖呰澶囨敞", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -2022,7 +2026,7 @@
//鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
var HIsClose_Manual = false;
//鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
- var Filter = document.getElementsByClassName(HClassTag);
+ var Filter = document.getElementsByClassName(HClassTag);
var HFilterIdList = "";//杩囨护鏉′欢
var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
@@ -2032,7 +2036,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鑾峰彇鏍囩绫诲瀷
}
@@ -2233,7 +2237,7 @@
//#endregion
-
+
//#endregion
//#region 鑾峰彇婧愬崟-鐢熶骇璁㈠崟鍗曟嵁鐘舵��
@@ -2259,7 +2263,7 @@
}
//#endregion
- //#region 鑾峰彇鍙傛暟
+ //#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -2271,7 +2275,7 @@
return vars;
}
//#endregion
- //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
var params = getUrlVars();
@@ -2307,7 +2311,7 @@
var HRemark = data[0].澶囨敞
//鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
document.getElementById("HFilterScheme_Now").style.display = "block";
- document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
HInterID = data[0].hmainid
//鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
for (let i = 0; i < data.length; i++) {
@@ -2327,7 +2331,7 @@
}
});
}
- //#endregion
+ //#endregion
function GetDataCol(data) {
GetDataCols = data;
--
Gitblit v1.9.1