From 073c695d21829fa8aaa0792c84b7ab48f31f8ed4 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 19 一月 2022 00:46:31 +0800
Subject: [PATCH] 雅琪诺报工台产量汇报修改
---
WebTM/views/IpadStepIndex.html | 178 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 84 insertions(+), 94 deletions(-)
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 6e49d4a..8488760 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -35,6 +35,7 @@
var HSourceBillType = ""; //婧愬崟绫诲瀷
var HICMOInterID = ""; //鐢熶骇璁㈠崟涓诲唴鐮�
var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛愬唴鐮�
+ var HProcID = ""; //宸ュ簭ID
var HICMOBillNo = ""; //浠诲姟鍗曞彿
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
@@ -65,7 +66,7 @@
$("#topleft").html("");
var HUserName = sessionStorage["HUserName"]; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
- url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
+ url: GetWEBURL() + "/ReportStepPlatForm/SearchGetLineBindStepBillList",
type: "GET",
data: { "HUserName": HUserName },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
@@ -146,7 +147,7 @@
$("#ts" + i + "").addClass('check'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
//鎵ц鑱斿姩浜嬩欢
$.ajax({
- url: GetWEBURL() + "/ReportPlatForm/SearchGetWorkBillList",
+ url: GetWEBURL() + "/ReportStepPlatForm/SearchGetWorkStepBillList",
type: "GET",
data: { "HSourceID": HSourceID },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
@@ -171,7 +172,7 @@
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 style="display:none;"><span>宸ュ簭ID锛�</span><span id="ps' + (i + 1) + '">' + LoadData1[i].HProcID + '</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>';
@@ -179,16 +180,16 @@
html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty+'</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
case "鐢熶骇涓�":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border2"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
case "鎸傝捣":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border1"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
case "瀹屽伐":
- html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
+ html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border4"></span><span>' + LoadData1[i].HICMOStatus + '</span><span style="margin-left:20px;">宸ュ簭锛�</span><span>' + LoadData1[i].HProcName +'</span></h1>';
break;
default:
}
@@ -227,7 +228,8 @@
html1 += '<h1><span>杩涘害锛�</span><span>' + (LoadData2[i].HRelationQty / LoadData2[i].HPlanQty) * 100 + '%</span></h1>';
}
html1 += '<h1><span>鏈崟杩愯鏃堕棿锛�</span><span>' + getSeconds(LoadData2[i].HSumTimes) + '</span></h1>';
- html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';
+ html1 += '<h1><span>褰撳墠宸ュ簭锛�</span><span>' + LoadData2[i].HProcName + '</span></h1>';
+ /*html1 += '<h1><span>鏈祫婧愯繍琛屾椂闂达細</span><span>' + getSeconds(LoadData2[i].HSourceWorkTime) + '</span></h1>';*/
html1 += '</dd>';
html1 += '</dl>';
html1 += '</div>';
@@ -255,7 +257,7 @@
, shadeClose: false //寮�鍚伄缃╁叧闂�
, shade: 0.5
, maxmin: true
- , content: ['鐢熶骇绠＄悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBind.html', 'yes']
+ , content: ['鐢熶骇绠＄悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBindStep.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero, e) {
@@ -278,7 +280,7 @@
var HRemark = body.find("#HRemark").val();
$.ajax(
{
- url: GetWEBURL() + "/ReportPlatForm/SaveGetLineBindBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/ReportStepPlatForm/SaveGetLineBindStepBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
dataType: "json",
type: "Get",
async: false,
@@ -338,7 +340,7 @@
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
- url: GetWEBURL() + "/ReportPlatForm/DeleteGetLineBindBillList",
+ url: GetWEBURL() + "/ReportStepPlatForm/DeleteGetLineBindStepBillList",
type: "GET",
data: { "HSourceID": HSourceID },
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
@@ -373,7 +375,8 @@
HSourceBillType = $("#st" + i + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(婧愬崟绫诲瀷)
HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
-
+ HProcID = $("#ps" + i + "").html(); //宸ュ簭ID
+ console.log(HProcID);
if (workcode != "" && workcode != null) {
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
@@ -551,7 +554,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -591,7 +594,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -612,6 +615,7 @@
},
});
}
+
//瀹屽伐鍗曟寜閽偣鍑讳簨浠�
function OpenEnd(event, obj) {
if (wktag == 0) {
@@ -630,7 +634,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -651,6 +655,7 @@
},
});
}
+
//鍋滃伐鍗曟寜閽偣鍑讳簨浠�
function OpenStop(event, obj) {
if (wktag == 0) {
@@ -669,7 +674,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -705,7 +710,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -720,6 +725,48 @@
"HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
"Czybm": sessionStorage["Czybm"],
//"HEmpID": "0", //sessionStorage["HEmpID"]
+ "HSourceInterID": HSourceInterID,
+ "HSourceBillType": HSourceBillType,
+ "HProcID": HProcID
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
+ //杩斿伐鐢宠鍗曟寜閽偣鍑讳簨浠�
+ function OpenReturn(event, obj) {
+ if (wktag == 0) {
+ 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', //鍔犱笂杈规
+ title: '鏂板杩斿伐鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HBillType": HBillType,
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
"HSourceBillType": HSourceBillType
});
@@ -767,52 +814,6 @@
});
}
- //棣栨妫�楠�
- 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 + '&HICMOEntryID=' + HSourceEntryID, '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 + '&HICMOEntryID=' + HSourceEntryID, 'yes']
- , resize: false
- , cancel: function () {
-
- }
- , end: function () {
-
- }
- })
- }
//涓嶈壇閲囬泦
function BadGather() {
@@ -900,6 +901,9 @@
break;
case "鎶ユ鐢宠":
+ break;
+ case "杩斿伐":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('0','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
break;
default:
}
@@ -996,19 +1000,25 @@
<legend style="color: #5FB878">鎿嶄綔鍙�</legend>
<div class="content4">
<div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenWork(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenWork(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-pause imgicon"></span>
<span class="imgtitle">寮�宸�</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenReport(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenStop(event,this)">
+ <div class="cnt bottomright">
+ <span class="layui-icon layui-icon-play imgicon"></span>
+ <span class="imgtitle">鍋滃伐</span>
+ </div>
+ </div>
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenReport(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-list imgicon"></span>
<span class="imgtitle">姹囨姤</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenEnd(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenEnd(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-logout imgicon"></span>
<span class="imgtitle">瀹屽伐</span>
@@ -1016,39 +1026,25 @@
</div>
</div>
<div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenFistCheck(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenReturn(event,this)">
<div class="cnt bottomright">
- <span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">棣栨</span>
+ <span class="layui-icon layui-icon-return imgicon"></span>
+ <span class="imgtitle">杩斿伐鐢宠</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
- <span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">宸℃</span>
- </div>
- </div>
- <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">
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenInSpection(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenInSpection(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-release imgicon"></span>
<span class="imgtitle">鎶ユ鐢宠</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenMaterToSource(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="OpenMaterToSource(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-engine imgicon"></span>
<span class="imgtitle">涓婃枡闃插憜</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="BadGather(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="BadGather(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-chart imgicon"></span>
<span class="imgtitle">涓嶈壇閲囬泦</span>
@@ -1056,19 +1052,13 @@
</div>
</div>
<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>
- </div>
- </div>
- <div class="layui-col-sm12 layui-col-md4" onclick="ExceFeedback(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" onclick="ExceFeedback(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-unlink imgicon"></span>
<span class="imgtitle">寮傚父</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
+ <div class="layui-col-sm12 layui-col-md3" 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