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

1.修改巡检结果维护SPC005C,SPC005U 

1.1.表头增加线别，站别选择，并自动赋值列表中的线别，站别
1.2.表头增加复选框，显示/隐藏 线别&站别栏位
PTD
Marvin 2 years ago
parent
ebdd0e3b8d
commit
6a2257136c
2 changed files with 126 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
  2. 64
      AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml

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

@ -31,7 +31,7 @@
<div class="layui-card-body">
<label class="layui-form-label" value="@ViewBag.FormName"></label>
<label class="layui-form-label" value="@ViewBag.InspectionForm"></label>
<form id="modelform" method="post">
<form class="layui-form" id="modelform" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<input type="hidden" id="InspectionID" asp-for="InspectionID" value="@ViewBag.MasterID" />
<input type="hidden" id="InspectionFormID" asp-for="InspectionFormID" value="@ViewBag.FormID" />
@ -78,6 +78,27 @@
<input type="hidden" asp-for="StatusNo" value="T" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">線別：</label>
<div class="layui-input-inline" style="width:100px">
<select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">站別：</label>
<div class="layui-input-inline" style="width:100px">
<select id="theStation" lay-event="theStation" lay-filter="theStation" lay-submit asp-items="@ViewBag.StationList">
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="width:200px">
<input lay-filter="show" lay-skin="primary" type="checkbox" value="" title="勾選確認顯示線別/站別" />
</div>
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-form-item">
@ -113,12 +134,12 @@
</script>
@*線別*@
<script type="text/html" id="selectLine">
<select name='line' lay-verify='' lay-search='' asp-items="@ViewBag.LineList" class="layui-form" lay-filter="line">
<select id='line' name='line' lay-verify='' lay-search='' asp-items="@ViewBag.LineList" class="layui-form" lay-filter="line">
</select>
</script>
@*站別*@
<script type="text/html" id="selectStation">
<select name='station' lay-verify='' lay-search='' asp-items="@ViewBag.StationList" class="layui-form" lay-filter="station">
<select id='station' name='station' lay-verify='' lay-search='' asp-items="@ViewBag.StationList" class="layui-form" lay-filter="station">
</select>
</script>
@*插件位置*@
@ -494,8 +515,8 @@
{ field: 'inspectionItemName', title: '項目', align: 'left' },
{ field: 'inspectionItemValue', title: '標準值', align: 'left' },
{ field: 'inspectionResult', title: '稽核結果', width: 100, align: "left", templet: '#selectResult' },
{ field: 'line', title: '線別', width: 100, align: "left", templet: '#selectLine' },
{ field: 'station', title: '站別', width: 100, align: "left", templet: '#selectStation' },
{ field: 'line', title: '線別', width: 100, align: "left", templet: '#selectLine', style: 'display:none' },
{ field: 'station', title: '站別', width: 100, align: "left", templet: '#selectStation', style: 'display:none' },
{ field: 'Location', title: '插件位置', width: 100, align: "left", templet: '#inputLocation' },
{ field: 'missingUnitNo', title: '缺失單位', width: 100, align: "left", templet: '#selectDept' },
{ field: 'MissingUserID', title: '缺失人員', width: 100, align: "left", templet: '#selectUser' },
@ -562,6 +583,10 @@
}
}
});
$('table.layui-table thead tr th:nth-child(5)').addClass('layui-hide');
$('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide');
form.on('select(line)', function (data) {
//获取下拉框选中的值
var score = data.value;
@ -581,7 +606,42 @@
console.log(data);
});
form.on('select(theLine)', function (data) {
//'#line'只更改第一行
//'#line '更改全部
var select = 'dd[lay-value=' + data.value + ']';
$('#line ').each(function () {
$(this).siblings("div.layui-form-select").find('dl').find(select).click();
});
});
form.on('select(theStation)', function (data) {
//'#station'只更改第一行
//'#station '更改全部
var select = 'dd[lay-value=' + data.value + ']';
var changeselect = $('#station ').siblings("div.layui-form-select").find('dl').find(select).click();
});
form.on('checkbox(show)', function (data) {
console.log(data.elem.checked); //是否被选中，true 或者 false
if (data.elem.checked)
{
$("[data-field='line']").css('display', 'inline-block');
$("[data-field='station']").css('display', 'inline-block');
$('table.layui-table thead tr th:nth-child(5)').removeClass('layui-hide');
$('table.layui-table thead tr th:nth-child(6)').removeClass('layui-hide');
}
else
{
$("[data-field='line']").css('display', 'none');
$("[data-field='station']").css('display', 'none');
$('table.layui-table thead tr th:nth-child(5)').addClass('layui-hide');
$('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide');
}
});
});
function CheckBarcodeNo(BarcodeNo, WipNo) {

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

@ -21,7 +21,7 @@
<div class="layui-card-body">
<label class="layui-form-label" value="@ViewBag.FormName"></label>
<label class="layui-form-label" value="@ViewBag.InspectionForm"></label>
<form id="modelform">
<form class="layui-form" id="modelform">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<input type="hidden" id="InspectionID" asp-for="InspectionID" />
<input type="hidden" id="InspectionFormID" asp-for="InspectionFormID" />
@ -66,6 +66,27 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">線別：</label>
<div class="layui-input-inline" style="width:100px">
<select id="theLine" lay-event="theLine" lay-filter="theLine" lay-submit asp-items="@ViewBag.LineList">
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">站別：</label>
<div class="layui-input-inline" style="width:100px">
<select id="theStation" lay-event="theStation" lay-filter="theStation" lay-submit asp-items="@ViewBag.StationList">
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="width:200px">
<input lay-filter="show" lay-skin="primary" type="checkbox" value="" title="勾選確認顯示線別/站別" />
</div>
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-form-item">
@ -334,8 +355,8 @@
}
},
{ field: 'result', title: '稽核結果', width: 100, align: "left", templet: '#selectResult' },
{ field: 'lineID', title: '線別', width: 100, align: "left", templet: '#selectLine' },
{ field: 'ruleStationID', title: '站別', width: 100, align: "left", templet: '#selectStation' },
{ field: 'lineID', title: '線別', width: 100, align: "left", templet: '#selectLine', style: 'display:none' },
{ field: 'ruleStationID', title: '站別', width: 100, align: "left", templet: '#selectStation', style: 'display:none' },
{ field: 'location', title: '零件位置', width: 100, align: "left", templet: '#inputLocation' },
{ field: 'missingUnitNo', title: '缺失單位', width: 100, align: "left", templet: '#selectDept' },
{ field: 'missingUserID', title: '缺失人員', width: 100, align: "left", templet: '#selectUser' },
@ -426,6 +447,10 @@
}
}
});
$('table.layui-table thead tr th:nth-child(5)').addClass('layui-hide');
$('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide');
form.on('select(line)', function (data) {
//获取下拉框选中的值
var score = data.value;
@ -445,7 +470,40 @@
console.log(data);
});
form.on('select(theLine)', function (data) {
//'#line'只更改第一行
//'#line '更改全部
var select = 'dd[lay-value=' + data.value + ']';
$('#selectLine ').each(function () {
$(this).siblings("div.layui-form-select").find('dl').find(select).click();
});
});
form.on('select(theStation)', function (data) {
//'#station'只更改第一行
//'#station '更改全部
var select = 'dd[lay-value=' + data.value + ']';
var changeselect = $('#selectStation ').siblings("div.layui-form-select").find('dl').find(select).click();
});
form.on('checkbox(show)', function (data) {
console.log(data.elem.checked); //是否被选中，true 或者 false
if (data.elem.checked) {
$("[data-field='lineID']").css('display', 'inline-block');
$("[data-field='ruleStationID']").css('display', 'inline-block');
$('table.layui-table thead tr th:nth-child(5)').removeClass('layui-hide');
$('table.layui-table thead tr th:nth-child(6)').removeClass('layui-hide');
}
else {
$("[data-field='lineID']").css('display', 'none');
$("[data-field='ruleStationID']").css('display', 'none');
$('table.layui-table thead tr th:nth-child(5)').addClass('layui-hide');
$('table.layui-table thead tr th:nth-child(6)').addClass('layui-hide');
}
});
});
// PLM_ECN

Write Preview
Loading…
Cancel
Save