From 404e1079eff665f7b5926f79774c6d59b2213434 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 07 八月 2023 14:40:39 +0800
Subject: [PATCH] 首件检验单
---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 668 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 557 insertions(+), 111 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 6fb232c..41fdd83 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -436,14 +436,6 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
- <div class="layui-input-block" style="margin-left: 100px;">
- <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px;">
- <div class="layui-inline">
<label class="layui-form-label" style="width: 70px;">妫�楠岄」鐩�</label>
<div class="layui-input-block" style="margin-left: 45px;">
<input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
@@ -451,6 +443,14 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
+ <div class="layui-input-block" style="margin-left: 100px;">
+ <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -471,7 +471,7 @@
</div>
<div class="layui-row" style="margin-top:5px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 70px;">鏍锋湰涓嶅悎鏍兼暟</label>
+ <label class="layui-form-label" style="width: 70px;">涓嶅悎鏍兼暟</label>
<div class="layui-input-block" style="margin-left: 100px;">
<input type="text" class="layui-input" name="HSampleUnRightQty2" id="HSampleUnRightQty2" value="0" style="">
</div>
@@ -595,8 +595,8 @@
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>-->
</div>
</script>
<!--闅愯棌瀛楁-->
@@ -639,7 +639,7 @@
</select>
</script>
<!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
- <script type="text/html" id="HKeyInspect_Sub">
+ <script type="text/html" id="HKeyInspect">
<input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
</script>
<script>
@@ -672,8 +672,9 @@
var trindex = ""; //榛樿閫変腑琛屼笅鏍�
var SummaryIndex = []; //閫変腑琛屼笅鏍囨眹鎬�
var LastIndex = 0; //鏈�鍚庨�変腑涓�琛岀殑涓嬫爣
- var isFristClick = true;
- var isHavingCount = false;
+ var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
+ var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
+ var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
@@ -1039,7 +1040,7 @@
Pub_Close(1);
}
- //琛屽唴浜嬩欢
+ //琛屽唴浜嬩欢--妫�楠岄」鐩�
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
@@ -1075,11 +1076,9 @@
});
}
-
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
- if (obj.event == 'HQCCheckItemID') //妯″叿淇℃伅
- {
+ if (obj.event == 'HQCCheckItemID') {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -1117,12 +1116,381 @@
});
}
+ if (obj.event == 'HInSpectValueB_Open') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽�煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
obj.event = "";
return false;
}
})
});
+
+ //琛屽唴浜嬩欢--妫�楠屽��
+ table.on('tool(ValueTable)', function (obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event == 'HInSpectValueB_Open') {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妫�楠屽�煎垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ var DXValue = checkStatus.data[0].妫�楠屽�煎悕绉�; //瀹氭�ф娴嬪��
+ var MBValue = $("#HTargetVal").val(); //鐩爣鍊�
+
+ if (Number(DXValue) == Number(MBValue)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ form.render('select');
+
+ addUnRightQty();//缁熻涓嶅悎鏍兼暟閲�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ });
+
+ table.on('edit(ValueTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+
+ var MBValue = $("#HTargetVal").val();//鐩爣鍊�
+ var HComparator = $("#HComparator").val();//姣旇緝绗�
+
+ switch (field) {
+ //瀹氭�ф娴�
+ case "HInSpectValueB":
+
+ break;
+ //瀹氶噺妫�娴�
+ case "HInSpectValue":
+ Qualified_Value(HComparator, MBValue, value, obj);
+ addUnRightQty();
+ break;
+ //鍏朵粬妫�娴�
+ case "HInSpectValueT":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ form.render('select');
+ addUnRightQty();
+ break;
+ }
+ });
+
+ function addUnRightQty() {
+ //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+ var HValueTable = table.cache["ValueTable"];
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+ for (let i = 0; i < HValueTable.length; i++) {
+ if (HValueTable[i].HInSpectResult == 2) {
+ UnRightQty++;
+ }
+ }
+ UnRightQty_isFied = UnRightQty;
+ $("#HSampleUnRightQty").val(UnRightQty);
+ $("#HSampleUnRightQty2").val(UnRightQty);
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+ var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+ if (UnRightQty > HAcceptQty) {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+ $("#HInspectResultToSee").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+ $("#HInspectResultToSee").val('鍚堟牸');
+ $("#HInspectResultToSee2").val('鍚堟牸');
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ form.render('select');
+ LastResult();
+ }
+
+ function Qualified_Value(HComparator, MBValue, value, obj) {
+ var HUpLimit = $("#HUpLimit").val(); //涓婇檺鍊�
+ var HDownLimit = $("#HDownLimit").val(); //涓嬮檺鍊�
+ var HStatus = $("#HStatus").val() //鐘舵��
+
+ if (HStatus == 1) {
+ switch (HComparator) {
+ case "=":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case ">":
+ if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case ">=":
+ if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<":
+ if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<=":
+ if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "<>":
+ if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ case "between":
+ if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ } else {
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ }
+ break;
+ }
+ } else {
+ switch (HComparator) {
+ case "=":
+ if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case ">":
+ if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case ">=":
+ if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<":
+ if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<=":
+ if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "<>":
+ if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ case "between":
+ if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+ obj.update({
+ HInSpectResult: 2
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+ } else {
+ obj.update({
+ HInSpectResult: 1
+ });
+ $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+ }
+ break;
+ }
+ }
+
+
+ form.render('select');
+ }
//淇濆瓨鎸夐挳
form.on('submit(btnSave)', function (data) {
@@ -1219,18 +1587,21 @@
//缂栬緫鏃跺姞杞借〃澶�
function RoadBillMain(linterid) {
var ajaxLoad = layer.load();
+ var sWhere = " and hmainid=" + linterid;
$.ajax({
- url: GetWEBURL() + "/GetQC_FirstPieceCheckDetail",
+ url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
type: "GET",
- data: { "HID": linterid },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+ //var data = result.data.h_v_QC_Edit_FirstPieceCheckBillList[0];
+ var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
- , "HSourceID": data.鐢熶骇璧勬簮ID
+ , "HSourceID": data.HSourceID
, "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
, "HICMOBillNo": data.浠诲姟鍗曞彿
, "HICMOQty": data.浠诲姟鍗曟暟閲�
@@ -1242,16 +1613,14 @@
, "HProcExchBillNo": data.HProcExchBillNo
, "HProcExchInterID": data.HProcExchInterID
, "HProcExchEntryID": data.HProcExchEntryID
- , "HFirstCheckEmp": data.妫�楠屽憳ID
- , "HFirstCheckEmpName": data.妫�楠屽憳鍚嶇О
+ , "HFirstCheckEmp": data.HFirstCheckEmp
+ , "HFirstCheckEmpName": data.璐ㄦ鍛樺悕绉�
//, "HQCCheckProjectID": data.妫�楠屾柟妗圛D
//, "HQCCheckProjectName": data.妫�楠屾柟妗堝悕绉�
//, "HQCCheckProjectID": data.HManagerID
//, "HPSStyleID": data.HPSStyleID
-
, "HRemark": data.琛ㄥご澶囨敞
//, "HSSID": data.HSSID
-
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡
, "HChecker": data.瀹℃牳浜�
@@ -1260,15 +1629,45 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡
, "HUpDateDate": data.淇敼鏃ユ湡
, "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HSampleSchemeID": data.HSampleSchemeID
+ , "HSampleSchemeName": data.鎶芥牱鏂规鍚嶇О
+ , "HSampleQty": data.鏍锋湰閲�
+ , "HSampleQty2": data.鏍锋湰閲�
+ , "HSampleDamageQty": data.鏍锋湰鐮村潖鏁�
+ , "HSamplingType": data.鎶芥牱绫诲瀷
+ , "HAcceptQty": data.鍏佽鏁�
+ //, "HInspectResultToSee": data.浣滃簾鏃ユ湡 //妫�楠岀粨鏋�
+ , "HInspectionLevel": data.妫�楠屾按骞�
+ , "HRejectQty": data.鎷掔粷鏁�
+ , "HStrictness": data.涓ユ牸搴�
+ , "HSampleUnRightQty": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HSampleUnRightQty2": data.鏍锋湰涓嶅悎鏍兼暟
+ , "HAQL": data.AQL
+ , "HUnitID": data.HUnitID
+ , "HUnit": data.鍗曚綅
+ , "HInspectValB": data.妫�娴嬪�煎熀纭�璧勬枡
+ , "HInspectVal": data.妫�娴嬪��
+ , "HTargetValB": data.鐩爣鍊煎熀纭�璧勬枡
+ , "HTargetVal": data.鐩爣鍊�
+ , "HUpLimit": data.涓婇檺鍊�
+ , "HDownLimit": data.涓嬮檺鍊�
+ , "HUpOffSet": data.涓婂亸宸�
+ , "HDownOffSet": data.涓嬪亸宸�
+ , "HEntryID": data.hsubid
+ , "HQCCheckItemName": data.妫�楠岄」鐩悕绉�
+ , "HQCCheckItemID": data.HQCCheckItemID
});
- data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
+ data = result.data;
+ //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
//瀛愯〃 璧嬪��
var rowdata = [];
for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HQCStd": data[i].HQCStd, "HUnit": data[i].HUnit, "HQCNote": data[i].HQCNote, "HResult": data[i].HResult,
- "HMax": data[i].HMax, "HMin": data[i].HMin, "HAvg": data[i].HAvg, "HRemark": data[i].HRemark
+ "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
+ "HUnit": data[i].妫�楠屽崟浣�, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹,
+ "HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
+ "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HKeyInspect": data[i].閲嶇偣妫�鏌� == 0 ? false : true,
}
)
}
@@ -1276,7 +1675,13 @@
option.data = rowdata;
table.render(option);
for (let j = 0; j < data.length; j++) {
- $("#HResult" + (j + 1)).val(data[j].HResult)
+ $("#HResult" + (j + 1)).val(data[j].缁撹)
+ }
+ for (let j = 0; j < data.length; j++) {
+ $("#HAnalysisMethod" + (j + 1)).val(data[j].鍒嗘瀽鏂规硶)
+ }
+ for (var i = 1; i <= data.length; i++) {
+ $('#HKeyInspect' + i + '').find("option[value='" + (data[i - 1].閲嶇偣妫�鏌� == 0 ? false : true) + "']").attr("selected", true);
}
form.render('select');
@@ -1628,7 +2033,20 @@
type: "GET",
data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
success: function (result) {
- option.data = result.data;
+ var rowdata = [];
+ var data = result.data;
+ for (var i = 0; i < result.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+ "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+ "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+ "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+ "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+ });
+ }
+
+ option.data = rowdata;
table.render(option);
for (var i = 1; i <= result.data.length; i++) {
@@ -1643,7 +2061,7 @@
$("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
$("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
//榛樿閫変腑鏈�鍚庝竴琛�
- //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").click();
+ $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
//$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
$("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
@@ -1870,7 +2288,7 @@
}];
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, height: 'full-50'
, cellMinWidth: 150
@@ -1881,7 +2299,7 @@
, { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
, { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
, { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
- , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect_Sub', unresize: false }
+ , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
, { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
, { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
@@ -1950,7 +2368,7 @@
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { field: 'HSEQ', title: '搴忓彿' }
, { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
- , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text' }
+ , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
, { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
, { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
//, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
@@ -1989,7 +2407,43 @@
value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
+
+ //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+ var selectValue = data.value;
+ if (selectValue == 1) {
+ selectValue = "鍚堟牸"
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ selectValue = "涓嶅悎鏍�"
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
+ $("#HInspectResultToSee").val(selectValue);
+ $("#HInspectResultToSee2").val(selectValue);
+ //$("#HInSpectResult" + Guid).val(selectValue);
+ //$("[name='HResult']").val(selectValue);
+
+ //$("[name='HInspectResult']").val(selectValue);
+ form.render('select');
+
+ LastResult();
});
+
+ function LastResult() {
+ var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+ for (let i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i].HResult == 2) {
+ HQty++;
+ }
+ }
+ if (HQty > 0) {
+ $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true");
+ } else {
+ $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true");
+ }
+ form.render('radio');
+ }
////琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級-- 澶囦唤
//form.on('select(HInSpectResult)', function (data) {
@@ -2016,12 +2470,14 @@
//寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
var HValueTable = table.cache["ValueTable"];
- var UnRightQty = 0;
+ var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
for (let i = 0; i < HValueTable.length; i++) {
if (HValueTable[i].HInSpectResult == 2) {
UnRightQty++;
}
}
+ UnRightQty_isFied = UnRightQty;
$("#HSampleUnRightQty").val(UnRightQty);
$("#HSampleUnRightQty2").val(UnRightQty);
var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
@@ -2055,33 +2511,6 @@
//闅愯棌妫�娴嬪�煎瓧娈�
IsHide(data.value);
});
-
- //鐩戝惉涓嬫媺妗嗙紪杈�--缁撹
- form.on('select(HResult)', function (data) {
- //鑾峰彇褰撳墠琛宼r瀵硅薄
- var elem = data.othis.parents('tr');
- //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
- var Guid = elem.first().find('td').eq(1).text();
- //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
- var selectValue = data.value;
-
- if (selectValue == 1) {
- selectValue = "鍚堟牸"
- $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- } else {
- selectValue = "涓嶅悎鏍�"
- $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
- }
- $("#HInspectResultToSee").val(selectValue);
- $("#HInspectResultToSee2").val(selectValue);
- //$("#HInSpectResult" + Guid).val(selectValue);
- //$("[name='HResult']").val(selectValue);
-
- //$("[name='HInspectResult']").val(selectValue);
- form.render('select');
- })
//琛岄�夋嫨澶勭悊锛堢姸鎬侊級
form.on('select(HStatus)', function (data) {
@@ -2149,19 +2578,21 @@
//鏄惁閲嶇偣妫�鏌�
form.on('checkbox(HKeyInspect)', function (data) {
- //$("#HKeyInspect").val(data.elem.checked);
- $("[name='HKeyInspect']").attr("value", data.elem.checked);
-
- if ($("#HKeyInspect").val() == 'true') {
- $("[name='HKeyInspect']").prop("checked", true);
- } else {
- $("[name='HKeyInspect']").prop("checked", false);
- }
- form.render('checkbox');//鍒锋柊鍊�
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
});
- //#region銆愮偣鍑绘楠岄」鐩浜嬩欢銆�
+ //#region銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
table.on('rowDouble(mainTable)', function (obj) {
+ $("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+
//鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
var dataindex = $("#HEntryID").val() - 1;
@@ -2170,8 +2601,8 @@
LastIndex = nowindex;
$("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
- $("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
- $("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+ //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+ //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
//閫変腑琛屾敼鍙橀鑹�
check_row(obj);
@@ -2183,6 +2614,14 @@
//鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
var table_value = table.cache['ValueTable'];
+ set_SaveValue(dataindex + 1);
+ if (isHavingCount == false) {
+ //鍒锋柊妫�楠屽�艰〃鏍�
+ option_Value.data = [{
+ "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+ }];
+ table.render(option_Value);
+ }
//璧嬪�间笌鍥炴樉
Assignment(nowindex, dataindex);
if (isFristClick != true) {
@@ -2195,14 +2634,6 @@
} else {
isFristClick = false;
}
- set_SaveValue(dataindex + 1);
- if (isHavingCount == false) {
- //鍒锋柊妫�楠屽�艰〃鏍�
- option_Value.data = [{
- "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
- }];
- table.render(option_Value);
- }
//console.log(maindata);
//Array.some(item => {
// console.log("==============item===============");
@@ -2249,7 +2680,7 @@
if (HAnalysisMethod == 2) {
$("#HUpLimit").val(HTargetVal) //涓婇檺鍊�
$("#HDownLimit").val(HTargetVal) //涓嬮檺鍊�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
//鍏朵粬鍒嗘瀽
if (HAnalysisMethod == 3) {
@@ -2269,7 +2700,7 @@
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
$("#HUpOffSet").val(Number(HUpLimit) - Number(HTargetVal)) //涓婂亸宸�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
})
@@ -2285,7 +2716,7 @@
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
$("#HDownOffSet").val(Number(HDownLimit) - Number(HTargetVal)) //涓嬪亸宸�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
})
@@ -2301,7 +2732,7 @@
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
$("#HUpLimit").val(Number(HUpOffSet) + Number(HTargetVal)) //涓婇檺鍊�
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
}
})
@@ -2316,7 +2747,7 @@
//瀹氶噺鍒嗘瀽
if (HAnalysisMethod == 2) {
- Qualified(HComparator, HEntryID); //鍒ゆ柇鏄惁鍚堟牸
+ Qualified(HComparator, HEntryID, HAnalysisMethod); //鍒ゆ柇鏄惁鍚堟牸
$("#HDownLimit").val(Number(HDownOffSet) + Number(HTargetVal)) //涓嬮檺鍊�
}
})
@@ -2332,6 +2763,7 @@
var HUpOffSet = $("#HUpOffSet").val() //涓婂亸宸�
var HDownOffSet = $("#HDownOffSet").val() //涓嬪亸宸�
var HStatus = $("#HStatus").val() //鐘舵��
+ var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
//#region銆愬畾鎬у垎鏋愭柟娉曘��
if (HAnalysisMethod == 1) {
@@ -2340,7 +2772,7 @@
switch (HComparator) {
//瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
case '=':
- if (HInspectVal == HTargetVal) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+ if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2353,7 +2785,7 @@
switch (HComparator) {
//瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
case '=':
- if (HInspectVal == HTargetVal) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+ if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2373,7 +2805,7 @@
//姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾鍚堟牸锛�
//涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氬悎鏍硷紝
//涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾鍚堟牸
- if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal)) {
+ if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2381,7 +2813,7 @@
break;
case '>':
//姣旇緝绗︿负'>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) > Number(HTargetVal)) {
+ if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2389,7 +2821,7 @@
break;
case '>=':
//姣旇緝绗︿负'>='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) >= Number(HTargetVal)) {
+ if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2397,7 +2829,7 @@
break;
case '<':
//姣旇緝绗︿负'<'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal)) {
+ if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2405,7 +2837,7 @@
break;
case '<=':
//姣旇緝绗︿负'<='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) <= Number(HTargetVal)) {
+ if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2413,7 +2845,7 @@
break
case '<>':
//姣旇緝绗︿负'<>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) {
+ if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2421,7 +2853,7 @@
break;
case 'between':
//姣旇緝绗︿负'between'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
- if (Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) {
+ if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2436,7 +2868,7 @@
//姣旇緝绗︿负'='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾涓嶅悎鏍硷紝
//涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氫笉鍚堟牸锛�
//涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾涓嶅悎鏍�
- if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal)) {
+ if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2444,7 +2876,7 @@
break;
case '>':
//姣旇緝绗︿负'>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) > Number(HTargetVal)) {
+ if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2452,7 +2884,7 @@
break;
case '>=':
//姣旇緝绗︿负'>='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) >= Number(HTargetVal)) {
+ if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2460,7 +2892,7 @@
break;
case '<':
//姣旇緝绗︿负'<'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal)) {
+ if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2468,7 +2900,7 @@
break;
case '<=':
//姣旇緝绗︿负'<='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) <= Number(HTargetVal)) {
+ if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2476,7 +2908,7 @@
break
case '<>':
//姣旇緝绗︿负'<>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) {
+ if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2484,7 +2916,7 @@
break;
case 'between':
//姣旇緝绗︿负'between'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
- if (Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) {
+ if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2502,7 +2934,7 @@
switch (HComparator) {
case '=':
//姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氬悎鏍硷紝
- if (HInspectVal.toString() == HTargetVal.toString()) {
+ if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
@@ -2515,7 +2947,7 @@
switch (HComparator) {
case '=':
//姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氫笉鍚堟牸锛�
- if (HInspectVal.toString() == HTargetVal.toString()) {
+ if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
$("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
} else {
$("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
@@ -2542,6 +2974,7 @@
}
$("#HInspectResultToSee").val(HInspectResultToSee);
$("#HInspectResultToSee2").val(HInspectResultToSee);
+ LastResult();
};
//#endregion
@@ -2784,6 +3217,13 @@
$("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
$("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+ if (maindata[nowindex].HInspectResultToSee == "鍚堟牸") {
+ $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ } else {
+ $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+ }
var HInterID = $("#HInterID").val();
var HEntryID = $("#HEntryID").val();
@@ -2814,7 +3254,7 @@
$('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
}
- //IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+ IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
form.render('select');
} else {
//layer.msg(result.code + result.Message, { icon: 5 });
@@ -2837,7 +3277,7 @@
$("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
$("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
$("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
- form.render("select");
+
$('#btnSearchInspectValB').removeClass("layui-btn-disabled").attr("disabled", false);//妫�楠屽�兼寜閽惎鐢�
$('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
@@ -2855,7 +3295,7 @@
$('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
$('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
$("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
- form.render("select");
+
} else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
option_Value.cols[0][5].hide = false; //鍏朵粬
@@ -2873,9 +3313,15 @@
$('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
$('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
$("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
- form.render("select");
+
}
+ //閲嶆柊娓叉煋琛ㄦ牸
table.render(option_Value);
+ //涓嬫媺妗嗗洖鏄�
+ for (var i = 0; i < option_Value.data.length; i++) {
+ $('#HInSpectResult' + (i + 1)).find("option[value='" + option_Value.data[i].HInSpectResult + "']").attr("selected", true);
+ }
+ form.render("select");
}
//#endregion
--
Gitblit v1.9.1