From 2bb2ec7bb9d2989bbb3b7d6de2d1228c3c4af609 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 25 八月 2021 08:55:23 +0800
Subject: [PATCH] 合并
---
WebTM/views/IpadIndex.html | 195 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 169 insertions(+), 26 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 23d57ad..c2d8933 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -54,7 +54,6 @@
var mychart2 = echarts.init(document.getElementById('mychart2'));
element.on('tab(TabTest)', function (data) {
- console.log(data);
Mychart(mychart1, mychart2);
mychart1.resize();
mychart2.resize();
@@ -64,7 +63,7 @@
});
function TSLoad() {
$("#topleft").html("");
- var HUserName = "Admin" //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
+ var HUserName = sessionStorage["HUserName"]; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
type: "GET",
@@ -84,6 +83,8 @@
html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
+ html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
+ html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
html1 += '</dd>';
html1 += '</dl>';
@@ -112,8 +113,13 @@
}
}
else {
- layer.alert(data.Message, { icon: 5 });
- return false;
+ var html1 = '';
+ html1 += '<div class="layui-col-sm12 layui-col-md3">';
+ html1 += '<div class="cnt ctop" id="ts1" onclick="Check(this,1)">';
+ html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,1)"></span>';
+ html1 += '</div>';
+ html1 += '</div>';
+ $("#topleft").append(html1);
}
},
error: function (err) {
@@ -144,6 +150,7 @@
data: { "HSourceID": HSourceID },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data) {
+
var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
@@ -155,14 +162,19 @@
html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1)+ ')">';
html1 += '<dl>';
html1 += '<dd class="tcenter">';
- html1 += '<h1 style="display:none;"><span>鍗曟嵁鐘舵�侊細</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>鍗曟嵁绫诲瀷锛�</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
+ //HSourceInterID瀹為檯鍙栧�硷細Sc_ICMOBillStatus_Tmp HInterID锛堝崟鎹富ID锛�
html1 += '<h1 style="display:none;"><span>婧愬崟涓诲唴鐮侊細</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟瀛愬唴鐮侊細</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟鍗曞彿锛�</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
html1 += '<h1 style="display:none;"><span>婧愬崟绫诲瀷锛�</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟鍙蜂富ID锛�</span><span id="df' + (i + 1) + '">' + LoadData1[i].HICMOInterID + '</span></h1>';
+ html1 += '<h1 style="display:none;"><span>鐢熶骇璁㈠崟瀛怚D锛�</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
+ html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
+ html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
@@ -198,14 +210,14 @@
html1 += '<div class="layui-col-sm12 layui-col-md12">';
html1 += '<dl class="topright">;'
html1 += '<dt>';
- html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../ layuiadmin/layui/images/erro.png";">';
+ html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../layuiadmin/layui/images/erro.png";">'
html1 += '</dt>';
html1 += '<dd>';
html1 += '<h1><span>褰撳墠璁惧锛�</span><span>' + LoadData2[i].HSourceName + '</span></h1>';
html1 += '<h1><span>褰撳墠璁㈠崟锛�</span><span>' + LoadData2[i].HSourceBillNo + '</span></h1>';
html1 += '<h1><span>鐗╂枡鍚嶇О锛�</span><span>' + LoadData2[i].HMaterName + '</span></h1>';
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData2[i].HPlanQty + '</span></h1>';
- html1 += '<h1><span>浠ユ眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span></h1>';
+ html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span></h1>';
if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null)
{
html1 += '<h1><span>杩涘害锛�</span><span>0%</span></h1>';
@@ -254,7 +266,7 @@
{
return false;
}
- var HUserName = "Admin";
+ var HUserName = sessionStorage["HUserName"];
var HSourceID = body.find("#HSourceID").val();
var HSourceCode = body.find("#HSourceCode").val();
var HSourceName = body.find("#HSourceName").val();
@@ -363,7 +375,9 @@
HSourceEntryID = $("#sb" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟瀛愬唴鍚�)
HSourceBillNo = $("#sw" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟鍗曞彿)
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
-
+ HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
+ HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
+
if (workcode != "" && workcode != null) {
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -531,7 +545,11 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", {icon: 5 });
return false;
}
-
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "寮�宸�"))
+ {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻寮�宸ユ潯浠�!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -540,7 +558,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -568,6 +586,10 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "姹囨姤")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -576,7 +598,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -603,6 +625,11 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "瀹屽伐"))
+ {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻瀹屽伐鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -611,7 +638,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -638,6 +665,11 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "鍋滃伐"))
+ {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻鍋滃伐鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -646,7 +678,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -682,7 +714,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤/Sc_ProductReportBillList.html?hID=&Type=2',
+ content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -691,7 +723,13 @@
data.push({
"workcode": workcode,
"HSourceID": HSourceID1,
- "HSourceName": HSourceName1
+ "HSourceName": HSourceName1,
+ "HICMOInterID": HICMOInterID,
+ "HICMOEntryID": HICMOEntryID,
+ "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
+ "Czybm": sessionStorage["Czybm"],
+ //"HEmpID": "0", //sessionStorage["HEmpID"]
+ "HSourceBillType": HSourceBillType
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -701,7 +739,112 @@
},
});
}
+
+ //棣栨妫�楠�
+ function OpenFistCheck(event, obj)
+ {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '棣栦欢妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType, 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ , end: function () {
+
+ }
+ })
+ }
+
+ //杩囩▼妫�楠�
+ function OpenProcess(event, obj)
+ {
+ if (wktag == 0) {
+ layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
+ return false;
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID +'&HSouceBillType=' + HBillType, 'yes']
+ , resize: false
+ , cancel: function () {
+
+ }
+ , end: function () {
+
+ }
+ })
+ }
+
+ //閫�鍑�
+ function Esc(event, obj)
+ {
+ parent.location.href = "index.html"
+
+ }
+
+ //鍗曟嵁鐘舵�侀獙璇�
+ function WorkStaus(HSourceID1, workcode,HSourceInterID,btn)
+ {
+ var flag = false;
+ var sWhere = "";
+ switch (btn) {
+ case "寮�宸�":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID+"' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ュ紑宸ョ姸鎬併�佸仠宸ョ姸鎬�
+ break;
+ case "瀹屽伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸畬宸ョ姸鎬�
+ break;
+ case "鍋滃伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1')"; //鏄惁鏈変笉涓哄仠宸ユ寕璧风姸鎬�
+ break;
+ case "姹囨姤":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
+ break;
+ case "鎶ユ鐢宠":
+
+ break;
+ default:
+ }
+
+ $.ajax({
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
+ type: "GET",
+ data: { "sWhere": sWhere},
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ async: false,
+ success: function (data) {
+
+ if (data.count > 0)
+ {
+ flag = true;
+
+ }
+ else {
+ flag =false;
+ }
+ },
+ error: function (err)
+ {
+ flag = false;
+ }
+ });
+ return flag;
+ }
</script>
</head>
@@ -741,11 +884,11 @@
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
<ul class="layui-tab-title">
<li class="layui-this">宸ュ崟鍒楄〃</li>
- <li>鏁堢巼/涓嶈壇鍒嗘瀽</li>
+ <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">鏁堢巼/涓嶈壇鍒嗘瀽</li>
</ul>
<div class="layui-tab-content content3">
<div class="layui-tab-item layui-show">
- <div class="layui-row layui-col-space10" id="btomleft">
+ <div class="layui-row layui-col-space10" id="btomleft" style="height:600px;display:block;overflow-y:auto;">
</div>
</div>
@@ -791,7 +934,7 @@
</div>
</div>
<div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenFistCheck(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-search imgicon"></span>
<span class="imgtitle">棣栨</span>
@@ -803,15 +946,15 @@
<span class="imgtitle">宸℃</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-search imgicon"></span>
<span class="imgtitle">杩囩▼妫�楠�</span>
</div>
</div>
</div>
- <div class="layui-row layui-col-space10" onclick="OpenInSpection(event,this)">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenInSpection(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-release imgicon"></span>
<span class="imgtitle">鎶ユ鐢宠</span>
@@ -824,14 +967,14 @@
</div>
</div>
<div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
<span class="layui-icon layui-icon-chart imgicon"></span>
<span class="imgtitle">涓嶈壇閲囬泦</span>
</div>
</div>
</div>
- <div class="layui-row layui-col-space10" onclick="OpenStop(event,this)">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-play imgicon"></span>
<span class="imgtitle">鍋滃伐</span>
@@ -843,7 +986,7 @@
<span class="imgtitle">寮傚父</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-close imgicon"></span>
<span class="imgtitle">閫�鍑�</span>
--
Gitblit v1.9.1