From 85ba9ee7d366dde25c93763bad12979bca25d2b2 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 08 四月 2024 17:33:03 +0800
Subject: [PATCH] 报工台右上角添加首检/工序检次数，工单添加计划时间 超产修改背景色，布局css调整，绑定生产资源自动带出用户，班组等基础资料；排产页面小时产能放到物料信息后面，并提示那一行小时产能不存在；修复首检/工序检 列表过滤方案保存功能；生产汇报单添加必填项控制
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 10
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 21 ++-
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 1
WebTM/views/设备管理/Sb_EquipMaintainBillList.html | 2
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html | 3
WebTM/views/IpadIndex.html | 70 ++++++++--
WebTM/layuiadmin/layui/css/ReportPlatform.css | 2
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 6
WebTM/views/生产管理/报工平台功能页/LineBind.html | 25 ++-
WebTM/views/生产管理/工单/Sc_CurrentTicket.html | 264 ++++++++++++++++++-------------------
10 files changed, 227 insertions(+), 177 deletions(-)
diff --git a/WebTM/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index 851b901..1230db7 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -75,7 +75,7 @@
.topright > dd {
padding: 0px 10px;
- width: 50%;
+ width: 75%;
}
dt, dd {
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index ccfe5fd..da1a490 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -41,6 +41,10 @@
var HProQty = []; //鏃堕棿鐐逛骇閲�
var HBadQty = []; //涓嶈壇鏁伴噺
var HBadReason = []; //涓嶈壇鍘熷洜
+ var HEmpName = ""; //鎿嶄綔鍛�
+ var HManagerName = ""; //璐熻矗浜�
+ var HGroupName = ""; //鐝粍
+
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
base: '../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -67,7 +71,7 @@
TSLoad();
});
function TSLoad() {
- $("#topleft").html("");
+ $("#topleft").html("");
var HUserName = sessionStorage["HUserName"]; //sessionStorage["HUserName"]; //榛樿褰撳墠鐧诲綍浜哄憳
$.ajax({
url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
@@ -88,8 +92,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="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
- html1 += '<h1><span>鎿嶄綔鍛橈細</span><span id="eqp' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
- html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
+ html1 += '<h1><span>鎿嶄綔鍛橈細</span><span id="HEmpName' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
+ html1 += '<h1><span>鐢熶骇鐝粍锛�</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</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>';
@@ -152,6 +156,12 @@
var eqp = "eqp" + i; //鑾峰彇鎸囧畾璧勬簮鏍峰紡ID
var HSourceName = $("#" + eqp + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮)
HSourceName1 = $("#" + eqp + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮)
+ var emp = "HEmpName" + i; //鑾峰彇鎸囧畾璧勬簮鏍峰紡ID
+ var us = "us" + i; //鑾峰彇鎸囧畾璧勬簮鏍峰紡ID
+ var gro = "HGroupName" + i; //鑾峰彇鎸囧畾璧勬簮鏍峰紡ID
+ HEmpName = $("#" + emp + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
+ HManagerName = $("#" + us + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
+ HGroupName = $("#" + gro + "").html(); //閫氳繃鏍峰紡ID鑾峰彇html鍐呭(璧勬簮ID)
if (HSourceID != "" && HSourceID != null) {
$('.ctop').removeClass('check'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
$("#ts" + i + "").addClass('check'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
@@ -172,7 +182,12 @@
for (var i = 0; i < LoadData1.length; i++) {
var html1 = '';
- html1 += '<div class="layui-col-sm12 layui-col-md3">';
+ //姹囨姤鎬绘暟澶т簬璁″垝鏁伴噺锛岃皟鏁磋儗鏅壊鎻愮ず
+ if (LoadData1[i].HDateFinishQty > LoadData1[i].HDatePlanQty) {
+ html1 += '<div class="layui-col-sm12 layui-col-md3" style="background-color:#F595A0;border-radius: 3%;">';
+ } else {
+ html1 += '<div class="layui-col-sm12 layui-col-md3">';
+ }
html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1) + ')">';
html1 += '<dl>';
html1 += '<dd class="tcenter">';
@@ -186,7 +201,7 @@
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="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span><span style="margin-left:25px;">鏃ユ湡锛�</span><span>' + LoadData1[i].璁″垝鏃ユ湡 + '</span></h1>';
html1 += '<h1 style="display:none;"><span>浜у搧ID锛�</span><span id="materid' + (i + 1) + '">' + LoadData1[i].HMaterID + '</span></h1>';
html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">[' + LoadData1[i].HMaterNumber + ']-[' + LoadData1[i].HMaterName + ']</span></h1>';
html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
@@ -224,16 +239,17 @@
for (var i = 0; i < LoadData2.length; i++) {
var html1 = '';
html1 += '<div class="layui-col-sm12 layui-col-md12">';
- html1 += '<dl class="topright">;'
+ html1 += '<dl class="topright">'
html1 += '<dt>';
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 style="display:none;"><span>璁惧缂栧彿锛�</span><span id="HEquipCode' + (i + 1) + '">' + LoadData2[i].HSourceCode + '</span></h1>';
+ html1 += '<h1><span>褰撳墠璁惧锛�</span><span id="HEquipName' + (i + 1) + '">' + LoadData2[i].HSourceName + '</span><div style="margin-left:25px;float:right"><span >棣栨娆℃暟锛�</span><span>' + LoadData2[i].棣栨娆℃暟 + '</span></div></h1>';
+ html1 += '<h1><span>褰撳墠璁㈠崟锛�</span><span>' + LoadData2[i].HSourceBillNo + '</span><div style="margin-left:25px;float:right"><span >宸℃娆℃暟锛�</span><span>' + LoadData2[i].宸℃娆℃暟 + '</span></div></h1>';
+ html1 += '<h1><span>鐗╂枡鍚嶇О锛�</span><span>' + LoadData2[i].HMaterName + '</span><div style="margin-left:25px;float:right"><span >杩囩▼妫�娆℃暟锛�</span><span>' + LoadData2[i].杩囩▼妫�娆℃暟 + '</span></div></h1>';
+ html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData2[i].HPlanQty + '</span><div style="margin-left:25px;float:right"><span >褰撴棩鐐规鏃堕棿锛�</span><span>' + '棰勭暀' + '</span></div></h1>';
+ html1 += '<h1><span>宸叉眹鎶ユ暟閲忥細</span><span>' + LoadData2[i].HRelationQty + '</span><div style="margin-left:25px;float:right"><span >鏈�鍚庝繚鍏绘椂闂达細</span><span>' + '棰勭暀' + '</span></div></h1>';
if (LoadData2[i].HRelationQty == 0 || LoadData2[i].HRelationQty == null) {
html1 += '<h1><span>杩涘害锛�</span><span>0%</span></h1>';
}
@@ -273,7 +289,7 @@
HBadReason.push(LoadData4[i].涓嶈壇鍘熷洜);
HBadQty.push(LoadData4[i].涓嶈壇鏁伴噺);
}
- }
+ }
//鍒锋柊鍥捐〃鏁版嵁
Mychart(mychart1, mychart2);
},
@@ -575,7 +591,7 @@
}
return result;
}
-
+
//寮�宸ユ寜閽偣鍑讳簨浠�
function OpenWork(event, obj) {
if (wktag == 0) {
@@ -999,7 +1015,33 @@
content: '鐢熶骇绠＄悊/宸ュ崟/Sc_CurrentTicket.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
- }
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HEquipName": $("#HEquipName1").text(),
+ "HEquipCode": $("#HEquipCode1").text(),
+ "HICMOBillNo": workcode,
+ "HICMOInterID": HICMOInterID,
+ "HICMOEntryID": HICMOEntryID,
+ "HSourceID": HSourceID1,
+ "HEmpName": HEmpName,
+ "HManagerName": HManagerName,
+ "HGroupName": HGroupName,
+ "HBillType": HBillType,
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
+ "HSourceBillType": HSourceBillType
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+
+
});
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
index a55070f..94c45de 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
@@ -36,10 +36,12 @@
<div style="float:left;margin-left:5%;">
<dl>
<dd>
- <h2><span>璁惧鍚嶇О</span></h2>
- <h3><span>璁惧缂栧彿</span></h3>
- <h3><span>璁惧鐘舵��</span></h3>
- <h3><span>杩愯鏃堕棿</span></h3>
+ <h2><span style="margin-left:10px;" id="HEquipName"></span></h2>
+ <h3><span>璁惧缂栧彿:<span style="margin-left:10px;" id="HEquipCode"></span></span></h3>
+ <h3><span>璁惧鐘舵��:<span style="margin-left:10px;" id="HEquipStatus"></span></span></h3>
+ <h3><span>杩愯鏃堕棿:<span style="margin-left:10px;" id="HWorkTime"></span></span></h3>
+ <h3><span>褰撴棩鐐规鏃堕棿:<span style="margin-left:10px;" id="HDotCheckDate"></span></span></h3>
+ <h3><span>鏈�鍚庝繚鍏绘椂闂�:<span style="margin-left:10px;" id="HMaintainDate"></span></span></h3>
</dd>
</dl>
</div>
@@ -51,42 +53,58 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">宸� 鍗� 鍙�</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">宸� 鍗� 鍙�:</label>
+ <span style="margin-left:10px;" id="HICMOBillNo"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">褰撳墠鐘舵��</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">褰撳墠鐘舵��:</label>
+ <span style="margin-left:10px;" id="HICMOBillStatus"></span>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">浜у搧鍚嶇О:</label>
+ <span style="margin-left:10px;" id="HMaterName"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璁″垝鏁伴噺</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">璁″垝鏁伴噺:</label>
+ <span style="margin-left:10px;" id="HPlanQty"></span>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浜у搧浠ｇ爜</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">浜у搧浠ｇ爜:</label>
+ <span style="margin-left:10px;" id="HMaterNumber"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姹囨姤鎬绘暟</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">姹囨姤鎬绘暟:</label>
+ <span style="margin-left:10px;" id="HReportQty"></span>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
+ <span style="margin-left:10px;" id="HMaterModel"></span>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">棰嗘枡鐘舵��</label>
- <span>aaaaaaa</span>
+ <label class="layui-form-label">棰嗘枡鐘舵��:</label>
+ <span style="margin-left:10px;" id="HPickMtrlStatus"></span>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">棣栨娆℃暟:</label>
+ <span style="margin-left:10px;" id="HFCheckNum"></span>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">杩囩▼妫�娆℃暟:</label>
+ <span style="margin-left:10px;" id="HPrCheckNum"></span>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸℃娆℃暟:</label>
+ <span style="margin-left:10px;" id="HPPCheckNum"></span>
</div>
</div>
</div>
@@ -99,10 +117,10 @@
<div style="margin-left:25%;">
<dl>
<dd>
- <h2><span>閮ㄩ棬</span></h2>
- <h3><span>鐝粍</span></h3>
- <h3><span>鎿嶄綔鍛�</span></h3>
- <h3><span>璐熻矗浜�</span></h3>
+ <h2><span>閮ㄩ棬<span style="margin-left:10px;" id="HDepName"></span></span></h2>
+ <h3><span>鐝粍:<span style="margin-left:10px;" id="HGroupName"></span></span></h3>
+ <h3><span>鎿嶄綔鍛�:<span style="margin-left:10px;" id="HEmpName"></span></span></h3>
+ <h3><span>璐熻矗浜�:<span style="margin-left:10px;" id="HManagerName"></span></span></h3>
</dd>
</dl>
</div>
@@ -114,12 +132,12 @@
</div>
<div id="bottom" style="width: 100%;height:calc(7vh);">
<div class="layui-form-item" style="text-align: center;">
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <!--<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui<!---btn-radius layui-btn-danger">閫�鍑�</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>-->
+ <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
</div>
</div>
</form>
@@ -128,11 +146,39 @@
</div>
</div>
<script>
+ //鑾峰彇鍙傛暟
+ var HBillType = ""; //鍗曟嵁绫诲瀷
+ var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
+ var HSourceBillNo = ""; //婧愬崟鍗曞彿
+ var HSourceBillType = ""; //婧愬崟绫诲瀷
+ var HEquipName = ""; //璁惧鍚嶇О
+ var HEquipCode = ""; //璁惧缂栧彿
+ var HEmpName = ""; //鎿嶄綔鍛�
+ var HManagerName = ""; //璐熻矗浜�
+ var HGroupName = ""; //鐝粍
+
+ var edit = function (data) {
+ HBillType = data[0].HBillType;
+ HSourceInterID = data[0].HSourceInterID;
+ HSourceEntryID = data[0].HSourceEntryID;
+ HSourceBillNo = data[0].HSourceBillNo;
+ HSourceBillType = data[0].HSourceBillType;
+ HEquipName = data[0].HEquipName;//璁惧鍚嶇О
+ HEquipCode = data[0].HEquipCode;//璁惧缂栧彿
+ HICMOBillNo = data[0].HICMOBillNo;//鐢熶骇璁㈠崟鍗曞彿
+ HICMOInterID = data[0].HICMOInterID;//鐢熶骇璁㈠崟涓诲唴鐮�
+ HICMOEntryID = data[0].HICMOEntryID;//鐢熶骇璁㈠崟瀛愬唴鐮�
+ HSourceID = data[0].HSourceID;//鐢熶骇璧勬簮id
+ HEmpName = data[0].HEmpName;//鎿嶄綔鍛�
+ HManagerName = data[0].HManagerName;//璐熻矗浜�
+ HGroupName = data[0].HGroupName;//鐝粍
+ }
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -144,16 +190,24 @@
, laydate = layui.laydate
, util = layui.util
, soulTable = layui.soulTable
- var sWhere = "";
+ var sWhere = "";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
var HModName = "Sc_CurrentTicket";
- //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID","HEntryID","HSourceID","HMaterID","HDeptID","婧愬崟瀛愬唴鐮�","婧愬崟绫诲瀷","鍗曟嵁绫诲瀷"];
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID", "HEntryID", "HSourceID", "HMaterID", "HDeptID", "婧愬崟瀛愬唴鐮�", "婧愬崟绫诲瀷", "鍗曟嵁绫诲瀷"];
+ var HFinishRate = 0; //瀹屾垚鐜�
+ var HQualifiedRate = 0; //鍚堟牸鐜�
//鍒濆鍖栫晫闈�
set_ClearBill();
+
+ $("#HEquipName").text(HEquipName);//璁惧鍚嶇О
+ $("#HEquipCode").text(HEquipCode);//璁惧缂栧彿
+ $("#HEmpName").text(HEmpName);//鎿嶄綔鍛�
+ $("#HManagerName").text(HManagerName);//璐熻矗浜�
+ $("#HGroupName").text(HGroupName);//鐝粍
//#endregion
//#region 銆愪华琛ㄧ洏銆�
@@ -163,13 +217,13 @@
var data1 = [{
name: "瀹屾垚鐜�",
- value: 55.55,
+ value: HFinishRate.toFixed(2),
}];
// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
var option = {
//backgroundColor: "#000",
- tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
show: true,
formatter: "{b}锛歿c}%",
backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
@@ -198,7 +252,7 @@
color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 30, //杞寸嚎瀹藉害,榛樿 30銆�
- shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -210,7 +264,7 @@
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 2, //绾垮害,榛樿 2銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -218,12 +272,12 @@
show: true, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
- lineStyle: { // 鍒诲害绾挎牱寮忋��
+ lineStyle: { // 鍒诲害绾挎牱寮忋��
color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 1, //绾垮害,榛樿 1銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
},
@@ -245,7 +299,7 @@
borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
- shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
@@ -274,17 +328,17 @@
chart1.setOption(option);
- var chart2 = echarts.init(document.getElementById("chart2"));
+ var chart2 = echarts.init(document.getElementById("chart2"));
var data2 = [{
name: "鍚堟牸鐜�",
- value: 85,
+ value: HQualifiedRate.toFixed(2),
}];
// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
var option2 = {
//backgroundColor: "#000",
- tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+ tooltip: { // 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
show: true,
formatter: "{b}锛歿c}%",
backgroundColor: "rgba(50,50,50,0.7)", // 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
@@ -313,7 +367,7 @@
color: colorTemplate1, //浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑 缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜� 棰滆壊 鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 30, //杞寸嚎瀹藉害,榛樿 30銆�
- shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 20, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -325,7 +379,7 @@
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 2, //绾垮害,榛樿 2銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
}
},
@@ -333,12 +387,12 @@
show: true, // 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
splitNumber: 5, // 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
length: 8, // 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
- lineStyle: { // 鍒诲害绾挎牱寮忋��
+ lineStyle: { // 鍒诲害绾挎牱寮忋��
color: "#eee", //绾跨殑棰滆壊,榛樿 #eee銆�
opacity: 1, //鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
width: 1, //绾垮害,榛樿 1銆�
type: "solid", //绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
- shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, //(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", //闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
},
@@ -360,7 +414,7 @@
borderWidth: 0, // 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
borderType: "solid", // 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
borderColor: "#000", // 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
- shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+ shadowBlur: 10, // (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
shadowColor: "#fff", // 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
},
emphasis: { // 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
@@ -407,8 +461,9 @@
});
//閫�鍑�
- form.on('submit(get_Exit)', function (data) {
- Pub_Close(2);
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ window.parent.location.reload();
});
//鍒锋柊
@@ -419,7 +474,7 @@
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- function set_ClearBill() {
+ function set_ClearBill() {
//鏌ヨ
get_FastQuery();
}
@@ -430,101 +485,36 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
+
//#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
-
$.ajax({
- url: GetWEBURL() + '/Sc_MyTicket/list',
+ //h_p_JIT_GetCurrentTicketInfo
+ url: GetWEBURL() + '/Sc_CurrentTicket/list',
type: "GET",
async: false,
- data: { "HSourceID": sessionStorage["HSourceID"], "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 });
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left' });
- 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;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- }
-
- //鍔ㄦ�佹樉绀哄垪鍚�
- option_notStart = {
- elem: '#mainTable_notStart'
- //, toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data.h_p_Sc_MyICMOWorkBill
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- }
- table.render(option_notStart);
- ins = table.render(option_notStart);
-
- option_finish = {
- elem: '#mainTable_finish'
- //, toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data.h_p_Sc_MyICMOWorkBill1
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- }
- table.render(option_finish);
-
- option_proc = {
- elem: '#mainTable_proc'
- //, toolbar: '#toolbarDemo'
- , cols: [col]
- , data: data1.data.h_p_Sc_MyICMOWorkBill2
- , height: 'full-80'
- , page: true
- , limits: [50, 500, 5000, 50000]
- , limit: 50
- , cellMinWidth: 90
- }
- table.render(option_proc);
-
- //鍒锋柊鎸夐挳鏄剧ず
- var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
- var HBillType = "鎴戠殑宸ュ崟";
- Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
- //鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
-
+ data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HSourceInterID": HSourceInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data.h_p_JIT_GetCurrentTicketInfo[0];
+ $("#HICMOBillNo").text(data.HSourceBillNo);//宸ュ崟鍙�
+ $("#HICMOBillStatus").text('');//褰撳墠鐘舵��
+ $("#HMaterNumber").text(data.HMaterNumber);//浜у搧浠ｇ爜
+ $("#HMaterName").text(data.HMaterName);//浜у搧鍚嶇О
+ $("#HMaterModel").text(data.HModel);//瑙勬牸鍨嬪彿
+ $("#HPlanQty").text(data.HPlanQty);//璁″垝鏁伴噺
+ $("#HReportQty").text(data.HRelationQty);//姹囨姤鎬绘暟
+ $("#HPickMtrlStatus").text('');//棰嗘枡鐘舵��
+ $("#HFCheckNum").text(data.棣栨娆℃暟);//棣栨娆℃暟
+ $("#HPrCheckNum").text(data.杩囩▼妫�娆℃暟);//杩囩▼妫�娆℃暟
+ $("#HPPCheckNum").text(data.宸℃娆℃暟);//宸℃娆℃暟
+ HFinishRate = data.瀹屾垚鐜�;//瀹屾垚鐜�
+ HQualifiedRate = data.鍚堟牸鐜�;//鍚堟牸鐜�
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
-
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(result.code + result.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -541,7 +531,7 @@
get_FastQuery();
}
//#endregion
-
+
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/LineBind.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/LineBind.html"
index 91ca297..35dba1f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/LineBind.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260\345\212\237\350\203\275\351\241\265/LineBind.html"
@@ -100,9 +100,9 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鐢熶骇璧勬簮:</label>
<div class="layui-input-block">
- <input type="text" name="HSourceName" id="HSourceName" class="layui-input" style="width:80%;">
+ <input type="text" name="HSourceName" id="HSourceName" class="layui-input" placeholder="鐢ㄦ埛缁戝畾鐢熶骇璧勬簮" style="width:80%;">
<input type="hidden" name="HSourceCode" id="HSourceCode" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input">
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0" class="layui-input">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSource" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -111,8 +111,8 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
- <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
+ <input type="text" name="HManagerName" id="HManagerName" placeholder="鐢ㄦ埛缁戝畾淇濈鍛�" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HManagerID" id="HManagerID" value="0" class="layui-input">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HManager" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -121,8 +121,8 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鐝粍:</label>
<div class="layui-input-block">
- <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="width: 80%;">
- <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="">
+ <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" placeholder="鐢ㄦ埛缁戝畾鐝粍" style="width: 80%;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -169,8 +169,15 @@
elem: '#HCreateDate'
, type: 'datetime'
});
+ //鍒濆鍖栨暟鎹�
$("#HUserName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
$("#HCreateDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HSourceID").val(sessionStorage["HSourceID"]); //鐢熶骇璧勬簮id
+ $("#HSourceName").val(sessionStorage["HSource"]); //鐢熶骇璧勬簮
+ $("#HManagerID").val(sessionStorage["HKeeperID"]); //璐熻矗浜篿d
+ $("#HManagerName").val(sessionStorage["HKeeper"]); //璐熻矗浜�
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鐢熶骇鐝粍id
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鐢熶骇鐝粍
//琛ㄥご淇℃伅鐢熶骇璧勬簮寮圭獥
form.on('submit(HSource)', function () {
@@ -289,12 +296,12 @@
});
});
-
-
+
+
//浠ヤ笂涓簂ayui妯″潡
});
-
+
</script>
</body>
</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 5309e07..b19373c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -84,7 +84,7 @@
<label class="layui-form-label">鐝粍</label>
<div class="layui-input-inline">
<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -94,7 +94,7 @@
<label class="layui-form-label">缁熻鍛�</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -1205,15 +1205,15 @@
//#region 闈炵┖楠岃瘉
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
var Result = true;
- if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null || $("#HDeptID").val() == "undefined" || $("#HDeptID").val() == 0) {
layer.msg("杞﹂棿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+ if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null || $("#HGroupID").val() == "undefined" | $("#HGroupID").val() == 0) {
layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+ if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null || $("#HGroupID").val() == "undefined" || $("#HEmpID").val() == 0) {
layer.msg("缁熻鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
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 c83d2d1..b158352 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"
@@ -543,7 +543,7 @@
if (table.cache["mainTable"][i] != "") {
if (parseFloat(table.cache["mainTable"][i]["浼樺厛绾�"]) == 0) {
HYxjQty++
- }
+ }
}
}
if (HYxjQty > 0) {
@@ -748,11 +748,11 @@
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
- columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, sort: true });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true });
+ columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });//0
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true });//0
@@ -899,8 +899,7 @@
columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150, sort: true });
columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true });
- columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
- columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
+ columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
@@ -917,7 +916,7 @@
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: 'HWorkShopID', title: 'HWorkShopID', hide: true });
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
@@ -1484,9 +1483,10 @@
}
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">
<div class="layui-progress-bar" lay-percent="40%"></div>
@@ -1548,6 +1548,13 @@
table.render(option);
+ data = table.cache["mainTable"];
+ for (var i = 0; i < data.length; i++) {
+ if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+ return layer.alert("绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�');
+ }
+ }
+
} else {
//layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index f9f1eef..4aba6b7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -357,6 +357,7 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
+ //h_v_Sb_EquipDotCheckBillList
url: GetWEBURL() + '/Sb_EquipDotCheckBill/GetEquipDotCheckBillList',
type: "GET",
async: false,
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index fc2ae16..f3de829 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -482,6 +482,7 @@
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
+ //h_v_Sc_EquipMaintain
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
type: "GET",
@@ -540,7 +541,6 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
-
//鍒锋柊鎸夐挳鏄剧ず
var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
var HBillType = "3901";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index ac94705..9cf366b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -447,6 +447,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
+ //h_v_QC_ProcessCheckBill
url: GetWEBURL() + '/QC_ProcessCheckBill/QC_ProcessCheckBillList',
type: "GET",
async: false,
@@ -581,7 +582,7 @@
com = "" + Comparator + "'" + ColContent + "'";
break;
}
- sWhere += " and " + ColName + " " + com;
+ sqlWhere += " and " + ColName + " " + com;
}
if (HBillNo)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index 2929a4c..c703198 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -118,7 +118,7 @@
<div class="layui-inline" style="width: 85px;">
<label class="layui-form-label">鍒ゅ畾缁撹</label>
<div class="layui-input-block" style="width:190px;">
- <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+ <select name="HLastResult" id="HLastResult" class="ForFilteringSchemes" lay-verify="HLastResult">
<option value=""></option>
<option value="鍚堟牸">鍚堟牸</option>
<option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
@@ -649,8 +649,10 @@
function RoadHBillNo(sqlWhere) {
var ajaxLoad = layer.load();
$.ajax({
+ //h_v_QC_FirstPieceCheckBill
url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
type: "GET",
+ async: false,
data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -859,7 +861,7 @@
com = "" + Comparator + "'" + ColContent + "'";
break;
}
- sWhere += " and " + ColName + " " + com;
+ sqlWhere += " and " + ColName + " " + com;
}
if (HBillNo)
--
Gitblit v1.9.1