From 02af6ea33f505e4e06dc91785154898a801b267d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 14 四月 2025 12:21:56 +0800
Subject: [PATCH] 修复出站单  第三个自定义过滤没有数据显示,完善生产质量汇报单  复制一行不显示,修复不良原因查询在其他页面打开报错,性能散点报表 增加生产资源过滤,设备工艺参数点检表 完善 初始化点检人 id未赋值

---
 WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html |  366 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 279 insertions(+), 87 deletions(-)

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 5b6ecbf..bdd04c4 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"
@@ -13,6 +13,7 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style>
         .layui-form-item .layui-inline {
             margin-top: 5px;
@@ -38,83 +39,190 @@
                         </div>
                     </div>
                     <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <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 class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鍩烘湰淇℃伅</li>
+                                <li>鍏朵粬淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <div class="layui-row">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs4 layui-inline">
+                                                <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 layui-inline">
+                                                <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 layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
+                                                </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">
+                                                    <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 layui-inline">
+                                                <label class="layui-form-label">鍔冲姟鍗曚綅</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HCompName" lay-verify="HCompName" id="HCompName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 layui-inline">
+                                                <label class="layui-form-label">璁′欢绫诲瀷</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HPayMentType" id="HPayMentType" lay-verify="HPayMentType">
+                                                        <option value="涓汉璁′欢">涓汉璁′欢</option>
+                                                        <option value="闆嗕綋璁′欢">闆嗕綋璁′欢</option>
+                                                        <option value="鍏跺畠" selected="selected">鍏跺畠</option>
+                                                    </select>
+                                                </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">
+                                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                    <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>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 layui-inline">
+                                                <label class="layui-form-label">宸ュ簭</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                                    <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>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 layui-inline">
+                                                <label class="layui-form-label">浜烘暟</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HEmpQty" lay-verify="HEmpQty" id="HEmpQty" value="0">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs8 layui-inline">
+                                                <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" 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">
+                                                    <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">
+                                                </div>
+                                                <input type="hidden" value="0" name="HParentID" id="HParentID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <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="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </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="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+                                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs4 layui-inline">
+                                                <label class="layui-form-label">浣跨敤鐘舵�侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娴�" selected>鏈娴�</option>
+                                                        <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <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 layui-inline">
-                                <label class="layui-form-label">浜烘暟</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HEmpQty" lay-verify="HEmpQty" id="HEmpQty" value="0">
-                                </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">
-                                    <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">
-                                    <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>
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鍔╄鐮�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鏉″舰鐮�</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
-                                </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">
-                                    <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HProcID" id="HProcID" value="0">
-                                    <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>
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <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" title="鏄惁绂佺敤">
-                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
+                                <!--鍏朵粬淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item">
+                                        <div class="layui-row">
+                                            <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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+                                                </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="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+                                                </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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
 
-                            <div class="layui-col-xs8 layui-inline">
-                                <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                        </div>
+                                        <div class="layui-row">
+                                            <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="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+                                                </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="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+                                                </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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
-
                             </div>
                         </div>
                     </div>
-                    <input type="hidden" value="0" name="HParentID" id="HParentID">
-                    <input type="hidden" value="true" name="HUseFlag" id="HUseFlag">
                 </form>
             </div>
         </div>
@@ -145,9 +253,16 @@
 
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-
+            //绂佺敤缁勭粐閫夐」
+            $("#HUSEORGID").attr("disabled", true);
+            $("#HCREATEORGID").attr("disabled", true);
+            $("#checkboxHStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
+            //鍒濆鍖栫粍缁�
+            Organ();
 
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
@@ -160,7 +275,19 @@
             }
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
-                $("#HItemID").val(0);
+                $("#HItemID").val(0);               
+                 $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+            }
+            else if (OperationType == 2) {//澶嶅埗
+                $("#HUSEORGID").attr("disabled", true);
+                $("#HCREATEORGID").attr("disabled", true);
+                $("#checkboxHStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                 $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+                //澶嶅埗鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
             }
             else if (OperationType == 3) {//缂栬緫
                 $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -252,17 +379,28 @@
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HNumber": data.鐝粍浠g爜
-                                , "HItemID": data.HItemID
+                                , "HItemID": OperationType == 2 ? 0 : data.HItemID
                                 , "HDeptName": data.閮ㄩ棬鍚嶇О
                                 , "HName": data.鐝粍鍚嶇О
                                 , "HEmpQty": data.浜烘暟
                                 , "HDeptID": data.HDeptID
                                 , "HHelpCode": data.鍔╄鐮�
                                 , "HBarCodeForBase": data.鏉$爜缂栧彿
+                                , "HCompName": data.鍔冲姟鍗曚綅
                                 , "HProcID": data.HProcID
                                 , "HProcName": data.宸ュ簭
                                 , "HStopflag": data.绂佺敤鏍囪
                                 , "HRemark": data.澶囨敞
+                                , "HPayMentType": data.璁′欢绫诲瀷
+                                , "HUseFlag": data.HUseFlag
+                                , "HUSEORGID": data.HUSEORGID
+                                , "HCREATEORGID": data.HCREATEORGID                                
+                                , "HMakeEmp": data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�
+                                , "HMakeTime": data.鍒涘缓鏃ユ湡 == null ? "" : Format(new Date(data.鍒涘缓鏃ユ湡), "yyyy-MM-dd")
+                                , "HStopEmp": data.绂佺敤浜�
+                                , "HStopTime": data.绂佺敤鏃ユ湡 == null ? "" : Format(new Date(data.绂佺敤鏃ユ湡), "yyyy-MM-dd")
+                                , "HCheckEmp": data.瀹℃牳浜�
+                                , "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -277,21 +415,65 @@
             }
             //#endregion
 
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+                            $("#HCREATEORGID").append(Organization);
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
-                if (!$("#HProcID").val()) {
-                    layer.msg("璇烽�夋嫨宸ュ簭锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                if ($("#HNumber").val() == "") {
+                    layer.msg("浠g爜涓嶈兘涓虹┖锛�");
                     return;
                 }
-                if (!$("#HEmpQty").val()) {
-                    layer.msg("璇疯緭鍏ヤ汉鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                if ($("#HName").val() == "") {
+                    layer.msg("鍚嶇О涓嶈兘涓虹┖锛�");
                     return;
                 }
-                var sMainStr = JSON.stringify(data.field);
+
+                var HEmpQty = $('#HEmpQty').val();
+                if (HEmpQty.substring(HEmpQty.length - 1, HEmpQty.length) == ".") {
+                    layer.msg("浜烘暟鐨勭粨灏句笉鑳芥槸.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+$/;
+                    if (!ref.test(HEmpQty)) {
+                        layer.msg("浜烘暟璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                        return;
+                    }
+                }
+
+                //if ($("#HProcID").val()=="0") {
+                //    layer.msg("璇烽�夋嫨宸ュ簭锛�");
+                //    return;
+                //}
+                //if ($("#HEmpQty").val() == "0") {
+                //    layer.msg("璇疯緭鍏ヤ汉鏁帮紒");
+                //    return;
+                //}
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "Gy_Group/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    //url:"http://localhost:30552/Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "oMain": sMainStr },
                     dataType: "json",
@@ -323,15 +505,15 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ュ簭鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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"
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
                         $("#HProcID").val(checkStatus.data[0].HItemID);
                         $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -349,7 +531,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -357,9 +539,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -379,7 +561,7 @@
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
@@ -430,6 +612,16 @@
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
+        function GetHDeptNameValue(obj) {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+            $("#HDeptNumber").val(obj[0].閮ㄩ棬浠g爜);
+        }
+        function GetProcessValue(obj) {
+            $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+            $("#HProcID").val(obj[0].HItemID);
+            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
+        }
     </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1