From 2f55e014a562ca2625e6ba3e3cc999c7d08c59c1 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 20 三月 2024 08:46:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html |  229 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 148 insertions(+), 81 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index d8925b5..17821f2 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -65,7 +65,7 @@
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID" value="0">
-                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -77,11 +77,11 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">杈呭姪瀛楁</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" readonly>
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">                                        
+                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">甯佸埆</label>
                                             <div class="layui-input-inline">
@@ -95,7 +95,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">姹囩巼</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0">
+                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -135,7 +135,7 @@
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
-                                        </div>                                        
+                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -170,20 +170,20 @@
                                         </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="HLinkMan" id="HLinkMan" 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="HLinkMan" id="HLinkMan" 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="HLinkPhone" id="HLinkPhone" autocomplete="off">
-                                            </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="HLinkPhone" id="HLinkPhone" autocomplete="off">
+            </div>
+        </div>
+    </div>-->
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">缁撶畻鏃ユ湡</label>
@@ -195,6 +195,16 @@
                                             <label class="layui-form-label">澶囨敞</label>
                                             <div class="layui-input-block">
                                                 <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:10px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
@@ -324,6 +334,8 @@
             var allVal;
             //#endregion
 
+          //璁板綍缁勭粐鐨勫��
+            var HOrgIDBar = 0;
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
@@ -343,6 +355,37 @@
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
 
             $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+
+        //#region 鍒濆鍖栫粍缁�
+            Organ();
+            //#endregion
+
+        //#region 鑾峰彇缁勭粐
+            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>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            if (OperationType == 1 || OperationType == 4) {
+                                HOrgIDBar = sessionStorage["OrganizationID"];
+                            }
+                            $("#HOrgID").val(HOrgIDBar);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
@@ -370,7 +413,7 @@
 
             var rowdata = [{
                 "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "鏁伴噺": "", "HRemark": ""
-                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0","HDate":"2022-12-05"
+                , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "", "HRelTaxPrice": "", "HTaxRate": "", "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "","HDate":"2022-12-05"
             }];
 
             // 鍒濆鍖栫晫
@@ -383,8 +426,8 @@
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow = {
                     "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "鏁伴噺": "", "HRemark": ""
-                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": "2022-12-05"
-                };
+                , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "", "HRelTaxPrice": "", "HTaxRate": "", "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "","HDate":"2022-12-05"
+                     };
                 switch (obj.event) {
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
@@ -732,24 +775,24 @@
                     , height: 500
                     , loading: false
                     , cols: [[ //瀛愯〃
-                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                        , { type: 'numbers', title: '搴忓彿', width: 100}
+                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' , style: 'background-color:#efefef4d;'}
+                        , { type: 'numbers', title: '搴忓彿', width: 100, style: 'background-color:#efefef4d;'}
                         , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
-                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150,  style: 'background-color:#efefef4d;'}
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
                         , { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text', totalRow: true}
                         , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text'}
                         , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text'}
-                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true }
+                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true , style: 'background-color:#efefef4d;'}
                         , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text'}
-                        , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, }
+                        , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, style: 'background-color:#efefef4d;' }
                         , { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
-                        , { field: 'HTaxMoney', title: '绋庨', width: 100, }
+                        , { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;'}
                         , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, edit: 'text' }
-                        , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 120, }
+                        , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 120, style: 'background-color:#efefef4d;' }
                         , { field: 'HDate', title: '鍒拌揣鏃ユ湡', width: 120, event: 'HDate'}
                         , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
@@ -808,6 +851,9 @@
                                 , "HUpDateDate": data.淇敼鏃ユ湡
                                 , "HDeleteDate": data.浣滃簾鏃ユ湡
                             });
+
+                           //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                            HOrgIDBar = data.HOrgID;
 
                             //瀛愯〃  璧嬪��
                             var rowdata = [];
@@ -916,6 +962,8 @@
                     if (event.key == "F7") {
                         //鐗╂枡
                         if (obj.event == "HMaterID") {
+                            var HOrgID = $("#HOrgID").val();
+
                             layer.open({
                                 type: 2
                                 , skin: "layui-layer-rim" //鍔犱笂杈规
@@ -924,7 +972,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -984,19 +1032,19 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
                                     var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                    if (checkStatus.data.length != 0) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
+                                    //if (checkStatus.data.length != 0) {
+                                        //return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                   // }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].HName
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                         , "HUnitID": checkStatus.data[0].HItemID
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
@@ -1036,19 +1084,19 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閲囪喘鍛樺垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HEmpName").val(checkStatus.data[0].HName);
-                    //    $("#HEmpID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
                 })
             }
 
@@ -1106,19 +1154,19 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閲囪喘閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HDeptName").val(checkStatus.data[0].HName);
-                    //    $("#HDeptID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.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('璇烽�夋嫨鏁版嵁');
+                       }
+                       $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                       $("#HDeptID").val(checkStatus.data[0].HItemID);
+                       layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                   }
+                   , btn2: function (index, layero) { }
                 })
             }
 
@@ -1129,19 +1177,19 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓荤鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HManagerName").val(checkStatus.data[0].HName);
-                    //    $("#HManagerID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
                 })
             }
 
@@ -1152,7 +1200,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1160,7 +1208,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HPSStyleName").val(checkStatus.data[0].HName);
+                        $("#HPSStyleName").val(checkStatus.data[0].閲囪喘鏂瑰紡鍚嶇О);
                         $("#HPSStyleID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1175,7 +1223,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1183,7 +1231,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSSName").val(checkStatus.data[0].HName);
+                        $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
                         $("#HSSID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
@@ -1233,22 +1281,41 @@
        // 鍩虹璧勬枡杩斿洖鏁版嵁
        function GetHEmpValue(obj)  //杩斿洖閲囪喘鍛�
        {
-           $("#HEmpName").val(obj[0].HName);
+           $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
            $("#HEmpID").val(obj[0].HItemID);
        }
 
        function GetHDeptNameValue(obj)  //杩斿洖閲囪喘閮ㄩ棬
        {
-           $("#HDeptName").val(obj[0].HName);
+           $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
            $("#HDeptID").val(obj[0].HItemID);
         } 
 
         function GetHManagerValue(obj)  //杩斿洖涓荤
         {
-            $("#HManagerName").val(obj[0].HName);
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
         }
 
+       function GetHPSStyleNameValue(obj)  //杩斿洖閲囪喘鏂瑰紡
+       {
+            $("#HPSStyleName").val(obj[0].閲囪喘鏂瑰紡鍚嶇О);
+            $("#HPSStyleID").val(obj[0].HItemID);
+        } 
+
+       function GetHSupNameValue(obj)  //杩斿洖渚涘簲鍟�
+       {
+            $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+            $("#HSupID").val(obj[0].HItemID);
+        } 
+
+        
+        function GetSettleStyleValue(obj)  //杩斿洖缁撶畻鏂瑰紡
+        {
+            $("#HSSName").val(obj[0].缁撶畻鏂瑰紡鍚嶇О);
+            $("#HSSID").val(obj[0].HItemID);
+        }
+
     </script>
 </body>
 </html>     
\ No newline at end of file

--
Gitblit v1.9.1