From 2bfaab21576ba77575344d28b7eea8da428500c1 Mon Sep 17 00:00:00 2001
From: gaofei <231232131@163.com>
Date: Sat, 23 Apr 2022 22:49:21 +0800
Subject: [PATCH] 0423-001

---
 .../版本日志/SGGLDB_V2022-04-23-001.sql   |  31 +
 .../JDGL/Check/QuantityCompletion.aspx.cs     |   2 +-
 SGGL/FineUIPro.Web/common/mainIII.aspx        | 554 ++++++++++--------
 SGGL/FineUIPro.Web/common/mainIII.aspx.cs     | 121 ++--
 .../common/mainIII.aspx.designer.cs           |  18 +
 SGGL/FineUIPro.Web/common/mainProject.aspx.cs |   2 +-
 6 files changed, 446 insertions(+), 282 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2022-04-23-001.sql

diff --git a/DataBase/版本日志/SGGLDB_V2022-04-23-001.sql b/DataBase/版本日志/SGGLDB_V2022-04-23-001.sql
new file mode 100644
index 00000000..bf119b91
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-04-23-001.sql
@@ -0,0 +1,31 @@
+alter table [dbo].[JDGL_QuantityList] add SortIndex int null
+GO
+
+
+ALTER VIEW [dbo].[View_JDGL_QuantityCompletion]
+AS
+select qc.*,ql.DesignNum,ql.Name,ql.Unit,ql.SortIndex,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalPlanNum,
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalRealNum,
+                            CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(qc.PlanNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL(qc.RealNum,0) / (1.0 *qc.PlanNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE (select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) END AS DECIMAL(9,2)))))+'%'
+		AS TotalRate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ql.DesignNum,0) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *ql.DesignNum) END AS DECIMAL(9,2)))))+'%'
+		AS SumRate,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalPlanNum, 
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalRealNum
+                            from [dbo].JDGL_QuantityList ql
+							left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
+where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from [JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId order by q.EndDate desc)
+
+
+
+
+
+GO
+
+
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs
index 6389fdb3..5e735e42 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/QuantityCompletion.aspx.cs
@@ -92,7 +92,7 @@ namespace FineUIPro.Web.JDGL.Check
             //GetQuantityCompletion();
             string strSql = @"select *
                             from dbo.View_JDGL_QuantityCompletion qc 
-                            where qc.ProjectId=@ProjectId order by qc.Name";
+                            where qc.ProjectId=@ProjectId order by qc.SortIndex, qc.Name";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/common/mainIII.aspx b/SGGL/FineUIPro.Web/common/mainIII.aspx
index 9656661d..fd699c61 100644
--- a/SGGL/FineUIPro.Web/common/mainIII.aspx
+++ b/SGGL/FineUIPro.Web/common/mainIII.aspx
@@ -9,240 +9,295 @@
     <link href="../res/index/css/home.css" rel="stylesheet" />
     <link href="../res/index/css/swiper-3.4.2.min.css" rel="stylesheet" />
     <style>
-         .wrap{
-            height:100%;
-            padding:15px;
-        }
-         .top-wrap{
-            height:100%;
-         }
-         .bw-b-bottom{
-             width:100%;
-             height:100%;
-         }
-         .bw-b-bottom-up {
+        .wrap {
             height: 100%;
-            margin:0;
+            padding: 15px;
+        }
+
+        .top-wrap {
+            height: 100%;
+        }
+
+        .bw-b-bottom {
+            width: 100%;
+            height: 100%;
+        }
+
+        .bw-b-bottom-up {
+            height: 100%;
+            margin: 0;
             box-shadow: rgb(0,162,233) 0px 0px 50px inset;
-            border-radius:10px;
+            border-radius: 10px;
         }
-        .bottom-wrap{
-        padding:0;
+
+        .bottom-wrap {
+            padding: 0;
         }
-        .pdtb0{
-            padding-top:0 !important;
-            padding-bottom:0 !important;
+
+        .pdtb0 {
+            padding-top: 0 !important;
+            padding-bottom: 0 !important;
         }
-        .tit-center{
-            text-align:center;
-            font-size:12px;
+
+        .tit-center {
+            text-align: center;
+            font-size: 12px;
         }
-        .tit-one{
-           padding: 10px 0; 
+
+        .tit-one {
+            padding: 10px 0;
         }
-        .pdl{
-            padding-left:15px;
-            font-size:12px;
+
+        .pdl {
+            padding-left: 15px;
+            font-size: 12px;
         }
+
         .more {
             cursor: pointer;
             text-align: right;
             padding: 10px;
             font-size: 10px;
         }
-        .bg-img{
-            width:100%;
-            max-height:225px;
+
+        .bg-img {
+            width: 100%;
+            max-height: 225px;
         }
-        .item{
+
+        .item {
             margin-bottom: 5px;
-            font-size:10px;
+            font-size: 10px;
         }
-        .item:last-child{
-            margin-bottom: 0;
-        }
-        .item-two{
+
+            .item:last-child {
+                margin-bottom: 0;
+            }
+
+        .item-two {
             margin: 5px 0;
         }
-        .jd-list-wrap{
+
+        .jd-list-wrap {
             padding: 10px 10px;
         }
-        .jd-list-long{
-            width:100%;
+
+        .jd-list-long {
+            width: 100%;
         }
-        .jd-list{
-            height:100%;
+
+        .jd-list {
+            height: 100%;
             /*background-color:#1A5A92;*/
-            font-size:10px;
+            font-size: 10px;
         }
-        .jd-list .jd-title{
-            color:#fff;
+
+            .jd-list .jd-title {
+                color: #fff;
+            }
+
+            .jd-list .jd-item {
+                display: flex;
+                align-items: center;
+                border-bottom: 1px solid #1D6FA9;
+                padding: 5px 0;
+            }
+
+                .jd-list .jd-item .item {
+                    flex: 1;
+                    display: flex;
+                    justify-content: center;
+                }
+
+        .pd10 {
+            padding: 10px !important;
         }
-        .jd-list .jd-item{
-            display:flex;
-            align-items:center;
-            border-bottom:1px solid #1D6FA9;
-            padding: 5px 0;
+
+        .bg-img-1 {
+            height: 100%;
+            background: url(../Images/siteProject.jpg) center center no-repeat;
+            background-size: 100% 100%;
+        }
+
+        .tab-wrap-hastit {
+            position: relative;
+        }
+
+        .tab-wrap-pos {
+            left: auto;
+            right: 30px;
+            top: 5px;
+        }
+
+        .content-ul .c-item .tit {
+            display: block;
+            position: relative;
+            padding-left: 2em;
         }
-         .jd-list .jd-item  .item{
-             flex:1;
-             display:flex;
-             justify-content:center;
-         }
-         .pd10{
-             padding:10px !important;
-         }
-         .bg-img-1{
-             height:100%;
-             background: url(../Images/siteProject.jpg) center center no-repeat;
-             background-size: 100% 100%;
-         }
-         .tab-wrap-hastit{
-           position:relative;
-         }
-         .tab-wrap-pos{
-           left: auto;
-           right: 30px;
-           top: 5px;
-         }
-             .content-ul .c-item .tit {
- display:block;
-position:relative;
-padding-left: 2em;
-}
 
 
-.content-ul .c-item .tit::before {
-  content: '';
-  position: absolute;
-  border-color: #57B8BD;
-  border-style: solid;
-  border-width: 0.25em;
-  height: 0;
-  top: 0;
-  left: 0.6em;
-  margin-top: 0.5em;
-  width: 0;
-  border-radius:50%;
-}
+            .content-ul .c-item .tit::before {
+                content: '';
+                position: absolute;
+                border-color: #57B8BD;
+                border-style: solid;
+                border-width: 0.25em;
+                height: 0;
+                top: 0;
+                left: 0.6em;
+                margin-top: 0.5em;
+                width: 0;
+                border-radius: 50%;
+            }
 
-.content-ul .c-item .tit-read::before {
-  content: '';
-  position: absolute;
-  border-color: #ffffff;
-  border-style: solid;
-  border-width: 0.25em;
-  height: 0;
-  top: 0;
-  left: 0.6em;
-  margin-top: 0.25em;
-  width: 0;
-  border-radius:50%
-}
-.content-ul .c-item .tit .tit-t{
-   flex:1;  
-   min-width: 0;
-   overflow: hidden;
+        .content-ul .c-item .tit-read::before {
+            content: '';
+            position: absolute;
+            border-color: #ffffff;
+            border-style: solid;
+            border-width: 0.25em;
+            height: 0;
+            top: 0;
+            left: 0.6em;
+            margin-top: 0.25em;
+            width: 0;
+            border-radius: 50%
+        }
+
+        .content-ul .c-item .tit .tit-t {
+            flex: 1;
+            min-width: 0;
+            overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
             word-break: keep-all;
- }
+        }
 
-.content-ul .c-item.disabled .tit::before{
-  display:none !important;
-}
+        .content-ul .c-item.disabled .tit::before {
+            display: none !important;
+        }
 
-.content-ul .c-item .tit .tit-v{
-  margin-left: 12px;
-  width: 80px;  
- }
-.project-list-wrap{
-    position:absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    background-color: #21269a;
-    padding: 15px;
-    color: #fff;
-    border-radius:8px;
-    width: 1024px;
-    min-height: 500px;
-    z-index: 9999;
-}
-.projectList_btn{
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    text-align: right;
-    width: 100%;
-    padding: 10px;
+        .content-ul .c-item .tit .tit-v {
+            margin-left: 12px;
+            width: 80px;
+        }
 
-}
-.projectList_btn .pl_btn{
-    color:#ccc;
-    cursor:pointer;
-    width: 32px;
-    float: right;
+        .project-list-wrap {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+            background-color: #21269a;
+            padding: 15px;
+            color: #fff;
+            border-radius: 8px;
+            width: 1024px;
+            min-height: 500px;
+            z-index: 9999;
+        }
 
-}
-.tit-right-wrap{
-    position:relative;
-}
-.tit-right-wrap .tit-right{
-    position:absolute;
-    right: 20px;
-    top: 10px;
-}
-.zl-list{
-   justify-content:space-around;
-   width:100%;
-}
-.zl-list .zl-item{
-   margin-bottom:15px;
-   justify-content: flex-end;
-}
-.zl-list .zl-item .zl-tit, .zl-list .zl-item .zl-val{
-   font-size:15px;
-}
-.zl-list .zl-item .zl-tit{
-   
-}
-.zl-list .zl-item .zl-val{
-   color:#fff;
-   margin-left:8px;
-}
-.bubble-wrap{
-    border-radius:50%;
-    border: 1px solid #00a2e9;
-    display: flex;
-    flex-direction: column;
-    width: 84px;
-    height: 70px;
-    padding: 10px;
-    justify-content: center;
-    align-items: center;
-    margin-right: 15px;
-}
+        .projectList_btn {
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            text-align: right;
+            width: 100%;
+            padding: 10px;
+        }
 
-.b-num{
-    font-size: 20px;
-    color: #fff;
-}
-.b-txt{
-    font-size:12px;
-}
-.flexOne{
-   min-height:200px;
-}
+            .projectList_btn .pl_btn {
+                color: #ccc;
+                cursor: pointer;
+                width: 32px;
+                float: right;
+            }
+
+        .tit-right-wrap {
+            position: relative;
+        }
+
+            .tit-right-wrap .tit-right {
+                position: absolute;
+                right: 20px;
+                top: 10px;
+            }
+
+        .zl-list {
+            justify-content: space-around;
+            width: 100%;
+        }
+
+            .zl-list .zl-item {
+                margin-bottom: 15px;
+                justify-content: flex-end;
+            }
+
+                .zl-list .zl-item .zl-tit, .zl-list .zl-item .zl-val {
+                    font-size: 15px;
+                }
+
+                .zl-list .zl-item .zl-tit {
+                }
+
+                .zl-list .zl-item .zl-val {
+                    color: #fff;
+                    margin-left: 8px;
+                }
+
+        .bubble-wrap {
+            border-radius: 50%;
+            border: 1px solid #00a2e9;
+            display: flex;
+            flex-direction: column;
+            width: 84px;
+            height: 70px;
+            padding: 10px;
+            justify-content: center;
+            align-items: center;
+            margin-right: 15px;
+        }
+
+        .b-num {
+            font-size: 20px;
+            color: #fff;
+        }
+
+        .b-txt {
+            font-size: 12px;
+        }
+
+        .flexOne {
+            min-height: 200px;
+        }
+
+        .tab-wrap {
+            position: absolute;
+            left: auto;
+            right: 15px;
+            top: 5px;
+            font-size: 12px;
+        }
+
+        .tab .t-item {
+            width: auto;
+            padding: 5px 10px;
+        }
+
+        .tit-item {
+            padding: 0 10px;
+            color: #fff;
+            justify-content: space-between;
+            font-size: 12px;
+        }
     </style>
 </head>
 <body>
     <div class="wrap flex">
-        <div class="flex1 flex flexV top-wrap" style="margin-right:5px;">
+        <div class="flex1 flex flexV top-wrap" style="margin-right: 5px;">
             <div class="item flex1">
                 <div class="bw-b-bottom">
                     <div class="bw-b-bottom-up flex flexV">
-                        <div class="tit-one tit-center tit-right-wrap" style="color:#fff">
+                        <div class="tit-one tit-center tit-right-wrap" style="color: #fff">
                             <div>施工进度曲线</div>
                             <div class="tit-right more js-more-2">更多</div>
                         </div>
@@ -252,11 +307,11 @@ padding-left: 2em;
                     </div>
                 </div>
             </div>
-            
-            <div class="item flex1"  id="swiper-pre">
+
+            <div class="item flex1" id="swiper-pre">
                 <div class="bw-b-bottom">
                     <div class="bw-b-bottom-up flex flexV">
-                        <div class="tit-one tit-center tit-right-wrap" style="color:#fff">
+                        <div class="tit-one tit-center tit-right-wrap" style="color: #fff">
                             <div>各工种人力情况</div>
                             <div class="tit-right js-num-ggzllqk more js-more-3">总数：</div>
                         </div>
@@ -269,7 +324,14 @@ padding-left: 2em;
             <div class="item flex1">
                 <div class="bw-b-bottom">
                     <div class="bw-b-bottom-up flex flexV">
-                        <div class="tit-one tit-center pdl" style="color:#fff">关键事项<form runat="server"><asp:HiddenField runat="server" ID="hdNoticeId" /><asp:Button ID="imgBtn" runat="server" OnClick="imgBtn_Click" style="display:none;"/></form></div>
+                        <div class="tit-one tit-center pdl" style="color: #fff">
+                            关键事项<form runat="server">
+                                <asp:HiddenField runat="server" ID="hdNoticeId" />
+                                <asp:Button ID="imgBtn" runat="server" OnClick="imgBtn_Click" Style="display: none;" />
+                            </form>
+                            <input id="hdContractQuantitySheets" type="hidden" runat="server" />
+                            <input id="hdMaterialRecords" type="hidden" runat="server" />
+                        </div>
                         <div class="bw-item-content flex1 pdtb0">
                             <div class="" style="padding: 0 10px 0; overflow: hidden;">
                                 <div class="swiper-container " id='swiper2' runat="server">
@@ -284,9 +346,9 @@ padding-left: 2em;
             <div class="item flex1">
                 <div class="bw-b-bottom flex">
                     <div class="bw-b-bottom-up flex">
-                        <div  class=" flex flexV" style="max-width:362px;">
-                            <div class="tit-one tit-center pdl" style="color:#fff;padding: 10px 0 0 !important;">HSE绩效</div>
-                            <div class="bw-item-content flex1 flex" style="flex-wrap:wrap;justify-content:space-around;align-items:center;padding: 8px 10px 2px;">
+                        <div class=" flex flexV" style="max-width: 362px;">
+                            <div class="tit-one tit-center pdl" style="color: #fff; padding: 10px 0 0 !important;">HSE绩效</div>
+                            <div class="bw-item-content flex1 flex" style="flex-wrap: wrap; justify-content: space-around; align-items: center; padding: 8px 10px 2px;">
                                 <div class="bubble-wrap">
                                     <div class="b-num" runat="server" id="divZY">0</div>
                                     <div class="b-txt">作业许可</div>
@@ -310,8 +372,8 @@ padding-left: 2em;
                             </div>
                         </div>
                         <div class="flex1  flex flexV">
-                            <div class="tit-one tit-center pdl" style="color:#fff">质量管理</div>
-                            <div class="bw-item-content flex1 pd10 flex" style="justify-content: center;align-items: center;">
+                            <div class="tit-one tit-center pdl" style="color: #fff">质量管理</div>
+                            <div class="bw-item-content flex1 pd10 flex" style="justify-content: center; align-items: center;">
                                 <div class="zl-list flex">
                                     <div class="'zl-item-wrap">
                                         <div class="zl-item flex">
@@ -358,9 +420,20 @@ padding-left: 2em;
             <div class="item flex2">
                 <div class="bw-b-bottom">
                     <div class="bw-b-bottom-up flex flexV">
-                        <div class="tit-one tit-center" runat="server" id="divMonth" style="color:#fff">专业工作量表</div>
+                        <div class="tit-one tit-center" runat="server" id="divMonth" style="color: #fff; margin-left: 15px; text-align: left;">&nbsp;</div>
+                        <div class="tab-wrap">
+                            <div class="tab" data-value="2">
+                                <div class="t-item active">材料到货情况</div>
+                                <div class="spline"></div>
+                                <div class="t-item ">材料出库情况</div>
+                                <div class="spline"></div>
+                                <div class="t-item">建筑单位工程</div>
+                                <div class="spline"></div>
+                                <div class="t-item">专业</div>
+                            </div>
+                        </div>
                         <div class="bw-item-content flex1 flex jd-list-wrap">
-                            <div class="jd-list jd-list-long" runat="server" id="divGZL" style="overflow:scroll;max-height:200px;">
+                            <div class="jd-list jd-list-long" runat="server" id="divGZL" style="overflow: scroll; max-height: 200px;">
                                 <div class="jd-item">
                                     <div class="item jd-title">序号</div>
                                     <div class="item jd-title">类型</div>
@@ -369,7 +442,7 @@ padding-left: 2em;
                                     <div class="item jd-title">计划完成</div>
                                     <div class="item jd-title">实际完成</div>
                                     <div class="item jd-title">计划完成率</div>
-                                     <div class="item jd-title">累计计划完成</div>
+                                    <div class="item jd-title">累计计划完成</div>
                                     <div class="item jd-title">累计实际完成</div>
                                     <div class="item jd-title">累计计划完成率</div>
                                     <div class="item jd-title">总完成率</div>
@@ -388,7 +461,7 @@ padding-left: 2em;
                                     <div class="item">50%</div>
                                 </div>
                                 <div class="jd-item">
-                                   <div class="item">2</div>
+                                    <div class="item">2</div>
                                     <div class="item">钢筋</div>
                                     <div class="item">T</div>
                                     <div class="item ">200</div>
@@ -413,8 +486,8 @@ padding-left: 2em;
                                     <div class="item">67%</div>
                                     <div class="item">50%</div>
                                 </div>
-                                 <div class="jd-item">
-                                        <div class="item">4</div>
+                                <div class="jd-item">
+                                    <div class="item">4</div>
                                     <div class="item">钢筋</div>
                                     <div class="item">T</div>
                                     <div class="item ">200</div>
@@ -427,7 +500,7 @@ padding-left: 2em;
                                     <div class="item">50%</div>
                                 </div>
                                 <div class="jd-item">
-                                        <div class="item">5</div>
+                                    <div class="item">5</div>
                                     <div class="item">钢结构</div>
                                     <div class="item">吨</div>
                                     <div class="item ">200</div>
@@ -440,7 +513,7 @@ padding-left: 2em;
                                     <div class="item">50%</div>
                                 </div>
                                 <div class="jd-item">
-                                        <div class="item">6</div>
+                                    <div class="item">6</div>
                                     <div class="item">设备</div>
                                     <div class="item">台</div>
                                     <div class="item ">200</div>
@@ -453,7 +526,7 @@ padding-left: 2em;
                                     <div class="item">50%</div>
                                 </div>
                                 <div class="jd-item">
-                                        <div class="item">7</div>
+                                    <div class="item">7</div>
                                     <div class="item">管道安装</div>
                                     <div class="item">达因</div>
                                     <div class="item ">200</div>
@@ -465,8 +538,8 @@ padding-left: 2em;
                                     <div class="item">67%</div>
                                     <div class="item">50%</div>
                                 </div>
-                                 <div class="jd-item">
-                                        <div class="item">8</div>
+                                <div class="jd-item">
+                                    <div class="item">8</div>
                                     <div class="item">其他</div>
                                     <div class="item"></div>
                                     <div class="item ">200</div>
@@ -483,11 +556,11 @@ padding-left: 2em;
                         <div class="more js-more-1">更多</div>
                     </div>
                 </div>
-                
+
             </div>
         </div>
     </div>
-    <div class="project-list-wrap" style="display:none;">
+    <div class="project-list-wrap" style="display: none;">
         <div class="pl" id="projectList">
             <div>润弘建设有限公司</div>
             <div>中国化学工程第十四建设有限公司</div>
@@ -507,13 +580,13 @@ padding-left: 2em;
 <script type="text/javascript" src="../res/index/js/swiper-3.4.2.jquery.min.js"></script>
 <script type="text/javascript" src="../res/index/js/echarts.min.js"></script>
 <script type="text/javascript">
-    function line(id, xArr, data)  {
+    function line(id, xArr, data) {
         // 基于准备好的dom，初始化echarts实例
         var myChart = echarts.init(document.getElementById(id))
         // 指定图表的配置项和数据
         var option = {
             title: {
-                left:'center',
+                left: 'center',
                 text: ' ',
                 textStyle: {
                     color: '#fff',
@@ -523,12 +596,12 @@ padding-left: 2em;
                 show: false
             },
             tooltip: {
-	      formatter: '{a}<br />{b}: {c}%'
-	    },
+                formatter: '{a}<br />{b}: {c}%'
+            },
             legend: {
                 show: true,
-		textStyle: {
-                  color: '#fff'
+                textStyle: {
+                    color: '#fff'
                 },
                 left: 0
             },
@@ -565,7 +638,7 @@ padding-left: 2em;
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     },
-		    formatter: '{value} %'
+                    formatter: '{value} %'
                 }
             },
             series: data,
@@ -598,7 +671,7 @@ padding-left: 2em;
     //var two = { "title": "赢得值曲线", "xFontNum": 0, "legend": null, "categories": ["2020-07", "2020-08", "2020-09", "2020-10", "2020-11", "2020-12", "2021-01", "2021-02"], "series": [{ "name": null, "type": null, "data": [5.0, 2.0, 0.0, 1.0, 4.0, 8.0, 2.0, 3.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [8.0, 12.0, 4.0, 9.0, 10.0, 2.0, 3.0, 3.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [12.0, 2.0, 5.0, 10.0, 3.0, 3.0, 8.0, 10.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [4.0, 3.0, 14.0, 8.0, 10.0, 3.0, 5.0, 10.0], "dataString": null, "dataObject": null }], "series2": null };
     var two =<%=Two %>
     var xArr1 = two.categories
-    var data1 = [ {
+    var data1 = [{
         name: '计划值',
         type: 'bar',
         //smooth: true,
@@ -615,7 +688,7 @@ padding-left: 2em;
         lineStyle: {
             //color: 'rgba(200,201,10, 1)'
         }
-    },{
+    }, {
         name: '实际值',
         type: 'bar',
         //smooth: true,
@@ -629,7 +702,7 @@ padding-left: 2em;
             },
             formatter: '{c}',
         },
-    },{
+    }, {
         name: '累计计划值',
         type: 'line',
         //smooth: true,
@@ -646,7 +719,7 @@ padding-left: 2em;
         lineStyle: {
             //color: 'rgba(200,201,10, 1)'
         }
-    },{
+    }, {
         name: '累计实际值',
         type: 'line',
         //smooth: true,
@@ -805,7 +878,7 @@ padding-left: 2em;
 </script>
 <script>
     //var swiper_One = '<ul class="content-ul swiper-wrapper"><li data-id="../Notice/NoticeView2.aspx?NoticeId=0597eed1-07b2-4d4e-af0c-3946c96a08df" notice-id="0597eed1-07b2-4d4e-af0c-3946c96a08df" class="c-item swiper-slide"><div class="tit" title="Strengthening prevention measures of Sunstroke"><div class="flex" ><div class="tit-t flex1">Strengthening prevention measures of Sunstroke</div><div class="tit-v">2017-07-09</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=062bc818-5994-45da-9d49-19815bef02d4" notice-id="062bc818-5994-45da-9d49-19815bef02d4" class="c-item swiper-slide"><div class="tit" title="关于规范现场人员出入管理的通知"><div class="flex" ><div class="tit-t flex1">关于规范现场人员出入管理的通知</div><div class="tit-v">2017-02-06</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=07ab4cbd-e09d-404a-9c4e-01846a164ad6" notice-id="07ab4cbd-e09d-404a-9c4e-01846a164ad6" class="c-item swiper-slide"><div class="tit" title="关于开展国庆节前安全大检查的通知"><div class="flex" ><div class="tit-t flex1">关于开展国庆节前安全大检查的通知</div><div class="tit-v">2019-09-30</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=07bbe33f-4c65-4bab-b97d-3c0983f7c83e" notice-id="07bbe33f-4c65-4bab-b97d-3c0983f7c83e" class="c-item swiper-slide"><div class="tit" title="关于报送HSE相关资料的通知"><div class="flex" ><div class="tit-t flex1">关于报送HSE相关资料的通知</div><div class="tit-v">2018-04-08</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=0af9fdd1-847f-45cc-8831-03d2a0ccbed1" class="c-item disabled swiper-slide"><div class="tit tit-read" title="About Dining Room"><div class="flex" ><div class="tit-t flex1">About Dining Room</div><div class="tit-v">2017-08-13</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=0c7ca6d4-d1f1-484f-b561-9e6f1e7e1f48" class="c-item disabled swiper-slide"><div class="tit tit-read" title="请于2017年6月8日组织开展施工机具专项检查"><div class="flex" ><div class="tit-t flex1">请于2017年6月8日组织开展施工机具专项检查</div><div class="tit-v">2017-05-30</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=0e0d4655-be58-4ba7-8aa0-4b8ea2052e52" notice-id="0e0d4655-be58-4ba7-8aa0-4b8ea2052e52" class="c-item swiper-slide"><div class="tit" title="请于5月25日前开展HSE内业资料检查、消防安全检查"><div class="flex" ><div class="tit-t flex1">请于5月25日前开展HSE内业资料检查、消防安全检查</div><div class="tit-v">2017-05-23</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=14fe97ba-d619-44c6-9327-4db5eb4aa186" notice-id="14fe97ba-d619-44c6-9327-4db5eb4aa186" class="c-item swiper-slide"><div class="tit" title="关于加强项目现场射线探伤作业安全管理的通知"><div class="flex" ><div class="tit-t flex1">关于加强项目现场射线探伤作业安全管理的通知</div><div class="tit-v">2017-03-22</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=16e3f479-e5fa-4a14-aeb5-88af9ba1a66c" notice-id="16e3f479-e5fa-4a14-aeb5-88af9ba1a66c" class="c-item swiper-slide"><div class="tit" title="关于做好履带吊大臂受损后续工作安排的通知"><div class="flex" ><div class="tit-t flex1">关于做好履带吊大臂受损后续工作安排的通知</div><div class="tit-v">2019-11-10</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=19443b9e-5e92-4c00-9510-02d8c30b03ff" notice-id="19443b9e-5e92-4c00-9510-02d8c30b03ff" class="c-item swiper-slide"><div class="tit" title="关于加强新建LNG罐区大门管理的通知"><div class="flex" ><div class="tit-t flex1">关于加强新建LNG罐区大门管理的通知</div><div class="tit-v">2019-10-10</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=1b21886b-e7df-4cbc-ae3c-1cd1daee93a9" notice-id="1b21886b-e7df-4cbc-ae3c-1cd1daee93a9" class="c-item swiper-slide"><div class="tit" title="关于严格执行作业票证制度和作业前安全技术交底工作的通知"><div class="flex" ><div class="tit-t flex1">关于严格执行作业票证制度和作业前安全技术交底工作的通知</div><div class="tit-v">2018-03-12</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=1c3ff63e-df82-4b0c-ba54-d623f0473e14" notice-id="1c3ff63e-df82-4b0c-ba54-d623f0473e14" class="c-item swiper-slide"><div class="tit" title="Important HSE instructions"><div class="flex" ><div class="tit-t flex1">Important HSE instructions</div><div class="tit-v">2017-08-01</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=227d6922-f455-4382-8f86-7fc83c45d22b" notice-id="227d6922-f455-4382-8f86-7fc83c45d22b" class="c-item swiper-slide"><div class="tit" title="关于报送HSE相关资料的通知"><div class="flex" ><div class="tit-t flex1">关于报送HSE相关资料的通知</div><div class="tit-v">2019-07-23</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=23c364db-62af-4f05-b5e9-3ef60cf1aa9d" notice-id="23c364db-62af-4f05-b5e9-3ef60cf1aa9d" class="c-item swiper-slide"><div class="tit" title="Crane Rejection"><div class="flex" ><div class="tit-t flex1">Crane Rejection</div><div class="tit-v">2017-12-11</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=247fe11c-4f16-4c74-9098-ae287f860b71" notice-id="247fe11c-4f16-4c74-9098-ae287f860b71" class="c-item swiper-slide"><div class="tit" title="关于做好土建撤场工作安排的通知"><div class="flex" ><div class="tit-t flex1">关于做好土建撤场工作安排的通知</div><div class="tit-v">2019-11-06</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=279da471-c47e-47b4-a89d-a3f97692961e" notice-id="279da471-c47e-47b4-a89d-a3f97692961e" class="c-item swiper-slide"><div class="tit" title="请于2017年6月5日前开展动火作业安全专项检查"><div class="flex" ><div class="tit-t flex1">请于2017年6月5日前开展动火作业安全专项检查</div><div class="tit-v">2017-05-30</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=2a35f657-1206-479b-8510-8639cc024e0c" notice-id="2a35f657-1206-479b-8510-8639cc024e0c" class="c-item swiper-slide"><div class="tit" title="关于设定马苏项目重点消防区域及组建义务消防队的通知"><div class="flex" ><div class="tit-t flex1">关于设定马苏项目重点消防区域及组建义务消防队的通知</div><div class="tit-v">2017-05-30</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=2acbfdd5-dc97-432e-9e66-8281906fe507" notice-id="2acbfdd5-dc97-432e-9e66-8281906fe507" class="c-item swiper-slide"><div class="tit" title="请于2017年6月10日组织开展高处作业安全检查"><div class="flex" ><div class="tit-t flex1">请于2017年6月10日组织开展高处作业安全检查</div><div class="tit-v">2017-05-30</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=2ad4da01-085b-44fc-9fb2-b17ff4188157" class="c-item disabled swiper-slide"><div class="tit tit-read" title="关于现场焊工持证上岗的通知"><div class="flex" ><div class="tit-t flex1">关于现场焊工持证上岗的通知</div><div class="tit-v">2019-12-18</div></div></div></li><li data-id="../Notice/NoticeView2.aspx?NoticeId=2fc6d514-adb9-4071-86da-48dc527f2b05" notice-id="2fc6d514-adb9-4071-86da-48dc527f2b05" class="c-item swiper-slide"><div class="tit" title="通知"><div class="flex" ><div class="tit-t flex1">通知</div><div class="tit-v">2017-03-21</div></div></div></li></ul>'
-    var swiper_One ='<%=swiper_One %>'
+    var swiper_One = '<%=swiper_One %>'
     var todoNum = '0'
     $(".tab .t-item").click(function () {
         var $this = $(this)
@@ -849,6 +922,25 @@ padding-left: 2em;
                 }
             }
         }
+        else if (value == 2) {
+            if (index == 0) {
+                //alert($('#hdContractQuantitySheets')[0].value);
+                $('#divGZL').html($('#hdContractQuantitySheets')[0].value);
+                //alert(swiper_One);
+                //$('#divGZL').html("1");
+            } else if (index == 2) {
+                //alert($('#hdMaterialRecords')[0].value);
+                $('#divGZL').html($('#hdMaterialRecords')[0].value);
+                //$('#divGZL').html("无");
+                //$('#divGZL').reload();
+                //$('#divGZL').html($('#hdMaterialRecords').value);
+                //$('#divGZL').html("2");
+            } else if (index == 4) {
+
+            } else if (index == 6) {
+
+            }
+        }
     })
 
     $("#swiper2").on('click', 'li', function () {
@@ -869,7 +961,7 @@ padding-left: 2em;
     var mySwiper = null
     $(document).ready(function () {
         var swiper_One = '<%=swiper_One %>'
-        $("#swiper2").css("width", ($("#swiper-pre").width()) + 'px') 
+        $("#swiper2").css("width", ($("#swiper-pre").width()) + 'px')
         var height = $("#swiper-pre").height() - 40
         $("#swiper2").css("height", (height) + 'px')
         slidesNum = Math.floor((height) / 24)
@@ -923,15 +1015,15 @@ padding-left: 2em;
             //str += '<div>五环天地项目</div>'
             //$("#projectList").html(str)
             //$(".project-list-wrap").show();
-             window.open("../JDGL/Check/TotalCompletion.aspx");
+            window.open("../JDGL/Check/TotalCompletion.aspx");
         })
 
         $(".js-more-2").click(function () {
-             window.open("../JDGL/Check/ProgressCompletion.aspx");
+            window.open("../JDGL/Check/ProgressCompletion.aspx");
         })
 
         $(".js-more-3").click(function () {
-             window.open("../HSSE/SitePerson/PersonList.aspx");
+            window.open("../HSSE/SitePerson/PersonList.aspx");
         })
 
         $("#projectList_btn").click(function () {
@@ -939,10 +1031,10 @@ padding-left: 2em;
         })
 
         // 计算表格最大高度
-        var maxheight = $("#swiper-pre").height() * 2 - 72 -20
+        var maxheight = $("#swiper-pre").height() * 2 - 72 - 20
         //debugger
-       $(".jd-list-long").css("max-height", maxheight)
-       
+        $(".jd-list-long").css("max-height", maxheight)
+
     })
 </script>
 </html>
diff --git a/SGGL/FineUIPro.Web/common/mainIII.aspx.cs b/SGGL/FineUIPro.Web/common/mainIII.aspx.cs
index ec24bb1f..8299a281 100644
--- a/SGGL/FineUIPro.Web/common/mainIII.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainIII.aspx.cs
@@ -16,7 +16,7 @@ namespace FineUIPro.Web.common
             if (!IsPostBack)
             {
                 string roleCNs = Request.Params["roleCNs"];
-                List<string> cns = Funs.GetStrListByStr(roleCNs,',');
+                List<string> cns = Funs.GetStrListByStr(roleCNs, ',');
                 Model.SGGLDB db = Funs.DB;
                 //未遂事故
                 //var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord
@@ -63,70 +63,93 @@ namespace FineUIPro.Web.common
                 //签证
                 var siteVisas = from x in db.Comprehensive_SiteVisaManagement where x.ProjectId == this.CurrUser.LoginProjectId && cns.Contains(x.CNProfessionalId) select x;
                 this.divQZ.InnerHtml = siteVisas.Count().ToString();
-                //工程量完成情况
-                string date = string.Empty;
-                var quantityCompletions = from x in Funs.DB.View_JDGL_QuantityCompletion where x.ProjectId == this.CurrUser.LoginProjectId orderby x.Name select x;
-                if (quantityCompletions.Count() > 0)
+                //材料到货情况
+                string contractQuantitySheetsStr = string.Empty;
+                long projectId = BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId);
+                var contractQuantitySheets = from x in Funs.DB.CLGL_ContractQuantitySheet where x.ProjectId == projectId.ToString() select x;
+                if (contractQuantitySheets.Count() > 0)
                 {
-                    string quantityCompletionStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>类型</div><div class='item jd-title'>单位</div><div class='item jd-title'>设计数量</div><div class='item jd-title'>计划完成</div><div class='item jd-title'>实际完成</div><div class='item jd-title'>计划完成率</div><div class='item jd-title'>累计计划完成</div><div class='item jd-title'>累计实际完成</div><div class='item jd-title'>累计计划完成率</div><div class='item jd-title'>总完成率</div></div>";
+                    contractQuantitySheetsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>材料用途</div><div class='item jd-title'>合同号</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>采购量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>企业中文名称</div><div class='item jd-title'>备注</div></div>";
                     int i = 1;
-                    foreach (var item in quantityCompletions)
+                    foreach (var item in contractQuantitySheets)
                     {
-                        quantityCompletionStr += "<div class='jd-item'><div class='item'>"
+                        contractQuantitySheetsStr += "<div class='jd-item'><div class='item'>"
                                         + i + "</div><div class='item'>"
-                                        + item.Name + "</div><div class='item'>"
-                                        + item.Unit + "</div><div class='item'>"
-                                        + (item.DesignNum != null ? item.DesignNum.Value.ToString("F0") : "0") + "</div><div class='item'>"
-                                        + (item.PlanNum != null ? item.PlanNum.Value.ToString("F0") : "0") + "</div><div class='item'>"
-                                        + (item.RealNum != null ? item.RealNum.Value.ToString("F0") : "0") + "</div><div class='item'>"
-                                        + item.Rate + "</div><div class='item'>"
-                                        + item.TotalPlanNum + "</div><div class='item'>"
-                                        + item.TotalRealNum + "</div><div class='item'>"
-                                        + item.TotalRate + "</div><div class='item'>"
-                                        + item.SumRate + "</div></div>";
+                                        + item.MaterialUse + "</div><div class='item'>"
+                                        + item.ContractCode + "</div><div class='item'>"
+                                        + item.Major + "</div><div class='item'>"
+                                        + item.MaterialCode + "</div><div class='item'>"
+                                        + item.TagNo + "</div><div class='item'>"
+                                        + item.BuyQuantity + "</div><div class='item'>"
+                                        + item.DeviceCode + "</div><div class='item'>"
+                                        + item.MainItemCode + "</div><div class='item'>"
+                                        + item.UnitName + "</div><div class='item'>"
+                                        + item.Remark + "</div></div>";
                         i++;
                     }
-                    divGZL.InnerHtml = quantityCompletionStr;
-                    if (quantityCompletions.Count() > 0)
-                    {
-                        if (quantityCompletions.First() != null && quantityCompletions.First().EndDate != null)
-                        {
-                            date = " (" + string.Format("{0:yyyy-MM}", quantityCompletions.First().EndDate) + ")";
-                        }
-                    }
                 }
-                else   //低温储罐项目显示低温储罐数据
+                this.divGZL.InnerHtml= contractQuantitySheetsStr;
+                this.hdContractQuantitySheets.Value = contractQuantitySheetsStr;
+                //材料出库情况
+                string materialRecordsStr = string.Empty;
+                var materialRecords= from x in db.CLGL_PickMaterialRecord where x.ProjectId == projectId.ToString() select x;
+                if (contractQuantitySheets.Count() > 0)
                 {
-                    var lowTankCompletions = from x in Funs.DB.View_JDGL_LowTankCompletion where x.ProjectId == this.CurrUser.LoginProjectId orderby x.Code select x;
-                    string quantityCompletionStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>储罐编号</div><div class='item jd-title'>类型</div><div class='item jd-title'>单位</div><div class='item jd-title'>设计数量</div><div class='item jd-title'>计划完成</div><div class='item jd-title'>实际完成</div><div class='item jd-title'>计划完成率</div><div class='item jd-title'>累计计划完成</div><div class='item jd-title'>累计实际完成</div><div class='item jd-title'>累计计划完成率</div><div class='item jd-title'>总完成率</div></div>";
+                    materialRecordsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>领料单号</div><div class='item jd-title'>领料时间</div><div class='item jd-title'>领料单位</div><div class='item jd-title'>领料截止时间</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>申领量</div><div class='item jd-title'>批准量</div><div class='item jd-title'>实发量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>发料备注</div></div>";
                     int i = 1;
-                    foreach (var item in lowTankCompletions)
+                    foreach (var item in materialRecords)
                     {
-                        quantityCompletionStr += "<div class='jd-item'><div class='item'>"
+                        materialRecordsStr += "<div class='jd-item'><div class='item'>"
                                         + i + "</div><div class='item'>"
-                                        + item.Code + "</div><div class='item'>"
-                                        + item.Name + "</div><div class='item'>"
-                                        + item.Unit + "</div><div class='item'>"
-                                        + (item.TotalNum != null ? item.TotalNum.Value.ToString("F0") : "0") + "</div><div class='item'>"
-                                        + (item.PlanNum != null ? item.PlanNum.Value.ToString("F0") : "0") + "</div><div class='item'>"
-                                        + (item.RealNum != null ? item.RealNum.Value.ToString("F0") : "0") + "</div><div class='item'>"
-                                        + item.Rate + "</div><div class='item'>"
-                                        + item.TotalPlanNum + "</div><div class='item'>"
-                                        + item.TotalRealNum + "</div><div class='item'>"
-                                        + item.TotalRate + "</div><div class='item'>"
-                                        + item.SumRate + "</div></div>";
+                                        + item.PickCode + "</div><div class='item'>"
+                                        + (item.PickDate.HasValue?string.Format("{0:yyyy-MM-dd}", item.PickDate.Value) :"") + "</div><div class='item'>"
+                                        + item.PickUnit + "</div><div class='item'>"
+                                        + (item.PickLimitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", item.PickLimitDate.Value) : "") + "</div><div class='item'>"
+                                        + item.Major + "</div><div class='item'>"
+                                        + item.MaterialCode + "</div><div class='item'>"
+                                        + item.TagNo + "</div><div class='item'>"
+                                        + item.ClaimQuantity + "</div><div class='item'>"
+                                        + item.ApproveQuantity + "</div><div class='item'>"
+                                        + item.ActualQuantity + "</div><div class='item'>"
+                                        + item.DeviceCode + "</div><div class='item'>"
+                                        + item.MainItemCode + "</div><div class='item'>"
+                                        + item.Remark + "</div></div>";
                         i++;
                     }
-                    divGZL.InnerHtml = quantityCompletionStr;
-                    if (lowTankCompletions.Count() > 0)
+                }
+                this.hdMaterialRecords.Value = materialRecordsStr;
+            }
+        }
+
+        protected string swiper_One1
+        {
+            get
+            {
+                string contractQuantitySheetsStr = string.Empty;
+                long projectId = BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId);
+                var contractQuantitySheets = from x in Funs.DB.CLGL_ContractQuantitySheet where x.ProjectId == projectId.ToString() select x;
+                if (contractQuantitySheets.Count() > 0)
+                {
+                    contractQuantitySheetsStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>材料用途</div><div class='item jd-title'>合同号</div><div class='item jd-title'>专业</div><div class='item jd-title'>材料编码</div><div class='item jd-title'>位号</div><div class='item jd-title'>采购量</div><div class='item jd-title'>装置号</div><div class='item jd-title'>主项号</div><div class='item jd-title'>企业中文名称</div><div class='item jd-title'>备注</div></div>";
+                    int i = 1;
+                    foreach (var item in contractQuantitySheets)
                     {
-                        if (lowTankCompletions.First() != null && lowTankCompletions.First().EndDate != null)
-                        {
-                            date = " (" + string.Format("{0:yyyy-MM}", lowTankCompletions.First().EndDate) + ")";
-                        }
+                        contractQuantitySheetsStr += "<div class='jd-item'><div class='item'>"
+                                        + i + "</div><div class='item'>"
+                                        + item.MaterialUse + "</div><div class='item'>"
+                                        + item.ContractCode + "</div><div class='item'>"
+                                        + item.Major + "</div><div class='item'>"
+                                        + item.MaterialCode + "</div><div class='item'>"
+                                        + item.TagNo + "</div><div class='item'>"
+                                        + item.BuyQuantity + "</div><div class='item'>"
+                                        + item.DeviceCode + "</div><div class='item'>"
+                                        + item.MainItemCode + "</div><div class='item'>"
+                                        + item.UnitName + "</div><div class='item'>"
+                                        + item.Remark + "</div></div>";
+                        i++;
                     }
                 }
-                divMonth.InnerHtml = "专业工作量表" + date;
+                return contractQuantitySheetsStr;
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/common/mainIII.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainIII.aspx.designer.cs
index 9e9e5aad..720c0729 100644
--- a/SGGL/FineUIPro.Web/common/mainIII.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainIII.aspx.designer.cs
@@ -39,6 +39,24 @@ namespace FineUIPro.Web.common {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button imgBtn;
         
+        /// <summary>
+        /// hdContractQuantitySheets 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdContractQuantitySheets;
+        
+        /// <summary>
+        /// hdMaterialRecords 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hdMaterialRecords;
+        
         /// <summary>
         /// swiper2 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
index fc533ebc..ba609ff8 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.common
                 this.divBG.InnerHtml = designChangeOrders.Count().ToString();
                 //工程量完成情况
                 string date = string.Empty;
-                var quantityCompletions = from x in Funs.DB.View_JDGL_QuantityCompletion where x.ProjectId == this.CurrUser.LoginProjectId orderby x.Name select x;
+                var quantityCompletions = from x in Funs.DB.View_JDGL_QuantityCompletion where x.ProjectId == this.CurrUser.LoginProjectId orderby x.SortIndex, x.Name select x;
                 if (quantityCompletions.Count() > 0)
                 {
                     string quantityCompletionStr = "<div class='jd-item'><div class='item jd-title'>序号</div><div class='item jd-title'>类型</div><div class='item jd-title'>单位</div><div class='item jd-title'>设计数量</div><div class='item jd-title'>计划完成</div><div class='item jd-title'>实际完成</div><div class='item jd-title'>计划完成率</div><div class='item jd-title'>累计计划完成</div><div class='item jd-title'>累计实际完成</div><div class='item jd-title'>累计计划完成率</div><div class='item jd-title'>总完成率</div></div>";