针对UI那边给的文档进行调整页面。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8050 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/css/deputyOrder/order.css

@@ -297,12 +297,15 @@ body {
 .purchase_form01 ul li .select {
     height: 34px;
     line-height: 34px;
-    border:#5078cb 1px solid;
+    border:#bfbfbf 1px solid;
     width: 146px;
     position: relative;
     font-size: 14px;
     padding-left: 10px;
     background: url("../../img/deputyOrder/select.png") no-repeat right;
+}
+.purchase_form01 ul li .select:focus{
+    border: #5078cb 1px solid;
 }
  .purchase_xq{
     border-bottom: #d0cfcf 1px solid;
@@ -380,4 +383,20 @@ body {
 }
 .purchase .save a:hover {
     background: #1f4fb2;
+}
+.purchase .save button {
+    width:94px;
+    height: 36px;
+    display: inline-block;
+    background: #5078cb;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+    float: right;
+    line-height: 36px;
+    margin-right: 40px;
+    border: none;
+}
+.purchase .save button:hover {
+    background: #1f4fb2;
 }

src/main/webapp/resources/css/index.css

@@ -1850,11 +1850,11 @@ ul>li.item-link>a {
 }
 .role-container>.role-list>.item>.icon{
   	float: left;
-  	width: 100px;
-  	height: 100px;
-  	line-height: 100px;
+  	width: 60px;
+  	height: 60px;
+  	line-height: 60px;
   	text-align: center;
-  	margin-top: 15px;
+  	margin-top: 30px;
   	color: #56a022;
   	font-size: 52px;
   	border-radius: 50%;
@@ -1862,9 +1862,13 @@ ul>li.item-link>a {
   	box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
   	background-color: #f3f3f4;
 }
-
+.role-container>.role-list>.item>.icon i{
+	font-size: 36px;
+	position: relative;
+	top: -10px;
+}
 .role-container>.role-list>.item>.desc {
-	margin-left: 120px;
+	margin-left: 80px;
 }
 
 .userrole-list {
@@ -1908,7 +1912,7 @@ ul>li.item-link>a {
 }
 
 .userrole-list>.item>.desc {
-	margin-left: 90px;
+	margin-left: 70px;
 	text-overflow: ellipsis;
 }
 
@@ -2149,9 +2153,9 @@ ul>li.item-link>a {
 }
 /*enterprise*/
 .base-info {
-	-webkit-box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
+	/*-webkit-box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
 	box-shadow: 0 0 7px 0 rgba(119, 119, 119, 0.2);
-	border-bottom: 1px solid #d9d9d9;
+	border-bottom: 1px solid #d9d9d9;*/
 	margin-bottom: 10px;
 }
 
@@ -2583,10 +2587,6 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 #footer .col-sm-4{
 	margin-top: 30px;
 }
-/*所有hover边框颜色*/
-.sale-view .order-table>tbody:hover {
-	border: #d32526 2px solid !important;
-}
 .modal-content{
 	margin-top: 90px;
 }
@@ -2787,4 +2787,71 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 }
 .tender-table .header{
 	border-bottom: #e8e8e8 1px solid !important;
+}
+.blue{
+	color: #5078cb;
+}
+.red{
+	color: #f00;
+}
+/*不可以提交的时候背景为灰色*/
+
+.dropdown-menu li td button{
+	border: none;
+}
+/*
+日期按钮高度*/
+.btn-ht34{
+	height: 34px !important;
+	width: 34px !important;
+	border: #b7b7b7 1px solid !important;
+}
+/*所有hover边框颜色*/
+.sale-view .order-table>tbody:hover {
+	border: #d32526 2px solid !important;
+}
+.btn-warning{
+	color: #5078cb;
+	background-color: #fff;
+	border-color: #5078cb;
+}
+.btn-warning:hover{
+	background: #3a89d1;
+	border-color: #5078cb;
+}
+.modal-header{
+	padding: 10px !important;
+}
+.modal-header h3{
+	font-size: 14px;
+}
+.modal-header h3 i{
+	display: none;
+}
+.modal-header h3 span{
+	font-size: 14px;
+}
+/*disabled*/
+.many-file-btn button:disabled,
+.bid-content>div>div.btn-bid>button:disabled,
+.tender-content>div>div.btn-publish>button:disabled,
+.tender-content>div>div.btn-save>button:disabled,
+.per-data ul li button.save:disabled,
+.purchase .save:disabled,
+.modal-footer button:disabled{
+	background: #999 !important;
+	border: none !important;
+}
+.public-btn01{
+	border: 1px;
+	width: 94px !important;
+	height: 36px !important;
+	line-height: 36px !important;
+	font-size: 14px;
+	display: inline-block;
+	text-align: center;
+	padding: 0;
+}
+.public-btn01:disabled {
+	background: #999 !important;
 }

src/main/webapp/resources/css/serve.css

@@ -4,7 +4,7 @@ body {
 		"\9ED1\4F53", Arial, sans-serif;
 	color: #222;
 	font-size: 14px;
-	background-color: #eff2f9;
+	background-color: #f5f5f5;
 }
 
 #top, #header, #footer {

src/main/webapp/resources/tpl/index/account/add_userInfo.html

@@ -17,7 +17,7 @@
 </style>
 <div class="modal-header">
 	<h3 class="modal-title">
-		<i class="fa fa-user fa-fw text-default"></i>为企业分配用户
+		为企业分配用户
 	</h3>
 </div>
 <div class="form-group" id="window-search" style="height: 36px; margin-bottom: 0; margin-top: 5px;">

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -114,8 +114,10 @@
 }
 
 #company .form-control {
-	border: #327ebe 1px solid;
+	border: #bfbfbf 1px solid;
 	margin-top: 5px;
+	font-size: 14px;
+	border-radius: 3px;
 }
 
 #company .col-xs-4 p {
@@ -227,6 +229,9 @@
 	width: 100%;
 	overflow: hidden;
 }
+.input-group-xs>.input-group-addon{
+	border: #bfbfbf 1px solid;
+}
 </style>
 <!--<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>-->
 <div class="com_head"><span>企业信息</span></div>
@@ -303,9 +308,9 @@
 														   ng-bind="::enterprise.enUrl" href="http://{{::enterprise.enUrl}}"
 														   target="_blank"></a>
 						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 240px;">
+							<div class="input-group input-group-xs" style="width: 250px;">
 								<span class="input-group-addon">http://</span>
-								<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs"  style="width: 190px;" placeholder="企业官方网站网址">
+								<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs"  style="width: 200px;" placeholder="企业官方网站网址">
 							</div>
 						</div>
 					</div>
@@ -313,7 +318,7 @@
 						<span class="title">企业传真</span> <div ng-show="!connectionEditing" class="content"
 															 ng-bind="::enterprise.enFax"></div>
 						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 240px;">
+							<div class="input-group input-group-xs" style="width: 250px;">
 								<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
 							</div>
 						</div>
@@ -357,7 +362,7 @@
 					<div class="com-text col-xs-6">
 						<span class="title">地址：</span>
 						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>
-						<div class="content" ng-show="connectionEditing" style="width: 240px;">
+						<div class="content" ng-show="connectionEditing" style="width: 250px;">
 							<input ng-model="enterprise.enAddress" placeholder="详细地址"
 								   class="form-control input-xs" type="text" />
 						</div>
@@ -371,7 +376,7 @@
 						</div>
 						<div class="content" ng-show="connectionEditing">
 							<select ng-model="enterprise.enIndustry" placeholder="所属行业"
-									class="form-control input-xs" type="text" style="width: 240px;">
+									class="form-control input-xs" type="text" style="width: 250px;">
 								<option value="make">制造型</option>
 								<option value="trade">贸易型</option>
 							</select>

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -301,8 +301,8 @@
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 		<span class="f14">我的客户</span>
 		<div class="pull-right" ng-show="user.sys">
-			<a title="新增用户默认密码为111111" ng-show="adding == true" class="btn btn-success btn-sm" ng-disabled="newUserForm.$invalid" ng-click="addUser(newUser)" class="text-simple" style="color: #fff">
-				<i class="fa fa-user-plus fa-fw" ></i>
+			<a title="新增用户默认密码为111111" ng-show="adding == true" class="btn btn-success btn-sm" ng-disabled="newUserForm.$invalid" ng-click="addUser(newUser)" class="text-simple" style="color: #fff;">
+				<i class="fa fa-user-plus fa-fw"></i>
 				确定添加
 			</a>
 			<a ng-click="adding = false" ng-show="adding == true" class="text-simple">

src/main/webapp/resources/tpl/index/approvalFlow/user_role.html

@@ -1,6 +1,23 @@
+<style>
+	.userrole-list>.item>.icon{
+		color: #fff;
+	}
+	.userrole-list>.item:nth-child(1)>.icon{
+		background: #077bba;
+	}
+	.userrole-list>.item:nth-child(2)>.icon{
+		background: #f87103;
+	}
+	.userrole-list>.item:nth-child(3)>.icon{
+		background: #02c6c5;
+	}
+	.userrole-list>.item:nth-child(4)>.icon{
+		background: #5078cb;
+	}
+</style>
 <div class="modal-header">
 	<h3 class="modal-title">
-		<i class="fa fa-user fa-fw text-default"></i>选择角色
+		选择角色
 	</h3>
 </div>
 <div class="modal-body">

src/main/webapp/resources/tpl/index/baseInfo/modal/product_kindChoose_modal.html

@@ -366,7 +366,6 @@
 <!-- 类目修改模态框，修改类目名称 -->
 <div class="modal-header">
 	<h3 class="modal-title">
-		<i class="fa fa-fw fa-sitemap text-default"></i>
 		<span>选择类目（只能选择子类目）</span>
 	</h3>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -124,6 +124,9 @@
 #public .com_title{
     margin-bottom: 10px;
 }
+.order-hd td a{
+    margin: 0 8px;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -189,7 +192,7 @@
                 <td class="text-center" title="标准料号" ng-bind="::product.cmpUuId"></td>
                 <td class="text-center" title="原厂型号" ng-bind="::product.cmpCode"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
-                <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self" title="编辑"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>
+                <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self" title="编辑" style="position: relative;top:1px;"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>
             </tr>
             </tbody>
         </table>

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -1,6 +1,6 @@
 <style>
 .append{
-	color: #428bca;font-size:13px; margin-left: 10px
+	color: #5078cb;font-size:12px; margin-left: 10px
 }
 .order-table td {
 	padding-top: 10px;
@@ -124,7 +124,7 @@
 			<div class="col-xs-4 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">
 				<a class="text-simple append" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a>&nbsp;&nbsp;&nbsp;
 				<a href="sale/apCheck/allxls?_state={{active}}&searchFilter={{searchFilterXls}}" 
-					target="_self" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
+					target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/fa/apCheckList.html

@@ -20,8 +20,8 @@
 	}
 	
 	.checkboxSize input{
-		width: 18px;
-		height: 18px;
+		width: 12px;
+		height: 12px;
 	}
 	
 	form {
@@ -39,14 +39,11 @@
 	}
 	
 	td {
-		border:1px solid;
+		/*border:1px solid;*/
 		word-break: break-all;
 		text-align: center;
 	}
-	
-	.divid {
-		border-bottom:2px solid #A9A9A9;			
-	}
+
 	
 	.info {
 		overflow:scroll;
@@ -56,16 +53,53 @@
 		margin: 10px;
 	}
 	.searchcolor .col-xs-2{
-		text-align: right;
+		font-size: 14px;
+		padding-left: 38px;
+	}
+	.searchcolor .col-xs-3{
 		font-size: 14px;
 	}
-	.searchcolor .col-xs-2 label{
+	.searchcolor .col-xs-2 label,.searchcolor .col-xs-3 label{
 		font-weight: normal;
 	}
+	.add-apCheckList .form-control{
+		border: #bfbfbf 1px solid !important;
+		height: 34px;
+		background: #fff;
+		font-size: 14px;
+	}
+	.add-apCheckList .row{
+		line-height: 34px;
+	}
+	.input-group-btn button{
+		height: 34px;
+	}
+	.thAlign th{
+		border-top: none !important;
+		border-right: none !important;
+		border-left: none !important;
+		border-bottom: #e8e8e8 1px solid;
+	}
+	#order-detail-list .input-sm{
+		border: #ccc 1px solid;
+	}
+	.tab-style table td{
+		padding-left: 0 !important;
+		padding-right: 0 !important;
+	}
+	.has-feedback input[type="search"]{
+		padding-right: 0 !important;
+	}
 </style>
 
 <div style="margin-right:20px;">
-<div>
+<div class="add-apCheckList">
+	<div class="pub-com_head">
+		<span>新增对账单</span>
+		<div class="p-right">
+
+		</div>
+	</div>
 	<div class="block searchcolor" style="padding-top: 10px; padding-bottom: 20px;">
 	
  	<!-- 	<div class="loading in" ng-class="{'in': loading}">
@@ -74,7 +108,7 @@
 		<div class="row" id="tip">（<a class="text-inverse">*提示</a>：为了提高反应速率，现在所有单据都由用户手动筛选得出）</div>
   		<div class="row">
   			<div class="col-xs-2">
-				<label>&nbsp;&nbsp;客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
+				<label>客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
 			</div>
  			<div class="col-xs-3">
  				<div class="form-group form-group-sm has-feedback">
@@ -122,7 +156,7 @@
 		</div>
 		<div class="row">
 			<div class="col-xs-2">
-				<label>&nbsp;&nbsp;规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</label>
+				<label>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</label>
 			</div>
 			<div class="col-xs-3">
 				<div class="form-group form-group-sm has-feedback">
@@ -136,10 +170,12 @@
 		<div class="more">
 			<form class="form-inline">
 			<div class="row">
-			  <div class="col-xs-6">
-			  <div class="form-group ">
-			    <label style="margin-left: 20px;">单据日期：</label>
-			    <div class="form-group input-group input-group-xs input-trigger">
+			  	<div class="col-xs-7">
+					<div class="col-xs-3">
+						<label>单据日期：</label>
+					</div>
+			  <div class="col-xs-9 form-group">
+			    <div class="col-xs-5 form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="sdateFrom"
 							class="form-control" placeholder="起始日期" 
 							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
@@ -149,51 +185,49 @@
 							ng-click="openDatePicker($event, condition, '$fromOpened')"
 							ng-change="onDateCondition()">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
+							<button type="button" class="btn-ht34 btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
 					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="sdateTo"
-							class="form-control" placeholder="截止日期"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
-					</div>
-					</div>
-					</div>
-					<div class="col-xs-2 col-xs-offset-1" style="margin-top:4px">
-						<div class="pull-right">
-							<a href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" title="导出Excel表格">
-							<i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
-						</div>
-					</div>
-					<div class="col-xs-3" >
-					<div class="form-group pull-right">
-						<button class="btn btn-default btn-sm" ng-click="searchOrder()" title="若果没有筛选条件，将筛选出所有的单据">筛选单据</button>&nbsp;&nbsp; <button class="btn btn-default btn-sm" ng-click="createApCheck(check.$selected)">生成对账</button>			
+				<div class="col-xs-5 form-group input-group input-group-xs input-trigger">
+					<input type="text" ng-model="sdateTo"
+						class="form-control" placeholder="截止日期"
+						datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+						min-date="condition.dateFrom"
+						current-text="今天" clear-text="清除" close-text="关闭"
+						datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+						ng-click="openDatePicker($event, condition, '$toOpened')"
+						ng-change="onDateCondition()">
+					<span class="input-group-btn">
+						<button type="button" class="btn-ht34 btn btn-default"
+							ng-click="openDatePicker($event, condition, '$toOpened')">
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
+				</div>
 					</div>
 					</div>
-					</div> 
+				<div class="col-xs-2" style="margin-top:4px; padding: 0;">
+					<a href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" title="导出Excel表格" class="blue f14">
+						<i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
+				</div>
+				<div class="col-xs-3" >
+				<div class="form-group">
+					<button class="btn btn-default btn-sm" ng-click="searchOrder()" title="若果没有筛选条件，将筛选出所有的单据">筛选单据</button>&nbsp;&nbsp; <button class="btn btn-default btn-sm" ng-click="createApCheck(check.$selected)">生成对账</button>
+				</div>
+				</div>
+			</div>
 				</form>		
 			  </div>
 		</div>
-	<div class="info">
-			<table width="1400px" class="tableMargin">
+	<div class="info" style="background: #fff;" id="order-detail-list">
+			<table width="1600px" class="tableMargin">
 				<tr>
-					<table width="1400px" class="table-bordered"
+					<table width="1600px" class="table-bordered"
 						style="margin-bottom: 0">
-						<tr class="thAlign">
+						<tr class="thAlign" style="height: 40px;">
 							<th width="36px;" class="checkboxSize"><input
 								type="checkbox" name="checkbox" ng-model="checkboxes.checked"
 								ng-click="checkAll()"></th>
@@ -203,62 +237,62 @@
 							<th width="35px;">序号</th>
 							<th width="60px;">类型</th>
 							<th width="60px;">单据日期</th>
-							<th width="73px;">应付供应商名称</th>
-							<th width="60px;">客户采购单号</th>
+							<th width="90px;">应付供应商名称</th>
+							<th width="70px;">客户采购单号</th>
 							<th width="65px;">客户料号</th>
-							<th width="65px;">客户物料名称</th>
-							<th width="65px;">客户规格型号</th>
+							<th width="70px;">客户物料名称</th>
+							<th width="70px;">客户规格型号</th>
 							<th width="65px;">送货工厂</th>
 							<th width="55px;">数量</th>
 							<th width="40px;">单价</th>
 							<th width="30px;">币别</th>
 							<th width="40px;">税率</th>
 							<th width="60px;">金额</th>
-							<th width="60px;">本次对帐金额</th>
-							<th width="17px" style="visibility: hidden;"></th>
+							<th width="70px;">本次对帐金额</th>
+						</tr>
+						<tr
+								ng-repeat="check in data | filter:condition.factory | filter:condition.prodSpec | filter:condition.prodTitle | filter:condition.uuorname | filter:condition.venduuorname | orderBy: 'piDate': reverse=true"
+								ng-if="((condition.dateFrom == '') || ((condition.dateFrom !== '') && (condition.dateFrom <= check.piDate))) && ((condition.dateTo == '') || ((condition.dateTo !== '') && (condition.dateTo >= check.piDate)))"
+								class="thAlign" style="height: 40px;">
+							<td width="36px;" style="text-align: center"
+								class="checkboxSize" n><input ng-model="check.$selected"
+															  name="checkbox" ng-click="checkOne(check)"
+															  ng-change="getTotalMoney()" type="checkbox"></td>
+							<td width="99.5px;"><input ng-model="check.thisCheckQty"
+													   type="number" max="data.maxThisCheckQty"
+													   min="data.minThisCheckQty" ng-change="getTotalMoney()"
+													   style="width: 75px;" class=" input-sm text-center"></td>
+							<td width="69.5px;" title="{{check.custName}}"><div
+									style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.custName}}</div></td>
+							<td width="59.5px;">{{check.inOutNo}}</td>
+							<td width="34.5px;" align="center">{{check.detno}}</td>
+							<td width="59.5px;">{{check.piClass}}</td>
+							<td width="59.5px;">{{check.piDate | date:'yyyy-MM-dd' }}</td>
+							<td width="89.5px;" title="{{check.receiveName}}">
+								<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.receiveName}}</div></td>
+							<td width="69.5px;">{{check.orderCode}}</td>
+							<td width="64.5px;">{{check.prodCode}}</td>
+							<td width="64.5px;" title="{{check.prodTitle}}">
+								<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.prodTitle}}</div></td>
+							<td width="64.5px;" title="{{check.prodSpec}}"><div
+									style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.prodSpec}}</div></td>
+							<td width="64.5px;">{{check.factory}}</td>
+							<td width="54.5px;">{{check.qty}}</td>
+							<td width="39.5px;">{{check.orderPrice}}</td>
+							<td width="29.5px;">{{check.currency}}</td>
+							<td width="39.5px;" align="center">{{check.taxrate}}</td>
+							<td width="59.5px;">{{(check.qty || 0)*(check.orderPrice ||
+								0) | number:2}}</td>
+							<td width="60px;">{{(check.orderPrice ||
+								0)*(check.thisCheckQty || 0) | number:2}}</td>
 						</tr>
 					</table>
 				</tr>
 				<tr>
 					<td>
-						<div style="overflow-y: scroll; width: 1395px; max-height: 500px">
+						<div style="overflow-y: scroll; width: 1600px; max-height: 500px" class="tab-style">
 							<table class="table table-bordered table-striped table-hover">
-								<tr
-									ng-repeat="check in data | filter:condition.factory | filter:condition.prodSpec | filter:condition.prodTitle | filter:condition.uuorname | filter:condition.venduuorname | orderBy: 'piDate': reverse=true"
-									ng-if="((condition.dateFrom == '') || ((condition.dateFrom !== '') && (condition.dateFrom <= check.piDate))) && ((condition.dateTo == '') || ((condition.dateTo !== '') && (condition.dateTo >= check.piDate)))"
-									class="thAlign">
-									<td width="36px;" style="text-align: center"
-										class="checkboxSize" n><input ng-model="check.$selected"
-										name="checkbox" ng-click="checkOne(check)"
-										ng-change="getTotalMoney()" type="checkbox"></td>
-									<td width="99.5px;"><input ng-model="check.thisCheckQty"
-										type="number" max="data.maxThisCheckQty"
-										min="data.minThisCheckQty" ng-change="getTotalMoney()"
-										style="width: 75px;" class=" input-sm text-center"></td>
-									<td width="69.5px;" title="{{check.custName}}"><div
-											style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.custName}}</div></td>
-									<td width="59.5px;">{{check.inOutNo}}</td>
-									<td width="34.5px;" align="center">{{check.detno}}</td>
-									<td width="59.5px;">{{check.piClass}}</td>
-									<td width="59.5px;">{{check.piDate | date:'yyyy-MM-dd' }}</td>
-									<td width="72.5px;" title="{{check.receiveName}}">
-										<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.receiveName}}</div></td>
-									<td width="59.5px;">{{check.orderCode}}</td>
-									<td width="64.5px;">{{check.prodCode}}</td>
-									<td width="64.5px;" title="{{check.prodTitle}}">
-										<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.prodTitle}}</div></td>
-									<td width="64.5px;" title="{{check.prodSpec}}"><div
-											style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{check.prodSpec}}</div></td>
-									<td width="64.5px;">{{check.factory}}</td>
-									<td width="54.5px;">{{check.qty}}</td>
-									<td width="39.5px;">{{check.orderPrice}}</td>
-									<td width="29.5px;">{{check.currency}}</td>
-									<td width="39.5px;" align="center">{{check.taxrate}}</td>
-									<td width="59.5px;">{{(check.qty || 0)*(check.orderPrice ||
-										0) | number:2}}</td>
-									<td width="60px;">{{(check.orderPrice ||
-										0)*(check.thisCheckQty || 0) | number:2}}</td>
-								</tr>
+
 							</table>
 						</div>
 					</td>
@@ -266,7 +300,7 @@
 			</table>
 		</div>
 	</div>
-	<div style="text-align: left;">
-		<div class="divid">总金额合计：{{totalMoney | number:2}}</div>
+	<div style="text-align: left; background: #fff; height: 40px; line-height: 40px;">
+		<div class="divid" style="margin-left: 20px">总金额合计：{{totalMoney | number:2}}</div>
 	</div>
 </div>

src/main/webapp/resources/tpl/index/fa/arCheck_detail.html

@@ -28,41 +28,44 @@
 	background: #d9534f;
 	color: #ffffff;
 }
-</style>
-<div class="loading" ng-class="{'in': loading}">
+</style>
+<div class="loading" ng-class="{'in': loading}">
 	<i></i>
-</div>
-<div class="pane base-info">
-	<div class="pane-header f16">
-		应付对账单<!-- <a ng-click="print(order)" class="pull-right text-simple"><i
-			class="fa fa-print fa-fw"></i>打印</a> -->
-	</div>
-	<div class="pane-body">
-		<div class="headerline">
-			<span class="index">1</span> <span class="content">单据资料</span>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-6">
-				<span class="title">供应商</span>
-				<div class="content" ng-bind="::order.vendor.enName"></div>
-			</div>
-			<div class="col-xs-6">
-				<span class="title">对账期间</span>
-				<div class="content text-num">{{::order.fromDate | date:'yyyy/MM/dd'}} - {{::order.toDate | date:'yyyy/MM/dd'}}</div>
-			</div>
-		</div>
+</div>
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>应收对账单</span>
+		<div class="p-right">
+			<!-- <a ng-click="print(order)" class="pull-right text-simple"><i
+			class="fa fa-print fa-fw"></i>打印</a> -->
+		</div>
+	</div>
+	<div class="pane-body">
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">单据资料</span>&nbsp;
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<span class="title">供应商</span>
+				<div class="content" ng-bind="::order.vendor.enName"></div>
+			</div>
+			<div class="col-xs-6">
+				<span class="title">对账期间</span>
+				<div class="content text-num">{{::order.fromDate | date:'yyyy/MM/dd'}} - {{::order.toDate | date:'yyyy/MM/dd'}}</div>
+			</div>
+		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">单据编号</span>
 				<div class="content text-num" ng-bind="::order.code"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">录单日期</span>
-				<div class="content" ng-bind="::order.date | date:'MM月dd日 HH:mm'"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">录单人</span>
-				<div class="content" ng-bind="::order.recorder"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">录单日期</span>
+				<div class="content" ng-bind="::order.date | date:'MM月dd日 HH:mm'"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">录单人</span>
+				<div class="content" ng-bind="::order.recorder"></div>
 			</div>
 			<div class="col-xs-3">
 				<span class="title">审批人</span>
@@ -74,81 +77,81 @@
 				<span class="title">应收日期</span>
 				<div class="content" ng-bind="::order.arDate | date:'MM月dd日'"></div>
 			</div>
-			<div class="col-xs-3">
-				<span class="title">对方业务员</span>
-				<div class="content" ng-bind="::order.sellerName"></div>
-			</div>
+			<div class="col-xs-3">
+				<span class="title">对方业务员</span>
+				<div class="content" ng-bind="::order.sellerName"></div>
+			</div>
 		</div>
 		<div class="row row-sm item" ng-if="order.remark">
 			<div class="col-xs-9">
 				<span class="title">供应商备注</span>
 				<div class="content" ng-bind="::order.remark"></div>
 			</div>
-		</div>
-		<div class="headerline">
-			<span class="index">2</span> <span class="content">财务信息</span>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">对账总额</span>
-				<div class="content text-num" ng-bind="::order.checkAmount | number:6"></div>
+		</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">财务信息</span>&nbsp;
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">对账总额</span>
+				<div class="content text-num" ng-bind="::order.checkAmount | number:6"></div>
 			</div>
 			<div class="col-xs-3">
 				<span class="title">币别</span>
 				<div class="content" ng-bind="::order.currency"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">汇率</span>
-				<div class="content text-num" ng-bind="::order.rate"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">付款方式</span>
-				<div class="content" ng-bind="::order.payments"></div>
-			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">本期收账</span>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">汇率</span>
+				<div class="content text-num" ng-bind="::order.rate"></div>
+			</div>
+			<div class="col-xs-3">
+				<span class="title">付款方式</span>
+				<div class="content" ng-bind="::order.payments"></div>
+			</div>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-3">
+				<span class="title">本期收账</span>
 				<div class="content text-num">
 					<span ng-bind="order.payAmount | number:6"></span>
 					<span ng-if="">-</span>
-				</div>
-			</div>
-			<div class="col-xs-9">
-				<span class="title">期初金额</span>
+				</div>
+			</div>
+			<div class="col-xs-9">
+				<span class="title">期初金额</span>
 				<div class="content text-num">
 					<span ng-if="order.beginAmount" ng-bind="order.beginAmount | number:6"></span>
 					<span ng-if="!order.beginAmount">-</span>
-				</div>
-			</div>
-		</div>
-		<div class="headerline">
-			<span class="index">3</span> <span class="content">对账明细清单</span>
-		</div>
-		<div class="block">
-			<table class="block table table-default table-striped table-hover">
-				<thead>
-					<tr class="header">
-						<th width="52" class="br-r">行号</th>
+				</div>
+			</div>
+		</div>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">对账明细清单</span>&nbsp;
+		</div>
+		<div class="block">
+			<table class="block table table-default table-striped table-hover">
+				<thead>
+					<tr class="header">
+						<th width="52">行号</th>
 						<th>商品</th>
-						<th width="200">单据信息</th>
-						<th width="80">单价</th>
+						<th width="200">单据信息</th>
+						<th width="80">单价</th>
 						<th width="120">对账数量</th>
-						<th width="120">对账金额</th>
-						<th width="100">操作</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr ng-repeat="item in order.items track by item.id">
-						<td class="text-center text-num text-bold f-16 text-success br-r">
-							<span ng-bind="::item.number"></span>
-						</td>
-						<td>
-							<div class="text-num text-bold">
-								<span ng-bind="::item.prodCode" title="商品编号"></span>
-							</div>
-							<div class="text-muted" ng-bind="::item.prodSpec" title="商品规格"></div>
-						</td>
+						<th width="120">对账金额</th>
+						<th width="100">操作</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr ng-repeat="item in order.items track by item.id">
+						<td class="text-center text-num text-bold f-16 text-success">
+							<span ng-bind="::item.number"></span>
+						</td>
+						<td>
+							<div class="text-num text-bold">
+								<span ng-bind="::item.prodCode" title="商品编号"></span>
+							</div>
+							<div class="text-muted" ng-bind="::item.prodSpec" title="商品规格"></div>
+						</td>
 						<td class="text-muted text-num">
 							<div>
 								<i class="fa fa-file-text-o fa-fw" title="采购订单编号"></i> 
@@ -157,7 +160,7 @@
 							<div>
 								<i class="fa fa-share-square-o fa-fw" title="供应商出库单号"></i> 
 								<span ng-bind="::item.inoutCode"></span> 第<span ng-bind="item.sourceNumber"></span>行
-							</div>
+							</div>
 						</td>
 						<td class="text-center">
 							<div class="text-num" ng-bind="::item.price | number:6"></div>
@@ -208,7 +211,7 @@
 									</div>
 								</div>
 							</div>
-						</td>
+						</td>
 						<td class="text-center">
 							<div ng-if="item.status == 200 && !item.$editing">
 								<a ng-click="onReplyClick(item, true)" class="">确认<i class="fa fa-check-square-o"></i></a><br>
@@ -224,7 +227,7 @@
 							<div ng-if="item.waiting">
 								<span class="text-muted f12">您确认的数量正在等待供应商确认...</span>
 							</div>
-						</td>
+						</td>
 					</tr>
 					<tr>
 						<td></td>
@@ -236,9 +239,9 @@
 							<span class="text-num f16" ng-bind="order.checkAmount | number:6"></span>
 						</td>
 						<td></td>
-					</tr>
+					</tr>
 				</tbody>
-			</table>
-		</div>
-	</div>
+			</table>
+		</div>
+	</div>
 </div>

src/main/webapp/resources/tpl/index/make/order_detail.html

@@ -36,10 +36,12 @@
 				<span class="title">录单人</span>
 				<div class="content" ng-bind="::order.recorder"></div>
 			</div>
-			<div class="col-xs-3">
+			<div class="col-xs-6">
 				<span class="title">审批人</span>
 				<div class="content" ng-bind="::order.auditor"></div>
 			</div>
+		</div>
+		<div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">委外员</span>
 				<div class="content" ng-bind="::order.user.userName"></div>

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -71,11 +71,12 @@
     height: 34px;
     z-index: 3;
     position: absolute;
-    background: #5078cb;
-    border: 1px solid #5078cb;
+    background: #bfbfbf;
+    border: 1px solid #bfbfbf;
 }
 .purchase_form01 ul li .input-group .form-control {
-width:152px;
+    width:152px;
+    border: #bfbfbf 1px solid;
 	}
 .purchase_form01 ul li .dropdown-menu li{
   line-height: 30px;

src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -71,12 +71,20 @@
     height: 34px;
     z-index: 3;
     position: absolute;
+    background: #bfbfbf;
+    border: 1px solid #bfbfbf;
+}
+.purchase_form01 ul li .input-group .input-group-btn .btn-sm:focus{
     background: #5078cb;
-    border: 1px solid #5078cb;
 }
 .purchase_form01 ul li .input-group .form-control {
-width:146px;
+    width:146px;
+    background: #fff;
+    border: #bfbfbf 1px solid;
 	}
+.purchase_form01 ul li .input-group .form-control:focus{
+    border: #5078cb 1px solid;
+}
 .purchase_form01 ul li .dropdown-menu li{
   line-height: 30px;
 }
@@ -518,8 +526,8 @@ width:146px;
                     </ul>
                 </div>
                 <div class="save">
-                	<a href="#" ng-click="save()">保存</a> 
-                	<a href="#" ng-click="submit()">提交</a> 
+                	<button href="#" ng-click="save()">保存</button>
+                	<button href="#" ng-click="submit()">提交</button>
                 </div>
             </div>
         </div>

src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -136,19 +136,26 @@ select.select-menu::-ms-expand {
 
 .purc-tender .date-picker input {
 	border-radius: 0;
-	border: 1px solid #5078cb;
+	border: 1px solid #bfbfbf;
 	border-right: none;
 	font-size: 12px;
+    background: #fff;
+    font-size: 14px;
 }
 
 .purc-tender .date-picker span .btn-open {
 	color: #fff;
-	background-color: #5078cb;
+	background-color: #bfbfbf;
 	border-radius: 0;
-	border: 1px solid #5078cb;
+	border: 1px solid #bfbfbf;
 	border-left: none;
 }
-
+.purc-tender .date-picker input:focus{
+    border: #5078cb 1px solid;
+}
+.purc-tender .date-picker span .btn-open:focus{
+    background: #5078cb;
+}
 /* 修改本页内btn的样式 及datepicker中的btn-success的样式 */
 .tender-content .date-picker .btn {
 	border-radius: 0;

src/main/webapp/resources/tpl/index/purc/modal/product_kindChoose_modal.html

@@ -366,7 +366,6 @@
 <!-- 类目修改模态框，修改类目名称 -->
 <div class="modal-header">
 	<h3 class="modal-title">
-		<i class="fa fa-fw fa-sitemap text-default"></i>
 		<span>选择类目（只能选择子类目）</span>
 	</h3>
 </div>

src/main/webapp/resources/tpl/index/purc/modal/purc_order_custProd.html

@@ -1,6 +1,8 @@
 <div class="modal-body" style="min-height: 500px;">
-	<div class="headerline">
-		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择客户物料</span>
+	<div class="modal-header">
+		<h3 class="modal-title">
+			<span>采购订单 - 选择客户物料</span>
+		</h3>
 	</div>
 	<form class="form-horizontal">
 		<div class="form-group">

src/main/webapp/resources/tpl/index/purc/modal/purc_order_vendor.html

@@ -21,9 +21,11 @@
 	line-height: 36px;
 }
 </style>
-<div class="modal-body">
-	<div class="headerline">
-		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择供应商</span>
+<div class="modal-body" style="padding-top: 0;">
+	<div class="modal-header" style="margin-bottom: 10px;">
+		<h3 class="modal-title">
+			<span>采购订单 - 选择供应商</span>
+		</h3>
 	</div>
 	<form class="form-horizontal">
 		<div class="form-group" id="window-search">
@@ -75,5 +77,5 @@
 		<br>
 	</div>
 	<button class="btn btn-success btn-sm" ng-if="ensure && prod" ng-click="checkVendor(vendorInfo)">确定</button>
-	<button class="btn btn-danger btn-sm" ng-click="cancel()" type="button">取消</button>
+	<button class="btn btn-warning btn-sm" ng-click="cancel()" type="button">取消</button>
 </div>

src/main/webapp/resources/tpl/index/purc/tender.html

@@ -135,19 +135,30 @@ select.select-menu::-ms-expand {
 
 .purc-tender .date-picker input {
 	border-radius: 0;
-	border: 1px solid #5078cb;
+	border: 1px solid #bfbfbf;
 	border-right: none;
+    background: #fff;
 	font-size: 12px;
 }
-
+.tender-content>div>div.btn-save>button{
+    background: #5078cb;
+}
 .purc-tender .date-picker span .btn-open {
 	color: #fff;
-	background-color: #5078cb;
+	background-color: #bfbfbf;
 	border-radius: 0;
-	border: 1px solid #5078cb;
+	border: 1px solid #bfbfbf;
 	border-left: none;
 }
-
+.purc-tender .date-picker input{
+    font-size: 14px;
+}
+.purc-tender .date-picker span .btn-open:focus{
+    background: #5078cb;
+}
+.input-group input:focus{
+    border: #5078cb 1px solid;
+}
 /* 修改本页内btn的样式 及datepicker中的btn-success的样式 */
 .tender-content .date-picker .btn {
 	border-radius: 0;
@@ -268,12 +279,9 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-content>div>div.btn-publish>button {
-	background-color: #327EBE;
+	background-color: #5078cb;
 }
 
-.tender-content>div>div.btn-save>button {
-	background-color: #32bebc;
-}
 
 .read-only {
 	border: none;

src/main/webapp/resources/tpl/index/purc/tender_evaluation.html

@@ -89,7 +89,10 @@
     .bid-content > div > div.btn-bid > button {
         background-color: #327EBE;
     }
-
+    .bid-content > div > div.btn-bid > button:hover{
+        background: #3a89d1;
+        color: #fff;
+    }
     /* 列表内容 */
     .tender-table {
         padding: 0 20px;
@@ -179,7 +182,7 @@
         text-overflow: ellipsis;
     }
     .tender-list02 .comment-oder-list,.comment-oder-list dl{width: 100%;margin:0 auto;}
-    .tender-list02 .comment-oder-list dl dt,.comment-oder-list dl dd{width: 100%;margin: 0 auto;border-bottom: #ccc 1px dashed;height: 50px;line-height: 50px;}
+    .tender-list02 .comment-oder-list dl dt,.comment-oder-list dl dd{width: 100%;margin: 0 auto;border-bottom: #ccc 1px dashed;height: 50px;line-height: 50px;     overflow: hidden;}
     .tender-list02 .comment-oder-list dl dt span.wid01{ text-align: left; padding-left: 30px;}
     .tender-list02 .comment-oder-list dl dd span.wid01{ text-align: left; padding-left: 30px;}
     .tender-list02 .comment-oder-list dl span{font-size: 14px;width: 9.1%;float: left;color: #323232 !important; line-height: 50px; position: relative;overflow: hidden;}

src/main/webapp/resources/tpl/index/purc/vendor_detail.html

@@ -72,6 +72,9 @@
                         <span>{{contact.email}}</span>
                         <span class="wid02"><a ng-click="edit(contact)" class="edit">编辑</a><a ng-click="deleteById(contact.id, $index)">删除</a></span>
                     </dd>
+                    <dd ng-if="vendorContacts.length == 0">
+                        <span style="width: 100%; color: #999;">您还未添加供应商联系人!</span>
+                    </dd>
                 </dl>
             </div>
             <div class="com_title01">

src/main/webapp/resources/tpl/index/sale/customer_detail.html

@@ -71,6 +71,9 @@
                         <span>{{contact.email}}</span>
                         <span class="wid02"><a ng-click="edit(contact)" class="edit">编辑</a><a ng-click="deleteById(contact.id, $index)">删除</a></span>
                     </dd>
+                    <dd ng-if="Contacts.length == 0">
+                        <span style="width: 100%; color: #999;">您还未添加客户联系人!</span>
+                    </dd>
                 </dl>
             </div>
             <div class="com_title01"><span>已分配人员</span><a ng-click="addUserInfo()">+新增分配人员</a></div>
@@ -94,6 +97,9 @@
                         <span ng-bind="::userinfo.user.userEmail"></span>
                         <span class="wid02"><!--<a>删除</a>--></span>
                     </dd>
+                    <dd ng-if="userdata.content.length == 0">
+                        <span style="width: 100%; color: #999;">当前客户还未分配人员!</span>
+                    </dd>
                     <dd>
                        <div class="col-md-8 col-md-offset-1 col-sm-10 col-sm-offset-0 col-xs-12 col-xs-offset-0" style="margin-top: 10px;">
 						<a ng-disabled="userdata.first"

src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -2,57 +2,60 @@
 	#order-detail-list .table-default tbody tr td{
 		vertical-align: top;
 	}
+	.pub-com_head span.fr {
+		margin-right: 20px;
+		color: #959595;
+		float: right;
+	}
+	.pub-com_head span.fr em {
+		margin-right: 50px;
+		font-size: 14px;
+		font-style: inherit;
+	}
 </style>
 <div class="pane base-info" id="order-detail-list">
 	<div class="pub-com_head">
 		<span>客户询价单</span>
+		<span class="fr"><em>制单人：{{inquiry.recorder}}</em><time>制单日期：{{inquiry.date | date:'yyyy-MM-dd'}}</time></span>
 	</div>
 	<div class="pane-body">
 		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">单据信息</span>&nbsp;
+			<span class="f14">单据信息</span>
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
-				<span class="title">流水号</span>
+				<span class="title">流水号：</span>
 				<div class="content" ng-bind="::inquiry.code"></div>
 			</div>
-			<div class="col-xs-3">
-				<span class="title">日期</span>
-				<div class="content" ng-bind="::inquiry.date | date:'yyyy-MM-dd'"></div>
-			</div>
 			<div class="col-xs-6">
-				<span class="title">客户</span>
+				<span class="title">客户：</span>
 				<div class="content" ng-bind="::inquiry.enterprise.enName"></div>
 			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">录单人</span>
-				<div class="content" ng-bind="::inquiry.recorder"></div>
-			</div>
 			<div class="col-xs-3">
-				<span class="title">审核人</span>
-				<div class="content" ng-bind="::inquiry.auditor"></div>
-			</div>
-			<div class="col-xs-6">
-				<span class="title">备注</span>
-				<div class="content" ng-bind="::inquiry.remark"></div>
+				<span class="title">截止报价：</span>
+				<div class="content" ng-bind="::inquiry.endDate | date:'yyyy-MM-dd'"></div>
 			</div>
 		</div>
 		<div class="row row-sm item">
 			<div class="col-xs-3">
-				<span class="title">截止报价</span>
-				<div class="content" ng-bind="::inquiry.endDate | date:'yyyy-MM-dd'"></div>
+				<span class="title">审核人：</span>
+				<div class="content" ng-bind="::inquiry.auditor"></div>
 			</div>
 			<div class="col-xs-3">
-				<span class="title">环保要求</span>
+				<span class="title">环保要求：</span>
 				<div class="content" ng-bind="::inquiry.environment"></div>
 			</div>
 			<div class="col-xs-6">
-				<span class="title">价格种类</span>
+				<span class="title">价格种类：</span>
 				<div class="content" ng-bind="::inquiry.priceType"></div>
 			</div>
 		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<span class="title">备注：</span>
+				<div class="content" ng-bind="::inquiry.remark"></div>
+			</div>
+		</div>
 		<div class="headerline" ng-if="inquiry.attachs.length">
 			<span class="content">附件</span>
 		</div>

src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -14,15 +14,15 @@
 			<span style="color: rgb(211,37,38);">*</span>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-4">
+			<div class="col-xs-3">
 				<span class="title">采购单号：</span>
 				<div class="content" ng-bind="::order.code"></div>
 			</div>
-			<div class="col-xs-4">
+			<div class="col-xs-3">
 				<span class="title">日期：</span>
 				<div class="content" ng-bind="::order.date | date:'yyyy-MM-dd'"></div>
 			</div>
-			<div class="col-xs-4">
+			<div class="col-xs-6">
 				<span class="title">客户：</span>
 				<div class="content" ng-bind="::order.enterprise.enName"></div>
 			</div>
@@ -36,10 +36,12 @@
 				<span class="title">录单人：</span>
 				<div class="content" ng-bind="::order.recorder"></div>
 			</div>
-			<div class="col-xs-3">
+			<div class="col-xs-6">
 				<span class="title">审批人：</span>
 				<div class="content" ng-bind="::order.auditor"></div>
 			</div>
+		</div>
+		<div class="row row-sm item">
 			<div class="col-xs-3">
 				<span class="title">采购员：</span>
 				<div class="content" ng-bind="::order.user.userName"></div>

src/main/webapp/resources/tpl/index/sale/quotation.html

@@ -137,7 +137,18 @@
 }
 </style>
 <div class="block">
-	<div class="condition block">
+	<div class="pub-com_head">
+		<span>主动报价单</span>
+		<div class="p-right">
+			<a  ui-sref="sale.quotation.new">
+				<i class="fa fa-plus-square-o"></i> 新增
+			</a>
+			<a ui-sref="sale.quotation.list">
+				<i class="fa fa-list"></i> 列表
+			</a>
+		</div>
+	</div>
+	<!--<div class="condition block">
 		<div class="row">
 			<div class="col-xs-10">
 				<div class="f16 text-default text-bold" style="line-height: 30px;">
@@ -160,6 +171,6 @@
 				</div>
 			</div>
 		</div>
-	</div>
+	</div>-->
 	<div ui-view></div>
 </div>

src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -146,10 +146,10 @@
 		<tr>
 			<td class="text-center" colspan="7">
 				<br>
-				<div class="text-muted"><h3><i class="fa fa-spinner"></i> 当前没有对应的单据</h3></div>
+				<div class="text-muted"><h3><!--<i class="fa fa-spinner"></i> -->当前没有对应的单据</h3></div>
 				<br>
 				<div>
-					<a ui-sref="sale.quotation.new">立即向客户主动报价</a>
+					<a ui-sref="sale.quotation.new" class="f14 blue">立即向客户主动报价</a>
 				</div>
 			</td>
 		</tr>

src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -83,15 +83,32 @@
 	height: 50px;
 	padding-top: 11px;
 }
+.form-horizontal .control-label{
+	text-align: left;
+	padding-left: 25px;
+}
+.form-horizontal .form-control{
+	border: #bfbfbf 1px solid !important;
+	height: 34px;
+	background: #fff;
+	font-size: 14px;
+}
+.form-horizontal .input-group-btn button{
+	height: 34px;
+	border: #bfbfbf 1px solid !important;
+	background: #bfbfbf;
+	font-size: 14px;
+	color: #fff;
+}
 </style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div class="title-div" style="border-bottom: 1px dashed #327ebe; margin-bottom: 10px;">
+	<span class="f14">基本信息</span>&nbsp;
+</div>
 <div class="block new">
 	<form class="form-horizontal" name="quotationForm">
-		<div class="title-div" style="border-bottom: 1px dashed #327ebe; margin-bottom: 10px;">
-			<span class="f14">基本信息</span>&nbsp;
-		</div>
 		<div style="position: relative;">
 			<div ng-if="item.quotation.status == 100" class="status">在录入</div>
 			<div ng-if="item.quotation.status == 101 && item.agreed == null" class="status">已提交</div>
@@ -113,7 +130,7 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm" ng-if="item.quotation.code">
-			<label for="code" class="col-sm-2 control-label">单据编号</label>
+			<label for="code" class="col-sm-2 control-label">单据编号：</label>
 			<div class="col-sm-4">
 				<div class="">
 					<input ng-model="item.quotation.code" readonly="readonly" type="text" class="form-control" id="code" 
@@ -122,7 +139,7 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm has-feedback">
-			<label for="customer" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>客户</label>
+			<label for="customer" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>客户：</label>
 			<div class="col-sm-4">
 				<div class="">
 					<input ng-model="item.quotation.cust.enName" readonly="readonly" type="text" class="form-control" id="customer" 
@@ -135,7 +152,7 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm has-feedback">
-			<label for="customerUser" class="col-sm-2 control-label">客户联系人</label>
+			<label for="customerUser" class="col-sm-2 control-label">客户联系人：</label>
 			<div class="col-sm-4">
 				<div class="">
 					<input ng-model="item.quotation.custUser.userName" type="text" class="form-control input-dbfind" id="custUser" 
@@ -148,7 +165,7 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm has-feedback">
-			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料</label>
+			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料：</label>
 			<div class="col-sm-4">
 				<div class="">
 					<input ng-model="item.product.code" type="text" class="form-control input-dbfind" id="product" 
@@ -168,38 +185,38 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="leadtime" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>交货周期(天)</label>
+			<label for="leadtime" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>交货周期(天)：</label>
 			<div class="col-sm-3">
 				<input ng-model="item.leadtime" type="number" class="form-control" id="leadtime" 
 					placeholder="只可以为整数" ng-readonly="!item.$editing" ng-required="true">
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="brand" class="col-sm-2 control-label">物料品牌</label>
+			<label for="brand" class="col-sm-2 control-label">物料品牌：</label>
 			<div class="col-sm-3">
 				<input ng-model="item.brand" type="text" class="form-control" id="brand" 
 				placeholder="物料品牌" ng-readonly="!item.$editing">
 			</div>
-			<label for="vendorprodcode" class="col-sm-2 control-label">供应商物料编号</label>
+			<label for="vendorprodcode" class="col-sm-2 control-label">供应商物料编号：</label>
 			<div class="col-sm-3">
 				<input ng-model="item.vendorprodcode" type="text" class="form-control" id="vendorprodcode" 
 					placeholder="供应商物料编号" ng-readonly="!item.$editing">
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="minPackQty" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>最小包装量</label>
+			<label for="minPackQty" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>最小包装量：</label>
 			<div class="col-sm-3">
 				<input ng-model="item.minPackQty" type="number" class="form-control" id="minPackQty" 
 					placeholder="最小包装量" ng-readonly="!item.$editing" ng-required="true">
 			</div>
-			<label for="minOrderQty" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>最小订购量</label>
+			<label for="minOrderQty" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>最小订购量：</label>
 			<div class="col-sm-3">
 				<input ng-model="item.minOrderQty" type="number" class="form-control" id="minOrderQty" 
 					placeholder="最小订购量" ng-readonly="!item.$editing" ng-required="true">
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="date" class="col-sm-2 control-label">录入日期</label>
+			<label for="date" class="col-sm-2 control-label">录入日期：</label>
 			<div class="col-sm-3">
 				<div class="input-group">
 					<input ng-model="item.quotation.date" type="text" class="form-control" id="date" placeholder="录入日期"
@@ -212,7 +229,7 @@
 					</span>
 				</div>
 			</div>
-			<label for="endDate" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>价格有效日期</label>
+			<label for="endDate" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>价格有效日期：</label>
 			<div class="col-sm-3">
 				<div class="input-group">
 					<input ng-model="item.quotation.endDate" type="text" class="form-control" id="endDate" 
@@ -231,7 +248,7 @@
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="currency" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>币别</label>
+			<label for="currency" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>币别：</label>
 			<div class="col-sm-3">
 				<select ng-model="item.quotation.currency" class="form-control" id="currency" ng-readonly="!item.$editing">
 					<option value="RMB">RMB 人民币</option>
@@ -240,14 +257,14 @@
 					<option value="HKD">HKD 港币</option>
 				</select>
 			</div>
-			<label for="taxrate" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>税率</label>
+			<label for="taxrate" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>税率：</label>
 			<div class="col-sm-3">
 				<input ng-model="item.quotation.taxrate" type="text" class="form-control" id="taxrate" 
 					placeholder="税率" ng-readonly="!item.$editing" ng-required="true">
 			</div>
 		</div>
 		<div class="form-group form-group-sm">
-			<label for="remark" class="col-sm-2 control-label">备注</label>
+			<label for="remark" class="col-sm-2 control-label">备注：</label>
 			<div class="col-sm-5">
 				<textarea ng-model="item.quotation.remark" class="form-control" rows="3" cols="3" id="remark" 
 					placeholder="备注" ng-readonly="!item.$editing">
@@ -277,8 +294,8 @@
 					ng-pattern="/^[1-9]\d*\.{0,1}\d*|0\.\d*[1-9]\d*$/" ng-readonly="!item.$editing" ng-required="true">
 			</div>
 			<label class="col-sm-3" style="line-height: 30px;">
-				<a ng-if="!$first && item.$editing" href="javascript:void(0)" ng-click="removePrice($index)"><i class="fa fa-trash-o"></i> 删除</a>&nbsp;&nbsp;&nbsp;
-				<a ng-if="$last && item.$editing" href="javascript:void(0)" ng-click="addPrice()"><i class="fa fa-plus-square-o"></i> 增加</a>
+				<a ng-if="!$first && item.$editing" href="javascript:void(0)" ng-click="removePrice($index)" class="red"><i class="fa fa-trash-o"></i> 删除</a>&nbsp;&nbsp;&nbsp;
+				<a ng-if="$last && item.$editing" href="javascript:void(0)" ng-click="addPrice()" class="blue"><i class="fa fa-plus-square-o"></i> 增加</a>
 			</label>
 		</div>
 		<div class="form-group form-group-sm">
@@ -289,8 +306,8 @@
 			<div class="col-sm-3" ng-if="item.$editing && item.quotation.status == 100">
 				<button class="btn btn-info btn-sm" style="width: 100%;" ng-click="cancel()">取消</button>
 			</div>
-			<div class="col-sm-3" ng-if="item.$editing">
-				<button class="btn btn-success btn-sm" style="width: 100%;" ng-disabled="quotationForm.$invalid" ng-click="save()">保存</button>
+			<div class="col-sm-2" ng-if="item.$editing">
+				<button class="public-btn01 btn btn-success btn-sm" style="width: 100%;" ng-disabled="quotationForm.$invalid" ng-click="save()">保存</button>
 			</div>
 			<div class="col-sm-3" ng-if="!item.$editing && item.quotation.status == 100">
 				<button class="btn btn-success btn-sm" style="width: 100%;" ng-click="submit()">提交</button>

src/main/webapp/resources/tpl/index/sale/quotation_new_cust.html

@@ -1,6 +1,8 @@
-<div class="modal-body" style="min-height: 500px;">
-	<div class="headerline">
-		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>主动报价 - 选择客户</span>
+<div class="modal-body" style="min-height: 500px; padding-top: 0;">
+	<div class="modal-header" style="margin-bottom: 10px;">
+		<h3 class="modal-title">
+			<span>主动报价 - 选择客户</span>
+		</h3>
 	</div>
 	<form class="form-horizontal">
 		<div class="form-group" id="window-search">

src/main/webapp/resources/tpl/index/sale/quotation_new_custProd.html

@@ -1,6 +1,8 @@
-<div class="modal-body" style="min-height: 500px;">
-	<div class="headerline">
-		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>主动报价 - 选择客户物料</span>
+<div class="modal-body" style="min-height: 500px; padding-top: 0;">
+	<div class="modal-header" style="margin-bottom: 10px;">
+		<h3 class="modal-title">
+			<span>主动报价 - 选择客户物料</span>
+		</h3>
 	</div>
 	<form class="form-horizontal">
 		<div class="form-group" id="window-search">

src/main/webapp/resources/tpl/index/sale/sample_send.html

@@ -5,6 +5,34 @@
 	.modal-body .row{
 		line-height: 34px;
 	}
+	.modal-content{
+		width: 720px;
+	}
+	.sampleSend .modal-body .row{
+		margin: 0;
+		line-height: 34px;
+		margin-bottom: 10px;
+	}
+	.sampleSend .modal-body .row .form-control{
+		height: 34px;
+		border: #bfbfbf 1px solid;
+		font-size: 14px;
+	}
+	.input-group-addon{
+		width: 60px;
+		padding: 0;
+		font-size: 12px;
+		background: #fff;
+	}
+	.input-group[class*="col-"]{
+		float: left;
+	}
+	.modal-footer{
+		border-top: none;
+		border-top: none;
+		margin-right: 18px;
+		margin-top: 20px;
+	}
 </style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
@@ -14,116 +42,134 @@
 </div>
 <form class="sampleSend" name="sampleSendForm"
 	ng-submit="ok(sampleSendForm)" novalidate>
-	<div class="modal-body" style="height: 450px; overflow-y: auto;">
+	<div class="modal-body" style="height: 500px;padding: 25px;">
 		<div class="row">
-			<label class="col-md-2 col-sm-2 col">物料：</label>
-			<div class="col-md-4 col-sm-4 col">{{sampleItem.proofing.product.title}}
-			</div>
 			<label class="col-md-2 col-sm-2 col">客户：</label>
-			<div class="col-md-4 col-sm-4 col">{{sampleItem.proofing.enterprise.enName}}
+			<div class="col-md-4 col-sm-4 col">{{sampleItem.proofing.enterprise.enName}}</div>
+			<label class="col-md-2 col-sm-2 col">最小订购量：</label>
+			<div class="col-md-4 col-sm-4 col input-group">
+				<input ng-model="sampleItem.sampleSend.minBuyQty" placeholder="整数"
+					   class="form-control input-sm" type="number"> <span
+					style="width: 30px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
+			</div>
+		</div>
+		<div class="row">
+			<label class="col-md-2 col-sm-2 col">物料：</label>
+			<div class="col-md-4 col-sm-4 col">{{sampleItem.proofing.product.title}}</div>
+			<label class="col-md-2 col-sm-2 col">最小包装量：</label>
+			<div class="col-md-4 col-sm-4 col input-group">
+				<input ng-model="sampleItem.sampleSend.minQty" placeholder="整数"
+					   class="form-control input-sm" type="number"> <span
+					style="width: 30px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
 			</div>
 		</div>
 		<div class="row">
 			<label class="col-md-2 col-sm-2 col">规格：</label>
 			<div class="col-md-4 col-sm-4 col">{{sampleItem.proofing.product.spec}}</div>
-			<label class="col-md-2 col-sm-2 col"><strong
-				class="text-inverse">*</strong>数量：</label>
-			<div class="col-md-4 col-sm-4 col input-group"
-				ng-init="sampleItem.sampleSend.sendQty = sampleItem.qty">
-				<input ng-model="sampleItem.sampleSend.sendQty" required placeholder="必填，整数"
-					class="form-control input-sm" type="number"
-					max="{{sampleItem.qty}}" min="0"> <span
-					style="width: 56px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
+			<label class="col-md-2 col-sm-2 col">生产厂型号：</label>
+			<div class="col-md-4 col-sm-4 col">
+				<input ng-model="sampleItem.sampleSend.vendSpec"
+					   class="form-control input-sm" type="text">
 			</div>
 		</div>
-		<div class="row" style="">
-			<label class="col-md-2 col-sm-2 col"><strong
-				class="text-inverse">*</strong>送样单号：</label>
+		<div class="row">
+			<label class="col-md-2 col-sm-2 col">单位：</label>
 			<div class="col-md-4 col-sm-4 col">
-				<input ng-model="sampleItem.sampleSend.code"
-					class="form-control input-sm" type="text" required placeholder="必填">
+				<input ng-model=""
+					   class="form-control input-sm" type="text">
+			</div>
+			<label class="col-md-2 col-sm-2 col">品牌：</label>
+			<div class="col-md-4 col-sm-4 col">
+				<input ng-model="sampleItem.sampleSend.brand"
+					   class="form-control input-sm" type="text">
+			</div>
+		</div>
+		<div class="row">
+			<label class="col-md-2 col-sm-2 col"><strong
+					class="text-inverse">*</strong>数量：</label>
+			<div class="col-md-4 col-sm-4 col input-group"
+				 ng-init="sampleItem.sampleSend.sendQty = sampleItem.qty">
+				<input ng-model="sampleItem.sampleSend.sendQty" required placeholder="必填，整数"
+					   class="form-control input-sm" type="number"
+					   max="{{sampleItem.qty}}" min="0"> <span
+					style="width: 30px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
 			</div>
 			<label class="col-md-2 col-sm-2 col">单重：</label>
 			<div class="col-md-4 col-sm-4 col input-group">
 				<input ng-model="sampleItem.sampleSend.weight" placeholder="仅限整数或小数"
-					class="form-control input-sm" type="text"
-					ng-pattern="/^\d*\.{0,1}\d*$/"> <span
-					style="width: 56px;" class="input-group-addon">g</span>
+					   class="form-control input-sm" type="text"
+					   ng-pattern="/^\d*\.{0,1}\d*$/"> <span
+					style="width: 30px;" class="input-group-addon">g</span>
 			</div>
 		</div>
-		<div class="row" style="">
+		<div class="row">
+			<label class="col-md-2 col-sm-2 col"><strong
+					class="text-inverse">*</strong>送样单号：</label>
+			<div class="col-md-4 col-sm-4 col">
+				<input ng-model="sampleItem.sampleSend.code"
+					   class="form-control input-sm" type="text" required placeholder="必填">
+			</div>
 			<label class="col-md-2 col-sm-2 col">材料：</label>
 			<div class="col-md-4 col-sm-4 col">
 				<input ng-model="sampleItem.sampleSend.material"
-					class="form-control input-sm" type="text">
-			</div>
-			<label class="col-md-2 col-sm-2 col">口水料比例：</label>
-			<div class="col-md-4 col-sm-4 col input-group">
-				<input ng-model="sampleItem.sampleSend.ratio"
-					class="form-control input-sm" type="number" placeholder="整数">
-				<span style="width: 56px;" class="input-group-addon">%</span>
+					   class="form-control input-sm" type="text">
 			</div>
 		</div>
-		<div class="row" style="">
+		<div class="row">
+			<label class="col-md-2 col-sm-2 col">币别：</label>
+			<div class="col-md-4 col-sm-4 col">
+				<select class="form-control">
+					<option value="1">币别</option>
+				</select>
+			</div>
 			<label class="col-md-2 col-sm-2 col">材质：</label>
 			<div class="col-md-4 col-sm-4 col">
 				<input ng-model="sampleItem.sampleSend.materialQuality"
-					class="form-control input-sm" type="text">
+					   class="form-control input-sm" type="text">
 			</div>
-			<label class="col-md-2 col-sm-2 col">最小订购量：</label>
+		</div>
+		<div class="row">
+			<label class="col-md-2 col-sm-2 col">税率：</label>
 			<div class="col-md-4 col-sm-4 col input-group">
-				<input ng-model="sampleItem.sampleSend.minBuyQty" placeholder="整数"
-					class="form-control input-sm" type="number"> <span
-					style="width: 56px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
+				<input class="form-control input-sm" type="text">
+				<span style="width: 30px;" class="input-group-addon">%</span>
 			</div>
-		</div>
-		<div class="row" style="">
 			<label class="col-md-2 col-sm-2 col">产地：</label>
 			<div class="col-md-4 col-sm-4 col">
 				<input ng-model="sampleItem.sampleSend.adress"
-					class="form-control input-sm" type="text">
-			</div>
-			<label class="col-md-2 col-sm-2 col">最小包装数：</label>
-			<div class="col-md-4 col-sm-4 col input-group">
-				<input ng-model="sampleItem.sampleSend.minQty" placeholder="整数"
-					class="form-control input-sm" type="number"> <span
-					style="width: 56px;" class="input-group-addon">{{sampleItem.proofing.product.unit}}</span>
+					   class="form-control input-sm" type="text">
 			</div>
 		</div>
-		<div class="row" style="">
+		<div class="row">
+			<label class="col-md-2 col-sm-2 col">采购单价：</label>
+			<div class="col-md-4 col-sm-4 col">
+				<input ng-model="sampleItem.sampleSend.puprice"
+					   class="form-control input-sm" type="text" placeholder="仅限整数或小数"
+					   ng-pattern="/^\d*\.{0,1}\d*$/">
+			</div>
 			<label class="col-md-2 col-sm-2 col">产地识别：</label>
 			<div class="col-md-4 col-sm-4 col">
 				<input ng-model="sampleItem.sampleSend.addressMark"
-					class="form-control input-sm" type="text">
+					   class="form-control input-sm" type="text">
 			</div>
+		</div>
+		<div class="row">
 			<label class="col-md-2 col-sm-2 col">交货周期：</label>
 			<div class="col-md-4 col-sm-4 col input-group">
 				<input ng-model="sampleItem.sampleSend.delivery" placeholder="整数"
-					class="form-control input-sm" type="number"> <span
-					style="width: 56px;" class="input-group-addon">天</span>
-			</div>
-		</div>
-		<div class="row" style="">
-			<label class="col-md-2 col-sm-2 col">品牌：</label>
-			<div class="col-md-4 col-sm-4 col">
-				<input ng-model="sampleItem.sampleSend.brand"
-					class="form-control input-sm" type="text">
+					   class="form-control input-sm" type="number"> <span
+					style="width: 30px;" class="input-group-addon">天</span>
 			</div>
-			<label class="col-md-2 col-sm-2 col">采购单价：</label>
-			<div class="col-md-4 col-sm-4 col">
-				<input ng-model="sampleItem.sampleSend.puprice"
-					class="form-control input-sm" type="text" placeholder="仅限整数或小数"
-					ng-pattern="/^\d*\.{0,1}\d*$/">
+			<label class="col-md-2 col-sm-2 col">口水料比例：</label>
+			<div class="col-md-4 col-sm-4 col input-group">
+				<input ng-model="sampleItem.sampleSend.ratio"
+					   class="form-control input-sm" type="number" placeholder="整数">
+				<span style="width: 30px;" class="input-group-addon">%</span>
 			</div>
 		</div>
-		<div class="row" style="">
-			<label class="col-md-2 col-sm-2 col">生产厂型号：</label>
-			<div class="col-md-4 col-sm-4 col">
-				<input ng-model="sampleItem.sampleSend.vendSpec"
-					class="form-control input-sm" type="text">
-			</div>
+		<div class="row">
 			<label class="col-md-2 col-sm-2 col">附件：</label>
-			<div class="col-md-4 col-sm-4 col">
+			<div class="col-md-10 col-sm-10 col">
 				<input type="file" ng-model="attachFile" ng-file-select
 					ng-multiple="false" class="form-control input-sm" name="attachFile"
 					id="attachFile">

src/main/webapp/resources/tpl/index/sale/send.html

@@ -289,7 +289,7 @@
 					ng-bind="::item.orderItem.product.spec"></div>
 				<div class="text-bold text-inverse" ng-if="item.orderItem.factory">送货工厂：<span ng-bind="::item.orderItem.factory"></span></div>					
 			</td>
-			<td class="text-right">
+			<td class="text-left">
 				<div class="text-num">
 					<span ng-bind="::currency(send.currency)"></span>
 					<span ng-bind="::item.price | number:6"></span>

src/main/webapp/resources/tpl/index/sale/send_detail.html

@@ -50,7 +50,7 @@
 				<span class="title">发货单号</span>
 				<div class="content" ng-bind="::order.code"></div>
 			</div>
-			<div class="col-xs-3">
+			<div class="col-xs-6">
 				<span class="title">发货日期</span>
 				<div class="content" ng-bind="::order.date | date:'yyyy-MM-dd HH:mm:ss'"></div>
 			</div>
@@ -191,7 +191,7 @@
 				<table class="block table table-default table-striped table-hover">
 					<thead>
 						<tr class="header">
-							<th width="50px" class="br-r">
+							<th width="60px" class="br-r">
 							<input type="checkBox" ng-model="checkbars.checked" ng-click="checkBarAll()" />&nbsp;全选</th>
 							<th width="40px" class="br-r">序号</th>
 							<th width="110px">物料信息</th>

src/main/webapp/resources/tpl/index/sale/tender.html

@@ -51,7 +51,7 @@
     /* 输入框 */
     .bid-input {
         border: none;
-        border-bottom: 1px solid #323232;
+        border-bottom: 1px solid #bfbfbf;
         text-align: center;
     }
     .bid-input:focus{
@@ -311,7 +311,7 @@
                                     <span class="wid01">
                                         <p>产品型号：{{prod.prodCode}}</p>
                                         <p>产品类型：{{prod.prodTitle}}</p>
-                                        <p>品牌：<span ng-bind="prod.brand || ''"></span></p>
+                                        <p>品牌：<i ng-bind="prod.brand || ''" style="font-style: inherit"></i></p>
                                     </span>
                                     <span ng-bind="prod.unit"></span>
                                     <span ng-bind="prod.qty"></span>

src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -114,9 +114,11 @@
     }
 
     .tender-table > tbody.not-done > tr:nth-child(odd) {
-        height: 100px;
+        height: 140px;
+    }
+    .tender-table > tbody.not-done > tr td div{
+        line-height: 25px;
     }
-
     .tender-table tbody.not-done > tr:nth-child(odd):hover {
         border: 2px solid #D32526;
 
@@ -165,6 +167,18 @@
     .list-num {
         text-align: right;
     }
+    .pro-line-sty01 td div{
+        padding-left: 10px;
+    }
+    .pro-line-sty02{
+        height: 120px;
+    }
+    .pro-line-sty02 td div{
+        line-height: 25px;
+    }
+    .main-content{
+        border: #e8e8e8 1px solid;
+    }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div ng-controller="SaleTenderCtrl" id="public">
@@ -461,7 +475,7 @@
                 </tr>
             </tbody>-->
             <tbody class="is-done" ng-repeat="tender in $data" ng-show="active == 'done' || active == 'waiting'">
-            <tr>
+            <tr class="pro-line-sty01">
                 <td class="list-notnum" width="350">
                     <div>招标标题：{{tender.title}}</div>
                     <div>
@@ -499,7 +513,7 @@
                     <!--</div>-->
                 <!--</td>-->
             </tr>
-            <tr ng-repeat="tenderProd in tender.purchaseTenderProds | orderBy : '- id'" ng-show="tenderProd.currentItem.price"><!--  ng-show="tenderProd.currentItem.price" -->
+            <tr ng-repeat="tenderProd in tender.purchaseTenderProds | orderBy : '- id'" ng-show="tenderProd.currentItem.price" class="pro-line-sty02"><!--  ng-show="tenderProd.currentItem.price" -->
                 <td class="list-notnum" width="350">
                     <div>产品名称：{{tenderProd.prodTitle}}</div>
                     <div>产品型号：{{tenderProd.prodCode}}</div>

src/main/webapp/resources/tpl/index/search/search_result.html

@@ -202,6 +202,12 @@
 #message {
 	display: -webkit-inline-box;
 }
+	td{
+		font-size: 14px;
+	}
+	.enterprise-table tbody .text-muted span{
+		margin-right: 15px;
+	}
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;">
 	<div class="tip-body">
@@ -244,11 +250,11 @@
 				<td width="220" class="text-center text-muted" ng-if="enterprise.status == 313">
 					<span ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">当前企业还不是您的合作伙伴</span>
 					<span ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
-					<span ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</a>
-					<span ng-if="enterprise.requestStatus==313">合作伙伴</a>
+					<span ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
+					<span ng-if="enterprise.requestStatus==313">合作伙伴</span>
 				</td>
 				<td width="220" class="text-center text-muted" ng-if="enterprise.status != 313">
-					<span>当前企业不是优软云用户</a>
+					<span>当前企业不是优软云用户</span>
 				</td>
 			</tr>
 			<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">