From c732ce2bca16b24fc94ace6850544065986014e4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 20 十月 2023 16:49:52 +0800
Subject: [PATCH] 缺料分析报表 双击 显示 物料的明细信息 采购订单 生产订单 流转卡
---
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 24 ++
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 159 +++++++++----
WebTM/views/index.html | 1
WebTM/views/生产管理/齐套分析/JIT_CompleteMaterlDetailList.html | 487 ++++++++++++++++++++++++++++++++++++++++
WebTM/WebTM.csproj | 1
5 files changed, 623 insertions(+), 49 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cdc6c79..83b2c78 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -273,6 +273,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSet.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇宸ヤ綅\Gy_SourceWorkStationSetList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
+ <Content Include="views\鐢熶骇绠＄悊\榻愬鍒嗘瀽\JIT_CompleteMaterlDetailList.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 99a8681..1b309a7 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -338,6 +338,7 @@
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
<!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
<dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html" style="margin: 0 0 0 13px;">榻愬鐗╂枡淇℃伅鏄庣粏鍒楄〃</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html" style="margin: 0 0 0 13px;">宸ュ巶鏃ュ巻</a></dd>
</dl>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 869b2d9..6f8f30f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -246,6 +246,7 @@
var dd = myDate.getDate();
var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
var dateHQty = 0;
+ var SumHQty = 0;//鎷嗗崟鏁伴噺
for (var i = 0; i <= (SumMonth - dd); i++) {
if (obj.field == "鐢熶骇璧勬簮") {
@@ -261,16 +262,38 @@
}
}
+ //鏌ヨ鎵�鏈夋暟鎹浉鍚岀殑璁㈠崟
+ for (var i = 0; i < option.data.length; i++) {
+ if (obj.data["鐢熶骇璁㈠崟鍙�"] == option.data[i]["鐢熶骇璁㈠崟鍙�"] && obj.data["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] == option.data[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+ SumHQty += parseInt(option.data[i]["鎷嗗崟鏁伴噺"]);
+ }
+ }
+
+ if (obj.value == "0" && obj.field == "鎷嗗崟鏁伴噺") {
+ return layer.msg("鎷嗗崟鏁伴噺涓嶈兘涓�0!");
+ }
+
+ if (SumHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
+ obj.update({
+ "鎷嗗崟鏁伴噺": "0"
+ });
+ return layer.msg("鎷嗗崟鏁伴噺澶т簬璁㈠崟鏁伴噺!");
+ }
+
+ var NowDate = obj.field;
if (dateHQty > (parseInt(obj.data["璁″垝鏁伴噺"]))) {
obj.update({
- "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty - obj.value,
+ [NowDate]: 0
});
return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
}
+
+
//淇敼鏁版嵁
obj.update({
- "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty
+ "鏃ヨ鍒掓暟閲忔�婚噺": dateHQty,
});
})
@@ -279,45 +302,8 @@
btnrowDouble(obj.data);
})
- var objData = "";
//鐐瑰嚮琛岄�変腑鏁版嵁
table.on('row(mainTable)', function (obj) {
-
- //if (objData != "" && objData.tr.find(':checkbox:first').prop('checked') != obj.tr.find(':checkbox:first').prop('checked')) {
- // objData.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- // objData.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- // layui.each(table.cache.mainTable, function (i, l) {
- // if (objData.tr.index() == l.LAY_TABLE_INDEX) {
- // l.LAY_CHECKED = false;
- // }
- // });
- //}
-
- //var flag = !obj.tr.find(':checkbox:first').prop('checked');
- //obj.tr.find(':checkbox').prop('checked', flag);
- //if (flag) {
- // obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
- //} else {
- // obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- // obj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
- //}
- ////mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
- //layui.each(table.cache.mainTable, function (i, l) {
- // if (obj.tr.index() == l.LAY_TABLE_INDEX) {
- // l.LAY_CHECKED = flag;
- // }
- //});
-
- //for (var i = 0; i < table.cache["mainTable"].length; i++) {
- // if (table.cache["mainTable"][i]["鐢熶骇璁㈠崟鍙�"] != obj.data["鐢熶骇璁㈠崟鍙�"]) {
- // table.cache["mainTable"][i].LAY_CHECKED = false;
- // }
- //}
- //option.data = table.cache["mainTable"];
- //table.render(option);
-
-
- //objData = obj;
//閫変腑琛屾敼鍙橀鑹�
var flag = !obj.tr.find(':checkbox:first').prop('checked');
@@ -354,6 +340,39 @@
data[0]["HSourceID"] = "";
data[0]["hmainid"] = "";
data[0]["鍗曟嵁鍙�"] = "";
+
+ var myDate = new Date();
+ //鑾峰彇骞�
+ var yyyy = myDate.getFullYear();
+ //鑾峰彇鏈堜唤
+ var MM = myDate.getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = myDate.getDate(); //鑾峰彇褰撳ぉ鏃ユ湡澶╂暟
+ var columns=[]
+ var k = 0;//鏀堕泦寰幆娆℃暟
+ for (var j = 0; j <= (30 - k); j++) {
+
+ data[0][Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')] = "";
+
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
+ }
+
var copydata = JSON.stringify(data);
var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
@@ -572,19 +591,19 @@
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;' });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150 });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text' });
- columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width:150 });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width:150 });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width:150 });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width:150 });
- columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width:150 });//0
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150 });//0
columns.push({field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150});//0
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>"});
- columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, event: "HPlanEndDate"});
- columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+ columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, event: "HPlanEndDate" });
+ columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150});
+ columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text' });
+ columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺'});
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150});
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
@@ -734,14 +753,16 @@
columns.push({ field: '鐢靛帇/鍔熺巼/搴曟澘', title: '鐢靛帇/鍔熺巼/搴曟澘', width: 150 });
columns.push({ field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 150 });
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
- columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150 });
columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
columns.push({ field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 150, hide: true });
columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
- columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+ columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+ columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
+ columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
+ columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option = {
@@ -1261,7 +1282,10 @@
if (isNaN(data[i]["HICMOInterID"])) {
return layer.msg("璇峰厛杩涜淇濆瓨!!")
}
- HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"]);
+ if (isNaN(data[i]["HSourceID"])) {
+ return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
+ }
+ HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
}
$('#HProgressBar').html(`
<div class="layui-progress" lay-filter="demo-filter-progress">
@@ -1273,7 +1297,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
type: "GET",
- data: { "HICOMNum": HICOMNum.toString() },
+ data: { "SWhere": HICOMNum.toString() },
success: function (data1) {
if (data1.count == 1) {
for (var i = 0; i < data1.data.length; i++) {
@@ -2075,7 +2099,7 @@
function set_Priority() {
var data = table.cache["mainTable"];
for (var i = 0; i < data.length; i++) {
- data[i]["浼樺厛绾�"] = (i + 1);
+ data[i]["浼樺厛绾�"] = ((i + 1) * 5);
}
option.data = data;
table.render(option);
@@ -2083,7 +2107,41 @@
//鍑嗗鎺掑簭
function set_ReadyAsc() {
+ if (option.data.length != 0) {
+ for (var i = 0; i < option.data.length - 1; i++) {
+ for (var j = 0; j < option.data.length - i - 1; j++) {
+ var tables = [];
+ //鎸夌収璁″垝缁撴潫鏃ユ湡 鐢熶骇璁㈠崟鍙� 鐢熶骇璁㈠崟鏄庣粏琛屽彿鐨勯『搴忓幓鎺�
+ if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] > option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ } else if (option.data[j]["璁″垝缁撴潫鏃ユ湡"] == option.data[j + 1]["璁″垝缁撴潫鏃ユ湡"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鍙�"] > option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ } else if (option.data[j]["鐢熶骇璁㈠崟鍙�"] == option.data[j + 1]["鐢熶骇璁㈠崟鍙�"]) {
+ if (option.data[j]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"] > option.data[j + 1]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"]) {
+
+ tables.push(option.data[j + 1]);
+ option.data[j + 1] = option.data[j];
+ option.data[j] = tables[0];
+
+ }
+ }
+ }
+ }
+ }
+ table.render(option);
+ }
+ else {
+ return layer.msg("鏃犳暟鎹�!")
+ }
}
//淇濆瓨
@@ -2093,8 +2151,11 @@
var num = [];
for (var i = 0; i < table.cache["mainTable"].length; i++) {
if (table.cache["mainTable"][i] != "") {
+ if (parseFloat(table.cache["mainTable"][i]["鎷嗗崟鏁伴噺"]) == 0) {
+ return layer.msg("绗�" + (i + 1) + "琛�,鎷嗕骇鏁伴噺鏈夎,璇烽噸鏂拌緭鍏�!");
+ }
if (parseFloat(table.cache["mainTable"][i]["璁㈠崟鍙帓鏁伴噺"]) < parseFloat(table.cache["mainTable"][i]["鏃ヨ鍒掓暟閲忔�婚噺"]) + parseFloat(table.cache["mainTable"][i]["浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�"])) {
- return layer.msg("绗�" + (i + 1) + "琛屾帓浜ф暟閲忚秴鍑鸿鍗曟暟閲�!");
+ return layer.msg("绗�" + (i + 1) + "琛�,鎺掍骇鏁伴噺瓒呭嚭璁㈠崟鏁伴噺!");
}
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index 8ce6720..afe5bc3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -195,6 +195,11 @@
});
//#endregion
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -239,6 +244,8 @@
, { field: '榻愬鐘舵��', title: '榻愬鐘舵��' }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
, { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺' }
+ , { field: '閲囪喘鍦ㄩ��', title: '閲囪喘鍦ㄩ��' }
+ , { field: '鐢熶骇鏈叆搴�', title: '鐢熶骇鏈叆搴�' }
, { field: '棰嗘枡鍗犵敤鏁伴噺', title: '棰嗘枡鍗犵敤鏁伴噺' }
, { field: '鍙敤鏁伴噺', title: '鍙敤鏁伴噺' }
, { field: '鍗犵敤鏁伴噺', title: '鍗犵敤鏁伴噺' }
@@ -373,6 +380,23 @@
}
+
+ //鍙屽嚮璺宠浆榻愬鍒嗘瀽鏄庣粏琛�
+ function btnrowDouble(obj) {
+
+ var HMaterID = obj["鐗╂枡ID"];
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , area: ['90%', '90%']//澶у皬
+ , title: '榻愬鐗╂枡鍒嗘瀽鏄庣粏琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html?OperationType=1&HMaterID=' + HMaterID, 'yes']
+ })
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn(value) {
var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterlDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterlDetailList.html"
new file mode 100644
index 0000000..9ba7f25
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteMaterlDetailList.html"
@@ -0,0 +1,487 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>榻愬鐗╂枡淇℃伅鏄庣粏鍒楄〃</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
+ <!--<div class="layui-inline" style="margin-left:30px">
+ <label class="layui-form-label">榻愬鐘舵��</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HComplete" id="HComplete" lay-filter="HComplete">
+ <option value="">鍏ㄩ儴</option>
+ <option value="榻愬">榻愬</option>
+ <option value="鏈綈濂�">鏈綈濂�</option>
+ </select>
+ </div>
+ </div>-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掓棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HPlanDate" style="width:190px;">
+ </div>
+ </div>-->
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--<div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 100px;">鏈夋棤閲囪喘璁㈠崟</label>
+ <div class="layui-input-block" style="width: 190px; margin-left: 130px;">
+ <select name="" lay-filter="">
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+ <option value="鏈夐噰璐鍗�">鏈夐噰璐鍗�</option>
+ <option value="鏃犻噰璐鍗�">鏃犻噰璐鍗�</option>
+ </select>
+ </div>
+ </div>
+ </div>-->
+ <!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閿�鍞鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ </div>-->
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , tree = layui.tree
+ , util = layui.util
+ var sWhere = "";
+ var option = [];
+ var HMaterID = 0;//鐗╂枡
+ var HModName = "JIT_CompleteMaterlDetailList";
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]];
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+ if (!isNaN(OperationType)) {
+ HMaterID = params[params[1]];
+ }
+
+ set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 鐗╂枡
+ form.on('submit(btnHMaterNumber)', function (data) {
+ btnHMaterNumber();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
+ //鏌ヨ
+ get_Display(HMaterID);
+ }
+ //#endregion
+
+
+ //#region 鏌ヨ
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/JIT_Complete/JIT_CompleteMaterlDetailList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(ajaxLoad);
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ 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;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ //for (var i in res.data) {
+ // var item = res.data[i];
+
+ // if (item["榻愬鐘舵��"] == "鏈綈濂�") {
+ // $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ // }
+ //}
+ }
+ };
+ option.cols = [col];
+ option.data = result.data;
+ table.render(option);
+
+ DisPlay_HideColumn();
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HMaterID = $("#HMaterID").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterName = $("#HMaterName").val();
+ var HMaterModel = $("#HMaterModel").val();
+ var HComplete = $("#HComplete").val();
+ var HPlanDate = $("#HPlanDate").val();
+ var HICMOBillNo = $("#HICMOBillNo").val();
+
+ if (HMaterID!="0") {
+ sWhere += HMaterID;
+ }
+ //if (HMaterNumber) {
+ // sWhere += " and 鐗╂枡缂栫爜 like '%" + HMaterNumber + "%'";
+ //}
+ //if (HMaterName) {
+ // sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ //}
+ //if (HMaterModel) {
+ // sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HMaterModel + "%'";
+ //}
+ //if (HComplete) {
+ // sWhere += " and 榻愬鐘舵�� = '" + HComplete + "'";
+ //}
+ //if (HPlanDate) {
+ // sWhere += " and 鏃ヨ鍒掓棩鏈� = '" + HPlanDate + "'";
+ //}
+ //if (HICMOBillNo) {
+ // sWhere += " and 鐢熶骇璁㈠崟鍙� = '" + HICMOBillNo + "'";
+ //}
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HMaterID").val("0");
+ $("#HMaterNumber").val("");
+ $('#HComplete').val("");
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ form.render('select');
+ sWhere = "";
+ }
+ //#endregion
+
+ //鐗╂枡鍒楄〃
+ function btnHMaterNumber() {
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterModel").val(checkStatus.data[0].HModel);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+
+ }
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn(value) {
+ var colName = "";
+
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ var contentUrl = "";
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹� 鐗╂枡淇℃伅
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ async: false,
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+</script>
\ No newline at end of file
--
Gitblit v1.9.1