From 0a34bec1a557fb95c376a298e0cbdabd46f8a14e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 三月 2023 13:56:51 +0800
Subject: [PATCH] 计算工资更新

---
 zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml |  190 ++++++++++++++++++++++++++++-------------------
 1 files changed, 114 insertions(+), 76 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
index 191605e..0df533d 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
@@ -15,8 +15,10 @@
 
     int PrintNum = Model.PrintNum.HasValue? Model.PrintNum.Value:0;
 
+    List<TChallengeRequestInfoDTO> challengeRequestInfoDTOs = Model.challengeRequestInfoDTOs;
 
- ResultDataEntity<SysAttachmentDTO> yinyezhizhao = ViewBag.yinyezhizhao as ResultDataEntity<SysAttachmentDTO>; //钀ヤ笟鎵х収
+
+    ResultDataEntity<SysAttachmentDTO> yinyezhizhao = ViewBag.yinyezhizhao as ResultDataEntity<SysAttachmentDTO>; //钀ヤ笟鎵х収
     List<SysAttachmentDTO> yinyezhizhaosssss = new List<SysAttachmentDTO>();
     if (yinyezhizhao.DataList != null)
     {
@@ -30,7 +32,7 @@
         shenfenzhengsssss = shenfenzheng.DataList;
     }
 
-  CooperatecustomCustomerDTO cooperatecustomCustomerDTO = ViewBag.cooperatecustomCustomerDTO as CooperatecustomCustomerDTO; //瀹㈡埛
+    CooperatecustomCustomerDTO cooperatecustomCustomerDTO = ViewBag.cooperatecustomCustomerDTO as CooperatecustomCustomerDTO; //瀹㈡埛
 
 }
 @{
@@ -94,14 +96,14 @@
                     <style type="text/css">
                         table {
                             width: 595px;
-                            font-size: 16pt;
+                            font-size: 14pt;
                             font-family: 'FangSong';
                             background: #fff;
-                            line-height: 1.5;
+                            line-height: 150%;
                         }
 
                         span {
-                            font-size: 16pt;
+                            font-size: 14pt;
                             display: inline;
                             /*  border-bottom: 1px dashed #111;*/
                         }
@@ -117,7 +119,7 @@
                     <div id="page1" style="page-break-after:always;">
                         <table border="0" align="center" cellpadding="3" cellspacing="0">
                             <tr>
-                                <td colspan="2" style="font-size:29.3px;text-align:center">璐ㄧ枒鍑斤紙姝f湰锛�</td>
+                                <td colspan="2" style="font-size:21px; text-align: center"><b>璐ㄧ枒鍑斤紙姝f湰锛�</b></td>
                             </tr>
                             <tr>
                                 <td colspan="2"><b>涓�銆佽川鐤戜緵搴斿晢鍩烘湰淇℃伅</b></td>
@@ -136,15 +138,15 @@
                             @for (int i = 0; i < challengecomplaintShouquandaibiaoDTOs.Count; i++)
                             {
 
-                            <tr>
-                                <td colspan="2" align="left">鎺堟潈浠h〃@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Shouquandaibiao </span></td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
-                            </tr>
-                            <tr>
-                                <td align="left" colspan="2">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@challengecomplaintShouquandaibiaoDTOs[i].Dizhi </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(challengecomplaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪")@(i!=0?(i+""):"")锛�<span style="width:160px;">@challengecomplaintShouquandaibiaoDTOs[i].Youbian </span></td>
-                            </tr>
+                                <tr>
+                                    <td colspan="2" align="left">鎺堟潈浠h〃@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Shouquandaibiao </span></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
+                                </tr>
+                                <tr>
+                                    <td align="left" colspan="2">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@challengecomplaintShouquandaibiaoDTOs[i].Dizhi </span>&nbsp; &nbsp; @(string.IsNullOrEmpty(challengecomplaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪")@(i!=0?(i+""):"")锛�<span style="width:160px;">@challengecomplaintShouquandaibiaoDTOs[i].Youbian </span></td>
+                                </tr>
                             }
                             <tr>
                                 <td colspan="2"><b>浜屻�佽川鐤戦」鐩熀鏈儏鍐�</b></td>
@@ -171,47 +173,48 @@
                                 {
                                     if (challengeItemDTOs.Count == 1)
                                     {
-                                <tr>
-                                    <td colspan="2">
-                                        璐ㄧ枒浜嬮」锛�<span style="text-indent:10px">@challengeItemDTOs[i].QuestionName </span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        浜嬪疄渚濇嵁锛欯Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        娉曞緥渚濇嵁锛�
-                                        @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
+                                        <tr>
+                                            <td colspan="2">
+                                                璐ㄧ枒浜嬮」锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeItemDTOs[i].Questionname)?challengeItemDTOs[i].QuestionName: challengeItemDTOs[i].Questionname) </span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                浜嬪疄渚濇嵁锛欯Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                娉曞緥渚濇嵁锛�
+                                                @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
                                                 {
                                                     var sssss = "";
-                                                  if(j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j-1].Classify3){
-                                          if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                    if (j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j - 1].Classify3)
                                                     {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        }
+                                                        else
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
+                                                        }
                                                     }
-                                                    else
-                                                    {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
-                                                    }
-                                        }
-                                                  
+
 
                                                     if (j != (challengeItemDTOs[i].sysCodeDtls.Count - 1))
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
                                                     }
                                                     else
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2  )
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2)
                                                     }
 
                                                 }
 
-                                    </td>
-                                </tr>
+                                            </td>
+                                        </tr>
 
 
 
@@ -220,47 +223,48 @@
                                     }
                                     else
                                     {
-                                <tr>
-                                    <td colspan="2">
-                                        璐ㄧ枒浜嬮」@((i + 1) + "")锛�<span style="text-indent:10px">@challengeItemDTOs[i].QuestionName </span>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2">
-                                        浜嬪疄渚濇嵁@((i + 1) + "")锛� @Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
-                                    </td>
-                                </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                璐ㄧ枒浜嬮」@((i + 1) + "")锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeItemDTOs[i].Questionname)?challengeItemDTOs[i].QuestionName: challengeItemDTOs[i].Questionname) </span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2">
+                                                浜嬪疄渚濇嵁锛� @Html.Raw("<span>" + (string.IsNullOrEmpty(challengeItemDTOs[i].Evidential) ? "" : challengeItemDTOs[i].Evidential.Replace(" ", "&nbsp;").Replace("\r", "<br/>")) + "</span>")
+                                            </td>
+                                        </tr>
 
-                                <tr>
-                                    <td colspan="2">
-                                        娉曞緥渚濇嵁锛�
-                                        @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
+                                        <tr>
+                                            <td colspan="2">
+                                                娉曞緥渚濇嵁锛�
+                                                @for (int j = 0; j < challengeItemDTOs[i].sysCodeDtls.Count; j++)
                                                 {
                                                     var sssss = "";
-                                                    if(j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j-1].Classify3){
-                                          if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                    if (j == 0 || challengeItemDTOs[i].sysCodeDtls[j].Classify3 != challengeItemDTOs[i].sysCodeDtls[j - 1].Classify3)
                                                     {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        if (challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�") >= 0)
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3.Insert(challengeItemDTOs[i].sysCodeDtls[j].Classify3.IndexOf("銆�"), "銆�");
+                                                        }
+                                                        else
+                                                        {
+                                                            sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
+                                                        }
                                                     }
-                                                    else
-                                                    {
-                                                        sssss = "銆�" + challengeItemDTOs[i].sysCodeDtls[j].Classify3 + "銆�";
-                                                    }
-                                        }
 
                                                     if (j != (challengeItemDTOs[i].sysCodeDtls.Count - 1))
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2 + "銆�")
                                                     }
                                                     else
                                                     {
-                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2)
+                                                        @Html.Raw(sssss + challengeItemDTOs[i].sysCodeDtls[j].Classify2)
                                                     }
 
                                                 }
 
-                                    </td>
-                                </tr>
+                                            </td>
+                                        </tr>
 
 
                                     }
@@ -270,12 +274,46 @@
                             <tr>
                                 <td colspan="2"><b>鍥涖�佷笌璐ㄧ枒浜嬮」鐩稿叧鐨勮川鐤戣姹�</b></td>
                             </tr>
-                            <tr>
-                                <td colspan="2" align="left">璇锋眰锛�<span>@Model.RequestInfoName</span></td>
-                            </tr>
+
+                            @{
+                                @for (int i = 0; i < challengeRequestInfoDTOs.Count; i++)
+                                {
+                                    if (challengeRequestInfoDTOs.Count == 1)
+                                    {
+                                        <tr>
+                                            <td colspan="2">
+                                                璇锋眰锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeRequestInfoDTOs[i].RequestInfoname)? challengeRequestInfoDTOs[i].RequestInfoNameName: challengeRequestInfoDTOs[i].RequestInfoname) </span>
+                                            </td>
+                                        </tr>
+                                         
+
+
+
+
+
+                                    }
+                                    else
+                                    {
+                                        <tr>
+                                            <td colspan="2">
+                                                璇锋眰@((i + 1) + "")锛�<span style="text-indent:10px">@(string.IsNullOrEmpty(challengeRequestInfoDTOs[i].RequestInfoname)? challengeRequestInfoDTOs[i].RequestInfoNameName: challengeRequestInfoDTOs[i].RequestInfoname)  </span>
+                                            </td>
+                                        </tr>
+                                         
+
+                                        
+
+
+                                    }
+
+                                }
+                            }
                             @*<tr>
-                        <td colspan="2" style="height:15px"></td>
-                    </tr>*@
+            <td colspan="2" align="left">璇锋眰锛�<span>@Model.RequestInfoName</span></td>
+        </tr>*@
+                            @*<tr>
+            <td colspan="2" style="height:15px"></td>
+        </tr>*@
                             <tr>
                                 <td align="left">绛惧瓧(绛剧珷)锛�</td>
                                 <td align="left">鍏珷锛�</td>
@@ -325,7 +363,7 @@
                                 <td colspan="2" style="height:50px"></td>
                             </tr>
                             <tr>
-                                <td colspan="2" align="right">宸濆嵃鏂囧寲闆嗗洟鑲′唤鏈夐檺鍏徃锛堝叕绔狅級<img src="~/img/images/gongzhang.png?v=3" alt="" /></td>
+                                <td colspan="2" align="right">宸濆嵃鏂囧寲闆嗗洟鑲′唤鏈夐檺鍏徃锛堝叕绔狅級</td>
                             </tr>
                             <tr>
                                 <td colspan="2" align="right">鏃ユ湡锛欯Model.Modifytime.Value.ToString("yyyy骞碝M鏈坉d鏃�")</td>
@@ -414,7 +452,7 @@
                 , content: '   <div class="clearfix layer-area" style="padding-bottom:15px;"> ' +
                     ' <label class="text-right col-sm-6 col-md-6 control-label">鍓湰鏁伴噺</label>' +
                     '   <div class="col-sm-6 col-md-6">' +
-                    ' <input class="form-control" label="鍓湰鏁伴噺" name="PrintNums" id="PrintNums" labtype="txt" addvisible="true"   type="number" value="@(PrintNum)" oninput="if(value.length>2)value=value.slice(0,2)" >' +
+                    ' <input class="form-control" label="鍓湰鏁伴噺" name="PrintNums" id="PrintNums" labtype="txt" addvisible="true"   type="text" value="@(PrintNum)" oninput="if(value.length>2)value=value.slice(0,2)" >' +
 
 
                     '</div>' +
@@ -490,7 +528,7 @@
                 , content: '   <div class="clearfix layer-area" style="padding-bottom:15px;"> ' +
                     ' <label class="text-right col-sm-6 col-md-6 control-label">鍓湰鏁伴噺</label>' +
                     '   <div class="col-sm-6 col-md-6">' +
-                    ' <input class="form-control" label="鍓湰鏁伴噺" name="PrintNums" id="PrintNums" labtype="txt" addvisible="true"   type="number" value="0" oninput="if(value.length>2)value=value.slice(0,2)" >' +
+                    ' <input class="form-control" label="鍓湰鏁伴噺" name="PrintNums" id="PrintNums" labtype="txt" addvisible="true"   type="text" value="0" oninput="if(value.length>2)value=value.slice(0,2)" >' +
 
 
                     '</div>' +

--
Gitblit v1.9.1