From 23029966aafae2bd76d29ea9570f550a916eba85 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 10 九月 2021 08:06:15 +0800
Subject: [PATCH] 恢复班组,不良原因,工序列表

---
 WebTM/views/基础资料/生产基础资料/Gy_BadReason.html          |  329 +++++---
 WebTM/views/基础资料/生产基础资料/Gy_Process.html            |  146 +++-
 WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html     |   25 
 WebTM/views/基础资料/工资基础资料/Gy_Group.html              |  304 +++-----
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html   |   35 
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html |  481 ++++++++++---
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html |  692 +++++++-------------
 7 files changed, 1,060 insertions(+), 952 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
index c430238..ab3e6df 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
@@ -440,7 +440,7 @@
                                                 <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HDeptID" id="HDeptID" value="0">
                                                 <input type="hidden" name="HDepNumber" id="HDepNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -451,7 +451,7 @@
                                                 <input type="text" name="HPostName" id="HPostName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HPostID" id="HPostID" value="0">
                                                 <input type="hidden" name="HPostNumber" id="HPostNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HPostID-BT" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -464,7 +464,7 @@
                                                 <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HGroupID" id="HGroupID" value="0">
                                                 <input type="hidden" name="HGroupNumber" id="HGroupNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupID-BT" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -475,13 +475,13 @@
                                                 <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
                                                 <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row">000000000000000
                                         <div class="layui-col-xs8 layui-inline">
                                             <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
                                             <div class="layui-input-block">
@@ -523,6 +523,7 @@
                             <div class="layui-tab-item">
                                 <!--鍏朵粬淇℃伅-->
                                 <div class="layui-form-item">
+                                    <div class="maintitle">鍏朵粬璧勬枡</div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs8 layui-inline">
                                             <label class="layui-form-label" style="width: 12.5%;">韬唤璇�</label>
@@ -530,6 +531,8 @@
                                                 <input class="layui-input" name="HIDCard" id="HIDCard" autocomplete="off" style=" width: 75%;">
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">涓嶆墦鍗�</label>
                                             <div class="layui-input-inline">
@@ -560,17 +563,144 @@
                                                     <div class="layui-form-item">
                                                         <select name="HEmpType" id="HEmpType" lay-verify="HEmpType">
                                                             <!--<option value="鐢�">鐢�</option>
-                                <option value="濂�">濂�</option>-->
+                                                             <option value="濂�">濂�</option>-->
                                                         </select>
                                                     </div>
                                                 </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">杞彮璋冧紤鏍囧織</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁璋冧紤">
+                                                <input type="hidden" value="false" name="HShiftFlag" id="HShiftFlag">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍋滃彂宸ヨ祫</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHStopwagesFlag" id="checkboxHStopwagesFlag" lay-skin="primary" lay-filter="checkboxHStopwagesFlag" value="true" title="鏄惁鍋滃彂">
+                                                <input type="hidden" value="false" name="HStopwagesFlag" id="HStopwagesFlag">
+                                            </div>
+                                        </div>
 
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">閾惰璐︽埛</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HBankAccount" id="HBankAccount" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">淇濋櫓琛ヨ创</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HInsuranceSubsidy" id="HInsuranceSubsidy" autocomplete="off" style=" width: 75%;">
                                             </div>
                                         </div>
                                     </div>
-
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鍏朵粬鎵f3</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HOtherDeduct3" id="HOtherDeduct3" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鍖荤枟淇濋櫓</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HMedicare" id="HMedicare" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鍏昏�佷繚闄�</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HInsurance" id="HInsurance" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">澶变笟淇濋櫓</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HDrydock" id="HDrydock" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鍏昏�佷繚闄�</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HInsurance" id="HInsurance" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">澶变笟淇濋櫓</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HDrydock" id="HDrydock" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="maintitle">鐗规畩璧勬枡</div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鍩烘湰宸ヨ祫</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HBasePay" id="HBasePay" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鑱屽姟鑰冩牳宸ヨ祫</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExamLevPostMoney" id="HExamLevPostMoney" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">甯︾彮绯绘暟</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExamRate" id="HExamRate" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏀粯绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <div class="layui-form">
+                                                    <div class="layui-form-item">
+                                                        <select name="HPayType" id="HPayType" lay-verify="HPayType">
+                                                            <!--<option value="鐢�">鐢�</option>
+                                                             <option value="濂�">濂�</option>-->
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鏈�楂樺伐璧�</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HHighestPay" id="HHighestPay" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">瓒呴姣旂巼</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HOverPayRate" id="HOverPayRate" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">鍓╀綑宸ヨ祫</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HLeftMoneyRate" id="HLeftMoneyRate" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
+                             </div>
                         </div>
                     </div>
                 </form>
@@ -645,21 +775,36 @@
                 Pub_Close(1);
             })
 
-            //鏄惁绂佺敤鎸夐挳
+            //#region 鏄惁鎵撳崱 - 澶嶉�夋浜嬩欢
+            form.on('checkbox(checkboxHNoBrushFlag)', function (data) {
+                /*  alert('寮瑰嚭涓嶆墦鍗¢�夌鍊�' + data.elem.checked);*/
+                $("#HNoBrushFlag").val(data.elem.checked);
+            });
+            //#endregion
+
+            //#region 鏄惁绂佺敤
             form.on('checkbox(checkboxHStopflag)', function (data) {
                 $("#HStopflag").val(data.elem.checked);
             });
+            //#endregion
 
-            //閫夋嫨鑱屽姟鎸夐挳
-            form.on('submit(HDutyID-BT)', function () {
-                get_checkDuty();
+            //#region 鏄惁璋冧紤
+            form.on('checkbox(checkboxHOverType)', function (data) {
+                $("#HOverType").val(data.elem.checked);
             });
+            //#endregion
 
-            //閫夋嫨瀹胯垗鎸夐挳
-            form.on('submit(HDormID-BT)', function () {
-                get_checkDorm();
+            //#region 杞彮璋冧紤鏍囧織
+            form.on('checkbox(checkboxHShiftFlag)', function (data) {
+                $("#HShiftFlag").val(data.elem.checked);
             });
+            //#endregion
 
+            //#region 鍋滃彂宸ヨ祫
+            form.on('checkbox(checkboxHStopwagesFlag)', function (data) {
+                $("#HStopwagesFlag").val(data.elem.checked);
+            });
+            //#endregion
           
 
             //淇濆瓨鎸夐挳
@@ -668,7 +813,147 @@
             });
 
         //#endregion
+            //#region 閫夋嫨鑱屽姟
+            form.on('submit(HDutyID-BT)', function () {//閫夋嫨鑱屽姟
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '鑱屽姟鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //#endregion
 
+            //#region 閫夋嫨瀹胯垗
+            form.on('submit(HDormID-BT)', function () {//閫夋嫨瀹胯垗
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '瀹胯垗鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DormList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //#endregion
+
+            //#region 閫夋嫨宸ョ
+            form.on('submit(HWorkTypeID-BT)', function () {//閫夋嫨宸ョ
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '宸ョ鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //#endregion
+
+            //#region 閫夋嫨鏍哥畻鏂瑰紡
+            form.on('submit(HCTPrjID-BT)', function () {//閫夋嫨鏍哥畻鏂瑰紡
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '鏍哥畻鏂瑰紡鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬
+            form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //#endregion
+
+            //#region 閫夋嫨宀椾綅
+            form.on('submit(HPostID-BT)', function () {//閫夋嫨宀椾綅
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '宀椾綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_PostList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //#endregion
+
+            //#region 閫夋嫨鐝粍
+            form.on('submit(HGroupID-BT)', function () {//閫夋嫨鐝粍
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐝粍鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    }
+                });
+            });
+            //#endregion
 
         //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
@@ -695,19 +980,58 @@
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data.h_v_Edit_IF_EmployeeList[0];
+                            console.log("杩斿洖鐨刣ata.HStopFlag" + JSON.stringify(data.绂佺敤鏍囪));
+                            console.log("杩斿洖鐨刣ata.HNoBrushFlag" + JSON.stringify(data.鏄惁鎵撳崱));
+                            var IsHNoBrushFlag = data.鏄惁鎵撳崱;
+                            //鏄惁鎵撳崱
+                            if (IsHNoBrushFlag == "true") {
+                                $("input[name='checkboxHNoBrushFlag'][value='" + IsHNoBrushFlag + "']").attr("checked", true);
+                            }
                             var IsHStopflag = data.绂佺敤鏍囪;
                             //绂佺敤鏍囪
-                            if (IsHStopflag) {
+                            if (IsHStopflag == "true") {
                                 $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            var IsHOverType = data.鏄惁璋冧紤;
+                            //鏄惁璋冧紤
+                            if (IsHOverType == "true") {
+                                $("input[name='checkboxHOverType'][value='" + IsHOverType + "']").attr("checked", true);
+                            }
+                            var IsHShiftFlag = data.鏄惁杞彮璋冧紤;
+                            //鏄惁杞彮璋冧紤
+                            if (IsHShiftFlag == "true") {
+                                $("input[name='checkboxHShiftFlag'][value='" + IsHShiftFlag + "']").attr("checked", true);
+                            }
+                            var IsHStopwagesFlag = data.鏄惁鍋滃彂;
+                            //鏄惁鍋滃彂
+                            if (IsHStopwagesFlag == "true") {
+                                $("input[name='checkboxHStopwagesFlag'][value='" + IsHStopwagesFlag + "']").attr("checked", true);
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HNumber": data.鑱屽憳浠g爜
                                 , "HItemID": data.HItemID
                                 , "HName": data.鑱屽憳鍚嶇О
                                 , "HHelpCode": data.鍔╄浠g爜
-                                , "HDutyName": data.鑱屽姟
+                                , "HGroupID": data.HGroupID
+                                , "HGroup": data.鐝粍鍚嶇О
+                                , "HEndFlag": data.鏄庣粏鏍囪
+                                , "HNoBrushFlag": data.鏄惁鎵撳崱
+                                , "HOverType": data.鏄惁璋冧紤
+                                , "HShiftFlag": data.鏄惁杞彮璋冧紤
+                                , "HStopwagesFlag": data.鏄惁鍋滃彂
+                                , "HInsuranceStatus": data.鏄惁鍙備繚
+                                , "HDeptID": data.閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О
                                 , "HDutyID": data.鑱屽姟ID
-                                , "HDutyNumber": data.鑱屽姟浠g爜
+                                , "HDutyName": data.鑱屽姟鍚嶇О
+                                , "HDormID": data.瀹胯垗ID
+                                , "HDormName": data.瀹胯垗鍚嶇О
+                                , "HWorkTypeID": data.宸ョID
+                                , "HWorkTypeName": data.宸ョ鍚嶇О
+                                , "HCTPrjID": data.鏍哥畻鏂瑰紡ID
+                                , "HCTPrjName": data.鏍哥畻鏂瑰紡鍚嶇О
+                                , "HPostID": data.宀椾綅ID
+                                , "HPostName": data.宀椾綅鍚嶇О
                                 , "HSex": data.鎬у埆
                                 , "HBirthDay": data.鍑虹敓骞存湀
                                 , "HAge": data.骞撮緞
@@ -722,9 +1046,6 @@
                                 , "HSalaryLev": data.钖祫绛夌骇
                                 , "HGradSchool": data.姣曚笟瀛︽牎
                                 , "HGradDate": data.姣曚笟鏃堕棿
-                                , "HDormName": data.瀹胯垗
-                                , "HDormID": data.瀹胯垗ID
-                                , "HDormNumber": data.瀹胯垗浠g爜
                                 , "HEngLev": data.澶栬姘村钩
                                 , "HCompLev": data.璁$畻鏈烘按骞�
                                 , "HSpec": data.涓撲笟
@@ -734,6 +1055,36 @@
                                 , "HPostalCode": data.閭斂缂栫爜
                                 , "HOldCompany": data.鍘熷叕鍙�
                                 , "HLinkPhone": data.鑱旂郴鐢佃瘽
+                                , "HMobilePhone": data.鎵嬫満鍙�
+                                , "HWorkType": data.鐢ㄥ伐绫诲瀷
+                                , "HInComDate": data.杩涘巶鏃ユ湡
+                                , "HRelDate": data.杞鏃ユ湡
+                                , "HInsuranceNo": data.淇濋櫓璇佺紪鍙�
+                                , "HContractBDate": data.鍚堝悓寮�濮嬫棩鏈�
+                                , "HContractEDate": data.鍚堝悓鍒版湡鏃ユ湡
+                                , "HContractYear": data.鍚堝悓鏈熼檺
+                                , "HInsuranceDate": data.鍙備繚鏃ユ湡
+                                , "HDimissionDate": data.绂昏亴鏃ユ湡
+                                , "HStayCardEDate": data.鏆備綇璇佸埌鏈熸棩
+                                , "HEmpRate": data.鑱屽憳绯绘暟
+                                , "HBSTDeptID": data.璐濆+杈鹃儴闂�
+                                , "HRemark": data.澶囨敞
+                                , "HDimissionReason": data.绂昏亴鍘熷洜
+                                , "linteridCard": data.韬唤璇�
+                                , "HEmpType": data.宸ヨ祫绫诲瀷
+                                , "HBankAccount": data.閾惰璐︽埛
+                                , "HInsuranceSubsidy": data.淇濋櫓琛ヨ创
+                                , "HOtherDeduct3": data.鍏朵粬鎵f3
+                                , "HMedicare": data.鍖荤枟淇濋櫓
+                                , "HInsurance": data.鍏昏�佷繚闄�
+                                , "HDrydock": data.澶变笟淇濋櫓
+                                , "HBasePay": data.鍩烘湰宸ヨ祫
+                                , "HExamLevPostMoney": data.鑱屽姟鑰冩牳宸ヨ祫
+                                , "HExamRate": data.鑰冩牳绯绘暟
+                                , "HPayType": data.鏀粯绫诲瀷
+                                , "HLeftMoneyRate": data.鍓╀綑宸ヨ祫
+                                , "HHighestPay": data.鏈�楂樺伐璧�
+                                , "HOverPayRate": data.瓒呴姣旂巼
                                 , "HStopflag": data.绂佺敤鏍囪
                                 , "HRemark": data.澶囨敞
                             });
@@ -778,93 +1129,7 @@
                 });
             }
             //#endregion
-            //#region 閫夋嫨鑱屽姟鏂规硶
-            function get_checkDuty() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '鑱屽姟鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDutyName").val(checkStatus.data[0].鑱屽姟);
-                        $("#HDutyID").val(checkStatus.data[0].HItemID);
-                        $("#HDutyNumber").val(checkStatus.data[0].鑱屽姟浠g爜);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
-
-            ////#region 閫夋嫨鑱屽姟
-            //form.on('submit(HDutyID-BT)', function () {//閫夋嫨鑱屽姟
-            //    layer.open({
-            //        type: 2
-            //        , area: ['90%', '90%']
-            //        , title: '鑱屽姟鍒楄〃'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
-            ////#endregion
-            //#region 閫夋嫨瀹胯垗鏂规硶
-            function get_checkDorm() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '瀹胯垗鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DormList.html', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDormName").val(checkStatus.data[0].瀹胯垗);
-                        $("#HDormID").val(checkStatus.data[0].HItemID);
-                        $("#HDormNumber").val(checkStatus.data[0].瀹胯垗浠g爜);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //#endregion
-
-            ////#region 閫夋嫨瀹胯垗
-            //form.on('submit(HDormID-BT)', function () {//閫夋嫨瀹胯垗
-            //    layer.open({
-            //        type: 2
-            //        , area: ['90%', '90%']
-            //        , title: '瀹胯垗鍒楄〃'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DormList.html', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
-            ////#endregion
-
+          
           
 
             //#region 淇濆瓨鍚庢祻瑙堟柟娉�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index 8f49276..07f3b64 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -8,14 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <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/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/zgqlayui.js"></script>
-    <style media="screen">
-          /* .custom-tree-item-clicked {
-            color: #FC9003*/
-        /*}*/
-    </style>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
 <body>
@@ -24,41 +21,35 @@
             <div class="layui-card" style="padding: 1px">
                 <div class="layui-card-body" style="padding: 1px;">
                     <form class="layui-form" action="" lay-filter="component-form-group">
-                        <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                            <div class="layui-row" style="padding:10px 0">
-                                <div class="layui-col-xs12 layui-inline">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">浠g爜</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">鍚嶇О</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HName" id="HName">
-                                            </div>
-                                        </div>
-                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                        </button>
-                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐝粍浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐝粍鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <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>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -75,7 +66,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
-        //#region 鍏敤鍙橀噺
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -91,21 +82,32 @@
             var option = [];
             //#endregion
 
-        //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
             //#endregion
 
-        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
-
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
                     //缂栬緫
                     case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
 
                 };
@@ -114,9 +116,7 @@
 
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                //$("#btnSearch").click();
+                set_ClearQuery();
             });
             //#endregion
 
@@ -126,64 +126,9 @@
             });
             //#endregion
 
-            //#region 淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                if (TagId != "") {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '缂栬緫鐝粍'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            location.reload();
-                        }
-                    })
-                }
-                else {
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    if (checkStatus.data.length === 1) {
-                        var hID = data[0].HItemID.toString();
-                        TagParentId = data[0].ParentID.toString();
-                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                        layer.open({
-                            type: 2
-                            , area: ['50%', '50%']
-                            , title: '缂栬緫鐝粍'
-                            , closeBtn: 1
-                            , shade: 0.6 //閬僵閫忔槑搴�
-                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                            , resize: false,
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            }
-                            , cancel: function () {
-                                location.reload();
-                            }
-                        })
-
-                    } else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
-                }
-            });
             //#endregion
 
-        //#endregion
-
-        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
@@ -196,7 +141,7 @@
 
             //#region 鍒濆鍖栬〃鏍兼柟娉�
             function set_InitGrid() {
-                 option = {
+                option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , height: 'full-50'
@@ -222,7 +167,8 @@
             //#endregion
 
             //#region 鏌ヨ
-                function get_Display(sWhere) {
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Gy_Group/list',
@@ -232,16 +178,19 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
+                            layer.close(ajaxLoad);
                             //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-              }
-           
+            }
+
             //#endregion
 
             //#region 蹇�熻繃婊�
@@ -259,29 +208,25 @@
             }
             //#endregion
 
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
+            //#endregion
 
             //#region 鏂板
-            form.on('submit(btnAdd)', function (obj) {
-                //椤甸潰灞�-鑷畾涔�
+            function set_AddNew() {
                 layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板鐝粍',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['50%', '50%'],
-                    maxmin: true,
-                    content: ['../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html?hID=' + TagId + ''],
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            })
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇璧勬簮-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
             //#endregion
 
             //#region 缂栬緫
@@ -305,87 +250,58 @@
             //#endregion
 
             //#region 鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                var ModRightNameDelete = 'Gy_Group_Delete'
-                if (TagId != "") {
-                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                        , yes: function (index, layero) {
-
-                            $.ajax({
-                                url: GetWEBURL() + '/Gy_Group/Delete_Json',
-                                type: "GET",
-                                //async: true,
-                                data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                                success: function (result) {
-                                    if (result.count == 1) {
-                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                            // 寰楀埌frame绱㈠紩
-                                            var index = layer.getFrameIndex(window.name);
-                                            //鍏抽棴褰撳墠frame
-                                            layer.close(index);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload();
-                                            //閲嶈浇tree
-                                            tree.reload('treeDepartment', {});
-                                        });
-
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'Gy_Group/EditBill',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
                                 }
-                            })
-                        }
-                    });
-                }
-                else {
-                    //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    //    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    var layEvent = checkStatus.event;
-                    if (checkStatus.data.length === 1) {
-                        layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                            btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                            , yes: function (index, layero) {
-
-                                $.ajax({
-                                    url: GetWEBURL() + '/Gy_Group/Delete_Json',
-                                    type: "GET",
-                                    //async: true,
-                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                                //閲嶈浇tree
-                                                tree.reload('treeDepartment', {});
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }
-                                })
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
                             }
                         });
-                    }
-                    else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
+                    })
                 }
-            });
-           // #endregion
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
 
-        //#endregion
+            }
+            //#endregion
+
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
     </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index 9640b4d..5b6ecbf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -19,6 +19,7 @@
             margin-bottom: 5px;
             margin-right: 0px;
         }
+
         .layui-form-label {
             width: 25%;
         }
@@ -128,7 +129,7 @@
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
 
-        //#region 鍏敤鍙橀噺
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -140,10 +141,10 @@
             var month = date.getMonth() + 1;
             var year = date.getFullYear();
             var shijian = year + "-" + month + "-" + day;
-        //#endregion
+            //#endregion
 
 
-        //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
@@ -176,10 +177,10 @@
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
 
-        //#endregion
+            //#endregion
 
 
-        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
@@ -216,10 +217,10 @@
                 set_SaveBill(data);
             });
 
-        //#endregion
+            //#endregion
 
 
-        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             function get_LoginIs() {
@@ -232,7 +233,7 @@
             //#endregion
 
             //#region 鍔犺浇琛ㄥご
-            function RoadBillMain(linterid){
+            function RoadBillMain(linterid) {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
@@ -289,7 +290,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "Gy_Group/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     //url:"http://localhost:30552/Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "oMain": sMainStr },
@@ -299,7 +300,7 @@
                             layer.msg(data.Message, { icon: 1 });
                             $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                             //淇濆瓨鍚庢祻瑙�
-                            ReRoadBillMain();
+                            //ReRoadBillMain();
                         }
                         else {
                             layer.alert(data.Message, { icon: 5 });
@@ -424,10 +425,10 @@
             }
             //#endregion
 
-        //#endregion
+            //#endregion
 
 
-        //浠ヤ笂鏄痩ayui妯″潡
+            //浠ヤ笂鏄痩ayui妯″潡
         });
     </script>
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index f3fd7f2..5d31f9a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -20,8 +20,7 @@
                             <div class="layui-btn-group">
 
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
 
                             </div>
 
@@ -35,81 +34,68 @@
                                 <h1 style="text-align:center;"><b>涓嶈壇鍘熷洜</b></h1>
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
-
                                         <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">浠g爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
-                                                        <input id="HItemID" name="HItemID" type="hidden" />
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">鍚嶇О锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HName" id="HName" autocomplete="off">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">鍔╄鐮侊細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
-
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">榛樿閮ㄩ棬浠g爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
-
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">榛樿閮ㄩ棬锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HDepName" id="HDepName" lay-verify="HDepName" readonly="readonly" autocomplete="off" class="layui-input">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">榛樿宸ュ簭锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HProcName" id="HProcName" lay-verify="HProcName" readonly="readonly" autocomplete="off" class="layui-input">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HProcID" name="HProcID" type="hidden" />
-                                                        <input id="HProcNumber" name="HProcNumber" type="hidden" />
-                                                    </div>
-                                                </div>
-
-
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-form-item" pane>
-                                            <div class="layui-col-xs5">
-                                                <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
-                                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                                 </div>
                                             </div>
                                         </div>
-
                                         <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs11">
-                                                    <label class="layui-form-label"> 澶囨敞锛�</label>
-                                                    <div class="layui-input-block">
-                                                        <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
-                                                    </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">榛樿閮ㄩ棬锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDepName" id="HDepName" lay-verify="HDepName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
+                                                    </button>
+                                                    <input id="HDeptID" name="HDeptID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">榛樿閮ㄩ棬浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">榛樿宸ュ簭锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HProcName" id="HProcName" lay-verify="HProcName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px"></i>
+                                                    </button>
+                                                    <input id="HProcID" name="HProcID" type="hidden" />
+                                                    <input id="HProcNumber" name="HProcNumber" type="hidden" />
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+                                            <div class="layui-input-inline">
+                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                 </div>
                                             </div>
                                         </div>
@@ -117,7 +103,6 @@
                                 </div>
                             </div>
                         </div>
-
                     </form>
                 </div>
             </div>
@@ -128,126 +113,123 @@
     <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/PubCustom.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;
+        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({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
+            //#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 tableReload = table.reload;
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
 
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                $.ajax({
-                    url: GetWEBURL() + "GetGy_BadReasonDetail",
-                    type: "GET",
-                    data: {
-                        "HID": hID
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_IF_Edit_BadReasonList[0];
-                            var IsHStopflag = data.绂佺敤鏍囪;
-                            //绂佺敤鏍囪
-                            if (IsHStopflag == "true") {
-                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field);
+                if (AllowLoadData()) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "SaveGy_BadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                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.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HNumber": data.涓嶈壇鍘熷洜浠g爜
-                                , "HItemID": data.HItemID
-                                , "HName": data.涓嶈壇鍘熷洜鍚嶇О
-                                , "HHelpCode": data.鍔╄浠g爜
-                                , "HDeptNumber": data.閮ㄩ棬浠g爜
-                                , "HDepName": data.閮ㄩ棬鍚嶇О
-                                , "HDeptID": data.閮ㄩ棬ID
-                                , "HProcName": data.宸ュ簭鍚嶇О
-                                , "HProcID": data.宸ュ簭ID
-                                , "HProcNumber": data.宸ュ簭浠g爜
-                                , "HStopflag": 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) {
-                //id new
-                $("#HItemID").val(0);
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HItemID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-               
-               /* RoadBillSub(linterid);*/
-            }
-
-            form.on('checkbox(checkboxHStopflag)', function (data) {
-                $("#HStopflag").val(data.elem.checked);
+                        });
+                }
             });
-
-            //閫夋嫨浜у搧寮圭獥
-            form.on('submit(HMateria-BT)', function () {//浜у搧
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            });
+            //閫夋嫨榛樿閮ㄩ棬
+            form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
                 layer.open({
                     type: 2
                     , area: ['80%', '80%']
-                    , title: '鐗╂枡'
+                    , title: '閮ㄩ棬鍒楄〃'
                     , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDepName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 })
             });
-            //閫夋嫨宸ュ簭
+            //閫夋嫨榛樿宸ュ簭
             form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
                 layer.open({
                     type: 2
@@ -256,173 +238,37 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //閫夋嫨渚涘簲鍟�
-            form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
-                layer.open({
-                    type: 2
-                    , area: ['666px', '666px']
-                    , title: '渚涘簲鍟嗗垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨閮ㄩ棬
-            form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '閮ㄩ棬鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-            //閫夋嫨鍗曚綅
-            form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
-                layer.open({
-                    type: 2
-                    , area: ['666px', '666px']
-                    , title: '鍗曚綅鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            form.on('submit(Exit)', function (data) {//
-                //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                //parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                parent.location.href = "../../../views/index.html"
-            });
-
-            //閫夋嫨璐d换浜�
-            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐d换浜�
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鑱屽憳鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨璐d换宸ュ簭
-            form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐d换宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '璐d换宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨鐢熶骇璧勬簮寮圭獥
-            form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐢熶骇璧勬簮'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-
-
-            form.on('submit(Exit)', function (data) {//閫�鍑�
-
-            });
-
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                if (hID == null || hID==0) {
-                    parent.location.href = "../../../views/index.html"
-                }
-                else
-                {
-                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                }
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
-
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                //var sSubStr = JSON.stringify(table.cache['mainTable']);
-                //var sMainSub = sMainStr + ';' + sSubStr;
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "SaveGy_BadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainStr },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { icon: 1 });
-                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
-                            }
-                            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);
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                    });
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                })
             });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
-            }
-
+            ////绂佺敤鏍囧織
+            //form.on('checkbox(HStopflag)', function (data) {
+            //    $("#HStopflag").val(data.elem.checked);
+            //});
             //鐩戝惉鎻愪氦
             form.verify({
                 numberOrEmpty: function (value, item) {
@@ -433,139 +279,81 @@
                     //}
                 }
             });
+            //#endregion
 
 
-        });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        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);
-        }
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
 
-        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-            $("#HSupName").val(obj[0].HName);
-            $("#HSupID").val(obj[0].HItemID);
-            $("#HSupNumber").val(obj[0].HNumber);
-        }
-
-        function GetHKeeperValue(obj) {  //杩斿洖妫�楠屽憳
-            $("#HEmpName").val(obj[0].HName);
-            $("#HFirstCheckEmp").val(obj[0].HItemID);
-        }
-
-        //杩斿洖鐢熶骇璧勬簮
-        function GetProductionResourcesValue(obj) {  //杩斿洖鐢熶骇璧勬簮
-
-            $("#HSource").val(obj[0].鐢熶骇璧勬簮);
-            $("#HSourceID").val(obj[0].HItemID);
-        }
-
-        //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: "娓╅Θ鎻愮ず" });
-                return false;
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
             }
-            if ($("#HKeeper").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: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HInterID").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: "娓╅Θ鎻愮ず" });
-                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;
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "GetGy_BadReasonDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_IF_Edit_BadReasonList[0];
+                            $("#HNumber").val(data.涓嶈壇鍘熷洜浠g爜);//浠g爜
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HName").val(data.涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄浠g爜);//鍔╄浠g爜
+                            $("#HDeptNumber").val(data.閮ㄩ棬浠g爜);//榛樿閮ㄩ棬浠g爜
+                            $("#HDepName").val(data.閮ㄩ棬鍚嶇О);//榛樿閮ㄩ棬
+                            $("#HDeptID").val(data.閮ㄩ棬ID);//閮ㄩ棬id
+                            $("#HProcName").val(data.宸ュ簭鍚嶇О);//榛樿宸ュ簭
+                            $("#HProcID").val(data.宸ュ簭ID);//宸ュ簭ID
+                            $("#HProcNumber").val(data.宸ュ簭浠g爜);//宸ュ簭浠g爜
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
                     }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                });
+            }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                if ($("#HHelpCode").val() == '') {
+                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
+                if ($("#HDeptNumber").val() == '') {
+                    layer.msg("璇烽�夋嫨榛樿閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HDepName").val() == '') {
+                    layer.msg("璇烽�夋嫨榛樿宸ュ簭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                else {
+                    return true;
+                }
             }
-            else {
-                return true;
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
             }
-        }
+            //#endregion
+        });
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 7c5f920..d6c8d17 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -19,6 +19,7 @@
             margin-bottom: 5px;
             margin-right: 0px;
         }
+
         .layui-form-label {
             width: 25%;
         }
@@ -105,7 +106,7 @@
                                 <div class="layui-col-xs4 layui-inline">
                                     <label class="layui-form-label">宸ユ</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                        <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float:left;width:150px;">
                                         <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
@@ -133,7 +134,7 @@
                                 <div class="layui-col-xs4 layui-inline">
                                     <label class="layui-form-label">ERP宸ュ簭</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" name="HProcessName_K3" id="HProcessName_K3" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                        <input type="text" name="HProcessName_K3" id="HProcessName_K3" class="layui-input" value="" style="float:left;width:150px;">
                                         <input type="hidden" name="HProcessID_K3" id="HProcessID_K3" value="0">
                                         <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
@@ -190,8 +191,8 @@
                                 </div>
                             </div>
                         </div>
-                            <input type="hidden" value="0" name="HParentID" id="HParentID">
-</form>
+                        <input type="hidden" value="0" name="HParentID" id="HParentID">
+                </form>
             </div>
         </div>
     </div>
@@ -205,7 +206,7 @@
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
 
-        //#region 鍏敤鍙橀噺
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -217,10 +218,10 @@
             var month = date.getMonth() + 1;
             var year = date.getFullYear();
             var shijian = year + "-" + month + "-" + day;
-        //#endregion
+            //#endregion
 
 
-        //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
@@ -253,10 +254,10 @@
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
 
-        //#endregion
+            //#endregion
 
 
-        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
@@ -308,10 +309,10 @@
                 set_SaveBill(data);
             });
 
-        //#endregion
+            //#endregion
 
 
-        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             function get_LoginIs() {
@@ -324,14 +325,14 @@
             //#endregion
 
             //#region 鍔犺浇琛ㄥご
-            function RoadBillMain(linterid){
+            function RoadBillMain(linterid) {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + "Gy_Process/cx",
                     type: "GET",
                     data: {
-                        "HInterID":  linterid
+                        "HInterID": linterid
                     },
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -412,7 +413,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Gy_Process/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "Gy_Process/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "oMain": sMainStr },
                     dataType: "json",
@@ -421,7 +422,7 @@
                             layer.msg(data.Message, { icon: 1 });
                             $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                             //淇濆瓨鍚庢祻瑙�
-                            ReRoadBillMain();
+                            //ReRoadBillMain();
                         }
                         else {
                             layer.alert(data.Message, { icon: 5 });
@@ -545,10 +546,10 @@
             }
             //#endregion
 
-        //#endregion
+            //#endregion
 
 
-        //浠ヤ笂鏄痩ayui妯″潡
+            //浠ヤ笂鏄痩ayui妯″潡
         });
     </script>
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
index c2e2e68..735e516 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
@@ -1,7 +1,7 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>涓嶈壇鍘熷洜璁剧疆</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,21 +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>
-    
+
 </head>
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
             <div class="layui-card" style="padding: 1px">
                 <div class="layui-card-body" style="padding: 1px;">
+
                     <form class="layui-form" action="" lay-filter="component-form-group">
+
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
-                                    <div class="layui-inline">
-                                        <span></span>
-                                    </div>
-                                </div>
+
                                 <div class="layui-inline">
                                     <label class="layui-form-label" style="width: 85px;">涓嶈壇鍘熷洜浠g爜</label>
                                     <div class="layui-input-block" style="margin-left: 120px;">
@@ -43,13 +41,16 @@
 
                             </div>
                         </div>
+
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                             </div>
                         </script>
+
                     </form>
                 </div>
             </div>
@@ -64,136 +65,118 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element
-            , laypage = layui.laypage
-            , laydate = layui.laydate
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: '涓嶈壇鍘熷洜浠g爜', title: '涓嶈壇鍘熷洜浠g爜' }
-                    , { field: '涓嶈壇鍘熷洜鍚嶇О', title: '涓嶈壇鍘熷洜鍚嶇О' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                ]]
-            };
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_BadReason/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-getCheckData':
-                        var data = checkStatus.data;
-                        layer.alert(JSON.stringify(data));
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].HItemID.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫涓嶈壇鍘熷洜'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?hID=' + hID
-                                , resize: false
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var ItemID = data[0].HItemID.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            $.ajax({
-                                url: GetWEBURL() + 'DeltetGy_BadReason',
-                                type: "GET",
-                                data: { "HItemID": ItemID },
-                                success: function (result) {
-                                    console.log('gouba' + result);
-                                    if (result.count == 1) {
-                                        layer.msg(result.Message, { icon: 1 }, function () {
-                                            // 寰楀埌frame绱㈠紩
-                                            var index = layer.getFrameIndex(window.name);
-                                            //鍏抽棴褰撳墠frame
-                                            layer.close(index);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload();
-                                        });
-
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
-                                }, error: function () {
-                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                }
-                            });
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
                         break;
                 };
             });
-
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#btnSearch").click();
-            });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limits: [20, 50, 100, 150, 200, 250]
+                    , limit: 20
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '涓嶈壇鍘熷洜浠g爜', title: '涓嶈壇鍘熷洜浠g爜' }
+                        , { field: '涓嶈壇鍘熷洜鍚嶇О', title: '涓嶈壇鍘熷洜鍚嶇О' }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                    ]]
+                    //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
+                    //, done: function (res, cuur, count) {
+                    //    for (var i = 0; i < res.data.length; i++)
+                    //    {
+                    //        if (res.data[i].绂佺敤鏍囪=='Y') {
+                    //            $("table tbody tr").eq(i).css('color','red')
+                    //        }
+                    //    }
+                    //}
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_BadReason/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -220,24 +203,102 @@
                     }
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板涓嶈壇鍘熷洜',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫涓嶈壇鍘熷洜'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
 
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
-        
-
-
     </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index b80d5a6..dd9c433 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -8,11 +8,16 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <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/layui.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/layui.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/PubCustom.js"></script>
 
 </head>
 <body>
@@ -23,20 +28,15 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
-                                    <div class="layui-inline">
-                                        <span></span>
-                                    </div>
-                                </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">宸ュ簭浠g爜</label>
-                                    <div class="layui-input-block">
+                                    <label class="layui-form-label" style="width: 85px;">宸ュ簭浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">宸ュ簭鍚嶇О</label>
-                                    <div class="layui-input-block">
+                                    <label class="layui-form-label" style="width: 85px;">宸ュ簭鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
                                         <input type="text" class="layui-input" name="HName" id="HName">
                                     </div>
                                 </div>
@@ -50,15 +50,11 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -83,7 +79,7 @@
                 , laydate = layui.laydate
             var option = [];
             var sWhere = "";
-            //#endregion 
+            //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
@@ -96,10 +92,22 @@
 
             //#region 澶村伐鍏锋爮浜嬩欢
 
-           table.on('toolbar(mainTable)', function (obj) {
+            table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
                     //缂栬緫
                     case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
@@ -107,9 +115,7 @@
 
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");//宸ュ簭浠g爜
-                $("#HName").val("");//宸ュ簭鍚嶇О
-                //$("#btnSearch").click();
+                set_ClearQuery();
             });
             //#endregion
 
@@ -119,7 +125,7 @@
             });
             //#endregion
 
-          //#endregion
+            //#endregion
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
@@ -134,7 +140,7 @@
 
             //#region 鍒濆鍖栬〃鏍兼柟娉�
             function set_InitGrid() {
-                 option = {
+                option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , height: 'full-50'
@@ -153,20 +159,20 @@
                         , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
                         , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
                         , { field: '搴忓彿', title: '搴忓彿' }
-                        , { field: '瀵瑰簲K3浠g爜', title: '瀵瑰簲K3浠g爜' }
+                        , { field: '瀵瑰簲K3浠g爜', title: '瀵瑰簲K3浠g爜', width: 115 }
                         , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
                         , { field: '鐝骇瀹氶', title: '鐝骇瀹氶' }
-                        , { field: '鍔犵彮琛ヨ创瀹氶', title: '鍔犵彮琛ヨ创瀹氶' }
+                        , { field: '鍔犵彮琛ヨ创瀹氶', title: '鍔犵彮琛ヨ创瀹氶', width: 120 }
                         , { field: '鑷姩绉昏浆', title: '鑷姩绉昏浆' }
                         , { field: '澶囨敞', title: '澶囨敞' }
-                        , { field: 'HProcessID_K3', title: 'HProcessID_K3' }
-                        , { field: 'ERP宸ュ簭浠g爜', title: 'ERP宸ュ簭浠g爜' }
-                        , { field: 'ERP宸ュ簭鍚嶇О', title: 'ERP宸ュ簭鍚嶇О' }
+                        , { field: 'HProcessID_K3', title: 'HProcessID_K3', width: 130 }
+                        , { field: 'ERP宸ュ簭浠g爜', title: 'ERP宸ュ簭浠g爜', width: 125 }
+                        , { field: 'ERP宸ュ簭鍚嶇О', title: 'ERP宸ュ簭鍚嶇О', width: 125 }
                     ]]
                 };
             }
 
-               //#endregion
+            //#endregion
 
             //#region 鏌ヨ
             function get_Display(sWhere) {
@@ -210,6 +216,27 @@
             }
             //#endregion
 
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇璧勬簮-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
             //#region 缂栬緫
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -230,12 +257,61 @@
             }
             //#endregion
 
-        });
-        
-        //#endregion
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_Process',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
 
-        //浠ヤ笂鏄痩ayui妯″潡
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+        });
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
     </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1