From fccdd555727976799c698b03442ee4cb42df88e3 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 31 八月 2021 08:38:02 +0800
Subject: [PATCH] 模具故障登记单维护

---
 WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html     |   18 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html |  850 +++++++++++++++++++++++++++-----------------------------
 2 files changed, 418 insertions(+), 450 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
index e46078a..8a767e4 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
@@ -91,7 +91,7 @@
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
-                                   
+
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -106,7 +106,7 @@
                                                     <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                 </div>
                                             </div>
-                                          
+
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -172,22 +172,17 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-    <script>//鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
 
 
         layui.config({
@@ -195,6 +190,8 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region  鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -202,302 +199,55 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            var sBillType = "3807";
+            var TabRow = { "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "", "HConkExplanation": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+            //#endregion
 
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate'
+            //#region  杩涘叆椤甸潰鍒濆鍖�
 
-            });
-            laydate.render({
-                elem: '#HConkBeginDate'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-            });
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-            var tableReload = table.reload;
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 500
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
-                    { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    , { field: 'HConkReasonID', title: 'HConkReasonID', edit: 'text', hide: true }
-                    , { field: 'HConkReasonCode', title: '鏁呴殰鍘熷洜浠g爜', edit: 'text', event: "HConkReasonCode"}
-                    , { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜', edit: 'text'}
-                    , { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text'}
-                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
-                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode"}
-                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text'}
-                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text'}
-                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo'}
-                ]]
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "", "HConkExplanation": "", "HManagerID": 0,"HManagerCode":"", "HManagerName": "", "HRemark": "" }];
-                table.render(option);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
             }
             else {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                //缂栬緫鍔犺浇鏁版嵁
-                $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai',
-                    type: "GET",
-                    //data: { "sqlWhere": "and HInterID=" + hID },
-                    data: { "sqlWhere": "and hmainid=" + hID },
-                    success: function (result) {
-                        //console.log('gouba' + result);
-                        if (result.count == 1) {
-                            option.data = result.data;
-                            table.render(option);
-
-                        } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(index0);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
+         
 
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛�
 
             //澶村伐鍏锋爮浜嬩欢
-            var rowid = 0;
-            var rows = 0;
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "", "HConkExplanation": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+                var NewRow = TabRow;
                 switch (obj.event) {
-                    case 'btn-AddLine':
-                        //table.cache["mainTable"].push(AddRow[rows]);
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-                        table.render(option);
-                        rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                    //澧炲姞涓�琛�
+                    case 'btn-AddLine': set_AddLine(NewRow);
                         break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': set_CopyLine(data);
                         break;
                 }
             });
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
-                var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
-                        console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
-                        } else {
-                            //obj.del();
-                            //layer.close(index);
-                            var oldData = table.cache["mainTable"];
-                            oldData.splice(obj.tr.data('index'), 1);
-                            table.reload('mainTable', { data: oldData });
-                            layer.close(index);
-                        }
-                    });
-                }
-               
-               
-                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
-                    if (event.key == "F7") {
-                        if (obj.event === 'HConkReasonCode')  //鏁呴殰鍘熷洜浠g爜
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '鏁呴殰鍘熷洜鍒楄〃',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/FaultReasonInformation.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({
-                                        HConkReasonID: checkStatus.data[0].HItemID,
-                                        HConkReasonCode: checkStatus.data[0].HNumber,
-                                        HConkReasonName: checkStatus.data[0].HName,
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
-
-                        if (obj.event === 'HManagerCode')  //璐熻矗浜轰俊鎭�
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '璐熻矗浜轰俊鎭垪琛�',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/UserInformation.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({
-                                        HManagerID: checkStatus.data[0].HItemID,
-                                        HManagerCode: checkStatus.data[0].HNumber,
-                                        HManagerName: checkStatus.data[0].HName
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
-
-                        obj.event = "";
-                        return false;
-
-                    }
-                })
-
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
 
             });
-
-
-
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                $.ajax({
-                    url: GetWEBURL() + "Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
-                    type: "GET",
-                    data: {
-                        "HID": hID
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MouldConkBookBillList_Edit[0];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": formatDate(data.鏃ユ湡)
-                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HMouldID": data.HMouldID        //妯″叿ID
-                                , "HName": data.浜у搧妯″叿      //妯″叿鍚嶇О
-                                , "HConkTypeID": data.HConkTypeID  //鏁呴殰绫诲埆ID
-                                , "HConkTypeName": data.鏁呴殰绫诲埆  //鏁呴殰绫诲埆鍚嶇О
-                                , "HEmpID": data.HEmpID            //鍙戠幇浜篒D
-                                , "HEmpName": data.鍙戠幇浜�            //鍙戠幇浜哄悕绉�
-                                , "HConkBeginDate": formatDate(data.鏁呴殰鍙戠敓鏃ユ湡)
-                                , "HEndDate": formatDate(data.瑕佹眰瀹屽杽鏃ユ湡)
-                                , "HManagerID": data.HManagerID    //璐熻矗浜篒D
-                                , "HManagerName": data.璐熻矗浜�    //璐熻矗浜哄悕绉�
-                                , "HDeptID": data.HDeptID        //浣跨敤閮ㄩ棬ID
-                                , "HDeptName": data.浣跨敤閮ㄩ棬     //浣跨敤閮ㄩ棬
-                                , "HExplanation": data.鎽樿
-                                , "HRemark": data.澶囨敞
-                            });
-
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-
-
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3815' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HConkBeginDate").val(shijian);
-                        $("#HEndDate").val(shijian);
-                        $("#HInterID").val(0);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
 
             //鎴愬搧妯″叿寮圭獥
             form.on('submit(ProductModulList)', function () {
@@ -575,7 +325,7 @@
                 });
             });
 
-            //琛ㄥご淇℃伅鍙戠幇浜哄脊绐� 
+            //琛ㄥご淇℃伅鍙戠幇浜哄脊绐�
             form.on('submit(HEmpList)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -613,7 +363,7 @@
                 });
             });
 
-            //琛ㄥご淇℃伅璐熻矗浜哄脊绐� 
+            //琛ㄥご淇℃伅璐熻矗浜哄脊绐�
             form.on('submit(HManagerList)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -651,7 +401,7 @@
                 });
             });
 
-            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥 
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -689,24 +439,184 @@
                 });
             });
 
-
-
-
+            //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
 
-           
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {
+                //debugger;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                //瀵规暟鎹繘琛岄獙璇�
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Sc_MouldConkBookBill/SaveGetMouldConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
 
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
 
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
 
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
+             //#endregion
 
+            //#region  褰撳墠椤甸〉闈㈡墍鏈夋柟娉�
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom()
+            {
+
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HConkBeginDate'
+                });
+                laydate.render({
+                    elem: '#HEndDate'
+                });
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [ 
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HConkReasonID', title: 'HConkReasonID', edit: 'text', hide: true }
+                    , { field: 'HConkReasonCode', title: '鏁呴殰鍘熷洜浠g爜', edit: 'text', event: "HConkReasonCode" }
+                    , { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜', edit: 'text' }
+                    , { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text' }
+                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
+                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                option.data = [TabRow];
+                table.render(option);
+            }
+
+            //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HConkBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_EditFromGrid() {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                option.data = [TabRow];
+                table.render(option);
+            }
+
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldConkBookBillList_Edit[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HMouldID": data.HMouldID        //妯″叿ID
+                                , "HName": data.浜у搧妯″叿      //妯″叿鍚嶇О
+                                , "HConkTypeID": data.HConkTypeID  //鏁呴殰绫诲埆ID
+                                , "HConkTypeName": data.鏁呴殰绫诲埆  //鏁呴殰绫诲埆鍚嶇О
+                                , "HEmpID": data.HEmpID            //鍙戠幇浜篒D
+                                , "HEmpName": data.鍙戠幇浜�            //鍙戠幇浜哄悕绉�
+                                , "HConkBeginDate": formatDate(data.鏁呴殰鍙戠敓鏃ユ湡)
+                                , "HEndDate": formatDate(data.瑕佹眰瀹屽杽鏃ユ湡)
+                                , "HManagerID": data.HManagerID    //璐熻矗浜篒D
+                                , "HManagerName": data.璐熻矗浜�    //璐熻矗浜哄悕绉�
+                                , "HDeptID": data.HDeptID        //浣跨敤閮ㄩ棬ID
+                                , "HDeptName": data.浣跨敤閮ㄩ棬     //浣跨敤閮ㄩ棬
+                                , "HExplanation": data.鎽樿
+                                , "HRemark": data.澶囨敞
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
             function formatDate(date) {
                 var d = new Date(date),
                     month = '' + (d.getMonth() + 1),
@@ -719,170 +629,228 @@
                 return [year, month, day].join('-');
             }
 
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+            // 缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai',
+                    type: "GET",
+                    data: { "sqlWhere": "and hmainid=" + linterid },
+                    success: function (result) {
+                        //console.log('gouba' + result);
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
 
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Sc_MouldConkBookBill/SaveGetMouldConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainSub },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { time: 1 * 1000, icon:1 }, function () {
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                });
-                            }
-                            else {
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
 
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                            }
-                            layer.closeAll("loading");
-                        },
-                        error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
                         }
                     });
-            });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
+                }
             }
 
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+            //琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HConkReasonCode')  //缁翠慨浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鏁呴殰鍘熷洜鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/FaultReasonInformation.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({
+                                        HConkReasonID: checkStatus.data[0].HItemID,
+                                        HConkReasonCode: checkStatus.data[0].HNumber,
+                                        HConkReasonName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HManagerCode')  //璐熻矗浜轰俊鎭�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璐熻矗浜轰俊鎭垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UserInformation.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({
+                                        HManagerID: checkStatus.data[0].HItemID,
+                                        HManagerCode: checkStatus.data[0].HNumber,
+                                        HManagerName: checkStatus.data[0].HName
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
                     }
-                    //}
+                })
+            }
+
+            //澧炲姞涓�琛�
+            function set_AddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+            }
+
+            //澶嶅埗涓�琛�
+            function set_CopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
                 }
-            });
+                else if (data.length > 1) {
+                    layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    //layer.alert(copyrow);
+                }
+            }
 
+            //#endregion
 
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+          
         });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID, ZRProcName, QRName
-            ;
-        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
-        {
-            HReasonName = obj[0].HName;
-            ReasonID = obj[0].HItemID;
-        }
-        //杩斿洖鐗╂枡
-        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
-            $("#HMater").val(obj[0].HName);
-            $("#HMaterID").val(obj[0].HItemID);
-            $("#HMaterNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖宸ュ簭
-        function GetHProcValue(obj) {  //杩斿洖宸ュ簭
-            $("#HProcName").val(obj[0].宸ュ簭);
-            $("#HProcID").val(obj[0].HItemID);
-            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
-        }
-        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
-            $("#HDepName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-            $("#HDeptNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖鍗曚綅
-        function GetHUnitNameValue(obj) {
-            $("#HUName").val(obj[0].HName);
-            $("#HUnitID").val(obj[0].HItemID);
-            $("#HUnitNumber").val(obj[0].HNumber);
-        }
 
-        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
-            EmpName = obj[0].HName;
-            // $("#HEmpName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
-        //    SQProcName = obj[0].宸ュ簭;
-        //    ProcID = obj[0].HItemID;
-        //    //$("#HSQProcName").val(obj[0].宸ュ簭);
-        //    //$("#HProcID").val(obj[0].HItemID);
-        //}
-        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
-            ZRProcName = obj[0].宸ュ簭;
-            //$("#HZRProcName").val(obj[0].宸ュ簭);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //HWorker
-        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
-            QRName = obj[0].HName;
-            //$("#HQRName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        function AllowLoadData(sSubStr) {
+            if ($("#HMouldID").val() == ''&& $("#HName").val() == '') {
+                layer.msg("鎴愬搧妯″叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HConkTypeID").val() == '' && $("#HConkTypeName").val() == '') {
+                layer.msg("鏁呴殰绫诲埆娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+            if ($("#HEmpID").val() == '' && $("#HEmpName").val() == '') {
+                layer.msg("鍙戠幇浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HManagerID").val()==''&& $("#HManagerName").val() == '') {
+                layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HDeptID").val() == '' && $("#HDeptName").val() == '') {
+                layer.msg("浣跨敤閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+          
+            //鍒ゆ柇鐗╂枡鏄庣粏椤�
+            if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].HRepairCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
                     }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
+                    if (sSubStr[i].HManagerCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    else {
+                        return true;
+                    }
                 }
             }
             else {
                 return true;
             }
-        }</script>
+        }
+  </script>
 </body>
 </html>
\ No newline at end of file
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_MouldConkBookBillList.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_MouldConkBookBillList.html"
index 7af0c98..d7f1a1a 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
@@ -220,7 +220,7 @@
                         , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
                         , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
                         , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115}
                         , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
                         , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
@@ -241,7 +241,7 @@
 
             //鏌ヨ
             function get_Display(sWhere) {
-                var index = layer.load(0, { shade: false });
+                var index = layer.load();//閬僵
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
@@ -270,16 +270,16 @@
                 var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
                 var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
                 if (HBillNo) {
-                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
                 if (HCreateBy) {
-                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
+                    sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
                 }
                 if (BenginHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
                 }
                 if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
                 }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -296,7 +296,7 @@
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html',
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?OperationType=1&linterid=&HSouceBillType=',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();
@@ -312,7 +312,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var hID = data[0].hmainid.toString();
+                    var linterid = data[0].hmainid.toString();
                     //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                     layer.open({
                         type: 2
@@ -322,7 +322,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?hID=' + hID
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                         , resize: false,
                         end: function () {
                             //鍒锋柊椤甸潰,

--
Gitblit v1.9.1