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/ServiceCharge/Index.cshtml | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
index b543845..4f709c1 100644
--- a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
@@ -184,7 +184,7 @@
<th style="width:15%;">
璐у彿
</th>
- <th style="width:15%;">
+ <th style="width:20%;">
涔﹀悕
</th>
<th style="width:15%;">
@@ -208,22 +208,25 @@
{
for (int i = 0; i < Book.Count; i++)
{
- <tr>
- <td>@(i+1)</td>
- <td>@Book[i].BookNo</td>
- <td>@Book[i].BookName</td>
- <td>@Book[i].Chubanshe</td>
- <td>@Book[i].Chubantime.Value.ToString("yyyy-MM-dd")</td>
- <td>@Book[i].Danjia.Value.ToString("F2")</td>
- <td>
- <a href="javascript:void(0)" onclick="OpenWindow('@Book[i].BookName','98%','100%', '/ServiceCharge/Edit?id=@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
- <span class="bold">淇敼</span>
- </a>
- <a href="javascript:void(0)" onclick="delPosition('@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
- <span class="bold">鍒犻櫎</span>
- </a>
- </td>
- </tr>
+ <tr>
+ <td>@(i+1)</td>
+ <td>@Book[i].BookNo</td>
+ <td>@Book[i].BookName</td>
+ <td>@Book[i].Chubanshe</td>
+
+ <td>@Book[i].ChubantimeName </td>
+
+
+ <td>@Book[i].Danjia.Value.ToString("F2")</td>
+ <td>
+ <a href="javascript:void(0)" onclick="OpenWindow('@Book[i].BookName','98%','100%', '/ServiceCharge/Edit?id=@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">淇敼</span>
+ </a>
+ <a href="javascript:void(0)" onclick="delPosition('@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
+ <span class="bold">鍒犻櫎</span>
+ </a>
+ </td>
+ </tr>
}
}
}
@@ -300,7 +303,7 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">4銆佹寚瀵兼姇鏍囨枃浠讹細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">4銆佹爣涔︽寚瀵硷細</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -341,7 +344,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">5銆佷唬涔﹁川鐤戯細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">5銆佷唬鎷熻川鐤戝嚱锛�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -382,7 +385,7 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">6銆佷唬涔︽姇璇夛細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label">6銆佷唬鎷熸姇璇変功锛�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -431,17 +434,17 @@
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">8銆佷唬鎷熸姇璇夊鐞嗗喅瀹氾細</label>
+ <label class="text-left col-sm-1 col-md-1 control-label" style="width:10%;">8銆佷唬鎷熸姇璇夊鐞嗗喅瀹氾細</label>
<div class="col-sm-2 col-md-2">
- <input class="form-control" label="8銆佺珵浜夊鎵嬪拰璇勫涓撳鏌ヨ锛�" name="Dainitousuchulijueding" id="Dainitousuchulijueding" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dainitousuchulijueding" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="8銆佷唬鎷熸姇璇夊鐞嗗喅瀹氾細" name="Dainitousuchulijueding" id="Dainitousuchulijueding" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Dainitousuchulijueding" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label class="text-left col-sm-1 col-md-1 control-label">鍏�</label>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-left col-sm-1 col-md-1 control-label">9銆佺珵浜夊鎵嬪拰璇勫涓撳鏌ヨ锛�</label>
+ <label class="text-left col-sm-1 col-md-1 control-label" style="width:20%;">9銆佺珵浜夊鎵嬪拰璇勫涓撳鍙傚姞鏀垮簻閲囪喘鏁版嵁淇℃伅鏌ヨ锛�</label>
<div class="col-sm-2 col-md-2">
- <input class="form-control" label="9銆佺珵浜夊鎵嬪拰璇勫涓撳鏌ヨ锛�" name="Jinzhengfuishou" id="Jinzhengfuishou" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jinzhengfuishou" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="9銆佺珵浜夊鎵嬪拰璇勫涓撳鍙傚姞鏀垮簻閲囪喘鏁版嵁淇℃伅鏌ヨ锛�" name="Jinzhengfuishou" id="Jinzhengfuishou" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jinzhengfuishou" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label class="text-left col-sm-1 col-md-1 control-label">鍏�/骞�</label>
</div>
@@ -651,7 +654,7 @@
</tbody>
</table>
</div>
- <div class="">
+ @*<div class="">
<h3>鍏�侀闄╀唬鐞�</h3>
@@ -660,10 +663,10 @@
<label class="text-left col-sm-1 col-md-1 control-label">闈㈣</label>
- </div>
+ </div>*@
<div class="">
- <h3>涔濄�佽蒋浠�</h3>
+ <h3>鍏�佽蒋浠�</h3>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -706,11 +709,11 @@
</table>
</div>
- <div class="">
+ @*<div class="">
<h3>鍗併�佸叾浠�</h3>
- </div>
+ </div>*@
--
Gitblit v1.9.1