From c6b1ddcc597daaabb8c17f72af78279d9be20700 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 25 六月 2024 12:19:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillType.html | 251 +++++++++++++
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 42 +
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 19
WebTM/views/IpadIndex.html | 37 +
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 95 +++-
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 2
WebTM/views/WMS扫码模块/上料防错单/Sc_MaterToSourceBill_PDA.html | 6
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 71 +++
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 2
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 27 +
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html | 1
WebTM/layuiadmin/Scripts/webConfig.js | 6
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html | 26
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_CF.html | 2
WebTM/WebTM.csproj | 2
WebTM/views/生产管理/生产报表/Sc_QualityReportBillDay.html | 476 ++++++++++++++++++++++++++
18 files changed, 985 insertions(+), 84 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 0edbe54..975e9d1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -378,7 +378,9 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
<Content Include="views\绯荤粺绠＄悊\浼氳鏈熼棿\Xt_AccountPeriodAdd.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserRightQuery.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 5c52701..3b4cbbd 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,13 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /*var WEBURL = "http://localhost/API/"; */ //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8083/API/"; //闄堥洴闈欐湰鍦伴厤缃�*/
- // var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- /*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index feed4ed..e2e590a 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -45,6 +45,7 @@
var HManagerName = ""; //璐熻矗浜�
var HGroupName = ""; //鐝粍
var HProcID = 0; //宸ュ簭
+ var HSBName = ""; //璁惧鍚嶇О
//娉ㄦ剰锛氶�夐」鍗� 渚濊禆 element 妯″潡锛屽惁鍒欐棤娉曡繘琛屽姛鑳芥�ф搷浣�
layui.config({
@@ -81,8 +82,10 @@
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data) {
var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
+
if (LoadData.length > 0)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
{
+ HSBName = LoadData[0].HSourceName;
for (var i = 1; i <= LoadData.length + 1; i++) {
if (i <= LoadData.length) {
var html1 = '';
@@ -185,7 +188,7 @@
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; //涓嶈壇鍒嗘瀽
+ var LoadData4 = data.data.h_p_JIT_GetWorkBillListInfoBySource3; //涓嶈壇鍒嗘瀽
if (LoadData1.length > 0) //宸ュ崟鍒楄〃鏁版嵁
{
@@ -246,6 +249,7 @@
}
if (LoadData2.length > 0) //褰撳墠鐘舵�佹暟鎹�
{
+ HSBName = LoadData2[0].HSourceName;
for (var i = 0; i < LoadData2.length; i++) {
var html1 = '';
html1 += '<div class="layui-col-sm12 layui-col-md12">';
@@ -1138,6 +1142,35 @@
});
}
+ //寮傚父鎸夐挳鐐瑰嚮浜嬩欢
+ function Abnormal (event, obj) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '寮傚父鍙嶉绫诲瀷',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillType.html',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HICMOBillNo": HICMOBillNo,//宸ュ崟鍙�
+ "HSourceName": HSBName //璁惧
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+
//闃查敊楠岃瘉娓呭崟鎸夐挳鐐瑰嚮浜嬩欢
function PreventErrMouldCheck(event, obj) {
layer.open({
@@ -1370,7 +1403,7 @@
<span class="imgtitle">鍋滃伐</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
<div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
<span class="layui-icon layui-icon-unlink imgicon"></span>
<span class="imgtitle">寮傚父</span>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
index 3272eff..d88e2d4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
@@ -333,7 +333,8 @@
var data = [];
listOption.cols = [[
- { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ { field: '鍘熸潗鏂欐壒娆″彿', title: '鍘熸潗鏂欐壒娆″彿', width: 100 }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
@@ -1062,7 +1063,8 @@
}
else {
listOption.cols = [[
- { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ { field: '鍘熸潗鏂欐壒娆″彿', title: '鍘熸潗鏂欐壒娆″彿', width: 100 }
+ ,{ field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index 1c1105d..01247d4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -333,6 +333,10 @@
$("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HPlanInterID").val(checkStatus.data[0].hmainid);
+ $("#HMouldID").val(checkStatus.data[0].HMouldID);
+ $("#HMouldName").val(checkStatus.data[0].浜у搧妯″叿);
+ $("#HMouldDotCheckRuleID").val(checkStatus.data[0].HMouldDotCheckRuleID);
+ $("#HMouldDotCheckRuleName").val(checkStatus.data[0].HMouldDotCheckRuleNo);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
//$.ajax({
// url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
@@ -453,6 +457,8 @@
console.log(checkStatus);
$("#HMouldDotCheckRuleName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
+ $("#HMouldID").val(checkStatus.data[0].HMouldID);
+ $("#HMouldName").val(checkStatus.data[0].妯″叿鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_DocCheckItem2(checkStatus.data[0].hmainid);
}
@@ -806,8 +812,8 @@
if (result != null) {
if (result.count == 1) {
var BYData = result.list[0];//鐐规
- var PJData = result.list[1];//閰嶄欢
- var rowdate1 = layui.table.cache["mainTable"];
+ //var PJData = result.list[1];//閰嶄欢
+ //var rowdate1 = layui.table.cache["mainTable"];
option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
@@ -816,9 +822,9 @@
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < BYData.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
- "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerCode,
- "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+ "HDotCheckItemID": BYData[i].鐐规椤圭洰ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
+ "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浠ｇ爜,
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -845,8 +851,8 @@
if (result != null) {
if (result.count == 1) {
var BYData = result.list[0];//鐐规
- var PJData = result.list[1];//閰嶄欢
- var rowdate1 = layui.table.cache["mainTable"];
+ //var PJData = result.list[1];//閰嶄欢
+ //var rowdate1 = layui.table.cache["mainTable"];
option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
table.render(option);
@@ -855,9 +861,9 @@
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < BYData.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
- "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+ "HDotCheckItemID": BYData[i].鐐规椤圭洰ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
+ "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].瀛愬娉�, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index e4113d3..f19db1b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -105,7 +105,7 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�:</label>
+ <label class="layui-form-label">鍗曟嵁鍙�:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
<input id="HInterID" name="HInterID" type="hidden" />
@@ -113,13 +113,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鏃ユ湡:</label>
+ <label class="layui-form-label">鍗曟嵁鏃ユ湡:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" disabled autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">涓婚:</label>
+ <label class="layui-form-label">涓婚:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" style="width:485px">
</div>
@@ -127,7 +127,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍙戦�佷汉:</label>
+ <label class="layui-form-label">鍙戦�佷汉:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSendMan" id="HSendMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSendManList" id="HSendManList" style="width:40px;">
@@ -136,7 +136,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎺ユ敹浜�:</label>
+ <label class="layui-form-label">鎺ユ敹浜�:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HReceiveMan" id="HReceiveMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HReceiveManList" id="HReceiveManList" style="width:40px;">
@@ -168,7 +168,7 @@
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鎶勯��:</label>
+ <label class="layui-form-label">鎶勯��:<label style="color:red"> * </label></label>
<div>
<input type="text" name="HCopyMan" id="HCopyMan" class="layui-input" value="" style="float:left;width:1035px;" disabled>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HCopyManList" id="HCopyManList" style="width:40px;">
@@ -199,7 +199,7 @@
</div>-->
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">璇︾粏绫诲:</label>
+ <label class="layui-form-label">璇︾粏绫诲:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<textarea placeholder="璇疯緭鍏ヨ缁嗗唴瀹�" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
</div>
@@ -215,27 +215,27 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">浜у搧缂栫爜:</label>
+ <label class="layui-form-label">浜у搧缂栫爜:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" id="HMaterNumber">
+ <input class="layui-input" name="HMaterNumber" lay-verify="HMaterNumber" value="" id="HMaterNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">浜у搧鍚嶇О:</label>
+ <label class="layui-form-label">浜у搧鍚嶇О:<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName">
+ <input class="layui-input" name="HMaterName" lay-verify="HMaterName" value="" id="HMaterName">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" id="HMaterModel">
+ <input class="layui-input" name="HMaterModel" lay-verify="HMaterModel" value="" id="HMaterModel">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">娑夊強鏁伴噺:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
+ <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="" autocomplete="off">
</div>
</div>
</div>
@@ -373,6 +373,16 @@
</div>
<script>
//鑾峰彇鍙傛暟
+ var HICMOBillNo = ""; //宸ュ崟鍙�
+ var HSourceName = ""; //璁惧
+ var HType = ""; //寮傚父绫诲瀷
+
+
+ var edit = function (data) {
+ HICMOBillNo = data[0].HICMOBillNo;
+ HSourceName = data[0].HSourceName;
+ HType = data[0].HType;
+ }
var HBillType = ""; //鍗曟嵁绫诲瀷
var HMainSourceInterID = ""; //婧愬崟涓诲唴鐮�
var HMainSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
@@ -380,21 +390,8 @@
var HMainSourceBillType = ""; //婧愬崟绫诲瀷
var refSav = ""; //鎻愪氦绫诲瀷
var Qty = "";
- //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
- var params = get_UrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- } else {
- var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
- var linterid = params[params[1]];//婧愬崟id
- var HEntryID = params[params[2]];//婧愬崟瀛恑d
- var HSBillType = params[params[3]];//婧愬崟绫诲瀷
- var HBillType = params[params[3]];
- var HSourceInterID = params[params[4]];
- var HSourceEntryID = params[params[5]];
- var HSourceBillNo = params[params[6]];
- var HSourceBillType = params[params[7]];
- }
+
+
//var edit = function (data) {
// HBillType = data[0].HBillType;
@@ -422,6 +419,21 @@
window.HDeptType = 0;
//#endregion
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟 //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HEntryID = params[params[2]];//婧愬崟瀛恑d
+ var HSBillType = params[params[3]];//婧愬崟绫诲瀷
+ var HBillType = params[params[3]];
+ var HSourceInterID = params[params[4]];
+ var HSourceEntryID = params[params[5]];
+ var HSourceBillNo = params[params[6]];
+ var HSourceBillType = params[params[7]];
+ }
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -436,6 +448,12 @@
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid();
+ } else if (OperationType == 4) {
+ set_AddFNew();
+ var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
+ var Person = sessionStorage["HUserName"];
+ //鎶ュ伐鍙拌烦杞〉闈㈣嚜鍔ㄧ敓鎴愬唴瀹�
+ $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType));
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -636,16 +654,12 @@
}
});
-
-
-
-
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
- if (!AllowLoadData())//鏁版嵁楠岃瘉
+ if (!AllowLoadData(OperationType))//鏁版嵁楠岃瘉
{
return false;
}
@@ -998,11 +1012,20 @@
});
});
+
+ //鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
+ function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
+ // 鎷兼帴瀛楃涓�
+ var result = Datetime + ', ' + Person + '鍦�' + HSourceName + '涓婄敓浜у伐鍗曚负' + HICMOBillNo + ', 鍙戠敓寮傚父绫诲瀷涓�:' + HType;
+ return result;
+ }
+
+
//浠ヤ笂涓簂ayui妯″潡
});
- function AllowLoadData() { //闈炵┖楠岃瘉
+ function AllowLoadData(OperationType) { //闈炵┖楠岃瘉
var Result = true;
if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1013,6 +1036,10 @@
return Result = false;
}
if ($("#HMaterName").val() == '' || $("#HMaterName").val() == null) {
+ layer.msg("浜у搧鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HMaterNumber").val() == '' || $("#HMaterName").val() == null) {
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/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
new file mode 100644
index 0000000..c47020f
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillType.html"
@@ -0,0 +1,251 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>寮傚父鍙嶉鍗曠被鍨�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ .layui-form-label {
+ width: 85px;
+ }
+
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 60px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+
+ .layui-input {
+ width: 93%;
+ }
+
+ .layui-inline, img {
+ display: block;
+ vertical-align: middle
+ }
+
+ .layui-input, .layui-textarea {
+ display: inline-block;
+ width: 100%;
+ padding-left: 10px;
+ }
+
+ .laydate-time-list ol {
+ overflow-x: hidden !important;
+ overflow-y: auto !important;
+ }
+
+ .layui-form-label {
+ padding: 9px 5px;
+ }
+
+ .layui-input-block {
+ margin-left: 85px;
+ min-height: 36px;
+ }
+
+ .radio-label {
+ font-size: 30px; /* 璁剧疆鎮ㄦ兂瑕佺殑瀛椾綋澶у皬 */
+ display: inline-block;
+ margin-right: 20px; /* 鏍规嵁闇�瑕佽皟鏁撮棿璺� */
+ }
+ </style>
+</head>
+<body>
+
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;"><b>寮傚父绫诲瀷</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鍩烘湰淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content" style="height: 700px;">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="margin-top:30px">
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="margin-left:200px">
+ <label class="radio-label">
+ <input type="radio" name="faultType" value="鐜鏁呴殰">鐜鏁呴殰
+ </label>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="margin-left:400px">
+ <label class="radio-label">
+ <input type="radio" name="faultType" value="澹伴煶寮傚父">澹伴煶寮傚父
+ </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="margin-top:60px">
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="margin-left:200px">
+ <label class="radio-label">
+ <input type="radio" name="faultType" value="鎬ц兘寮傚父">鎬ц兘寮傚父
+ </label>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="margin-left:400px">
+ <label class="radio-label">
+ <input type="radio" name="faultType" value="娑插帇鏁呴殰">娑插帇鏁呴殰
+ </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item" style="margin-top:90px">
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="margin-left:200px">
+ <label class="radio-label">
+ <input type="radio" name="faultType" value="浜轰负鏁呴殰">浜轰负鏁呴殰
+ </label>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline" style="margin-left:400px">
+ <label class="radio-label">
+ <input type="radio" name="faultType" value="纭欢鏁呴殰">纭欢鏁呴殰
+ </label>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ //鑾峰彇鍙傛暟
+ var HICMOBillNo = ""; //宸ュ崟鍙�
+ var HSourceName = ""; //璁惧
+
+
+ var edit = function (data) {
+ HICMOBillNo = data[0].HICMOBillNo;
+ HSourceName = data[0].HSourceName;
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+
+ //#endregion
+
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+
+ document.querySelectorAll('input[name="faultType"]').forEach(function (radio) {
+ radio.addEventListener('change', function () {
+ if (this.checked) { // 鍙湁琚�変腑鐨剅adio鎵嶄細瑙﹀彂
+ var value = this.value; // 鑾峰彇閫変腑鐨剅adio鐨勫��
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '寮傚父鍙嶉鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: './Sc_Add_MESExecptFeedBackBillList.html?OperationType=4&linterid=&HSouceBillType=',
+ end: function () {
+
+ },
+ success: function (dom, index) {
+ var data = [];
+ data.push({
+ "HICMOBillNo": HICMOBillNo,//宸ュ崟鍙�
+ "HSourceName": HSourceName, //璁惧
+ "HType": value //寮傚父绫诲瀷
+ });
+
+ //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
+ var iframe = window['layui-layer-iframe' + index];
+ //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
+ iframe.edit(data);
+ },
+ });
+ }
+ });
+ });
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index bea492c..4c4ff17 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -584,7 +584,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 4 || OperationType == 3) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
index 284afab..e7da65b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -150,7 +150,7 @@
</html>
<script>
layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 67e35cf..0af8888 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -87,7 +87,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -359,6 +359,7 @@
</div>
<script>
//鑾峰彇鍙傛暟
+ var OptionData = [];
var HBillType = ""; //鍗曟嵁绫诲瀷
var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
@@ -647,6 +648,65 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
if (AllowLoadData(data)) {
+ //绂佺敤淇濆瓨鎸夐挳
+ $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁鍕鹃��
+ Xt_AllowLoadData(data);
+ }
+ });
+
+ //鍒ゆ柇绯荤粺鍙傛暟鏄惁閫変腑
+ function Xt_AllowLoadData(data2) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/Xt_AllowLoadData", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "HKey": "Sc_MESBeginWorkBill_SwipeCardStart" },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (data.Verify == "Y") //鍒峰崱楠岃瘉
+ {
+ layer.msg("闇�瑕佽繘琛屽埛鍗￠獙璇�!", { time: 1 * 1000, icon: 1 }, function (index) {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: 'IC鍒峰崱',
+ closeBtn: 1,
+ shift: 2,
+ area: ['50%', '80%'],
+ maxmin: true,
+ content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
+ end: function () {
+ if (OptionData.length > 0) {
+ if (OptionData[0]["data"] == "1") {
+ save(data2);
+ } else if (OptionData[0]["data"] == "0") {
+ layer.msg("鍥犱负鎶�鑳戒笉鍖归厤,鏃犳硶淇濆瓨!")
+ }
+ OptionData = [];
+ } else {
+ $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }
+ });
+ });
+ }
+ else {
+ save(data2);
+ }
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
+ function save(data) {
+
var index = layer.load();
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
@@ -694,10 +754,8 @@
layer.alert(err, { icon: 5 })
}
})
- }
-
-
- });
+
+ }
//瀹℃牳鎸夐挳鎻愪氦
form.on('submit(VerIfySaver)', function (data) {
@@ -1018,6 +1076,9 @@
$("#HGroupName").val(obj[0].鐝粍鍚嶇О);
$("#HGroupID").val(obj[0].HItemID);
}
+ function GetSwipeCardStart(obj) {
+ OptionData[0] = obj;
+ }
</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\212\245\350\241\250/Sc_QualityReportBillDay.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillDay.html"
new file mode 100644
index 0000000..d3a6d61
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillDay.html"
@@ -0,0 +1,476 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鐢熶骇璐ㄩ噺鏃ユ眹鎶ュ崟</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+
+ <form class="layui-form" action="" lay-filter="component-form-group">
+
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "Sc_QualityReportBillDay";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HMaterID", "HProcID", "HGroupID", "HSourceID", "HBadReasonID"];
+
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_QualityReportBillDay";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(1);
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ set_InitGrid();
+ get_FastQuery();
+
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //鏌ヨ
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+
+ url: GetWEBURL() + '/Sc_QualityReportBill/getSc_QualityReportBillDay',
+ type: "GET",
+ async:false,
+ data: { "sWhere": sWhere, "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 = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
+ ins = table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Sc_QualityReportBillDay";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+
+ 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 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ }
+ //蹇�熸煡璇�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+
+ sWhere = {
+ HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HNumber: HNumber
+ , HName: HName
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+
+ }
+ //閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#btnSearch").click();
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ form.render('select');
+
+ sWhere = "";
+ }
+ //鍒锋柊
+ function get_Refresh() {
+ $("#btnSearch").trigger('click');
+ }
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 5fc4d59..8162b1a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -593,7 +593,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"], "HBadReasonHQty": $("HBadReasonHQty").val() },
success: function (result) {
if (result.count == 1) {
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
index 6c4a452..ee6f419 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/RetrospectiveQueryReport.html"
@@ -257,6 +257,7 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
+ col.push({ type: 'numbers', title: '搴忓彿' });
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) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index b057258..23c1e9a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -108,12 +108,19 @@
<input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐢熶骇缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+ </div>
+ </div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -164,10 +171,9 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐢熶骇缁勭粐</label>
+ <label class="layui-form-label">閬楀け鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+ <input type="text" class="layui-input" value="0" name="HLossQty" id="HLossQty" onfocus="this.select();">
</div>
</div>
</div>
@@ -183,17 +189,23 @@
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏍哥畻宸ュ簭</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
- <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
- </div>
- </div>-->
+ <label class="layui-form-label">鏍哥畻宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
+ </div>
+ </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHLastSubProc" id="checkboxHLastSubProc" title="杞笅閬�" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled>
<input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍙栨牱鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" value="0" name="HToCheckQty" id="HToCheckQty" onfocus="this.select();">
</div>
</div>
</div>
@@ -897,6 +909,8 @@
"HBackWorkQty": data.杩斿伐鏁伴噺,
"HShiftsID": data.HShiftsID,
"HShiftsName": data.鐝鍚嶇О,
+ "HToCheckQty": data.鍙栨牱鏁伴噺,
+ "HLossQty": data.閬楀け鏁伴噺,
});
if (data.鏄惁瀹℃牳 == "true") {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index ede9410..f0663cd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -203,7 +203,27 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 65px;">绌村彿</label>
<div class="layui-input-block" style="margin-left: 95px;">
- <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;" >
+ <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HBadCount" id="HBadCount" value="0" style="width: 150px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">閬楀け鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HLossQty" id="HLossQty" value="0" style="width: 150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">鍙栨牱鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HToCheckQty" id="HToCheckQty" value="0" style="width: 150px;">
</div>
</div>
</div>
@@ -1030,8 +1050,9 @@
layer.msg("璇锋壂娴佽浆鍗★紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if ($("#HQty").val() == 0) {
- layer.msg("鏁伴噺涓嶈兘涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HQty").val() == 0 && $("#HBadCount").val() == 0) {
+
+ layer.msg("涓嶈壇鍜屽悎鏍兼暟閲忎笉鑳藉悓鏃朵负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index e21ffd6..8bdc6a7 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -1515,7 +1515,7 @@
}
, end: function () {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
+ var sBillNo = $('#HProcExchBillNo').val();
if (sProcNo != "") {
txtHProcNo_KeyDown(sBillNo, sProcNo);
}
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_ProcessExchangeBill.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_ProcessExchangeBill.html"
index 9ca519b..ffaa0aa 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_ProcessExchangeBill.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_ProcessExchangeBill.html"
@@ -174,12 +174,18 @@
<input type="hidden" name="HUnitID" id="HUnitID" value="0">
</div>
</div>
- <!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鏉愯川</label>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鎵规鍙�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
</div>
- </div>-->
+ </div>
+ <!--<div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏉愯川</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
@@ -1024,7 +1030,7 @@
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1 ) {//鏃犳簮鍗曟柊澧�
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3772' },
success: function (d) {
@@ -1062,7 +1068,7 @@
layer.alert(result.Message, { icon: 5 });
} else {
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
type: "GET",
data: { "HBillType": '3772' },
success: function (d) {
@@ -2269,6 +2275,7 @@
, "HMaterModel": data.鏉愭枡瑙勬牸
, "HWidth": data.骞呭
, "HWeight": data.鍏嬮噸
+ , "HBatchNo": data.鎵瑰彿
, "HAuxQty": data.杈呮暟閲�
, "HAuxUnit": data.HAuxUnit
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_ProcessExchangeBill_CF.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_ProcessExchangeBill_CF.html"
index 45d1d69..87b4d42 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_ProcessExchangeBill_CF.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_ProcessExchangeBill_CF.html"
@@ -81,7 +81,7 @@
<div class="layui-inline">
<label class="layui-form-label">鎵瑰彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1