From 3bad6bae1832b354575bb742ea4eba62de5975b0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 28 十一月 2024 14:30:26 +0800
Subject: [PATCH] 首巡末:上下限编辑查看为带出 表头判定结论 也是根据结论判断,保存时,上下限没有保存进去 进站加生产资源不能为空的控制
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 8 ++++++--
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 9 ++++++---
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 4 ++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 7 +++++--
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index efca783..61a9c0c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -1397,7 +1397,7 @@
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
switch (field) {
case "HInspectVal": //妫�楠屽��
- value = isNaN(value) ? 0 : value;
+ value = isNaN(value) ? 0 : parseFloat(value);
if (HAnalysisMethod == "2") {
if (value <= HUpLimit && value >= HDownLimit) {
@@ -1415,6 +1415,7 @@
$('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
}
form.render('select');
+ LastResult();
}
break;
}
@@ -2609,7 +2610,10 @@
// set_SaveValue(dataindex + 1);
//}
//鍙屽嚮妫�楠岄」鐩浜嬩欢 璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
+ if ($("#HSampleSchemeID").val() != "0") {
+ Assignment(nowindex, dataindex);
+ }
+
if (isHavingCount == false && OperationType != 3) {
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index d8cd76e..ca4ac99 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1321,7 +1321,7 @@
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
switch (field) {
case "HInspectVal": //妫�楠屽��
- value = isNaN(value) ? 0 : value;
+ value = isNaN(value) ? 0 : parseFloat(value);
if (HAnalysisMethod == "2") {
if (value <= HUpLimit && value >= HDownLimit) {
@@ -1339,6 +1339,7 @@
$('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
}
form.render('select');
+ LastResult();
}
break;
}
@@ -1532,7 +1533,7 @@
$("input[name=HCheckerResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
$("input[name=HCheckerResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
- form.render();
+ form.render("radio");
data = result.data;
//瀛愯〃 璧嬪��
var rowdata = [];
@@ -2578,7 +2579,9 @@
}
//璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
+ if ($("#HSampleSchemeID").val() != "0") {
+ Assignment(nowindex, dataindex);
+ }
if (isHavingCount == false && OperationType != 3) {
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
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 468502b..9ca65e7 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"
@@ -2643,7 +2643,9 @@
set_SaveValue(dataindex + 1);
}
//璧嬪�间笌鍥炴樉
- Assignment(nowindex, dataindex);
+ if ($("#HSampleSchemeID").val() != "0") {
+ Assignment(nowindex, dataindex);
+ }
if (isHavingCount == false && OperationType != 3) {
var row_value = [];
for (let i = 0; i < SampleNum[nowindex]; i++) {
@@ -3911,7 +3913,7 @@
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
switch (field) {
case "HInspectVal": //妫�楠屽��
- value = isNaN(value) ? 0 : value;
+ value = isNaN(value) ? 0 : parseFloat(value);
if (HAnalysisMethod == "2") {
if (value <= HUpLimit && value >= HDownLimit) {
obj.update({
@@ -3928,6 +3930,7 @@
$('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
}
form.render('select');
+ LastResult();
}
break;
case "HTargetVal": //鐩爣鍊�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index ff0ee97..65c2fee 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -514,6 +514,10 @@
layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+ if ($("#HSourceID").val() == 0) {
+ layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
//console.log(data.field);
var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + OperationType;
//var oMain = data.field;
--
Gitblit v1.9.1