From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

---
 zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml |  152 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 144 insertions(+), 8 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
index 14ed8a7..9a4a531 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Appeal.cshtml
@@ -3,6 +3,13 @@
 @using zhengcaioa.Models;
 @{
     Layout = null;
+
+    //娴佺▼鐩稿叧
+    string shifoubiaoji = ViewBag.shifoubiaoji as string;
+    string sifoudangqian = ViewBag.sifoudangqian as string;
+    string dangqianbuzhou = ViewBag.dangqianbuzhou as string;
+
+    List<WfHistoryDTO> lishiyijian = ViewData["lishiyijian"] as List<WfHistoryDTO>; //瀹℃壒杩涘害
 }
 
 <!DOCTYPE html>
@@ -57,12 +64,35 @@
                         <div id="div_content" class="ibox-content" style="background-color:white;">
                             <div class="row">
                                 <div class="clearfix layer-area" style="padding-bottom:10px;">
-                                    <label class="text-right col-sm-1 col-md-1 control-label">鐢宠瘔鐞嗙敱<i class="red">*</i></label>
+                                    <label class="text-right col-sm-1 col-md-1 control-label">鍗曟嵁鍚嶇О<i class="red">*</i></label>
                                     <div class="col-sm-2 col-md-2">
-                                        <textarea class="form-control bt" id="ssly" name="reason"  maxlength="4000" length="long" style="resize:none;overflow-y:hidden; height:80px;">@Model.reason</textarea>
+                                        <input type="text" class="form-control" value="@Model.tittle" name="tittle" id="tittle"   validate="RequiredField" autocomplete="off" readonly="readonly">
+
                                     </div>
                                 </div>
                                 <div class="clearfix layer-area" style="padding-bottom:10px;">
+                                    <label class="text-right col-sm-1 col-md-1 control-label">鐢宠浜�<i class="red">*</i></label>
+                                    <div class="col-sm-2 col-md-2">
+                                        <input type="text" class="form-control" value="@Model.createrName" name="createrName" id="createrName"   validate="RequiredField" autocomplete="off" readonly="readonly">
+
+                                    </div>
+                                </div>
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-right col-sm-1 col-md-1 control-label">宸ヨ祫鏈堜唤<i class="red">*</i></label>
+                                    <div class="col-sm-2 col-md-2">
+                                        <input class="form-control" id="YearMonth" name="YearMonth" type="text" value="@Model.Year-@Model.Month" readonly="readonly">
+                                        <input type="hidden" name="Year" value="@Model.Year" />
+                                        <input type="hidden" name="Month" value="@Model.Month" />
+                                    </div>
+                                </div>
+
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-right col-sm-1 col-md-1 control-label">鐢宠瘔鐞嗙敱<i class="red">*</i></label>
+                                    <div class="col-sm-6 col-md-6">
+                                        <textarea class="form-control bt" id="ssly" name="reason" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; height:80px;">@Model.reason</textarea>
+                                    </div>
+                                </div>
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                     <label class="text-right col-sm-1 col-md-1 control-label">浜夎閲戦<i class="red">*</i></label>
                                     <div class="col-sm-2 col-md-2">
                                         <input class="form-control" id="zyje" name="amount" type="text" value="@Model.amount" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
@@ -70,10 +100,47 @@
                                 </div>
                                 <div class="clearfix layer-area" style="padding-bottom:10px;">
                                     <label class="text-right col-sm-1 col-md-1 control-label">鍒跺害渚濇嵁<i class="red">*</i></label>
-                                    <div class="col-sm-2 col-md-2">
+                                    <div class="col-sm-6 col-md-6">
                                         <input type="hidden" name="salary_id" value="@Model.salary_id" />
                                         <input class="form-control" id="zdyj" name="basis" labtype="txt" addvisible="true" editvisible="true" type="text" value="@Model.basis">
                                     </div>
+                                </div>
+                                <div class="clearfix layer-area" style="padding-bottom:15px;" id="shenpiyijian" >
+                                    <label class="text-right col-sm-1 col-md-1 control-label">瀹℃壒鎰忚</label>
+                                    <div class="col-sm-6 col-md-6">
+                                        <textarea class="form-control data" id="Content" name="Content"  style="resize:none;overflow-y:hidden; height:80px;" maxlength="500"></textarea>
+                                    </div>
+                                </div>
+                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                    <label class="text-right col-sm-1 col-md-1 control-label">瀹℃壒杩涘害</label>
+                                    <div class="col-sm-6 col-md-6">
+                                        <table>
+                                            @if (lishiyijian.Count > 0)
+                                            {
+                                            <tr>
+                                                <td style="border:1px solid #ccc;width:150px;">姝ラ </td>
+                                                <td style="border:1px solid #ccc;width:150px;"> 鎵瑰鐘舵��</td>
+                                                <td style="border:1px solid #ccc;width:150px;">鎵瑰鏃堕棿</td>
+                                                <td style="border:1px solid #ccc;width:300px;"> 瀹℃壒鎰忚</td>
+                                                <td style="border:1px solid #ccc;width:100px;"> 鎵瑰浜�</td>
+                                            </tr>
+                                            }
+                                            
+                                            @foreach (var wfHistory in lishiyijian)
+                                            {
+                                                <tr>
+                                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td>
+                                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td>
+                                                    <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td>
+                                                    <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td>
+                                                    <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td>
+                                                </tr>
+                                            }
+                                        </table>  
+                                    </div>
+                                </div>
+                                <div class="clearfix layer-area" style="padding-bottom:60px;">
+
                                 </div>
                             </div>
                         </div>
@@ -86,16 +153,27 @@
                 <a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" style="margin-left:4px; border-radius:4px;">
                     <i class="glyphicon glyphicon-remove"></i>&nbsp;&nbsp;<span class="bold">鍙栨秷</span>
                 </a>
-                <a class="btn btn-success" href="javascript:void(0)" onclick="saveSimCost();" style="margin-left:4px; border-radius:4px;">
+                <a class="btn btn-success" id="tijiao" href="javascript:void(0)" onclick="saveSimCost('');" style="margin-left:4px; border-radius:4px;">
                     <i class="glyphicon glyphicon-ok"></i>&nbsp;&nbsp;<span class="bold">鎻愪氦</span>
                 </a>
+
+                <a class="btn btn-success" id="tongyi" href="javascript:void(0)" onclick="saveSimCost('A');" style="margin-left:4px; border-radius:4px;">
+                    <span class="bold">鍚屾剰</span>
+                </a>
+
+                <a class="btn btn-success" id="jujue" href="javascript:void(0)" onclick="saveSimCost('D');" style="margin-left:4px; border-radius:4px;">
+                    <span class="bold">鎷掔粷</span>
+                </a>
+                <input type="hidden" id="id" name="id" value="@Model.id" />
+                <input type="hidden" id="Tongguojujue" name="Tongguojujue" value="" />
+                <input type="hidden" id="Step" name="Step" value="@dangqianbuzhou" />
             </div>
         </div>
 
     </form>
 
     <script type="text/javascript">
-        
+
         var hh = document.body.clientHeight -  $("#top").height() * 2 - 50;
         $("#div_content").height(hh);
 
@@ -115,8 +193,63 @@
             "hideMethod": "fadeOut"
         };
 
+
+        $(function () {
+
+        
+
+
+
+             if ("@shifoubiaoji" != "A") {
+                $("input").attr('readonly', true);
+                $("textarea").attr('readonly', true);
+                $(':radio').attr('disabled', true);
+                $(':checkbox').attr('disabled', true);
+                $(':button').attr('disabled', true);
+                //$('a').removeAttr('onclick');
+                 $('select').attr('disabled', true);
+                 $("#fileUp").attr('disabled', true);
+
+                 $('.fujianshanchu').removeAttr('onclick');
+
+
+                 if ("@sifoudangqian" == "A") {
+                     $("#Content").attr('readonly', false);
+                      $('#tijiao').hide();
+                 } else {
+                     $('#tongyi').hide();
+                      $('#jujue').hide();
+                     $('#tijiao').hide();
+                     $('#shenpiyijian').hide();
+                 }
+
+            } else {
+
+
+                  //瀹℃壒鐩稿叧
+                 $('#shenpiyijian').hide();
+                 if ("@sifoudangqian" == "A") {
+                     $('#tongyi').hide();
+                     $('#jujue').hide();
+                 } else {
+                     $('#tongyi').hide();
+                      $('#jujue').hide();
+                      $('#tijiao').hide();
+                 }
+
+ 
+            }
+
+        })
+
+
         // 淇濆瓨
-        function saveSimCost() {
+        function saveSimCost(tongyi) {
+            if ($("#salary_id").val() == '') {
+                toastr.warning("蹇呴』鍜屽伐璧勬寕閽�");
+                return;
+            }
+
 
             if ($("#ssly").val() == '') {
                 toastr.warning("鐢宠瘔鐞嗙敱涓嶈兘涓虹┖");
@@ -130,7 +263,8 @@
                 toastr.warning("鍒跺害渚濇嵁涓嶈兘涓虹┖");
                 return;
             }
-           
+            $("#Tongguojujue").val(tongyi);
+
             $.ajax({
                 type: "POST",
                 url: "/SalaryCheck/SaveAppeal",
@@ -145,7 +279,9 @@
                                 _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
                             }
                             catch (err) {
-                                parent._CloseTab1("/SalaryCheck/Appeal/");
+                                var pathname = window.location.pathname;
+                                var search = window.location.search;
+                                parent._CloseTab1(pathname + search);
                             }
                         }
                         else {

--
Gitblit v1.9.1