From ba9fc1c086b8fe2bf2daf407d5f4884a201a6117 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 30 十一月 2021 17:40:37 +0800
Subject: [PATCH] 修改丸井项目提出的问题+模具保养单选器具以后带出默认保养规程信息

---
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillList.html   |   29 ++--
 WebTM/WebTM.csproj.user                                     |    2 
 WebTM/views/PublicPage/MouldMaintainRuleInterList.html      |   11 -
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillList.html |   35 +++--
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                   |    4 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html   |  122 +++++++++++---------
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html     |    4 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html   |  128 ++++++++++++++++++++-
 8 files changed, 236 insertions(+), 99 deletions(-)

diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c147982..06468a2 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/WebTM/views/PublicPage/MouldMaintainRuleInterList.html b/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
index b752646..5940cfb 100644
--- a/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
+++ b/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
@@ -87,8 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷100046  sessionStorage["OrganizationID"]
-            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 ";  //鍒楄〃
+            var sWhere = " "; //鏍戝瀷100046  sessionStorage["OrganizationID"]
+            var sWhere1 = "";  //鍒楄〃
 
             var option = {
                 elem: '#mainTable'
@@ -98,16 +98,15 @@
                 , cellMinWidth: 90
                 , cols: [[
                     { type: 'radio', fixed: 'left' }
-                    , { field: 'hmainid', title: 'HInterID', sort: true, hide: true }
+                    , { field: 'hmainid', title: 'HInterID' }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: 'HCycleUnit', title: '鍛ㄦ湡鍗曚綅' }
                 ]]
             };
 
             var index = layer.load(0, { shade: false });
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             $.ajax({
-                url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+                url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
                 type: "GET",
                 data: { "sWhere": SeachFilter(sWhere1) },
                 success: function (data1) {
@@ -130,7 +129,7 @@
             form.on('submit(btnSearch)', function (data) {
 
                 $.ajax({
-                    url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+                    url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
                     type: "GET",
                     data: { "sWhere": SeachFilter(sWhere1) },
                     success: function (data1) {
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
index d888aed..26cc27a 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillEdit.html"
@@ -47,6 +47,7 @@
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
                                                     <input id="HInterID" name="HInterID" type="hidden" />
+                                                    <input id="HYear" name="HYear"  type="hidden"/>
                                                     <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
                                                 </div>
                                             </div>
@@ -481,7 +482,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
-                if (AllowLoadData()) {
+                if (AllowLoadData(sSubStr)) {
                     $.ajax(
                         {
                             type: "POST",
@@ -681,6 +682,7 @@
                         $("#HBillNo").val(d.data[0].HBillNo);
                         $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         $("#HInterID").val(0);
+                        $("#HYear").val(Pub_Format(new Date(), "yyyy"));
                     }
                 });
             }
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.html"
index 50d0ae5..54879ae 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairChangeBillList.html"
@@ -178,26 +178,35 @@
                         , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 125, templet: "<div>{{d.寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>" }
                         , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 125, templet: "<div>{{d.缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, hide: true }
-                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 110 }
-                        , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 125 }
-                        , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 125 }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125 }
-                        , { field: '璁″垝宸ユ椂', title: '璁″垝宸ユ椂', width: 125 }
-                        , { field: '瀹為檯宸ユ椂', title: '瀹為檯宸ユ椂', width: 125 }
-                        , { field: '鏀瑰埗鏁伴噺', title: '鏀瑰埗鏁伴噺', width: 125 }
-                        , { field: 'HNewMaterID', title: 'HNewMaterID', width: 200, hide: true }
-                        , { field: '鏂扮墿鏂欎唬鐮�', title: '鏂扮墿鏂欎唬鐮�', width: 115 }
-                        , { field: '鏂扮墿鏂�', title: '鏂扮墿鏂�', width: 125 }
+
                         , { field: 'HRepairID', title: 'HRepairID', width: 200, hide: true }
                         , { field: '鏀瑰埗椤圭洰浠g爜', title: '鏀瑰埗椤圭洰浠g爜', width: 115 }
                         , { field: '鏀瑰埗椤圭洰', title: '鏀瑰埗椤圭洰', width: 125 }
+
                         , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
-                        , { field: 'HEmpID', title: '鐢宠浜篒D', width: 125,hide: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '鏀瑰埗閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬', title: '鏀瑰埗閮ㄩ棬', width: 125 }
+                        , { field: 'HSupID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 115 }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 125 }
+
+                        , { field: 'HEmpID', title: '鐢宠浜篒D', width: 125, hide: true }
                         , { field: '鐢宠浜�', title: '鐢宠浜�', width: 125 }
                         , { field: 'HManagerID', title: '璐熻矗浜篒D', width: 125, hide: true }
                         , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 125 }
+
+                        , { field: '鏀瑰埗绫诲瀷', title: '鏀瑰埗绫诲瀷', width: 125 }
+                        , { field: 'HNewMaterID', title: 'HNewMaterID', width: 125,hide: true }
+                        , { field: '鏂扮墿鏂欎唬鐮�', title: '鏂扮墿鏂欎唬鐮�', width: 125 }
+                        , { field: '鏂扮墿鏂�', title: '鏂扮墿鏂�', width: 125 }
+                        , { field: '鏂板悕绉�', title: '鏂板悕绉�', width: 125 }
+                        , { field: '鏂拌鏍�', title: '鏂拌鏍�', width: 125 }
+                        , { field: '鏂板瀷鍙�', title: '鏂板瀷鍙�', width: 125 }
+
+                        , { field: '璁″垝宸ユ椂', title: '璁″垝宸ユ椂', width: 125 }
+                        , { field: '瀹為檯宸ユ椂', title: '瀹為檯宸ユ椂', width: 125 }
+                        , { field: '鏀瑰埗鏁伴噺', title: '鏀瑰埗鏁伴噺', width: 125 }
+                       
                         , { field: '鏀瑰埗瑕佹眰', title: '鏀瑰埗瑕佹眰', width: 125 }
                         , { field: '鏀瑰埗鍐呭', title: '鏀瑰埗鍐呭', width: 125 }
                         , { field: '澶囨敞', title: '澶囨敞', width: 125 }
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/Gy_MouldFile.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/Gy_MouldFile.html"
index feefb50..28f3697 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/Gy_MouldFile.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/Gy_MouldFile.html"
@@ -315,7 +315,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <!--<div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿鐐规瑙勭▼</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HMouldDotCheckRuleInterName" id="HMouldDotCheckRuleInterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -324,7 +324,7 @@
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div>-->
                                     </div>
                                 </div>
                             </div>
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_MouldMaintainBillList.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_MouldMaintainBillList.html"
index c1cc797..ddf941f 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_MouldMaintainBillList.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_MouldMaintainBillList.html"
@@ -233,7 +233,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = TabRow;
+                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -250,7 +250,7 @@
                 var checkStatus = table.checkStatus('mainTable1')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable1'];
-                var NewRow = TabRow1;
+                var NewRow = { "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HManagerID": "0", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine1': btnAddLine1(NewRow);
@@ -349,14 +349,126 @@
             });
 
             function get_MaintainItem() {
-                $.ajax({
+                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMaintainItemtemByMouldProjectID",
                     type: "GET",
                     data: { "MouldProjectID": $("#HMouldID").val() },
                     success: function (result) {
-                        if (result!=null) {
-                            option.data = result.data;
-                            table.render(option);
+                        if (result != null) {
+                            if (result.count == 1) {
+                                var BYData = result.list[0];//淇濆吇
+                                var PJData = result.list[1];//閰嶄欢
+                                var rowdate1 = layui.table.cache["mainTable"];
+                                var rowdate2 = layui.table.cache["mainTable1"];
+
+                                if (rowdate1.length == 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                {
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < BYData.length; i++) {
+                                        var checkrow = {
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
+                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
+                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    table.reload("mainTable", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                                if (rowdate1.length > 0 && rowdate1.length <= BYData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                                {
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < rowdate1.length; i++) {
+                                        var checkrow = {
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
+                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
+                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    //buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                    table.reload("mainTable", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                                if (rowdate1.length > 0 && rowdate1.length > BYData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                                {
+                                    console.log(checkStatus.data.length);
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < rowdate.length; i++) {
+                                        var checkrow = {
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
+                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
+                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    //buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                    table.reload("mainTable", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+
+
+
+
+                                if (rowdate2.length == 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                {
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < PJData.length; i++) {
+                                        var checkrow = {
+                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
+                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
+                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
+                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
+                                            "HRemark": rowdate2[i].HRemark
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    table.reload("mainTable1", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                                if (rowdate2.length > 0 && rowdate2.length <= PJData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                                {
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < rowdate2.length; i++) {
+                                        var checkrow = {
+                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
+                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
+                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
+                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
+                                            "HRemark": rowdate2[i].HRemark
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    //buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                                    table.reload("mainTable1", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                                if (rowdate2.length > 0 && rowdate2.length > PJData.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+                                {
+                                    console.log(checkStatus.data.length);
+                                    buttonArr = [];//娓呯┖鏁扮粍
+                                    for (var i = 0; i < rowdate.length; i++) {
+                                        var checkrow = {
+                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
+                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
+                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
+                                            "HManagerID": rowdate2[i].HManagerID, "HManagerNumber": rowdate2[i].HManagerNumber, "HManagerName": rowdate2[i].HManagerName,
+                                            "HRemark": rowdate2[i].HRemark
+                                        };
+                                        buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                    }
+                                    table.reload("mainTable1", {
+                                        data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                    })
+                                }
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
                         }
                     }
                 })
@@ -756,8 +868,8 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [];
-                option2.data = [];
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+                option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HManagerID": "0", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                 table.render(option);
                 table.render(option2);
             }
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_MouldMaintainRuleBillEdit.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_MouldMaintainRuleBillEdit.html"
index da7f360..1620035 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_MouldMaintainRuleBillEdit.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_MouldMaintainRuleBillEdit.html"
@@ -12,6 +12,11 @@
         .layui-form-label {
             width: 85px;
         }
+
+        .layui-input-block {
+            margin-left: 123px;
+            min-height: 36px;
+        }
     </style>
 </head>
 <body>
@@ -33,10 +38,6 @@
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
-                                <!--<li>鍏朵粬淇℃伅</li>-->
-                                <!--</ul>-->
                                 <h1 style="text-align:center;"><b>鍣ㄥ叿淇濆吇瑙勭▼鍗�</b></h1>
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
@@ -46,7 +47,7 @@
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo">
                                                     <input id="HInterID" name="HInterID" type="hidden" />
-                                                    <input id="HMaker" name="HMaker" type="hidden" /><!--鍒跺崟浜�-->
+                                                    <input id="HMaker" name="HMaker" type="hidden" />
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -65,18 +66,18 @@
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
-                                                <div class="layui-input-block">
-                                                    <select name="HCycleUnit" lay-filter="HCycleUnit" id="HCycleUnit">
-                                                        <option value="澶�" selected="selected">澶�</option>
-                                                        <option value="鍛�">鍛�</option>
+                                                <div class="layui-input-inline">
+                                                    <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+                                                        <option value="澶�">澶�</option>
                                                         <option value="鏈�">鏈�</option>
+                                                        <option value="鍛�">鍛�</option>
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">淇濆吇鍛ㄦ湡</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input">
+                                                    <input type="text" name="HCheckCycle" id="HCheckCycle" class="layui-input" value="0">
                                                 </div>
                                             </div>
                                         </div>
@@ -98,7 +99,6 @@
                                 </div>
                             </div>
                         </div>
-
                         <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                             <ul class="layui-tab-title">
                                 <li class="layui-this">淇濆吇椤逛俊鎭�</li>
@@ -162,7 +162,7 @@
 
 
         layui.config({
-            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
@@ -350,14 +350,15 @@
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    , { field: '淇濆吇椤圭洰ID', title: '淇濆吇椤圭洰ID', width: 200, hide: true }
-                    , { field: '淇濆吇椤圭洰', title: '淇濆吇椤圭洰', width: 200 }
-                    , { field: '淇濆吇閮ㄤ綅', title: '淇濆吇閮ㄤ綅', width: 200 }
-                    , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
-                    , { field: '璐熻矗浜篒D', title: '璐熻矗浜篒D', width: 200, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', width: 200 }
+                    , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
+                    , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: 'HMaintainItemNumber' }
+                    , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
+                    , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
+                    , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
+                    , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
+                    , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
                 option = {
@@ -369,6 +370,7 @@
                     , height: 500
                     , cols: [columns]
                     , done: function (res, curr, count) {
+
                     }
                 };
             }
@@ -377,16 +379,15 @@
                 //琛ㄥご
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    , { field: '閰嶄欢ID', title: '閰嶄欢ID', width: 200, hide: true }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { field: '鍗曚綅ID', title: '鍗曚綅ID', width: 200, hide: true }
-                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 200 }
-                    , { field: '璁¢噺鍗曚綅鍚嶇О', title: '璁¢噺鍗曚綅鍚嶇О', width: 200 }
-                    , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
-                    , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
-                    , { field: '瀛愬娉�', title: '澶囨敞', width: 200 }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
+                    , { field: 'HMaterNumber', title: '閰嶄欢浠g爜', edit: 'text', event: "HMaterCode" }
+                    , { field: 'HMaterName', title: '閰嶄欢鍚嶇О', edit: 'text', event: "" }
+                    , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+                    , { field: 'HUnitNumber', title: '鍗曚綅浠g爜', edit: 'text', event: "HUnitCode" }
+                    , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', edit: 'text', event: "" }
+                    , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
                 ];
                 option1 = {
@@ -409,7 +410,7 @@
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
                 option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
-                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "",  "HQty": "", "HRemark": "" }];
+                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option);
                 table.render(option1);
             }
@@ -437,7 +438,7 @@
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
                 option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                 table.render(option);
-                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" }];
+                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                 table.render(option1);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -452,15 +453,15 @@
                         //console.log(result.code)
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             //console.log(result)
-                            var data = result.data.h_v_Sb_EquipMaintainBillList[0];
+                            var data = result.data.Sc_MouldMaintainRuleBillMain[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": formatDate(data.鏃ユ湡)
-                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HExplanation": data.鎽樿               //鎽樿
-                                , "HRemark": data.澶囨敞                //澶囨敞
-                                , "HCycleUnit": data.鍛ㄦ湡鍗曚綅
-                                , "HCheckCycle": data.淇濆吇鍛ㄦ湡
+                                "HBillNo": data.HBillNo
+                                , "HDate": formatDate(data.HDate)
+                                , "HInnerBillNo": data.HInnerBillNo
+                                , "HExplanation": data.HExplanation               //鎽樿
+                                , "HRemark": data.HRemark
+                                , "HCycleUnit": data.HCycleUnit
+                                , "HCheckCycle": data.HCheckCycle
                             });
 
                         } else {
@@ -476,7 +477,7 @@
                 $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldMaintainRuleBill/Sc_MouldMaintainRuleBillListProjectDetaiNew',
+                    url: GetWEBURL() + 'Sc_MouldMaintainRuleBill/Sc_MouldMaintainRuleBillSubAndSubItem',
                     type: "GET",
                     data: { "HInterID": linterid },
                     success: function (result) {
@@ -496,6 +497,7 @@
                     }
                 });
             }
+
             //鏃ユ湡鏍煎紡鍖�
             function formatDate(date) {
                 var d = new Date(date),
@@ -520,7 +522,7 @@
                     data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
                 })
             }
-            //澧炲姞涓�琛�1
+            //澧炲姞涓�琛�
             function btnAddLine1(NewRow) {
                 var tableBak = table.cache["mainTable1"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
                 buttonArr = [];//娓呯┖鏁扮粍
@@ -549,7 +551,7 @@
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
                 }
             }
-            //澶嶅埗涓�琛�1
+            //澶嶅埗涓�琛�
             function btnCopyLine1(data) {
                 var copydata = JSON.stringify(data);
                 if (data.length <= 0) {
@@ -586,7 +588,7 @@
                     });
                 }
             }
-            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎1
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
             function set_GridDelete1(obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
@@ -606,12 +608,13 @@
                     });
                 }
             }
-            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�--淇濆吇
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
-                        if (obj.event === 'HMaintainItemNumber')  //淇濆吇椤圭洰淇℃伅
-                        {
+                        //淇濆吇椤圭洰淇℃伅
+                        if (obj.event === 'HMaintainItemNumber') {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
                                 type: 2,
@@ -621,7 +624,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../PublicPage/Gy_Maintain.html', 'yes'],
+                                content: ['../../PublicPage/Gy_Maintain.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -647,8 +650,8 @@
                                 }
                             });
                         }
-                        if (obj.event === 'HManagerNumber')  //璐d换浜轰俊鎭�
-                        {
+                        //璐d换浜轰俊鎭�
+                        if (obj.event === 'HManagerNumber') {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
                                 type: 2,
@@ -658,7 +661,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../PublicPage/UserInformation.html', 'yes'],
+                                content: ['../../PublicPage/UserInformation.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -693,7 +696,7 @@
                     }
                 })
             }
-            // 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�1
+            // 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�--閰嶄欢
             function set_GridCellCheck1(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
@@ -708,7 +711,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../PublicPage/UnitInformation.html', 'yes'],
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -744,7 +747,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../PublicPage/PartInformation.html', 'yes'],
+                                content: ['../../PublicPage/PartInformation.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
                                     //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -775,9 +778,18 @@
                     }
                 })
             }
+
             //闈炵┖楠岃瘉
             function AllowLoadData(sSubStr) {
                 var Result = true;
+                if ($("#HCheckCycle").val() == '' || $("#HCheckCycle").val() == '0') {
+                    layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+                    layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
                 if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                     sSubStr = JSON.parse(sSubStr);
                     for (var i = 0; i < sSubStr.length; i++) {
@@ -790,7 +802,7 @@
                             return Result = false;
                         }
                         if (sSubStr[i].HManagerNumber == "") {
-                            layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐d换浜轰俊鎭负绌�!", { 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;
                         }
 
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_MouldMaintainRuleBillList.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_MouldMaintainRuleBillList.html"
index e4b90af..c4cb9f7 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_MouldMaintainRuleBillList.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_MouldMaintainRuleBillList.html"
@@ -114,7 +114,7 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
         layui.config({
-            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -237,18 +237,19 @@
                         , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                         , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                        , { field: '鍛ㄦ湡鍗曚綅', title: '璁惧浠g爜', width: 200 }
-                        , { field: '淇濆吇鍛ㄦ湡', title: '璁惧鍚嶇О', width: 200 }
+                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
+                        , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
+                        , { field: '閰嶄欢ID', title: '閰嶄欢ID', width: 200, hide: true }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
                         , { field: '鎽樿', title: '鎽樿', width: 200 }
                         , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
                         , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                        , { field: 'hsubid', title: 'hsubid', width: 200,hide: true }
-                        , { field: '妯″叿浠g爜', title: '鍣ㄥ叿浠g爜', width: 115,  }
-                        , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 200 }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 200 }
+                        , { field: '鍗曚綅ID', title: '鍗曚綅ID', width: 200, hide: true }
+                        , { field: '璁¢噺鍗曚綅鍚嶇О', title: '璁¢噺鍗曚綅鍚嶇О', width: 200 }
                         , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
                         , { field: '瀛愬娉�', title: '瀛愬娉�', width: 200 }
-                        , { field: '淇濆吇椤圭洰', title: '淇濆吇椤圭洰', width: 115}
+                        , { field: '淇濆吇椤圭洰', title: '淇濆吇椤圭洰', width: 115 }
                         , { field: '淇濆吇閮ㄤ綅', title: '淇濆吇閮ㄤ綅', width: 200 }
                         , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
                         , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200, hide: true }
@@ -292,7 +293,7 @@
                         , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
                         , { field: '璐熻矗浜篒D', title: '璐熻矗浜篒D', width: 200, hide: true }
                         , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: '璐熻矗浜哄悕绉�', title: '璐熻矗浜�', width: 200 }
                         , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', width: 200 }
                     ]]
                 };
@@ -341,6 +342,8 @@
                             table.render(option);
                             layer.close(index);
                         } else {
+                            option.data = data1.data;
+                            table.render(option);
                             layer.close(index);
                             layer.alert("娌℃湁鏁版嵁璁板綍!", { icon: 5 });
                         }
@@ -358,12 +361,12 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板璁惧淇濆吇璁板綍鍗� ',
+                    title: '鏂板鍣ㄥ叿淇濆吇瑙勭▼鍗� ',
                     closeBtn: false,
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: '../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html?OperationType=1&linterid=&HSouceBillType=',
+                    content: '../妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html?OperationType=1&linterid=&HSouceBillType=',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();
@@ -382,11 +385,11 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '缂栬緫璁惧淇濆吇璁板綍鍗� '
+                        , title: '缂栬緫鍣ㄥ叿淇濆吇瑙勭▼鍗� '
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , content: '../妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                         , resize: false,
                         end: function () {
                             //鍒锋柊椤甸潰,

--
Gitblit v1.9.1