From 2c6f955ecb57ab18f2c211f4feef38b4cdece43c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 31 一月 2024 14:29:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 185 +++++++++++++++++++++++-------------
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 12 +-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 19 ++-
WebTM/views/IpadIndex.html | 66 ++++++++++---
4 files changed, 189 insertions(+), 93 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 0864503..7745b58 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -38,6 +38,9 @@
var HICMOBillNo = ""; //浠诲姟鍗曞彿
var HMaterName = ""; //浜у搧鍚嶇О
var HMaterID = 0; //浜у搧ID
+ var HProQty = []; //鏃堕棿鐐逛骇閲�
+ var HBadQty = []; //涓嶈壇鏁伴噺
+ var HBadReason = []; //涓嶈壇鍘熷洜
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
base: '../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -51,9 +54,9 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
-
- var mychart1 = echarts.init(document.getElementById('mychart1'));
- var mychart2 = echarts.init(document.getElementById('mychart2'));
+ //window 鍏ㄥ眬鍙橀噺
+ window.mychart1 = echarts.init(document.getElementById('mychart1'));
+ window.mychart2 = echarts.init(document.getElementById('mychart2'));
element.on('tab(TabTest)', function (data) {
Mychart(mychart1, mychart2);
@@ -64,7 +67,7 @@
TSLoad();
});
function TSLoad() {
- $("#topleft").html("");
+ $("#topleft").html("");
var HUserName = sessionStorage["HUserName"]; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
@@ -139,6 +142,9 @@
wktag = 0;
$("#btomleft").html("");
$("#topright").html("");
+ HProQty = []; //鏃堕棿鐐逛骇閲�
+ HBadQty = []; //涓嶈壇鏁伴噺
+ HBadReason = []; //涓嶈壇鍘熷洜
var partid = $(obj).parent().attr("id"); //鑾峰彇鐖剁骇id
var eqpid = "eqpid" + i; //鑾峰彇鎸囧畾璧勬簮鏍峰紡ID
var HSourceID = $("#" + eqpid + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
@@ -159,6 +165,8 @@
var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
+ var LoadData3 = data.data.h_p_JIT_GetWorkBillListInfoBySource2; //鏃堕棿鐐逛骇閲�
+ var LoadData4 = data.data.h_p_JIT_GetWorkBillListInfoBySource3; //涓嶈壇鍒嗘瀽
if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
{
@@ -240,13 +248,40 @@
$("#topright").append(html1);
}
}
+ if (LoadData3.length > 0) //褰撳墠鐘舵�佹暟鎹�
+ {
+ let k = 0; //LoadData3 鏁版嵁鏁扮粍鐨勪笅鏍�
+ for (let i = 8; i < 21; i++) {
+ let IsAdd = false; //鏄惁瑕佺疮鍔� LoadData3 鏁版嵁鏁扮粍鐨勪笅鏍囧��
+ for (let j = 0; j < LoadData3.length; k) {
+ if (i == LoadData3[k].鏃堕棿鐐�) { //濡傛灉 i锛�8--20锛� 鏃堕棿鐐规湁浜ч噺锛屽垯鎶婁骇閲忓啓鍏ユ暟缁� HProQty锛屽惁鍒欏啓鍏� 0
+ HProQty.push(LoadData3[k].浜ч噺)
+ IsAdd = true;
+ break;
+ } else {
+ HProQty.push(0)
+ break;
+ }
+ }
+ if (k < LoadData3.length - 1 && IsAdd == true) {
+ k++;
+ }
+ }
+ }
+ if (LoadData4.length > 0) {
+ for (let i = 0; i < LoadData4.length; i++) {
+ HBadReason.push(LoadData4[i].涓嶈壇鍘熷洜);
+ HBadQty.push(LoadData4[i].涓嶈壇鏁伴噺);
+ }
+ }
+ //鍒锋柊鍥捐〃鏁版嵁
+ Mychart(mychart1, mychart2);
},
error: function (err) {
layer.alert(err.Message, { time: 1 * 2000, icon: 5 });
return false;
}
});
-
}
}
@@ -392,6 +427,7 @@
function Mychart(mychart1, mychart2) {
+ //鐢熶骇鏁堢巼
option1 = {
title: {
text: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�'
@@ -416,7 +452,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00']
+ data: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00']
},
yAxis: {
type: 'value'
@@ -426,14 +462,14 @@
name: '褰撳墠璁惧鏃ョ敓浜ф晥鐜�',
type: 'line',
stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
+ data: HProQty
}
]
};
-
+ //涓嶈壇鍒嗘瀽
option2 = {
title: {
- text: '褰撳墠璁惧褰撴棩涓嶈壇鍘熷洜瀵规瘮'
+ text: '褰撳墠璁惧鏈懆涓嶈壇鍘熷洜瀵规瘮'
},
legend: {
data: ['涓嶈壇鍘熷洜']
@@ -445,7 +481,7 @@
containLabel: true
},
xAxis: {
- data: ['涓嶈壇1', '涓嶈壇浜�', '涓嶈壇涓�', '涓嶈壇鍥�']
+ data: HBadReason
},
yAxis: {},
series: [{
@@ -454,7 +490,7 @@
itemStyle: {
normal: {
color: function (params) {
- var colorList = ['#2eddc1', '#FCCE10', '#E87C25', '#27727B', '#9efdc6'];
+ var colorList = ['#2eddc1', '#FCCE10', '#E87C25', '#27727B', '#9efdc6', '#F00DC6', '#8317E5', '#29086A', '#D8E848', '#17ADE5', '#FF1F86', '#A27E90', '#71BCCE', '#11715012', '#DBF7B2',];
return colorList[params.dataIndex]
},
label: {
@@ -464,7 +500,7 @@
}
}
},
- data: [220, 182, 191, 234]
+ data: HBadQty
}]
};
@@ -778,7 +814,7 @@
if (wktag == 0) {
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
- }
+ }
var IsCheck = false;
@@ -837,7 +873,7 @@
});
}
-
+
}
//涓婃枡闃查敊鍗�
@@ -1038,7 +1074,7 @@
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
<li class="layui-this">宸ュ崟鍒楄〃</li>
- <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">鏁堢巼/涓嶈壇鍒嗘瀽</li>
+ <li>鏁堢巼/涓嶈壇鍒嗘瀽</li><!--style="pointer-events: none; background-color:rgb(0 0 0 / 10%);"-->
</ul>
<div class="layui-tab-content content3">
<div class="layui-tab-item layui-show">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 2eafb93..c44bbb1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -223,6 +223,8 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery(2);
+ //瀛樺偍鏉′欢
+ get_WriteConfigFile();
});
//#endregion
@@ -247,11 +249,9 @@
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鍒濆鍖� 閰嶇疆
- get_ReadConfigFile();
//鏌ヨ
get_FastQuery(1);
-
+
}
//#endregion
@@ -260,6 +260,7 @@
//鑾峰彇鐧诲綍椤电粍缁囧垪
$.ajax({
type: "get",
+ async: false,
url: GetWEBURL() + "/Web/GetOrganizations",
success: function (result) {
var Organization = "";
@@ -358,9 +359,6 @@
}
table.render(option);
- //瀛樺偍鏉′欢
- get_WriteConfigFile();
-
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -368,6 +366,8 @@
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
+ //鍒濆鍖� 閰嶇疆
+ get_ReadConfigFile();
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
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 3d3e0ae..9aff68b 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"
@@ -29,6 +29,7 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
@@ -350,7 +351,10 @@
});
return layer.msg("鎺掍骇鏁伴噺澶т簬璁㈠崟鏁伴噺!")
}
-
+
+ if (Date.parse(obj.field) > Date.parse(obj.data.璁″垝缁撴潫鏃ユ湡)) {
+ return layer.msg("鎺掍骇鏃ユ湡瓒呭嚭璁″垝缁撴潫鏃ユ湡!");
+ }
//淇敼鏁版嵁
@@ -632,6 +636,12 @@
}
})
+ //宸ヨ壓璺嚎缂栬緫
+ form.on('submit(btnRoutEdit)', function (data) {
+ get_btnRoutEdit();
+ })
+
+
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
@@ -756,127 +766,127 @@
columns.push({
field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')],d,Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({
field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
- return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')]);
+ return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
} })//0
columns.push({ field: 'T31', title: 'T31', width: 70 });//0
@@ -921,28 +931,24 @@
, cellMinWidth: 90
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
- //, done: function (res, page, count) {
- // var that = this.elem.next();
- // res.data.forEach(function (item, index) {
- // var NumCount = item.FBASEQTY;//鑾峰彇鎬诲簱瀛樻暟閲�
- // for (var i = 0; i < Days; i++) {
- // var dateNowTime = Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + i), 'yyyy-MM-dd');
- // if (item[dateNowTime] != null) {
- // if (NumCount > parseFloat(item[dateNowTime])) {
- // NumCount -= parseFloat(item[dateNowTime]);
- // } else {
- // var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
- // tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
- // rq = tr.children()[num + 1 + i];
- // rq.style.color = '#f66161';//鐒跺悗鍙樿壊
- // rq = tr.children()[num];
- // rq.style.color = '#f66161';//鐒跺悗鍙樿壊
- // }
- // }
- // }
- // });
- // $('.layui-table-cell').css({ 'height': 'auto' });
- //}
+ , done: function (res, page, count) {
+ //res.data.forEach(function (item, index) {
+ // if (data1.data.DataColor != undefined) {
+ // var sj = data1.data.DataColor;
+ // //绂佺敤澶嶉�夋锛岃缃笉鍙�変腑鏍囪瘑锛屽皢璇ヨ璁剧疆涓洪槾褰辫壊
+ // var tr = $(".layui-table tr[data-index=" + index + "]");
+ // var td = tr.children('td'); //鑾峰彇tr涓嬫墍鏈夌殑td
+ // if (sj.length > index) {
+ // for (var i = 1; i < td.length; i++) {
+ // var title = option.cols[0][i].field;
+ // if (sj[index][title] != "" && sj[index][title] != null) {
+ // td.eq(i).css("background-color", sj[index][title]);
+ // }
+ // }
+ // }
+ // }
+ //})
+ }
};
}
@@ -1107,7 +1113,7 @@
}
//鏁伴噺鏍囪棰滆壊
- function DayColor(DaySate, DayHQty) {
+ function DayColor(DaySate, DayHQty,Data,NowData) {
if (DaySate == "榻愬" || DaySate == "鏈綈濂�") {
if (DaySate == "榻愬") {
return "<span style='color:green;'>" + DayHQty + "</span>";
@@ -1119,6 +1125,9 @@
if (DayHQty == null) {
return "<span></span>";
} else {
+ if (Data[NowData] > 0 && Data[NowData] != null && Data[NowData] != "" && Date.parse(Data["璁″垝缁撴潫鏃ユ湡"]) < Date.parse(NowData)) {
+ return "<span style='background-color:#f48888;width:100%;display: inline-block;'>" + DayHQty + "</span>";
+ }
return "<span>" + DayHQty + "</span>";
}
}
@@ -1549,6 +1558,48 @@
});
}
+ //宸ヨ壓璺嚎缂栬緫
+ function get_btnRoutEdit() {
+ var CheckStatus = table.checkStatus("mainTable");
+ if (CheckStatus.data.length == 1) {
+ var HSouceID = CheckStatus.data[0]["HSourceID"];
+ var HMaterID = CheckStatus.data[0]["HMaterID"];
+ var sWhere = " select a.HInterID from Gy_RoutingBillMain a inner join Gy_RoutingBillSub b on a.HInterID = b.HInterID and a.HStandard = 1 inner join Gy_Process p on b.HProcID = p.HItemID and HTProcessFlag = 0 inner join Gy_WorkCenter w on b.HCenterID = w.HItemID inner join(select HCenterID from Gy_Source where HItemID = " + HSouceID + ")s on s.HCenterID = w.HItemID where a.HMaterID = " + HMaterID;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var HInterID = data.data[0]["HInterID"];
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璺嚎-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=3301'
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ //location.reload();
+ }
+ })
+
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ });
+ } else {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹繘琛屽伐鑹鸿矾绾跨紪杈�");
+ }
+ }
//鎺掍骇
function get_btnProPC(HWorkShopID) {
@@ -2377,20 +2428,20 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
-
- var num = 0;
- for (var i = 0; i < option.data.length; i++) {
- if (num >= data.length) {
- break;
+ if (OptionData.length > 0) {
+ var num = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ if (num >= data.length) {
+ break;
+ }
+ if (option.data[i]["LAY_CHECKED"] == true) {
+ option.data[i]["HSourceID"] = OptionData.HItemID;
+ option.data[i]["鐢熶骇璧勬簮"] = OptionData.鐢熶骇璧勬簮鍚嶇О;
+ num += 1;
+ }
}
- if (option.data[i]["LAY_CHECKED"] == true) {
- option.data[i]["HSourceID"] = OptionData.HItemID;
- option.data[i]["鐢熶骇璧勬簮"] = OptionData.鐢熶骇璧勬簮鍚嶇О;
- num += 1;
- }
+ table.render(option);
}
- table.render(option);
-
//obj.update({
// "HSourceID": OptionData.HItemID
// , "鐢熶骇璧勬簮": OptionData.鐢熶骇璧勬簮鍚嶇О
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 30f5bae..bb8dc11 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -601,8 +601,15 @@
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
+ get_DisplaySub(obj.data);
+
+ });
- var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ //#endregion
+
+ //鏌ヨ瀛愯〃鏁版嵁
+ function get_DisplaySub(obj) {
+ var datas = obj; //鑾峰緱褰撳墠琛屾暟鎹�
HBillNo = datas["鍗曟嵁鍙�"].toString();
var HMainID = datas.hmainid;
var wait = layer.load();
@@ -695,10 +702,7 @@
});
DisPlay_HideColumn_Sec();
set_ClearBillHMainID(HMainID); //鍣ㄥ叿娓呭崟
- });
-
- //#endregion
-
+ }
function set_ClearBillHMainID(HMainID) {
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
@@ -1147,6 +1151,11 @@
ColFilter();
}
+ //鏈夋暟鎹殑鎯呭喌涓�,榛樿鏄剧ず绗竴鏉＄殑鏄庣粏鏁版嵁
+ if (data1.data.length > 0) {
+ get_DisplaySub(data1.data[0]);
+ }
+
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
--
Gitblit v1.9.1