From ac5962f71fe0f4fd4e7e44fb74a02bba7ff816b4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 六月 2024 12:14:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html     |    3 
 WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html        |  379 ++++++++++++++++++++-----------------
 WebTM/views/基础资料/基础资料/Gy_DotCheckList.html                    |  105 ++++++++++
 WebTM/views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html |   54 ++++-
 WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html              |   10 +
 WebTM/views/仓存管理/条码报表/KF_ICinventoryQueryReport.html          |   24 ++
 WebTM/views/车间管理/启动点检单/Sc_WorkBeginDotCheckBill.html          |    4 
 7 files changed, 392 insertions(+), 187 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
index 5088f60..8e6dc97 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/KF_ICinventoryQueryReport.html"
@@ -447,6 +447,30 @@
             }
             //#endregion
 
+            //#region 搴撳瓨鏍″
+            function get_Proofread() {
+            
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/WEBSController/UpdateKf_ICInvBal',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: {},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                               
+                            });
+                        }
+                    },
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 //娓呯┖杩囨护鏉′欢
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
index 3e54945..3f4733a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckList.html"
@@ -9,12 +9,19 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui1.js"></script>
     <script src="../../../layuiadmin/treeTable.js"></script>
     <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 src="../../../layuiadmin/layui/lay/modules/util.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+            background: #aef0f7;
+        }
+    </style>
     <style media="screen">
         .custom-tree-item-clicked {
             color: #FC9003
@@ -81,7 +88,16 @@
                                 </div>
                             </div>
                         </div>
-                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-row" style="padding:10px 0">
+                            <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+                                <div id="TreeTable" class="demo-tree demo-tree-box"></div>
+                            </div>
+                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
+                                <div>
+                                    <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
@@ -233,6 +249,8 @@
 
                 //鏌ヨ
                 get_Display(sWhere);
+                //鏌ヨ璁惧鍒嗙被
+                get_Display_Tree();
             }
 
             //#region鍒濆鍖栬〃鏍�
@@ -580,6 +598,90 @@
 
             }
 
+            // 鏍戠姸鍥炬煡璇�
+            function get_Display_Tree() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_DotCheckBill/TreeGetList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.close(ajaxLoad);
+                            var data = JSON.parse(data1.data);
+                            MenuMain(data);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //閬嶅巻鐢熸垚涓昏彍鍗�
+            function MenuMain(data) {
+                var liStr = '[';
+                //閬嶅巻鐢熸垚涓昏彍鍗�
+                for (var i = 0; i < data.length; i++) {
+                    // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+                    if (data[i].children != null && data[i].children.length > 0) {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+                        // 閬嶅巻鑾峰彇瀛愯彍鍗�
+                        for (var k = 0; k < data[i].children.length; k++) {
+                            liStr += getChildMenu(data[i].children[k], 0);
+                        }
+                        liStr = liStr.substring(0, liStr.length - 1);
+                        liStr += ']},';
+                    } else {
+                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+                    }
+                };
+                liStr = liStr.substring(0, liStr.length - 1);
+                liStr += "]";
+                var treeTable = JSON.parse(liStr);
+                tree.render({
+                    elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+                    , data: treeTable
+                    , click: function (obj) {
+                        //楂樹寒鍙樿壊
+                        $(".layui-tree-set").removeClass('layui-tree-set-active');
+                        obj.elem.addClass('layui-tree-set-active');
+
+                        var data = obj.data;  //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+                        var sql = "";
+                        if (data.id == "0") {
+                            sql = "";
+                        } else {
+                            sql = " and HDotCheckItemClassID='" + data.id + "' ";
+                        }
+                        get_Display(sql);
+                    }
+                });
+            }
+
+            // 閫掑綊鐢熸垚瀛愯彍鍗�
+            function getChildMenu(subMenu, num) {
+                num++;
+                var subStr = '';
+                if (subMenu.children != null && subMenu.children.length > 0) {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+                    for (var j = 0; j < subMenu.children.length; j++) {
+                        subStr += getChildMenu(subMenu.children[j], num);
+                        if (j + 1 == subMenu.children.length) {
+                            subStr = subStr.substring(0, subStr.length - 1);
+                        }
+                    }
+                    subStr += ']},';
+                } else {
+                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+                }
+                return subStr;
+            }
+
+
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
@@ -615,6 +717,7 @@
                 })
             }
             //#endregion
+
             //#region 鏄剧ず鍒楁暟鎹�
             function DisPlay_HideColumn() {
                 $.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
index 7b5b38b..ae37770 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_Add_MESStopStepWorkBillList.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>瀹屽伐鍗�</title>
+    <title>鍋滃伐鍗�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -238,19 +238,46 @@
                                                 </div>
                                                 <div class="layui-form-item">
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+                                                        <label class="layui-form-label">鍋滃伐绫诲瀷</label>
                                                         <div class="layui-input-inline">
-                                                            <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+                                                            <div class="layui-form">
+                                                                <div class="layui-form-item">
+                                                                    <select name="HStopType" id="HStopType" lay-verify="HStopType">
+                                                                        <option value="">璇烽�夋嫨鍋滃伐鍘熷洜</option>
+                                                                        <option value="妯″叿淇濆吇">妯″叿淇濆吇</option>
+                                                                        <option value="鏂枡">鏂枡</option>
+                                                                        <option value="浜哄憳涓嶈冻">浜哄憳涓嶈冻</option>
+                                                                        <option value="鍋滄皵">鍋滄皵</option>
+                                                                        <option value="鍋滄按">鍋滄按</option>
+                                                                        <option value="鍋滅數">鍋滅數</option>
+                                                                        <option value="妯″叿鏁呴殰">妯″叿鏁呴殰</option>
+                                                                        <option value="鐩戞帶鎶ヨ">鐩戞帶鎶ヨ</option>
+                                                                        <option value="鑷姩鍖栨晠闅�">鑷姩鍖栨晠闅�</option>
+                                                                        <option value="娉ㄥ鏈烘晠闅�">娉ㄥ鏈烘晠闅�</option>
+                                                                        <option value="灏哄寮傚父">灏哄寮傚父</option>
+                                                                        <option value="璁″垝鍋滄満">璁″垝鍋滄満</option>
+                                                                        <option value="澶栬涓嶈壇璋冩満">澶栬涓嶈壇璋冩満</option>
+                                                                        <option value="妯″叿娓呮磥">妯″叿娓呮磥</option>
+                                                                        <option value="妯℃俯鏈烘晠闅�">妯℃俯鏈烘晠闅�</option>
+                                                                        <option value="鐑樻枡鏈烘晠闅�">鐑樻枡鏈烘晠闅�</option>
+                                                                    </select>
+                                                                </div>
+                                                            </div>
                                                         </div>
-                                                    </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">澶囨敞</label>
-                                                        <div class="layui-input-inline">
-                                                            <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+                                                            <div class="layui-input-inline">
+                                                                <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">澶囨敞</label>
+                                                            <div class="layui-input-inline">
+                                                                <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
-                                            </div>
                                             <div class="layui-tab-item">
                                                 <div class="layui-form-item">
                                                     <div class="layui-inline">
@@ -577,8 +604,9 @@
                                 , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
                                 , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
                                 , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
-                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
-                                , "HStopReason": data.鍋滃伐鍘熷洜                         //鍋滃伐鍘熷洜
+                                , "HICMOBillNo": data.HICMOBillNo
+                                , "HStopType": data.鍋滃伐绫诲瀷     //鐢熶骇璁㈠崟
+                                , "HStopReason": data.鍋滃伐鍘熷洜鎻忚堪                         //鍋滃伐鍘熷洜
                                 , "HRemark": data.澶囨敞                            //澶囨敞
                                 , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
                                 , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
@@ -960,6 +988,10 @@
                 layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
+            if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
+                layer.msg("鍋滃伐绫诲瀷涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
             if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
                 layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index 484eda3..f387d10 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -409,7 +409,8 @@
                         , { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
                         , { field: '鐢宠鍋滃伐浜哄憳浠g爜', title: '鐢宠鍋滃伐浜哄憳浠g爜', sort: true }
                         , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳', sort: true }
-                        , { field: '鍋滃伐鍘熷洜', title: '鍋滃伐鍘熷洜', sort: true }
+                        , { field: '鍋滃伐绫诲瀷', title: '鍋滃伐绫诲瀷', sort: true }
+                        , { field: '鍋滃伐鍘熷洜鎻忚堪', title: '鍋滃伐鍘熷洜鎻忚堪', sort: true }
                         , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷', sort: true }
                         , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', sort: true }
                         , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃', sort: true }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index b555f31..67e35cf 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>瀹屽伐鍗�</title>
+    <title>鍋滃伐鍗�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -237,85 +237,113 @@
                                                 </div>
                                                 <div class="layui-form-item">
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">鍋滃伐鍘熷洜</label>
+                                                        <label class="layui-form-label">鍋滃伐绫诲瀷</label>
                                                         <div class="layui-input-inline">
-                                                            <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+                                                            <div class="layui-form">
+                                                                <div class="layui-form-item">
+                                                                    <select name="HStopType" id="HStopType" lay-verify="HStopType">
+                                                                        <option value="">璇烽�夋嫨鍋滃伐鍘熷洜</option>
+                                                                        <option value="妯″叿淇濆吇">妯″叿淇濆吇</option>
+                                                                        <option value="鏂枡">鏂枡</option>
+                                                                        <option value="浜哄憳涓嶈冻">浜哄憳涓嶈冻</option>
+                                                                        <option value="鍋滄皵">鍋滄皵</option>
+                                                                        <option value="鍋滄按">鍋滄按</option>
+                                                                        <option value="鍋滅數">鍋滅數</option>
+                                                                        <option value="妯″叿鏁呴殰">妯″叿鏁呴殰</option>
+                                                                        <option value="鐩戞帶鎶ヨ">鐩戞帶鎶ヨ</option>
+                                                                        <option value="鑷姩鍖栨晠闅�">鑷姩鍖栨晠闅�</option>
+                                                                        <option value="娉ㄥ鏈烘晠闅�">娉ㄥ鏈烘晠闅�</option>
+                                                                        <option value="灏哄寮傚父">灏哄寮傚父</option>
+                                                                        <option value="璁″垝鍋滄満">璁″垝鍋滄満</option>
+                                                                        <option value="澶栬涓嶈壇璋冩満">澶栬涓嶈壇璋冩満</option>
+                                                                        <option value="妯″叿娓呮磥">妯″叿娓呮磥</option>
+                                                                        <option value="妯℃俯鏈烘晠闅�">妯℃俯鏈烘晠闅�</option>
+                                                                        <option value="鐑樻枡鏈烘晠闅�">鐑樻枡鏈烘晠闅�</option>
+                                                                    </select>
+                                                                </div>
+                                                            </div>
                                                         </div>
-                                                    </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">澶囨敞</label>
-                                                        <div class="layui-input-inline">
-                                                            <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍋滃伐鎻忚堪</label>
+                                                            <div class="layui-input-inline">
+                                                                <textarea placeholder="璇疯緭鍏ュ師鍥�" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">澶囨敞</label>
+                                                            <div class="layui-input-inline">
+                                                                <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
-                                            </div>
-                                            <div class="layui-tab-item">
-                                                <div class="layui-form-item">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">鍒跺崟浜�:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
+                                                <div class="layui-tab-item">
+                                                    <div class="layui-form-item">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍒跺崟浜�:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" disabled>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">淇敼浜�:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">瀹℃牳浜�:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
+                                                            </div>
                                                         </div>
                                                     </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">淇敼浜�:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" disabled>
+                                                    <div class="layui-form-item">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">淇敼鏃ユ湡:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                            </div>
                                                         </div>
                                                     </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">瀹℃牳浜�:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" disabled>
+                                                    <div class="layui-form-item">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍏抽棴浜�:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
+                                                            </div>
+                                                        </div>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">浣滃簾浜�:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
+                                                            </div>
                                                         </div>
                                                     </div>
-                                                </div>
-                                                <div class="layui-form-item">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">鍒跺崟鏃ユ湡:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="datetime" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                    <div class="layui-form-item">
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                            </div>
                                                         </div>
-                                                    </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">淇敼鏃ユ湡:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="datetime" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
-                                                        </div>
-                                                    </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">瀹℃牳鏃ユ湡:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="datetime" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-form-item">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">鍏抽棴浜�:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" disabled>
-                                                        </div>
-                                                    </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">浣滃簾浜�:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" disabled>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-form-item">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">鍏抽棴鏃ユ湡:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="datetime" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
-                                                        </div>
-                                                    </div>
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                        <div class="layui-inline">
+                                                            <label class="layui-form-label">浣滃簾鏃ユ湡:</label>
+                                                            <div class="layui-input-inline">
+                                                                <input type="datetime" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" disabled>
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -324,7 +352,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
                     </form>
                 </div>
             </div>
@@ -401,7 +428,7 @@
             }
             //#endregion
 
-            // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉� 
+            // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉�
             //鍒濆鍖栨彃浠�
             function set_InitFrom() {
                 //鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -442,7 +469,7 @@
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-                
+
             }
 
             //鏈夋簮鍗曟柊澧�
@@ -572,7 +599,8 @@
                                 , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
                                 , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
                                 , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
-                                , "HStopReason": data.鍋滃伐鍘熷洜                         //鍋滃伐鍘熷洜
+                                , "HStopType": data.鍋滃伐鍘熷洜                         //鍋滃伐鍘熷洜
+                                , "HStopReason": data.鍋滃伐鍘熷洜鎻忚堪                         //鍋滃伐鍘熷洜
                                 , "HRemark": data.澶囨敞                            //澶囨敞
                                 , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
                                 , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
@@ -585,7 +613,7 @@
                                 , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
                                 , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
                             });
-
+                            form.render('select');
                         } else {
                             layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
@@ -595,7 +623,7 @@
                 });
             }
 
-          
+
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
                 //鑾峰彇鏈�澶у崟鎹彿 new
@@ -618,58 +646,57 @@
 
             //淇濆瓨鎻愪氦
             form.on('submit(Saver)', function (data) {
-               
-                var sMainStr = JSON.stringify(data.field);
-                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
-                if (!AllowLoadData())//鏁版嵁楠岃瘉
-                {
-                    return false;
-                }
-                var index = layer.load();
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: false,
-                    data: { "msg": sMainSub },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                //layer.close(layer.index);
-                                //window.parent.location.reload();
-                            });
-                            if (data.Verify == "Y") //鑷姩瀹℃牳
-                            {
-                                layer.close(index);
-                                SaveVerify(); //瀹℃牳
+                if (AllowLoadData(data)) {
+                    var index = layer.load();
+                    var sMainStr = JSON.stringify(data.field);
+                    var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: false,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                                layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                    //layer.close(layer.index);
+                                    //window.parent.location.reload();
+                                });
+                                if (data.Verify == "Y") //鑷姩瀹℃牳
+                                {
+                                    layer.close(index);
+                                    SaveVerify(); //瀹℃牳
+                                }
+                                else {
+                                    layer.close(index);
+                                }
+                                //layer.confirm(data.Message, {
+                                //    btn: ['纭']
+                                //}, function (index) {
+                                //    if (data.Verify == "Y") //鑷姩瀹℃牳
+                                //    {
+                                //        layer.close(index);
+                                //        SaveVerify(); //瀹℃牳
+                                //    }
+                                //    else {
+                                //        layer.close(index);
+                                //    }
+                                //});
                             }
                             else {
                                 layer.close(index);
+                                layer.alert(data.Message, { icon: 5 })
                             }
-                            //layer.confirm(data.Message, {
-                            //    btn: ['纭']
-                            //}, function (index) {
-                            //    if (data.Verify == "Y") //鑷姩瀹℃牳
-                            //    {
-                            //        layer.close(index);
-                            //        SaveVerify(); //瀹℃牳
-                            //    }
-                            //    else {
-                            //        layer.close(index);
-                            //    }
-                            //});
-                        }
-                        else {
+                        },
+                        error: function (err) {
                             layer.close(index);
-                            layer.alert(data.Message, { icon: 5 })
+                            layer.alert(err, { icon: 5 })
                         }
-                    },
-                    error: function (err) {
-                        layer.close(index);
-                        layer.alert(err, { icon: 5 })
-                    }
-                })
+                    })
+                }
+
+           
             });
 
             //瀹℃牳鎸夐挳鎻愪氦
@@ -907,6 +934,63 @@
                 });
             });
 
+            function AllowLoadData() {  //闈炵┖楠岃瘉
+                var Result = true;
+                if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HDate").val() == '' || $("#HDate").val() == null) {
+                    layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
+                    layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HStopBeginWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
+                    layer.msg("瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HStopEndWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
+                    layer.msg("棰勮缁撴潫鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
+                    layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
+                    layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+                    layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+                    layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+                    layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
+                    layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }               
+                if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
+                    layer.msg("鍋滃伐绫诲瀷涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
+                    layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                return Result;
+            }
+
             //#endregion
 
             //浠ヤ笂涓簂ayui妯″潡
@@ -922,60 +1006,7 @@
             if (day.length < 2) day = '0' + day;
 
             return [year, month, day].join('-');
-        }
-
-        function AllowLoadData() {  //闈炵┖楠岃瘉
-            var Result = true;
-            if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
-                layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HDate").val() == '' || $("#HDate").val() == null) {
-                layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
-                layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HStopBeginWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
-                layer.msg("瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HStopEndWorkTime").val() == '' || $("#HStopBeginWorkTime").val() == null) {
-                layer.msg("棰勮缁撴潫鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
-                layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
-                layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
-                layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
-                layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
-                layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
-                layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
-                layer.msg("鍋滃伐鍘熷洜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            return Result;
-        }
+        }        
 
         //鎿嶄綔鍛�
         function GetHEmpValue(obj) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 02119f0..5fc4d59 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -82,6 +82,12 @@
                                                 <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBadReasonHQty" id="HBadReasonHQty" value="0">
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -392,6 +398,8 @@
                         $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                         $("#HMaker").val(sessionStorage["HUserName"]);
+                        $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                        $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
                         layer.close(ajaxLoad);
                     }
                 });
@@ -410,6 +418,8 @@
                         $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                         $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                         $("#HMaker").val(sessionStorage["HUserName"]);
+                        $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                        $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
                         layer.close(ajaxLoad);
                     }
                 });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
index caeed44..d14befd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Sc_WorkBeginDotCheckBill.html"
@@ -381,6 +381,8 @@
                 //鍒濆鍖栨棩鏈�
                 $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
 
+                $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
                 //鍒濆鍖栧瓙琛�
                 get_InitGrid();
 
@@ -407,6 +409,8 @@
                 $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栨棩鏈�
                 $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
+                $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
 
                 //鍒濆鍖栧瓙琛�
                 get_InitGrid();

--
Gitblit v1.9.1