|
|
@ -47,6 +47,8 @@ |
|
|
<label asp-for="BarcodeNo" class="control-label col-sm-2"></label> |
|
|
<label asp-for="BarcodeNo" class="control-label col-sm-2"></label> |
|
|
<input id="BarcodeNo" asp-for="BarcodeNo" class="layui-input" readonly> |
|
|
<input id="BarcodeNo" asp-for="BarcodeNo" class="layui-input" readonly> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="layui-input-inline" style="width:25%;"> |
|
|
<div class="layui-input-inline" style="width:25%;"> |
|
|
<label class="control-label col-sm-2">PLMENC</label> |
|
|
<label class="control-label col-sm-2">PLMENC</label> |
|
|
<div> |
|
|
<div> |
|
|
@ -61,6 +63,8 @@ |
|
|
<a class="qazone" href="#" target="_blank"> <i class="layui-icon layui-icon-template"></i><cite>QAZone異常紀錄</cite></a> |
|
|
<a class="qazone" href="#" target="_blank"> <i class="layui-icon layui-icon-template"></i><cite>QAZone異常紀錄</cite></a> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
<div class="layui-inline"> |
|
|
<div class="layui-inline"> |
|
|
@ -115,9 +119,17 @@ |
|
|
</select> |
|
|
</select> |
|
|
</script> |
|
|
</script> |
|
|
@*缺失人員*@ |
|
|
@*缺失人員*@ |
|
|
<script type="text/html" id="selectUser"> |
|
|
@* <script type="text/html" id="selectUser"> |
|
|
<select name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} lay-search='' asp-items="@ViewBag.UserList" class="layui-form"> |
|
|
<select name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} lay-search='' asp-items="@ViewBag.UserList" class="layui-form"> |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
</script> |
|
|
|
|
|
<script type="text/html" id="selectUser"> |
|
|
|
|
|
<input type="text" name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;"> |
|
|
|
|
|
</script> |
|
|
|
|
|
|
|
|
|
|
|
*@ |
|
|
|
|
|
<script type="text/html" id="selectUser"> |
|
|
|
|
|
<input type="text" name="selectUser" lay-filter="selectUser" id="selectUser" data-value={{d.missingUserID}} class="layui-input" style=" margin-top: -10px; margin-left: -10px; margin-right: -10px;"> |
|
|
</script> |
|
|
</script> |
|
|
<script type="text/javascript"> |
|
|
<script type="text/javascript"> |
|
|
////保存 |
|
|
////保存 |
|
|
@ -125,13 +137,7 @@ |
|
|
var WipNo = $("#WipNo").val(); |
|
|
var WipNo = $("#WipNo").val(); |
|
|
var ItemNo = $("#ItemNo").val(); |
|
|
var ItemNo = $("#ItemNo").val(); |
|
|
var BarcodeNo = $("#BarcodeNo").val(); |
|
|
var BarcodeNo = $("#BarcodeNo").val(); |
|
|
if (!WipNo) { |
|
|
if (!WipNo && !ItemNo && !BarcodeNo) { |
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
else if (!ItemNo) { |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
else if (!BarcodeNo) { |
|
|
|
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
@ -143,13 +149,7 @@ |
|
|
var ItemNo = $("#ItemNo").val(); |
|
|
var ItemNo = $("#ItemNo").val(); |
|
|
var BarcodeNo = $("#BarcodeNo").val(); |
|
|
var BarcodeNo = $("#BarcodeNo").val(); |
|
|
|
|
|
|
|
|
if (!WipNo) { |
|
|
if (!WipNo && !ItemNo && !BarcodeNo) { |
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
else if (!ItemNo) { |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
else if (!BarcodeNo) { |
|
|
|
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
@ -306,7 +306,9 @@ |
|
|
var formID = $("#InspectionID").val(); |
|
|
var formID = $("#InspectionID").val(); |
|
|
table.render({ |
|
|
table.render({ |
|
|
elem: '#test', |
|
|
elem: '#test', |
|
|
url: '/SPC/GetInspectionResultDetails?id=' + formID, |
|
|
// url: '/SPC/GetInspectionResultDetails?id=' + formID, |
|
|
|
|
|
url: '/SPC/GetInspectionResultDetailsAndBolb?id=' + formID, |
|
|
|
|
|
|
|
|
id: 'test', |
|
|
id: 'test', |
|
|
toolbar: '#toolBar', |
|
|
toolbar: '#toolBar', |
|
|
height: 720, |
|
|
height: 720, |
|
|
@ -334,17 +336,24 @@ |
|
|
{ field: 'result', title: '稽核結果', width: 100, align: "left", templet: '#selectResult' }, |
|
|
{ field: 'result', title: '稽核結果', width: 100, align: "left", templet: '#selectResult' }, |
|
|
{ field: 'lineID', title: '線別', width: 100, align: "left", templet: '#selectLine' }, |
|
|
{ field: 'lineID', title: '線別', width: 100, align: "left", templet: '#selectLine' }, |
|
|
{ field: 'ruleStationID', title: '站別', width: 100, align: "left", templet: '#selectStation' }, |
|
|
{ field: 'ruleStationID', title: '站別', width: 100, align: "left", templet: '#selectStation' }, |
|
|
{ field: 'location', title: '插件位置', width: 100, align: "left", templet: '#inputLocation' }, |
|
|
{ field: 'location', title: '零件位置', width: 100, align: "left", templet: '#inputLocation' }, |
|
|
{ field: 'missingUnitNo', title: '缺失單位', width: 100, align: "left", templet: '#selectDept' }, |
|
|
{ field: 'missingUnitNo', title: '缺失單位', width: 100, align: "left", templet: '#selectDept' }, |
|
|
{ field: 'missingUserID', title: '缺失人員', width: 100, align: "left", templet: '#selectUser' }, |
|
|
{ field: 'missingUserID', title: '缺失人員', width: 100, align: "left", templet: '#selectUser' }, |
|
|
{ field: 'missingRemark', title: '備註', width: 250, align: "left", templet: '#inputTest' },//templet: '#inputTest' |
|
|
{ field: 'missingRemark', title: '備註', width: 250, align: "left", templet: '#inputTest' },//templet: '#inputTest' |
|
|
|
|
|
|
|
|
{ |
|
|
{ |
|
|
field: 'right', |
|
|
field: 'right', |
|
|
width: 100, |
|
|
width: 120, |
|
|
title: '操作', |
|
|
title: '操作', |
|
|
fixed: 'right', |
|
|
fixed: 'right', |
|
|
templet: function (d) { |
|
|
templet: function (d) { |
|
|
return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">上傳圖片</a> ' |
|
|
|
|
|
|
|
|
var btn = '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">上傳圖片</a> '; |
|
|
|
|
|
if (d.ruleStationID > 0) |
|
|
|
|
|
btn = btn + '<i class="layui-icon" style="font-size: 20px;"></i> ' ; |
|
|
|
|
|
return btn; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
]], |
|
|
]], |
|
|
@ -480,6 +489,7 @@ |
|
|
|
|
|
|
|
|
if ($("#ModelNo").val() == "") { |
|
|
if ($("#ModelNo").val() == "") { |
|
|
var data = $("#WipNo").val(); |
|
|
var data = $("#WipNo").val(); |
|
|
|
|
|
if (data) { |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/SPC/GetWipAtt", |
|
|
url: "/SPC/GetWipAtt", |
|
|
dataType: 'json', |
|
|
dataType: 'json', |
|
|
@ -503,6 +513,7 @@ |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
} |
|
|
}; |
|
|
}; |
|
|
}); |
|
|
}); |
|
|
</script> |
|
|
</script> |
|
|
|
BB.Wang
3 years ago