JHSYS
/
AMES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1. 巡檢結果維護 稽核結果下拉選單加入顏色判定

master
Sai 8 months ago
parent
5857f8791b
commit
96aab6c8e0
3 changed files with 243 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
  2. 125
      AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
  3. 242
      AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml

31
AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
View File

@ -138,7 +138,7 @@
@*回復*@ @*回復*@
<script type="text/html" id="selectResult"> <script type="text/html" id="selectResult">
<select name='result' lay-verify='' lay-search='' class="layui-form" lay-filter="result"> <select name='selectResult' id='selectResult' lay-verify='' lay-search='' class="layui-form selectResult" lay-filter="selectResult">
<option value="NA">N/A</option> <option value="NA">N/A</option>
<option value="P">PASS</option> <option value="P">PASS</option>
<option value="F">FAIL </option> <option value="F">FAIL </option>
@ -584,9 +584,24 @@
elem.val(elem.data('value')).parents('div.layui-table-cell').css('overflow', 'visible'); elem.val(elem.data('value')).parents('div.layui-table-cell').css('overflow', 'visible');
}); });
form.render(); form.render();
handleSelectResult();
} }
}); });
} }
// Table SelectResult 選項字體換色
function handleSelectResult() {
$('.selectResult').each(function () {
console.log($(this).val());
if ($(this).val() === 'P') {
$(this).next().find('input').css('color', 'green');
}
else if ($(this).val() === 'F') {
$(this).next().find('input').css('color', 'red');
}
});
}
/*表格列表操作*/ /*表格列表操作*/
table.on('tool(test)', function (obj) { table.on('tool(test)', function (obj) {
var data = obj.data, layEvent = obj.event; var data = obj.data, layEvent = obj.event;
@ -686,6 +701,20 @@
$('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide'); $('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide');
} }
}); });
// 選單選擇後換色 SelectResult 選項字體換色
form.on('select(selectResult)', function (data) {
var id = data.elem.id;
if (data.value === "P") {
$(data.elem).next().find('input').css('color', 'green');
}
else if (data.value === "F") {
$(data.elem).next().find('input').css('color', 'red');
}
else {
$(data.elem).next().find('input').css('color', 'black');
}
});
}); });
function CheckBarcodeNo(BarcodeNo, WipNo) { function CheckBarcodeNo(BarcodeNo, WipNo) {

125
AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
View File

@ -96,34 +96,34 @@
</div> </div>
</div> </div>
@*<div class="layui-form-item"> @*<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">線別：</label> <label class="layui-form-label">線別：</label>
<div class="layui-input-inline" style="width:100px"> <div class="layui-input-inline" style="width:100px">
<select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList"> <select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList">
</select> </select>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">站別：</label> <label class="layui-form-label">站別：</label>
<div class="layui-input-inline" style="width:100px"> <div class="layui-input-inline" style="width:100px">
<select id="theStation" lay-event="theStation" lay-filter="theStation" lay-submit asp-items="@ViewBag.StationList"> <select id="theStation" lay-event="theStation" lay-filter="theStation" lay-submit asp-items="@ViewBag.StationList">
</select> </select>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<div class="layui-input-inline" style="width:200px"> <div class="layui-input-inline" style="width:200px">
<input lay-filter="show" lay-skin="primary" type="checkbox" value="" title="勾選確認顯示線別/站別" /> <input lay-filter="show" lay-skin="primary" type="checkbox" value="" title="勾選確認顯示線別/站別" />
</div> </div>
</div> </div>
</div>*@ </div>*@
</div> </div>
@*<div class="layui-inline"> @*<div class="layui-inline">
<div class="layui-form-item"> <div class="layui-form-item">
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span> <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<button id="querysubmitTmp" class="layui-btn tt">暫存</button> <button id="querysubmitTmp" class="layui-btn tt">暫存</button>
<button id="querysubmit" class="layui-btn tt">儲存</button> <button id="querysubmit" class="layui-btn tt">儲存</button>
</div> </div>
</div>*@ </div>*@
</form> </form>
<form id="modeltable"> <form id="modeltable">
@if (ViewBag.InspectionTypeID == 1000) @if (ViewBag.InspectionTypeID == 1000)
@ -143,7 +143,7 @@
@*回復*@ @*回復*@
<script type="text/html" id="selectResult"> <script type="text/html" id="selectResult">
<select name="selectResult" lay-filter="selectResult" id="selectResult" data-value={{d.result}} class="layui-form"> <select name="selectResult" lay-filter="selectResult" id="selectResult" data-value={{d.result}} class="layui-form selectResult">
<option value="NA">N/A</option> <option value="NA">N/A</option>
<option value="P">PASS</option> <option value="P">PASS</option>
<option value="F">FAIL </option> <option value="F">FAIL </option>
@ -355,12 +355,14 @@
laytpl = layui.laytpl, laytpl = layui.laytpl,
laydate = layui.laydate; laydate = layui.laydate;
itemslist(); itemslist();
function itemslist() { function itemslist() {
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, url: '/SPC/GetInspectionResultDetailsAndBolb?id=' + formID,
id: 'test', id: 'test',
@ -406,7 +408,7 @@
var btn = '<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.stations.newCno > 0) if (d.stations.newCno > 0)
btn = btn + '<i class="layui-icon" style="font-size: 20px;">&#xe66e;</i> ' ; btn = btn + '<i class="layui-icon" style="font-size: 20px;">&#xe66e;</i> ';
return btn; return btn;
@ -430,9 +432,24 @@
elem.val(elem.data('value')).parents('div.layui-table-cell').css('overflow', 'visible'); elem.val(elem.data('value')).parents('div.layui-table-cell').css('overflow', 'visible');
}); });
form.render(); form.render();
handleSelectResult();
} }
}); });
} }
// Table SelectResult 選項字體換色
function handleSelectResult() {
$('.selectResult').each(function () {
console.log($(this).val());
if ($(this).val() === 'P') {
$(this).next().find('input').css('color', 'green');
}
else if ($(this).val() === 'F') {
$(this).next().find('input').css('color', 'red');
}
});
}
/*表格列表操作*/ /*表格列表操作*/
table.on('tool(test)', function (obj) { table.on('tool(test)', function (obj) {
var data = obj.data, layEvent = obj.event; var data = obj.data, layEvent = obj.event;
@ -539,27 +556,41 @@
$('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide'); $('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide');
} }
}); });
});
function GetPLM_ECN() { // 選單選擇後換色 SelectResult 選項字體換色
var ItemNo = $("#ItemNo").val(); form.on('select(selectResult)', function (data) {
$.ajax({ var id = data.elem.id;
url: "@Url.Action("SPC005GetPLMECN", "SPC")", if (data.value === "P") {
type: "Post", $(data.elem).next().find('input').css('color', 'green');
data: { "ItemNo": ItemNo },
success: function (result) {
if (result.success) {
$('#PLMECN').val(result.msg);
} }
else { else if (data.value === "F") {
alert(result.msg); $(data.elem).next().find('input').css('color', 'red');
} }
}, else{
error: function (result) { $(data.elem).next().find('input').css('color', 'black');
alert(`呼叫API失敗`); }
} });
}); });
}
function GetPLM_ECN() {
var ItemNo = $("#ItemNo").val();
$.ajax({
url: "@Url.Action("SPC005GetPLMECN", "SPC")",
type: "Post",
data: { "ItemNo": ItemNo },
success: function (result) {
if (result.success) {
$('#PLMECN').val(result.msg);
}
else {
alert(result.msg);
}
},
error: function (result) {
alert(`呼叫API失敗`);
}
});
}
// PLM_ECN // PLM_ECN
$("#GetPLMECN").on("click", function () { $("#GetPLMECN").on("click", function () {
var ItemNo = $("#ItemNo").val(); var ItemNo = $("#ItemNo").val();
@ -629,7 +660,5 @@
}; };
}); });
</script> </script>
} }

242
AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml
View File

@ -1,7 +1,8 @@
@model AMESCoreStudio.WebApi.Models.AMES.InspectionResultMaster @model AMESCoreStudio.WebApi.Models.AMES.InspectionResultMaster
@{ ViewData["Title"] = "SPC005U"; @{
ViewData["Title"] = "SPC005U";
Layout = "~/Views/Shared/_AMESLayout.cshtml"; Layout = "~/Views/Shared/_AMESLayout.cshtml";
//Layout = "~/Views/Shared/_FormLayout.cshtml"; //Layout = "~/Views/Shared/_FormLayout.cshtml";
} }
@ -15,12 +16,24 @@
margin-left: -10px; margin-left: -10px;
margin-right: -10px; margin-right: -10px;
} }
.layui-table-cell { .layui-table-cell {
height: auto; height: auto;
overflow: visible; overflow: visible;
text-overflow: inherit; text-overflow: inherit;
white-space: normal white-space: normal
} }
.layui-disabled-red {
color: red !important;
cursor: not-allowed !important
}
.layui-disabled-green {
color: green !important;
cursor: not-allowed !important
}
green
</style> </style>
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-body"> <div class="layui-card-body">
@ -64,15 +77,17 @@
<table class="layui-hide" id="test" lay-filter="test" lay-data="{id:'test'}"></table> <table class="layui-hide" id="test" lay-filter="test" lay-data="{id:'test'}"></table>
</form> </form>
</div> </div>
</div> </div>
@section Scripts { @section Scripts {
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); @{
await Html.RenderPartialAsync("_FileinputScriptsPartial"); } await Html.RenderPartialAsync("_ValidationScriptsPartial");
await Html.RenderPartialAsync("_FileinputScriptsPartial");
}
@*回復*@ @*回復*@
<script type="text/html" id="selectResult"> <script type="text/html" id="selectResult">
<select name="selectResult" lay-filter="selectResult" id="selectResult" data-value={{d.result}} class="layui-form" disabled> <select name="selectResult" lay-filter="selectResult" id="selectResult" data-value={{d.result}} class="layui-form selectResult" disabled>
<option value="NA">N/A</option> <option value="NA">N/A</option>
<option value="P">PASS</option> <option value="P">PASS</option>
<option value="F">FAIL </option> <option value="F">FAIL </option>
@ -100,115 +115,130 @@
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () { layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () {
var layer = layui.layer, var layer = layui.layer,
$ = layui.jquery, $ = layui.jquery,
form = layui.form, form = layui.form,
table = layui.table; table = layui.table;
itemslist(); itemslist();
function itemslist() { function itemslist() {
var formID = $("#InspectionID").val(); var formID = $("#InspectionID").val();
table.render({ table.render({
elem: '#test', elem: '#test',
url: '/SPC/GetInspectionResultDetailsandBolb?id=' + formID, url: '/SPC/GetInspectionResultDetailsandBolb?id=' + formID,
id: 'test', id: 'test',
toolbar: '#toolBar', toolbar: '#toolBar',
//height:720, //height:720,
page: false, page: false,
cols: [[ cols: [[
{ field: 'inspectionItemID', width: 50, title: '#', }, { field: 'inspectionItemID', width: 50, title: '#', },
{ {
field: 'inspectionItem', field: 'inspectionItem',
title: '項目', title: '項目',
align: 'left', align: 'left',
sort: true, sort: true,
templet: function (d) { templet: function (d) {
return d.inspectionItem['inspectionItemName']; return d.inspectionItem['inspectionItemName'];
} }
}, },
{ {
field: 'inspectionItem', field: 'inspectionItem',
title: '標準值', title: '標準值',
minwidth: 80, minwidth: 80,
align: 'left', align: 'left',
templet: function (d) { templet: function (d) {
return d.inspectionItem['inspectionItemValue']; return d.inspectionItem['inspectionItemValue'];
} }
}, },
{ 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" }, { field: 'location', title: '插件位置', width: 100, align: "left" },
{ 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' { field: 'missingRemark', title: '備註', width: 250, align: "left" },//templet: '#inputTest'
{ {
field: 'right', field: 'right',
width: 120, width: 120,
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',
templet: function (d) { templet: function (d) {
var btn = '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">上傳圖片</a> ';
if (d.stations.newCno > 0)
btn = btn + '<i class="layui-icon" style="font-size: 20px;">&#xe66e;</i> ';
return btn;
var btn = '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">上傳圖片</a> ';
if (d.stations.newCno > 0)
btn = btn + '<i class="layui-icon" style="font-size: 20px;">&#xe66e;</i> ';
return btn;
}
} }
]],
done: function (res, curr, count) {
$(".layui-table-main tr").each(function (index, val) {
$($(".layui-table-fixed .layui-table-body tbody tr")[index]).height($(val).height());
});
layui.each($('select'), function (index, item) {
var elem = $(item);
elem.val(elem.data('value')).parents('div.layui-table-cell').css('overflow', 'visible');
});
form.render();
handleSelectResult();
} }
]], });
done: function (res, curr, count) { }
$(".layui-table-main tr").each(function (index, val) {
$($(".layui-table-fixed .layui-table-body tbody tr")[index]).height($(val).height()); // Table SelectResult 選項字體換色
}); function handleSelectResult() {
layui.each($('select'), function (index, item) { $('.selectResult').each(function () {
var elem = $(item); console.log($(this));
elem.val(elem.data('value')).parents('div.layui-table-cell').css('overflow', 'visible'); if ($(this).val() === 'P') {
}); $(this).next().find('input').addClass('layui-disabled-green');
form.render(); }
} else if ($(this).val() === 'F') {
}); $(this).next().find('input').addClass('layui-disabled-red');
} }
/*表格列表操作*/ });
table.on('tool(test)', function (obj) { }
var data = obj.data, layEvent = obj.event;
if (layEvent === 'edit') { /*表格列表操作*/
var id = $("#InspectionID").val(); table.on('tool(test)', function (obj) {
if (obj.data.inspectionItemID) { var data = obj.data, layEvent = obj.event;
layer.open({ if (layEvent === 'edit') {
type: 2 //此處以iframe舉例 var id = $("#InspectionID").val();
, title: '上傳文件' if (obj.data.inspectionItemID) {
, area: ['480px', '400px'] layer.open({
, shade: 0 type: 2 //此處以iframe舉例
, maxmin: true , title: '上傳文件'
, offset: 'auto'//顯示座標-auto居中 , area: ['480px', '400px']
, content: "/SPC/SPC005R?id=" + id + "&itemID=" + obj.data.inspectionItemID , shade: 0
//, btn: ['關閉'] , maxmin: true
, yes: function () { , offset: 'auto'//顯示座標-auto居中
//layer.close(); , content: "/SPC/SPC005R?id=" + id + "&itemID=" + obj.data.inspectionItemID
if (layer.confirm('確定要關閉麼')) { //, btn: ['關閉']
layer.close(index); , yes: function () {
//layer.close();
if (layer.confirm('確定要關閉麼')) {
layer.close(index);
}
// $(that).click();
} }
// $(that).click(); , zIndex: 19891014 //layer.zIndex //重點1
} , success: function (layero) {
, zIndex: 19891014 //layer.zIndex //重點1 layer.setTop(layero); //重點2
, success: function (layero) { }
layer.setTop(layero); //重點2 });
} //hg.open('上傳文件', '/SPC/SPC005R?id=' + id + '&itemID=' + obj.data.inspectionItemID, 1080, 640);
}); }
//hg.open('上傳文件', '/SPC/SPC005R?id=' + id + '&itemID=' + obj.data.inspectionItemID, 1080, 640);
} }
});
});
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') {
parent.hg.msg(error);
} }
}); });
});
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') {
parent.hg.msg(error);
}
});
</script> </script>
} }

Write Preview
Loading…
Cancel
Save