From e67c433f170d0cf5dfe0159bbd7ae8f09ea93c54 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 一月 2024 17:31:09 +0800
Subject: [PATCH] 我的项目 页面显示按钮功能

---
 WebTM/views/基础资料/公用基础资料/xmlPM_ProjectBillMainMy.aspx.cs          |   17 +
 WebTM/layuiadmin/Scripts/webConfig.js                            |    4 
 WebTM/views/基础资料/公用基础资料/xmlPM_ProjectBillMainMy.aspx.designer.cs |   26 ++
 WebTM/views/grf/我的项目.grf                                         |  252 +++++++++++++++++++++
 WebTM/views/项目管理/报表分析/PM_ProjectBillMainMy.html                  |  341 ++++++++++++++--------------
 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html                       |    4 
 WebTM/views/基础资料/公用基础资料/xmlPM_ProjectBillMainMy.aspx             |   28 ++
 WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html                       |   35 +-
 WebTM/WebTM.csproj                                               |    9 
 9 files changed, 530 insertions(+), 186 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 694df97..fd3728c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -307,6 +307,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx" />
@@ -664,6 +665,7 @@
     <Content Include="views\grf\寮傚父绫诲瀷.grf" />
     <Content Include="views\grf\鐢熶骇璁㈠崟棰嗘枡鐘舵�佹姤琛�.grf" />
     <Content Include="views\grf\閫�鏂欓�氱煡鍗�.grf" />
+    <Content Include="views\grf\鎴戠殑椤圭洰.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -1747,6 +1749,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
       <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx.cs">
+      <DependentUpon>xmlPM_ProjectBillMainMy.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx.designer.cs">
+      <DependentUpon>xmlPM_ProjectBillMainMy.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx.cs">
       <DependentUpon>xmlLBM_Kf_SellOutBillList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 922b73b..f9bb972 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,10 +3,10 @@
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴*/
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
-    var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
+    //var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
-    //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+    var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
     //var WEBURL = "http://localhost:81/API/";  //闄堥洴闈欐湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";    //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/grf/\346\210\221\347\232\204\351\241\271\347\233\256.grf" "b/WebTM/views/grf/\346\210\221\347\232\204\351\241\271\347\233\256.grf"
new file mode 100644
index 0000000..3d80d5c
--- /dev/null
+++ "b/WebTM/views/grf/\346\210\221\347\232\204\351\241\271\347\233\256.grf"
@@ -0,0 +1,252 @@
+锘縶
+	"Version":"6.0.0.6",
+	"Title":"1a.绠�鍗曡〃鏍�",
+	"Author":"閿愭氮鎶ヨ〃杞欢",
+	"Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":90000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"LeftMargin":1,
+		"TopMargin":1,
+		"RightMargin":1,
+		"BottomMargin":1
+	},
+	"DetailGrid":{
+		"FixCols":20,
+		"AppendBlankRow":true,
+		"AppendBlankRowAtLast":true,
+		"AppendBlankCol":true,
+		"AppendBlankColWidth":40,
+		"GrowToBottom":true,
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"鍗曟嵁鍙�"
+				},
+				{
+					"Name":"椤圭洰鍚嶇О"
+				},
+				{
+					"Name":"瀹㈡埛"
+				},
+				{
+					"Name":"褰撳墠椤圭洰闃舵"
+				},
+				{
+					"Name":"杩涘害鍗犳瘮"
+				},
+				{
+					"Name":"椤圭洰缁忕悊"
+				},
+				{
+					"Name":"椤圭洰鎴愬憳"
+				},
+				{
+					"Name":"鍚堝悓瀹炴柦浜哄ぉ"
+				},
+				{
+					"Name":"棰勮浜屾寮�鍙戜汉澶�"
+				},
+				{
+					"Name":"宸茶�楃敤浜哄ぉ"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"Column1",
+				"Width":2.77813
+			},
+			{
+				"Name":"Column2",
+				"Width":2.80458
+			},
+			{
+				"Name":"Column3",
+				"Width":2.77813
+			},
+			{
+				"Name":"Column4",
+				"Width":2.80458
+			},
+			{
+				"Name":"Column5",
+				"Width":2.80458
+			},
+			{
+				"Name":"Column6",
+				"Width":2.80458
+			},
+			{
+				"Name":"Column7",
+				"Width":3.38667
+			},
+			{
+				"Name":"Column8",
+				"Width":2.59292
+			},
+			{
+				"Name":"Column9",
+				"Width":3.20146
+			},
+			{
+				"Name":"Column10",
+				"Width":4.20688
+			}
+		],
+		"ColumnContent":{
+			"Height":0.608542,
+			"ColumnContentCell":[
+				{
+					"Column":"Column1",
+					"TextAlign":"MiddleCenter",
+					"DataField":"鍗曟嵁鍙�"
+				},
+				{
+					"Column":"Column2",
+					"TextAlign":"MiddleCenter",
+					"DataField":"椤圭洰鍚嶇О"
+				},
+				{
+					"Column":"Column3",
+					"TextAlign":"MiddleCenter",
+					"DataField":"瀹㈡埛"
+				},
+				{
+					"Column":"Column4",
+					"TextAlign":"MiddleCenter",
+					"DataField":"褰撳墠椤圭洰闃舵"
+				},
+				{
+					"Column":"Column5",
+					"TextAlign":"MiddleCenter",
+					"DataField":"杩涘害鍗犳瘮"
+				},
+				{
+					"Column":"Column6",
+					"TextAlign":"MiddleCenter",
+					"DataField":"椤圭洰缁忕悊"
+				},
+				{
+					"Column":"Column7",
+					"TextAlign":"MiddleCenter",
+					"DataField":"椤圭洰鎴愬憳"
+				},
+				{
+					"Column":"Column8",
+					"TextAlign":"MiddleCenter",
+					"DataField":"鍚堝悓瀹炴柦浜哄ぉ"
+				},
+				{
+					"Column":"Column9",
+					"TextAlign":"MiddleCenter",
+					"DataField":"棰勮浜屾寮�鍙戜汉澶�"
+				},
+				{
+					"Column":"Column10",
+					"TextAlign":"MiddleCenter",
+					"DataField":"宸茶�楃敤浜哄ぉ"
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0.608542,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"Column1",
+					"TextAlign":"TopCenter",
+					"Text":"鍗曟嵁鍙�"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column2",
+					"TextAlign":"TopCenter",
+					"Text":"椤圭洰鍚嶇О\r\n"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column3",
+					"TextAlign":"TopCenter",
+					"Text":"瀹㈡埛"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column4",
+					"TextAlign":"TopCenter",
+					"Text":"褰撳墠椤圭洰闃舵"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column5",
+					"TextAlign":"TopCenter",
+					"Text":"杩涘害鍗犳瘮\r\n"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column6",
+					"TextAlign":"TopCenter",
+					"Text":"椤圭洰缁忕悊"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column7",
+					"TextAlign":"TopCenter",
+					"Text":"椤圭洰鎴愬憳"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column8",
+					"TextAlign":"TopCenter",
+					"Text":"鍚堝悓瀹炴柦浜哄ぉ\r\n"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column9",
+					"TextAlign":"TopCenter",
+					"Text":"棰勮浜屾寮�鍙戜汉澶‐r\n"
+				},
+				{
+					"GroupTitle":false,
+					"Column":"Column10",
+					"TextAlign":"TopCenter",
+					"Text":"宸茶�楃敤浜哄ぉ"
+				}
+			]
+		}
+	},
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader2",
+			"Height":2.01083,
+			"Control":[
+				{
+					"Type":"MemoBox",
+					"Name":"MemoBox1",
+					"Left":12.8058,
+					"Top":0.608542,
+					"Width":2.80458,
+					"Height":0.582083,
+					"Font":{
+						"Name":"瀹嬩綋",
+						"Size":157500,
+						"Weight":400,
+						"Charset":134
+					},
+					"TextAlign":"MiddleCenter",
+					"Text":"鎴戠殑椤圭洰"
+				}
+			]
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":1.79917
+		}
+	]
+}
\ No newline at end of file
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/HBarPlanPrint.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/HBarPlanPrint.html"
index f63b5c0..efcb378 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/HBarPlanPrint.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/HBarPlanPrint.html"
@@ -238,6 +238,10 @@
             case "HPOInStockBackBill": //閫�鏂欓�氱煡鍗�
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPOInStockBackBill.aspx?linterid=" + value, true, "");
                 break;
+            case "PM_ProjectBillMainMy": //鎴戠殑椤圭洰
+                var ListTrue = value.split('|');
+                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlPM_ProjectBillMainMy.aspx?linterid=" + ListTrue[0] + "&Num=" + ListTrue[1], true, "");
+                break;
         }
     </script>
 </body>
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/xmlPM_ProjectBillMainMy.aspx" "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/xmlPM_ProjectBillMainMy.aspx"
new file mode 100644
index 0000000..21e0a54
--- /dev/null
+++ "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/xmlPM_ProjectBillMainMy.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlPM_ProjectBillMainMy.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlPM_ProjectBillMainMy" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+     <script runat="server"> 
+    protected void Page_Load(object sender, EventArgs e)
+    {
+        //鈽呯壒鍒彁绀衡槄锛�
+        //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+        //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+      SqlXMLReportData.GenOneRecordset(this,  "exec h_p_My_PM_ProjectReportBill  '',"+Request.Params["Num"]+","+Request.Params["linterid"]);
+    }
+</script>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
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/xmlPM_ProjectBillMainMy.aspx.cs" "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/xmlPM_ProjectBillMainMy.aspx.cs"
new file mode 100644
index 0000000..34f97b3
--- /dev/null
+++ "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/xmlPM_ProjectBillMainMy.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+    public partial class xmlPM_ProjectBillMainMy : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
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/xmlPM_ProjectBillMainMy.aspx.designer.cs" "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/xmlPM_ProjectBillMainMy.aspx.designer.cs"
new file mode 100644
index 0000000..ec7df21
--- /dev/null
+++ "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/xmlPM_ProjectBillMainMy.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+    public partial class xmlPM_ProjectBillMainMy
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index 6f55770..ecd4f16 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -1100,23 +1100,26 @@
                     data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var tableMain = result.data;
+                        if (result.data.length > 0) {
+                            //涓昏〃 璧嬪��
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HOrgID": tableMain[0]["HOrgID"]
+                                , "HProjectID": tableMain[0]["HInterID"]
+                                , "HProNumber": tableMain[0]["HProNumber"]
+                                , "HProName": tableMain[0]["HProName"]
+                                , "HProjectStageID": tableMain[0]["HProjectStageID"]
+                                , "HProjectStageName": tableMain[0]["HProjectStageName"]
+                                , "HMainSourceInterID": tableMain[0]["HInterID"]
+                                , "HMainSourceEntryID": tableMain[0]["HEntryID"]
+                                , "HMainSourceBillNo": tableMain[0]["HBillNo"]
+                                , "HMainSourceBillType": tableMain[0]["HBillType"]
+                            });
 
-                        //涓昏〃 璧嬪��
-                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                            "HOrgID": tableMain[0]["HOrgID"]
-                            , "HProjectID": tableMain[0]["HInterID"]
-                            , "HProNumber": tableMain[0]["HProNumber"]
-                            , "HProName": tableMain[0]["HProName"]
-                            , "HProjectStageID": tableMain[0]["HProjectStageID"]
-                            , "HProjectStageName": tableMain[0]["HProjectStageName"]
-                            , "HMainSourceInterID": tableMain[0]["HInterID"]
-                            , "HMainSourceEntryID": tableMain[0]["HEntryID"]
-                            , "HMainSourceBillNo": tableMain[0]["HBillNo"]
-                            , "HMainSourceBillType": tableMain[0]["HBillType"]
-                        });
-
-                        //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
-                        HOrgIDBar = tableMain[0]["HOrgID"];
+                            //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                            HOrgIDBar = tableMain[0]["HOrgID"];
+                        } else {
+                            layer.alert("涓嬫帹姝ゆ暟鎹�,鏃犲伐浣滀换鍔″瓨鍦�!!!")
+                        }
                     }
                 })
             }
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
index 8e2a878..90e3c96 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>宸ュ簭娴佽浆鍗″垪琛�</title>
+    <title>鎴戠殑椤圭洰鍒楄〃</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -26,13 +26,13 @@
                 <div class="layui-card-body" style="padding: 1px;">
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div style="padding: 10px; ">
-                            <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_LookDown" lay-event="btn_LookDown">寮曞嚭</button>
-                            <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_view" lay-event="btn_view">棰勮</button>
-                            <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_print" lay-event="btn_print">鎵撳嵃</button>
-                            <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_push_down" lay-event="btn_push_down_phase">涓嬫帹闃舵姹囨姤</button>
-                            <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_push_down" lay-event="btn_push_down_work">涓嬫帹宸ヤ綔浠诲姟</button>
-                            <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="btn_push_down" lay-event="btn_push_down_monthly">涓嬫帹闃舵鏈堝害璁″垝</button>
-                            <button type="button" class="layui-btn layui-btn-radius" style="display:none;" id="get_Exit" lay-event="get_Exit">閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">寮曞嚭</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">棰勮</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_print" lay-filter="btn_print">鎵撳嵃</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_push_down" lay-filter="btn_push_down_phase">涓嬫帹闃舵姹囨姤</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_push_down" lay-filter="btn_push_down_work">涓嬫帹宸ヤ綔浠诲姟</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_push_down" lay-filter="btn_push_down_monthly">涓嬫帹闃舵鏈堝害璁″垝</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
                         </div>
                         <!--<div class="layui-collapse">
                             <div class="layui-colla-item">
@@ -132,11 +132,11 @@
                 , soulTable = layui.soulTable
             //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
             var sWhere = "";
-            var option = "";
-            var option2 = "";
+            var option = "";  //鎴戜富瀵肩殑
+            var option1 = ""; //鎴戝弬涓庣殑
+            var ins;
 
-
-
+           
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -144,82 +144,33 @@
             //
             var HModName = "PM_ProjectBillMainMy";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜涓诲鐨勶級
-            var titleData = ["HInterID", "鍗曟嵁鐘舵��", "椤圭洰浠g爜", "HCusID", "HProjectStageID", "HPMEmpID"];
-            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鍙備笌鐨勶級
-            var titleData1 = ["HInterID", "鍗曟嵁鐘舵��", "椤圭洰浠g爜", "HCusID", "HProjectStageID", "HPMEmpID"];
-
+            var titleData = ["HInterID","HEntryID", "鍗曟嵁鐘舵��", "椤圭洰浠g爜", "HCusID", "HProjectStageID", "HPMEmpID"];
             //鍒濆鍖栫晫闈�
             set_ClearBill();
-
             //#endregion
 
             //#region 澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(mainTable)', function (obj) {
-                switch (obj.event) {
-                    //寮曞嚭
-                    case 'btn_LookDown': btn_LookDown();
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //棰勮
-                    case 'btn_view': get_view();
-                        break;
-                    //鎵撳嵃
-                    case 'btn_print': get_print();
-                        break;
-                    //涓嬫帹闃舵姹囨姤
-                    case 'btn_push_down_phase': btn_push_down_phase();
-                        break;
-                    //涓嬫帹宸ヤ綔浠诲姟
-                    case 'btn_push_down_work': btn_push_down_work();
-                        break;
-                    //涓嬫帹闃舵鏈堝害璁″垝
-                    case 'btn_push_down_monthly': btn_push_down_monthly();
-                        break;
-
-                };
+            //寮曞嚭
+            form.on('submit(btn_LookDown)', function (data) {
+                get_Export();
             });
-            table.on('toolbar(mainTable1)', function (obj) {
-                switch (obj.event) {
-                    //寮曞嚭
-                    case 'btn_LookDown': btn_LookDown();
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //棰勮
-                    case 'btn_view': get_view();
-                        break;
-                    //鎵撳嵃
-                    case 'btn_print': get_print();
-                        break;
-                    //涓嬫帹闃舵姹囨姤
-                    case 'btn_push_down_phase': btn_push_down_phase();
-                        break;
-                    //涓嬫帹宸ヤ綔浠诲姟
-                    case 'btn_push_down_work': btn_push_down_work();
-                        break;
-                    //涓嬫帹闃舵鏈堝害璁″垝
-                    case 'btn_push_down_monthly': btn_push_down_monthly();
-                        break;
-
-                };
+            //鎵撳嵃
+            form.on('submit(btn_view)', function (data) {
+                get_print();
+            }); 
+            //鎵撳嵃
+            form.on('submit(btn_print)', function (data) {
+                get_print();
+            }); 
+            //涓嬫帹闃舵姹囨姤
+            form.on('submit(btn_push_down_phase)', function (data) {
+                set_ProjectReport();
+            });
+            //涓嬫帹宸ヤ綔浠诲姟
+            form.on('submit(btn_push_down_work)', function (data) {
+                set_WorkTask();
             });
             //#endregion
-
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                set_ClearQuery();
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery();
-            });
-            //#endregion
-
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
             function set_ClearBill() {
@@ -228,32 +179,13 @@
                 set_InitGrid();
                 //鍒濆鍖栦粠琛ㄥ垪琛�
                 set_InitGrid2();
-
-                table.render(option2);
                 //鏌ヨ
                 get_FastQuery();
             }
 
-
-            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
-            function set_ClearQuery() {
-
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#ColContent").val("");
-                //$("#ColName").val("0");
-                //$("#Comparator").val("0");
-                //form.render('select');
-                //$("#btnSearch").click();
-                sWhere = "";
-                get_FastQuery();
-            }
-            //#endregion
-
             //#region 蹇�熻繃婊�
             function get_FastQuery() {
-
                 get_Display(sWhere);
-                get_Display1(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
             //#endregion
@@ -287,9 +219,10 @@
 
             }
 
-            //#region 鏌ヨ 鎴戜富瀵肩殑
+            //#region 鏌ヨ 鎴戜富瀵肩殑 鎴戝弬涓庣殑
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
+               
                 $.ajax({
                     url: GetWEBURL() + '/PM_ReportController/PM_ProjectBillMYList',
                     type: "GET",
@@ -327,7 +260,7 @@
                                 elem: '#mainTable'
                                 , toolbar: '#toolbarDemo'
                                 , cols: [col]
-                                , data: data1.data
+                                , data: data1.data.h_p_My_PM_ProjectReportBill
                                 , height: 'full-80'
                                 , page: true
                                 , limits: [50, 500, 5000, 50000]
@@ -335,81 +268,19 @@
                                 , cellMinWidth: 90
                             }
                             table.render(option);
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "PM_ProjectBillMainMy";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
-
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-
-                            layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                                ColFilter();
-                            }
-
-                            //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 鏌ヨ 鎴戝弬涓庣殑
-            function get_Display1(sWhere) {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/PM_ReportController/PM_ProjectBillMYList',
-                    type: "GET",
-                    async: false,
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            var data = [];
-                            var col = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                            }
-                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left' });
-                            for (var i = 0; i < data.length; i++) {
-                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
-                                if ($.inArray(data[i].name, titleData) > -1) {
-                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                }
-                                else {
-                                    switch (data[i].Type) {
-                                        //int
-                                        case 'DateTime':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                            break;
-                                        default:
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                    }
-                                }
-                            }
-
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
+                            ins = table.render(option);
+                            option1 = {
                                 elem: '#mainTable1'
                                 , toolbar: '#toolbarDemo'
                                 , cols: [col]
-                                , data: data1.data
+                                , data: data1.data.h_p_My_PM_ProjectReportBill1
                                 , height: 'full-80'
                                 , page: true
                                 , limits: [50, 500, 5000, 50000]
                                 , limit: 50
                                 , cellMinWidth: 90
                             }
-                            table.render(option);
+                            table.render(option1);
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             var HBillType = "PM_ProjectBillMainMy";
@@ -435,8 +306,142 @@
                 });
 
             }
-
             //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                let data = option.data;  // 鍋囪option.data鏄綘鐨勬暟鎹�  
+                for (let i = 0; i < data.length; i++) {
+                    if (data[i].椤圭洰鎴愬憳 && typeof data[i].椤圭洰鎴愬憳 === 'string') {
+                        data[i].椤圭洰鎴愬憳 = formatNames(data[i].椤圭洰鎴愬憳);
+                    }
+                }
+                table.exportFile(ins.config.id, data, "xls");
+            }
+            function formatNames(names) {
+                return `"${names.replace(/,/g, "銆�")}"`;
+            }
+            //#endregion
+
+            //#region 鎵撳嵃
+            function get_print() {
+                var activeTab =getActiveTab();
+                if (activeTab=="鎴戜富瀵肩殑") {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data,
+                        Num = 1;
+                } else if (activeTab == "鎴戝弬涓庣殑") {
+                    var checkStatus = table.checkStatus('mainTable1')
+                        , data = checkStatus.data,
+                        Num = 2;
+                }
+                
+                if (checkStatus.data.length == 1) {
+                    var linterid = [];
+
+                    for (var i = 0; i < data.length; i++) {
+                        linterid.push(data[i].HInterID.toString())
+                    }
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + Num + '&MyMsg=' + linterid.toString() + '&Type=PM_ProjectBillMainMy', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
+            function getActiveTab() {
+                var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+                var activeTab;
+                for (var i = 0; i < tabs.length; i++) {
+                    if (tabs[i].classList.contains("layui-this")) {
+                        activeTab = tabs[i].innerText;
+                        break;
+                    }
+                }
+                return activeTab;
+
+            }
+            //#endregion
+
+            //#region 涓嬫帹(闃舵姹囨姤)
+            function set_ProjectReport() {
+                var activeTab = getActiveTab();
+                if (activeTab == "鎴戜富瀵肩殑") {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                } else if (activeTab == "鎴戝弬涓庣殑") {
+                    var checkStatus = table.checkStatus('mainTable1')
+                        , data = checkStatus.data;
+                }
+                var InterID = data[0].HInterID.toString();
+                var HProjectStageID = data[0].HProjectStageID;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    var HProjectStageID = data[0].HProjectStageID;
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '椤圭洰闃舵姹囨姤-涓嬫帹'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../椤圭洰绠$悊/椤圭洰闃舵/PM_ProjectReportBill.html?OperationType=4&linterid=' + InterID + '&HSouceBillType=' + '&HProjectStageID=' + HProjectStageID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        btn1: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 涓嬫帹(宸ヤ綔浠诲姟)
+            function set_WorkTask() {
+                var activeTab = getActiveTab();
+                if (activeTab == "鎴戜富瀵肩殑") {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                } else if (activeTab == "鎴戝弬涓庣殑") {
+                    var checkStatus = table.checkStatus('mainTable1')
+                        , data = checkStatus.data;
+                }
+                var HInterID = data[0].HInterID.toString();
+                var HEntryID = data[0].HEntryID.toString();
+                if (checkStatus.data.length === 1) {
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '宸ヤ綔浠诲姟-涓嬫帹'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../椤圭洰绠$悊/宸ヤ綔浠诲姟/PM_WorkTaskBill.html?OperationType=4&linterid=' + HInterID + '&HSouceBillType=' + '&HEntryID=' + HEntryID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        btn1: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+                }
+            }
+            //#endregion
+
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";

--
Gitblit v1.9.1