From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期三, 04 八月 2021 14:29:15 +0800 Subject: [PATCH] 今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增,短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 工作报表 修改排版 问题维护 试用法条 改为1000字, 问题查询打开直接默认未审核,不要停两秒再刷新 项目新增 增加字段:采购预算 万元 工作考评 考聘不称职当天无工资 --- zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml index b22b742..a61072d 100644 --- a/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml +++ b/zhengcaioa/zhengcaioa/Views/Signin/AskLeave.cshtml @@ -16,9 +16,9 @@ //娴佺▼鐩稿叧 string shifoubiaoji = ViewBag.shifoubiaoji as string; string sifoudangqian = ViewBag.sifoudangqian as string; - string dangqianbuzhou = ViewBag.dangqianbuzhou as string; + string dangqianbuzhou = ViewBag.dangqianbuzhou as string; - List<WfHistoryDTO> lishiyijian = ViewData["lishiyijian"] as List<WfHistoryDTO>; //鍘嗗彶鎰忚 + List<WfHistoryDTO> lishiyijian = ViewData["lishiyijian"] as List<WfHistoryDTO>; //瀹℃壒杩涘害 } <!DOCTYPE html> <html> @@ -167,21 +167,31 @@ </td> </tr> <tr> - <td class="title">鍘嗗彶鎰忚</td> + <td class="title">瀹℃壒杩涘害</td> <td colspan="4"> </td> </tr> <tr> <td colspan="10"> <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:50px;">@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> + <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></td> -- Gitblit v1.9.1