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

---
 WebTM/views/项目管理/工程项目/PM_ProjectEndBillMainList.html |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMainList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMainList.html"
index 026ea56..da6dcf0 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMainList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectEndBillMainList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
 
 
 </head>
@@ -132,6 +133,13 @@
             var option = [];
             var sWhere = "";
             var HModName = "PM_ProjectEndBillMain";
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "4761";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            //#endregion
+
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HInterID", "HBillStatus", "HProjectID", "HPMTeamID", "HPMEmpID", "HWorkEmpID", "HCusID", "HManagerID", "HOrgID", "HEntryID","HTestEmp"];
@@ -445,7 +453,7 @@
                     type: 2
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['100%', '100%']
-                    , title: '宸ヤ綔浠诲姟鍒楄〃-鏂板'
+                    , title: '鏂板' + HPageTitle
                     , shift: 0//寮瑰嚭鍔ㄧ敾
                     , content: '../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectEndBillMain.html?OperationType=1&linterid=0&HSouceBillType='
                     ,btn: ['纭畾'],
@@ -467,7 +475,7 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '宸ヤ綔浠诲姟鍒楄〃-缂栬緫'
+                        , title: '缂栬緫' + HPageTitle
                         , shift: 0//寮瑰嚭鍔ㄧ敾
                         , content: '../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectEndBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                         , btn: ['纭畾'],
@@ -544,7 +552,7 @@
                         $.ajax({
                             url: GetWEBURL() + '/PM_ProjectBill/CheckPM_ProjectEndBillMain',
                             type: "GET",
-                            data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+                            data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 });
@@ -574,7 +582,7 @@
                         $.ajax({
                             url: GetWEBURL() + '/PM_ProjectBill/CheckPM_ProjectEndBillMain',
                             type: "GET",
-                            data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+                            data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 });
@@ -604,7 +612,7 @@
                         $.ajax({
                             url: GetWEBURL() + '/PM_ProjectBill/ClosePM_ProjectEndBillMain',
                             type: "GET",
-                            data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+                            data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
 
@@ -635,7 +643,7 @@
                         $.ajax({
                             url: GetWEBURL() + '/PM_ProjectBill/ClosePM_ProjectEndBillMain',
                             type: "GET",
-                            data: { "HInterID": InterID, "IsAudit": nums, "user": sessionStorage["HUserName"] },
+                            data: { "HInterID": InterID, "IsAudit": nums, "CurUserName": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
 

--
Gitblit v1.9.1