From 3dfe7dfe993869c8a44e9ccf177849abe98ca8d0 Mon Sep 17 00:00:00 2001
From: wangbin <lan@DESKTOP-MG88OFJ>
Date: 星期一, 08 七月 2024 10:12:25 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
index cfff6cd..bdd4360 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.html"
@@ -68,7 +68,7 @@
                                                 <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="0" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
@@ -86,7 +86,7 @@
                                                 <label class="layui-form-label">鐐规璁″垝缂栧彿<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
@@ -108,7 +108,7 @@
                                                 <label class="layui-form-label" style="width:95px;">鍣ㄥ叿鐐规瑙勭▼<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HMouldDotCheckRuleName" id="HMouldDotCheckRuleName" class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMouldDotCheckRuleID" id="HMouldDotCheckRuleID" class="layui-input" value="0" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldDotCheckRule" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
@@ -333,6 +333,10 @@
 
                         $("#HPlanNo").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HPlanInterID").val(checkStatus.data[0].hmainid);
+                        $("#HMouldID").val(checkStatus.data[0].HMouldID);
+                        $("#HMouldName").val(checkStatus.data[0].浜у搧妯″叿);
+                        $("#HMouldDotCheckRuleID").val(checkStatus.data[0].HMouldDotCheckRuleID);
+                        $("#HMouldDotCheckRuleName").val(checkStatus.data[0].HMouldDotCheckRuleNo);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                         //$.ajax({
                         //    url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
@@ -453,6 +457,8 @@
                         console.log(checkStatus);
                         $("#HMouldDotCheckRuleName").val(checkStatus.data[0].鍗曟嵁鍙�);
                         $("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
+                        $("#HMouldID").val(checkStatus.data[0].HMouldID);
+                        $("#HMouldName").val(checkStatus.data[0].妯″叿鍚嶇О);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                         get_DocCheckItem2(checkStatus.data[0].hmainid);
                     }
@@ -806,8 +812,8 @@
                         if (result != null) {
                             if (result.count == 1) {
                                 var BYData = result.list[0];//鐐规
-                                var PJData = result.list[1];//閰嶄欢
-                                var rowdate1 = layui.table.cache["mainTable"];
+                                //var PJData = result.list[1];//閰嶄欢
+                                //var rowdate1 = layui.table.cache["mainTable"];
                                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                 table.render(option);
 
@@ -816,9 +822,9 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HDotCheckItemID": BYData[i].鐐规ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
-                                            "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
-                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].澶囨敞, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+                                            "HDotCheckItemID": BYData[i].鐐规椤圭洰ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
+                                            "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浠g爜,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].琛ㄤ綋澶囨敞, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -845,8 +851,8 @@
                         if (result != null) {
                             if (result.count == 1) {
                                 var BYData = result.list[0];//鐐规
-                                var PJData = result.list[1];//閰嶄欢
-                                var rowdate1 = layui.table.cache["mainTable"];
+                                //var PJData = result.list[1];//閰嶄欢
+                                //var rowdate1 = layui.table.cache["mainTable"];
                                 option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                 table.render(option);
 
@@ -855,9 +861,9 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HDotCheckItemID": BYData[i].鐐规ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
+                                            "HDotCheckItemID": BYData[i].鐐规椤圭洰ID, "HDotCheckItem": BYData[i].鐐规椤圭洰, "HDotCheckPart": BYData[i].鐐规閮ㄤ綅,
                                             "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
-                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].澶囨敞, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HRemark": BYData[i].瀛愬娉�, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].鐐规椤圭洰鍒嗙被鍚嶇О, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].鐐规鏂规硶鍚嶇О, "HDotCheckResult": "Y"
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -897,15 +903,15 @@
                                 , "HExplanation": data.鎽樿
                                 , "HRemark": data.澶囨敞
                                 //, "HPlanNo": data.鐐规璁″垝缂栧彿
-                                , "HPlanInterID": data.HPlanInterID
-                                , "HPlanNo": data.HPlanNo //鐐规璁″垝鍐呯爜
-                                , "HMouldID": data.HMouldID
-                                , "HMouldDotCheckRuleName": data.HMouldDotCheckRuleName  //鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙�
-                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID
+                                , "HPlanInterID": data.HPlanInterID == undefined ? 0 : data.HPlanInterID
+                                , "HPlanNo": data.鐐规璁″垝鍐呯爜
+                                , "HMouldID": data.HMouldID == undefined ? 0 : data.HPlanInterID
+                                , "HMouldDotCheckRuleName": data.鍣ㄥ叿鐐规瑙勭▼鍗曟嵁鍙�
+                                , "HMouldDotCheckRuleID": data.HMouldDotCheckRuleID == undefined ? 0 : data.HPlanInterID
                                 , "HErrNote": data.寮傚父鎯呭喌璁板綍 //寮傚父鎯呭喌璁板綍
                                 , "HBigSafeNote": data.閲嶅ぇ瀹夊叏闅愭偅璁板綍 //閲嶅ぇ瀹夊叏闅愭偅璁板綍
                                 , "HDotCheckNote": data.鐐规鏁版嵁 //鐐规鏁版嵁
-                                , "HShiftsID": data.HShiftsID //
+                                , "HShiftsID": data.HShiftsID == undefined ? 0 : data.HPlanInterID
                                 , "HShiftsName": data.鐝鍚嶇О //鐝鍚嶇О
                             });
                             if (data.鏈�缁堢粨璁� == "涓嶅悎鏍�") {

--
Gitblit v1.9.1