From 10ef0eca16dd40fa943595b6c62e50a1aa6030b9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 28 二月 2024 17:31:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/采购管理/应付单/Cg_PayableBillList.html |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
index 1289b21..7f6742a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillList.html"
@@ -19,7 +19,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -134,6 +134,12 @@
             var option = [];
             var sWhere = "";
             var HModName = "Cg_PayableBillList";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "1114";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            //#endregion
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = [];
@@ -255,7 +261,7 @@
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
-                    , title: '搴斾粯鍗�-缂栬緫'
+                    , title: '缂栬緫' + HPageTitle
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../../閲囪喘绠$悊/搴斾粯鍗�/Cg_PayableBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                     , btn: ['纭畾'],
@@ -326,6 +332,7 @@
                             var totalArray = ["", ""];
                             var data = [];
                             var col = [];
+                            var totalArray = ["閲戦", "鏁伴噺"];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
@@ -455,7 +462,7 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '搴斾粯鍗�-鏂板'
+                    ,title: '鏂板' + HPageTitle
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../../閲囪喘绠$悊/搴斾粯鍗�/Cg_PayableBill.html?OperationType=1&linterid=0&HSouceBillType='
                     ,btn: [],
@@ -477,7 +484,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '搴斾粯鍗�-缂栬緫'
+                        , title: '缂栬緫' + HPageTitle
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../../閲囪喘绠$悊/搴斾粯鍗�/Cg_PayableBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                         , btn: [],
@@ -651,19 +658,11 @@
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
-                var contentUrl = "";
                 for (var i = 1; i < option.cols[0].length; i++) {
                     colName += option.cols[0][i]["title"] + ",";
                 }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
+
                 colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
-
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
-
                 layer.open({
                     type: 2
                     , skin: "layui-layer-rim" //鍔犱笂杈规
@@ -672,7 +671,7 @@
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [contentUrl, "yes"]
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁
@@ -693,8 +692,7 @@
                         if (data1.data.length != 0) {
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
+                            var titleData = ["hmainid", "HSSID", "HSupID", "HPSStyleID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "鐗╂枡浠g爜", "HSourceInterID", "HSourceEntryID", "HSourceBillNo", "HSourceBillType", "HRelationQty", "HRelationMoney", "HPOOrderInterID", "HPOOrderEntryID", "HPOOrderBillNo", "HSeOrderTaxPrice", "HSeOrderInterID", "HSeOrderEntryID", "HSeOrderBillNo"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -703,10 +701,6 @@
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
                                 }
-                                //璁剧疆鍒楀
-                                if (dataCols[3] > 0) {
-                                    option.cols[0][i + 1]["width"] = dataCols[3];
-                                }
                                 //璁剧疆鍐呭瀛椾綋澶у皬
                                 if (data1.data[0].HFontSize != 0) {
                                     option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
@@ -714,11 +708,9 @@
                                     option.cols[0][i + 1]["style"] = "font-size:100%";
                                 }
                                 //璁剧疆鍒楀
-                                //if (data1.data[0].HColumnWidth != 0) {
-                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
-                                //} else {
-                                //    option.cols[0][i + 1]["width"] = "";
-                                //}
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                     option.cols[0][i + 1]["hide"] = false;
@@ -756,8 +748,16 @@
                                 }
                             }
                             table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });

--
Gitblit v1.9.1