Procházet zdrojové kódy

Merge branch 'master' of http://192.168.1.12:3000/s.h.i.e.l.d./cld1.3

Chente před 8 roky
rodič
revize
e0a44a1b38
4 změnil soubory, kde provedl 92 přidání a 9 odebrání
  1. 8 0
      admin-user.html
  2. 17 8
      invoice-input-billing-all.html
  3. 66 0
      login1.html
  4. 1 1
      staff-employee.html

+ 8 - 0
admin-user.html

@@ -83,6 +83,8 @@
                   <th>手机</th>
                   <th>APP登录</th>
                   <th>入职时间</th>
+                  <th>实习时间</th>
+                  <th>转正时间</th>
                   <th>单点登录</th>
                   <th>操作</th>
                 </tr>
@@ -95,6 +97,8 @@
                   <td>广东省、山东省</td>
                   <td>15812644017</td>
                   <td>2014-11-20 12:32</td>
+                  <td>2015-01-20 12:32</td>
+                  <td>2015-04-20 12:32</td>
                   <td>2014-11-20</td>
                   <td><span class="colGreen">建筑造价(正常)</span></td>
                   <td><a href="admin-user-edit.html">编辑</a>/<a href="#">删除</a></td>
@@ -106,6 +110,8 @@
                   <td>广东省</td>
                   <td>15812644017</td>
                   <td>2014-11-20 12:32</td>
+                  <td>2015-01-20 12:32</td>
+                  <td>2015-04-20 12:32</td>
                   <td>2014-11-20</td>
                   <td><span class="colGreen">建筑造价(正常)</span></td>
                   <td><a href="#">编辑</a>/<a href="#">删除</a></td>
@@ -117,6 +123,8 @@
                   <td>广东省</td>
                   <td>15812644017</td>
                   <td>2014-11-20 12:32</td>
+                  <td>2015-01-20 12:32</td>
+                  <td>2015-04-20 12:32</td>
                   <td>2014-11-20</td>
                   <td><span class="colRed">建筑造价(禁止)</span></td>
                   <td><a href="#">编辑</a>/<a href="#">删除</a></td>

+ 17 - 8
invoice-input-billing-all.html

@@ -499,7 +499,7 @@
 				</tr>
 				<tr>
 					<th class="taC">退款金额</th>
-					<td><input type="text" name="" id="" placeholder="请输入退款金额" aria-required="true" aria-invalid="true"></td>
+					<td><input type="text" name="" id="" placeholder="请输入退款金额" aria-required="true" aria-invalid="true"> <span class="colRed">退款的金额不能大于实际收款金额</span></td>
 				</tr>
 				<tr>
 					<th class="taC">备注</th>
@@ -621,19 +621,28 @@
 					<table class="table table-bordered table-condensed">
 						<tbody>
 							<tr>
-								<th class="taC" colspan="2">退款记录</th>
+								<th class="taC" colspan="5">退款记录</th>
 							</tr>
 							<tr>
-								<th class="taC">退款单位名称</th><td>珠海XXXX公司</td>
-							</tr> 
-							<tr>
-								<th class="taC">退款的账号</th><td>62541336423355</td>
+								<th class="taC">退款单位名称</th>
+								<th class="taC">退款的账号</th>
+								<th class="taC">退款金额</th>
+								<th class="taC">退款</th>
+								<th class="taC">备注</th>
 							</tr>
 							<tr>
-								<th class="taC">退款金额</th><td class="colRed">¥5000.00</td>
+								<td>珠海XXXX公司</td>
+								<td>62541336423355</td>
+								<td><b class="colRed">¥5000.00</b></td>
+								<td>张少珊 退款 2015-04-20 11:30:02</td>
+								<td>客户只需要开票20000元,需要退款5000元。</td>
 							</tr>
 							<tr>
-								<th class="taC">退款</th><td>	张少珊 退款 2015-04-12 11:30:02</td>
+								<td>珠海XXXX公司</td>
+								<td>62541336423355</td>
+								<td><b class="colRed">¥5000.00</b></td>
+								<td>张少珊 退款 2015-04-15 11:30:02</td>
+								<td>客户只需要开票25000元,需要退款5000元。</td>
 							</tr>
 						</tbody>
 					</table>

+ 66 - 0
login1.html

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>登录CLD.System</title>
+	<meta name=description content=纵横内部信息管理系统>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+</head>
+<style>
+#animation{
+-webkit-animation:infinite pulse 4s 1s ease both;
+-moz-animation:infinite pulse 4s 1s ease both;}
+@-webkit-keyframes pulse{
+0%{-webkit-transform:scale(1)}
+50%{-webkit-transform:scale(1.1)}
+100%{-webkit-transform:scale(1)}
+}
+@-moz-keyframes pulse{
+0%{-moz-transform:scale(1)}
+50%{-moz-transform:scale(1.1)}
+100%{-moz-transform:scale(1)}
+}
+</style>
+<body class="loginBg">
+	<div class="loginIndex">
+		<div class="loginPanel inputErrow">
+			<div class="warpLogin clearfix">
+				<h2>CLD.System<sup> 1.0</sup></h2>
+				<form id="loginform" name="loginform" method="post">
+				<div class="formLine">
+					<label class="textTips">帐号</label>
+					<input  class="text" type="text">
+				</div>
+				<div class="formLine">
+					<label class="textTips">密码</label>
+					<input type="password" class="text">
+				</div>
+				<div class="formLine clearfix">
+					<a href="#welcome" data-toggle="modal" class="button">登录</a><span class="submitSus"></span>
+				</div>
+				</form>
+			</div>
+			<p class="formLink"><a href="http://smartcost.com.cn" target="_blabk">公司主页</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://h.smartcost.com.cn" target="_blabk">内部论坛</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a  href="http://gs.smartcost.com.cn" target="_blabk">工时系统</a></p>
+		</div>
+	</div>
+	<!--弹出(新员工信息填写)-->
+	<div class="modal hide fade" id="welcome">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>温馨提示:</h3>
+				</div>
+				<div class="modal-body">
+					<p class="alert alert-">您的申请正在审批中,请耐心等候!</p>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>
+					<!-- <a href="#" class="button btn-gray">关闭</a> -->
+				</div>
+			</div></div>
+	</div>
+</body>

+ 1 - 1
staff-employee.html

@@ -328,7 +328,7 @@
 								<th class="taC" width="150"></th><td></td>
 							</tr>
 						</table>
-						<p class="alert alert-">短信通知例子:「张三欢迎加入纵横大家庭,这是您的CLD账号密码:张三 sa4kj,请登录完成入职申请。」</p>
+						<p class="alert alert-">新添加员工,使用账号(姓名),无密码登录,即可开始他的入职申请。</p>
 				</div>
 				<div class="modal-footer">
 					<a href="#" class="button">确定添加</a>