From 02af6ea33f505e4e06dc91785154898a801b267d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 14 四月 2025 12:21:56 +0800
Subject: [PATCH] 修复出站单 第三个自定义过滤没有数据显示，完善生产质量汇报单 复制一行不显示，修复不良原因查询在其他页面打开报错，性能散点报表 增加生产资源过滤，设备工艺参数点检表 完善 初始化点检人 id未赋值
---
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 206 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 173 insertions(+), 33 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index a6177a4..e62ea36 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -351,6 +351,13 @@
</select>
</script>
+ <!--澶嶉�夋 鏄惁蹇呭綍鎺у埗-->
+ <script type="text/html" id="HIsRequired">
+ <div class="layui-input-block" style="margin-left: 20px;">
+ <input type="checkbox" name="HIsRequired" lay-filter="HIsRequired" id="HIsRequired{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
+ </div>
+ </script>
+
<script>
//鑾峰彇鍙傛暟
var OptionData = [];
@@ -371,19 +378,19 @@
}
- var edit = function (data) {
+ var edit = function (data) {
HSourceInterID = data[0].HSourceInterID;
HSourceEntryID = data[0].HSourceEntryID;
HSourceBillNo = data[0].HSourceBillNo;
HSourceBillType = data[0].HSourceBillType;
}
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -397,7 +404,7 @@
var HMaker = sessionStorage["HUserName"]
var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
var option = {};
-
+
//#endregion
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -453,9 +460,35 @@
//鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(HMaker);
- $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
}
- else if (OperationType == 2) { //缂栬緫
+ else if (OperationType == 2) { //澶嶅埗
+
+ //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+ RoadBillMain(HInterID);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(HMaker);
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ OperationType = 1;
+ }
+ else if (OperationType == 3) { //缂栬緫
$("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(HInterID);
@@ -472,15 +505,21 @@
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMaker").val(HMaker);
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛業D
+ $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鎿嶄綔鍛�
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭杞﹂棿
+ $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+ $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
//宸ュ簭娴佽浆鍗￠〉闈笅鎺�
if (HInterID == "") { //鎶ュ伐鍙颁笅鎺�
set_ProcessBill(HSourceInterID, HSourceEntryID);
} else {
set_ProcessBill(HInterID, HEntry);
}
-
+
OperationType = 1;
- }
+ }
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
@@ -521,7 +560,7 @@
$('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
+ "HBillNo": OperationType == 2 ? '' : data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HICMOInterID": data.HICMOInterID
, "HICMOEntryID": data.HICMOEntryID
@@ -570,7 +609,7 @@
for (let i = 0; i < result.data.length; i++) {
rowdata.push(
{
- "HTechParamID": result.data[i].HTechParamID
+ "HTechParamID": result.data[i].HTechParamID
, "HTechParamNumber": result.data[i].HTechParamNumber
, "HTechParamName": result.data[i].HTechParamName
, 'HTechParamUnitID': result.data[i].HTechParamUnitID
@@ -589,6 +628,7 @@
, 'HMax': result.data[i].HMax
, 'HMin': result.data[i].HMin
, 'HResult': result.data[i].HResult
+ , 'HIsRequired': result.data[i].HIsRequired
, 'HRemark': result.data[i].HRemark
}
)
@@ -634,16 +674,17 @@
, { field: 'HTechParamUnitName', title: '宸ヨ壓鍙傛暟鍗曚綅鍚嶇О', width: 130, style: 'background-color:#efefef4d;' }
, { field: 'HSNO', title: '宸ヨ壓娆″簭', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
- , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" }
- , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' }
- , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: false, event: "HVaule" }
+ , { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', hide: true, width: 130, edit: 'text', event: "HTechParamIDStdName" }
+ , { field: 'HResultStd', title: '璁惧璁惧畾鍊�', hide: true, width: 130, edit: 'text' }
+ , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: false, event: "HVaule" }
, { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
, { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
, { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
, { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
+ , { field: 'HIsRequired', title: '鏄惁蹇呭綍', width: 100, templet: "#HIsRequired" }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
- ]]
+ // , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
}
var rowdata = [{
@@ -653,18 +694,19 @@
, "HTechParamID": "0"
, "HTechParamNumber": ""
, "HTechParamName": ""
- ,"HSNO":"0"
+ , "HSNO": "0"
, "HTechParamUnitID": "0"
, "HTechParamUnitNumber": ""
, "HTechParamUnitName": ""
, "HTechParamIDStd": "0"
, "HTechParamIDStdName": ""
- ,"HResultStd":""
+ , "HResultStd": ""
, "HVaule": ""
, "HStd": ""
, "HMax": ""
, "HMin": ""
, "HResult": "OK"
+ , "HIsRequired": false
, "HRemark": ""
}];
@@ -729,7 +771,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -787,7 +829,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -845,7 +887,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -874,7 +916,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes']
+ , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html?openType=2', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -990,6 +1032,7 @@
, "HMax": ""
, "HMin": ""
, "HResult": "OK"
+ , "HIsRequired": false
, "HRemark": ""
};
@@ -1284,17 +1327,47 @@
var field = cell.data('field'); // 鑾峰彇瀛楁
var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
- // 浣跨敤 layui 鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
+ // 浣跨敤layui鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
var updatedData = table.cache['mainTable'].map(function (item) {
- if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤 numbers 鍒楃储寮曞畾浣�
+ if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤numbers鍒楃储寮曞畾浣�
item[field] = newValue;
}
return item;
});
- layui.table.reload('mainTable', {
- data: updatedData
+ // 鑾峰彇褰撳墠琛屾暟鎹�
+ var currentRowData = table.cache['mainTable'].find(function (item) {
+ return item.LAY_TABLE_INDEX === rowIndex;
});
+
+ // 鍋囪杩欓噷瑕佸垽鏂殑瀛楁鏄� 'HVaule'锛屼綘鍙互鏍规嵁瀹為檯闇�姹備慨鏀硅鍒ゆ柇鐨勫瓧娈靛悕
+ if (field === 'HVaule') {
+ var valueToCheck = parseFloat(newValue);
+ var lowerLimit = parseFloat(currentRowData.HMin);
+ var upperLimit = parseFloat(currentRowData.HMax);
+
+ // 寰幆閬嶅巻褰撳墠琛屼笂涓嬮檺鏁版嵁骞惰繘琛屽垽鏂紙杩欓噷鍏跺疄涓昏鏄垽鏂綋鍓嶈鐨勪笂涓嬮檺涓庢洿鏂板�肩殑鍏崇郴锛�
+ if (valueToCheck >= lowerLimit && valueToCheck <= upperLimit) {
+ // 鏇存柊褰撳墠琛岀殑HResult涓篛K
+ currentRowData.HResult = 'OK';
+ } else {
+ currentRowData.HResult = 'NG';
+ }
+ }
+
+ checkRefresh();
+
+ //// 浣跨敤 layui 鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
+ //var updatedData = table.cache['mainTable'].map(function (item) {
+ // if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤 numbers 鍒楃储寮曞畾浣�
+ // item[field] = newValue; // 鏇存柊瀛楁鍊�
+ // item.HResult = hResult; // 鏇存柊妫�娴嬬粨鏋�
+ // }
+ // return item;
+ //});
+ //layui.table.reload('mainTable', {
+ // data: updatedData
+ //});
// 鍙栨秷缂栬緫鐘舵��
cell.removeAttr('contenteditable');
//鍙栨秷鍐掓场
@@ -1413,13 +1486,29 @@
});
});
+ //鏄惁 蹇呭綍鎺у埗
+ form.on('checkbox(HIsRequired)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ 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.HIsRequired = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ });
+
//琛屾暟鎹� 涓嬫媺澶嶉�夋 鍒锋柊琛ㄦ牸
function checkRefresh() {
for (var i = 1; i <= option.data.length; i++) {
//鐘舵��
- $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+ $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").prop("selected", true);
+ if (option.data[i - 1].HIsRequired) {
+ $('#HIsRequired' + i + '').attr("checked", true);
+ }
}
form.render('select');
+ form.render('checkbox');
}
//#endregion
@@ -1474,6 +1563,13 @@
});
var rowdata = [];
for (var i = 0; i < result.data.length; i++) {
+ // 鑾峰彇褰撳墠鐨勬暟閲囧�笺�佷笂闄愬�煎拰涓嬮檺鍊硷紝骞剁‘淇濆畠浠槸鏁板�肩被鍨�
+ var value = parseFloat(result.data[i]["鏁伴噰鍊�"]);
+ var max = parseFloat(result.data[i]["涓婇檺鍊�"]);
+ var min = parseFloat(result.data[i]["涓嬮檺鍊�"]);
+
+ // 鍒ゆ柇 HResult 鐨勫��
+ var hResult = (value <= max && value >= min) ? "OK" : "NG";
rowdata.push(
{
"HTechParamClassID": result.data[i]["HTechParamClassID"] == null ? 0 : result.data[i]["HTechParamClassID"],
@@ -1483,7 +1579,7 @@
"HTechParamName": result.data[i]["宸ヨ壓鍙傛暟鍚嶇О"],
"HTechParamUnitID": result.data[i]["HTechParamUnitID"] == null ? 0 : result.data[i]["HTechParamUnitID"],
"HTechParamUnitNumber": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜"],
- "HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"] ,
+ "HTechParamUnitName": result.data[i]["宸ヨ壓鍙傛暟鍗曚綅鍚嶇О"],
"HSNO": result.data[i]["宸ヨ壓娆″簭"] == null ? 0 : result.data[i]["宸ヨ壓娆″簭"],
"HTechParamIDStd": result.data[i]["HTechParamIDStd"] == null ? 0 : result.data[i]["HTechParamIDStd"],
"HTechParamIDStdName": result.data[i]["瀵瑰簲璁惧畾鍊煎伐鑹哄弬鏁�"],
@@ -1492,13 +1588,15 @@
"HStd": result.data[i]["鏍囧噯鍊�"],
"HMax": result.data[i]["涓婇檺鍊�"],
"HMin": result.data[i]["涓嬮檺鍊�"],
- "HRemark": result.data[i]["閲囬泦鏉ユ簮"]
+ "HRemark": result.data[i]["閲囬泦鏉ユ簮"],
+ "HResult": hResult,
+ "HIsRequired": result.data[i]["HIsRequired"]
}
);
}
option.data = rowdata;
-
table.render(option);
+ checkRefresh();
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1511,7 +1609,7 @@
})
}
//#endregion
-
+
//#region 鍔熻兘鎺т欢
//#region 鎻愪氦
@@ -1555,6 +1653,12 @@
if (data.count == 1) {
layer.msg(data.Message, { icon: 1 });
$('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ set_CheckBill(1); //瀹℃牳
+ }
+ layer.close(index);
layer.close(index);
}
else {
@@ -1573,11 +1677,39 @@
//#endregion
+
+ //#region 瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+ function set_CheckBill(num) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Check_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
//#region 閫�鍑�
form.on('submit(btn_Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
//鎿嶄綔绫诲瀷锛圤perationType=1鏂板銆丱perationType=2缂栬緫锛�
- if (OperationType == 2) {
+ if (OperationType == 2 || OperationType == 1) {
Pub_Close(1);
}
else {
@@ -1774,7 +1906,15 @@
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i <= sSubStr.length - 1; i++) {
if (sSubStr[i].HTechParamID == "0") {
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟淇℃伅涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟浠ｇ爜/鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ //if (sSubStr[i].HRemark == "鎵嬪姩杈撳叆" && (sSubStr[i].HVaule == "" || sSubStr[i].HVaule == null)) {
+ // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵嬫湳杈撳叆鐨勫伐鑹哄弬鏁板�间笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ if (sSubStr[i].HIsRequired == "true" && (sSubStr[i].HVaule == "" || sSubStr[i].HVaule == null)) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,宸ヨ壓鍙傛暟鍊间笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -1849,7 +1989,7 @@
});
})
}
- //#endregion
+ //#endregion
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1