Просмотр исходного кода

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

Chente 8 лет назад
Родитель
Сommit
ddc504b468
5 измененных файлов с 290 добавлено и 31 удалено
  1. 72 0
      building-code-add.html
  2. 141 0
      building-code.html
  3. 16 7
      css/global.css
  4. 60 23
      invoice-shipping-all.html
  5. 1 1
      invoice-shipping.html

+ 72 - 0
building-code-add.html

@@ -0,0 +1,72 @@
+<!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>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="建筑激活码"><a href="building-code.html" class="icon- selected">e</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="日程表"><a href="#" class="icon-">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="开发需求" class="topLine"><a href="#" class="icon-">V</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="物品申请"><a href="#" class="icon-">W</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="contactTab">
+				<a class="now" href="#">建筑激活码</a>
+				<div class="searchItem"><input type="text" placeholder="输入激活码进行搜索"><input type="button" class="subBtn" value="搜索"><input value="新增" class="subBtn add" type="button"></div>
+			</div>			
+	  	<div class="adminContent autoHeightL1">
+			    <form>
+		        <legend>批量新增激活码</legend>
+		        <div class="control-group">
+			        <label for="inputEmail" class="control-label">选择版本</label>
+			        <div class="controls">
+			          <select>
+			          	<option>广东版</option>
+			          </select>
+			        </div>
+			      </div>
+					  <div class="control-group">
+			        <label for="inputEmail" class="control-label">激活码前缀</label>
+			        <div class="controls">
+			          <input type="text" value="DG-">
+			        </div>
+			      </div>
+			      <div class="control-group">
+			        <label for="inputEmail" class="control-label">生成的个数</label>
+			        <div class="controls">
+			          <input type="text" value="25">
+			        </div>
+			      </div>
+			      <div class="control-group">
+			        <div class="controls">
+					   		<button type="submit" class="button">提交</button>
+			        </div>
+			      </div>
+			    </form>
+			</div>	
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

+ 141 - 0
building-code.html

@@ -0,0 +1,141 @@
+<!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>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="#" class="icon-" >B</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="建筑激活码"><a href="building-code.html" class="icon- selected">e</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="日程表"><a href="#" class="icon-">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="开发需求" class="topLine"><a href="#" class="icon-">V</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="物品申请"><a href="#" class="icon-">W</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="contactTab">
+				<a class="now" href="#">建筑激活码</a>
+				<div class="searchItem"><input type="text" placeholder="输入激活码进行搜索"><input type="button" class="subBtn" value="搜索"><input value="新增" class="subBtn add" type="button" onclick="javascrtpt:window.location.href='building-code-add.html'"></div>
+			</div>			
+	  		<div class="lockDatabase fL">
+	  			<div class="lockCate">
+	  				<ul class="cateList">
+	  					<li class="clearfix filter"><select><option>广东专业版</option></select>&nbsp;<select><option>2018</option></select>&nbsp;<select><option>广东办</option></select>&nbsp;<select><option>香洲区</option></select>&nbsp;<select><option>负责人</option></select>&nbsp;<select><option>借出</option></select>&nbsp;<select><option>已激活</option></select></li>
+	  				</ul>
+	  				<ul class="lockTableUl buildingUl">
+	  					<li><i><input type="checkbox"></i><span>编号</span><span>激活码</span><span>办事处</span><span>出库</span><span>责任人</span><span>状态</span><span>客户</span><span>SSO手机号</span><span>激活时间</span></li>
+	  				</ul>
+	  			</div>
+	  			<div class="lockList autoHeightL1">
+	  				<ul class="lockTableUl buildingUl">
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Z23883</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>刘飞</span><span>已激活</span><span><a href="#">周乃君</a></span><span><a href="#">18225880860</a></span><span>2018-04-02</span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Z23884</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>已激活</span><span><a href="#">罗剑宁</a></span><span><a href="#">13761317036</a></span><span>2018-04-02</span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Z23885</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>已激活</span><span><a href="#">李建勋</a></span><span><a href="#">13945090416</a></span><span>2018-04-02</span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Y02873</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>未激活</span><span></span><span></span><span></span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-FJ00057</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>未激活</span><span></span><span></span><span></span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-FJ00058</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>刘飞</span><span>已激活</span><span><a href="#">周乃君</a></span><span><a href="#">18225880860</a></span><span>2018-04-02</span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Z23883</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>刘飞</span><span>已激活</span><span><a href="#">周乃君</a></span><span><a href="#">18225880860</a></span><span>2018-04-02</span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Z23884</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>已激活</span><span><a href="#">罗剑宁</a></span><span><a href="#">13761317036</a></span><span>2018-04-02</span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Z23885</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>已激活</span><span><a href="#">李建勋</a></span><span><a href="#">13945090416</a></span><span>2018-04-02</span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-Y02873</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>未激活</span><span></span><span></span><span></span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-FJ00057</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>黄巾桃</span><span>未激活</span><span></span><span></span><span></span></li>
+	  					<li><i><input type="checkbox"></i><span><a href="#">SC-FJ00058</a></span><span><a href="#">0001-0001-0001</a></span><span>广东办</span><span>2018-04-01</span><span>刘飞</span><span>已激活</span><span><a href="#">周乃君</a></span><span><a href="#">18225880860</a></span><span>2018-04-02</span></li>
+	  				</ul>
+	  			</div>
+	  		</div>
+	  		<div class="lockDetil fL">
+	  			<div class="header">
+	  				<h1>0001-0001-0001</h1>
+	  				<!-- <h2>添加客户</h2> -->
+	  			</div>
+	  			<div class="lockRecord autoHeightR2">
+	  				<div class="toolItem clearfix">
+							<form >
+								<div class="control-group">
+									<label class="control-label" for="inputEmail">记录类型</label>
+									<div class="controls">
+									<label class="radio inline">
+									<input type="radio" name="longleStatus" id="longleStatus_3" value="3" checked="">借出
+									</label>
+									<label class="radio inline">
+									<input type="radio" name="longleStatus" id="longleStatus_4" value="4">销售
+									</label>
+									<label class="radio inline">
+									<input type="radio" name="longleStatus" id="longleStatus_9" value="9">赠送
+									</label>
+									<label class="radio inline">
+									<input type="radio" name="longleStatus" id="longleStatus_8" value="8">备注
+									</label>
+									</div>
+								</div>
+							  <div class="control-group">
+							    <label class="control-label" for="inputPassword">添加客户</label>
+							    <div class="controls">
+							      <input type="text">
+							      <p style="color:#999;">只允许添加库里存在的客户,若输入不存在,请先添加客户</p>
+							    </div>
+							  </div>
+							  <div class="control-group clearfix">
+		  					<a href="#" class="button">确定添加</a>
+		  					<a href="#" class="button btn-gray">取消</a>
+		  					</div>
+							</form>
+							<div class="contactPanel">
+				 				<h1><p class="fR">总部-<a href="javascript:void(0)" onclick="getStaffInfo('温秀娟')">温秀娟</a></p>周乃君<i class="icon- sport">5</i><a data-original-title="编辑客户" data-toggle="ctooltip" data-placement="right" href="javascript:clientEdit(80171)" class="icon- edit">I</a></h1>
+				 				<table>
+				 					<tbody><tr><th>性别</th><td>女</td><th>昵称</th><td>庄(青美):</td></tr>
+				 					<tr><th>手机</th><td>18299400510</td><th>QQ</th><td>409764520</td></tr>
+				 					<tr><th>电话</th><td></td><th>邮箱</th><td>409764520@qq.com</td></tr>
+				 					<tr><th>激活码</th><td colspan="3"><a href="#">0001-0001-0001</a></td></tr>
+				 					<tr><th>备注</th><td colspan="3"></td></tr>
+				 					<tr><td colspan="4"></td></tr>
+				 				</tbody></table>
+				 			</div>
+				 			<div class="contactPanel">
+						 		<table>
+						 			<tbody>
+						 			<tr><th>单位全称</th><td colspan="3"><a href="javascript:void(0)" onclick="getCompany('8668')">昆明苇杭科技有限公司</a></td></tr>
+						 			<tr><th>单位主页</th><td colspan="3">http://www.xfxsoft.cn/</td></tr>
+						 			<tr><th>客户地区</th><td>云南省,昆明市,西山区</td><th>部门/职位</th><td>/</td></tr>
+						 			<tr><th>客户传真</th><td></td><th>办公室</th><td></td></tr>
+						 			<tr><th>客户地址</th><td colspan="3">云南省昆明市盘龙区东风东路47号建业商务中心A2202</td></tr>
+						 			<tr><th>客户乘车</th><td colspan="3"></td></tr>
+						 			<tr><th>客户地标</th><td colspan="3">建业商务中心</td></tr>
+						 			<tr><th>客户住宿</th><td colspan="3"></td></tr>
+						 		</tbody></table>
+						 	</div>
+							<div class="contactInfo">
+				  			<div class="contactPanel">
+				  				<h1>周乃君</h1>
+				  				<table>
+				  					<tbody><tr><th>账户</th><td>zhounaijun</td><th>注册时间</th><td>2015年05月14日</td></tr>
+				  					<tr><th>手机</th><td>18225880860</td><th>邮箱</th><td>3216329758@qq.com</td></tr>
+				  				</tbody></table>
+				  			</div>
+		  				</div>
+	  		</div>
+	  				</div>
+					</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

+ 16 - 7
css/global.css

@@ -130,17 +130,18 @@ a.disenable{color:#ccc}
 }
 @font-face {
   font-family: 'ZHcldSystem';
-  src:url('fonts/ZHcldSystem.eot');
-  src:url('fonts/ZHcldSystem.eot?#iefix') format('embedded-opentype'),
-    url('fonts/ZHcldSystem.ttf') format('truetype'),
-    url('fonts/ZHcldSystem.woff') format('woff'),
-    url('fonts/ZHcldSystem.svg#ZHcldSystem') format('svg');
+  src:  url('fonts/ZHcldSystem.eot?ox6e11');
+  src:  url('fonts/ZHcldSystem.eot?ox6e11#iefix') format('embedded-opentype'),
+    url('fonts/ZHcldSystem.ttf?ox6e11') format('truetype'),
+    url('fonts/ZHcldSystem.woff?ox6e11') format('woff'),
+    url('fonts/ZHcldSystem.svg?ox6e11#ZHcldSystem') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
-[class*="icon-"] {
-  font-family: 'ZHcldSystem';
+[class^="icon-"], [class*=" icon-"] {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'ZHcldSystem' !important;
   speak: none;
   font-style: normal;
   font-weight: normal;
@@ -1444,6 +1445,14 @@ border-color: #d6e9c6;
 .lockRecord .toolItem form{
   margin:10px
 }
+.buildingUl li span{
+  display:inline-block;
+  width:10.7%;
+  padding:0 0 0 3px;
+  overflow:hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
 .modal-body .contactsTag{
   color:#fff
 }

+ 60 - 23
invoice-shipping-all.html

@@ -56,11 +56,29 @@
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-					已打印发票
+					邮寄发票
 				</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 						<li>
+							<a class="now" href="#">所有</a>
+							<a href="#" title="待邮寄发票">待邮寄发票</a>
+							<a href="#" title="已邮寄发票">已邮寄发票</a>
+						</li>
+						<li>
+							<select>
+								<option>类型</option>
+								<option>普通发票</option>
+								<option>专用发票</option>
+							</select>
+						</li>
+						<li>
+							<select class="select">
+								<option>个人发票</option>
+								<option>培训班发票</option>
+							</select>
+						</li>
+						<li>
 							<div class="search">
 								<div class="input-append">
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
@@ -69,7 +87,7 @@
 									<button class="btn btn-small" type="button">查询</button>
 								</div>
 							</div></li>
-							<li>
+						<li>
 							<div class="search">
 								<div class="input-append">
 									<input class="span3" placeholder="发票抬头、开票金额" type="text">
@@ -81,27 +99,46 @@
 				<div class="saeaList">
 					<table class="table table-hover">
 						<tbody>
-						<tr class="thead"><th>开票流水号</th><th>开票单位(抬头)</th><th>开票金额</th><th>发票号</th><th>提交开票</th><th>快递信息</th><th>邮寄发票</th><th>操作</th></tr>
-						<tr>
-							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
-							<td>珠海XXXX公司</td>
-							<td><b>¥3000.00</b></td>
-							<td>No.99028</td>
-							<td>广东办刘飞 2016-03-03 12:20:20</td>
-							<td>顺丰速运:<a href="#shipping" data-toggle="modal">01239812382398</a></td>
-							<td>赵淑燕 2016-03-03 12:20:20</td>
-							<td><a href="#editshipping" data-toggle="modal">修改邮寄</a></td>
-						</tr>
-						<tr>
-							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
-							<td>珠海XXXX公司</td>
-							<td><b>¥3000.00</b><sup>专</sup></td>
-							<td>No.99028</td>
-							<td>广东办刘飞 2016-03-03 12:20:20</td>
-							<td>顺丰速运:<a href="#shipping" data-toggle="modal">01239812382398</a></td>
-							<td>赵淑燕 2016-03-03 12:20:20</td>
-							<td><a href="#editshipping" data-toggle="modal">修改邮寄</a></td>
-						</tr>
+							<tr class="thead"><th>开票流水号</th><th>开票单位(抬头)</th><th>开票金额</th><th>发票号</th><th>提交开票</th><th>快递信息</th><th>申请邮寄物品</th><th>邮寄备注</th><th>实际邮寄物品</th><th>邮寄发票</th><th>操作</th></tr>
+							<tr>
+								<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+								<td>珠海XXXX公司</td>
+								<td><b>¥3000.00</b></td>
+								<td>No.99028</td>
+								<td>广东办刘飞 2016-03-03 12:20:20</td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td></td>
+								<td>赵淑燕 2016-03-03 12:20:20</td>
+								<td><a href="#editshipping" data-toggle="modal">邮寄发票</a></td>
+							</tr>
+							<tr>
+								<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+								<td>珠海XXXX公司</td>
+								<td><b>¥3000.00</b></td>
+								<td>No.99028</td>
+								<td>广东办刘飞 2016-03-03 12:20:20</td>
+								<td>顺丰速运:<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+								<td>合同x1、锁套装x1</td>
+								<td>邮寄物品备注信息</td>
+								<td>合同x1、锁套装x1</td>
+								<td>赵淑燕 2016-03-03 12:20:20</td>
+								<td><a href="#editshipping" data-toggle="modal">修改邮寄</a></td>
+							</tr>
+							<tr>
+								<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+								<td>珠海XXXX公司</td>
+								<td><b>¥3000.00</b><sup>专</sup></td>
+								<td>No.99028</td>
+								<td>广东办刘飞 2016-03-03 12:20:20</td>
+								<td>顺丰速运:<a href="#shipping" data-toggle="modal">01239812382398</a></td>
+								<td>合同x1、锁套装x1</td>
+								<td>邮寄物品备注信息</td>
+								<td>合同x1、锁套装x1</td>
+								<td>赵淑燕 2016-03-03 12:20:20</td>
+								<td><a href="#editshipping" data-toggle="modal">修改邮寄</a></td>
+							</tr>
 						</tbody>
 					</table>
 				</div>

+ 1 - 1
invoice-shipping.html

@@ -58,7 +58,7 @@
 				<div class="borad-news">
 					<div class="saeaList">
 						<div class="clearfix">
-							<legend><div class="fR"></div>待邮寄</legend>
+							<legend><div class="fR"><a href="invoice-shipping-all.html">查看更多</a></div>待邮寄</legend>
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC">开票流水号</th><th class="taC">开票单位(抬头)</th><th class="taC">开票金额</th><th class="taC">发票号</th><th class="taC">提交开票</th><th class="taC">打印发票</th><th class="taC" width="120">操作</th></tr>