Browse Source

文字字段、细节修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8714 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 years ago
parent
commit
f2d385d977

+ 3 - 4
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -40,8 +40,7 @@
 }
 
 .order-table td .main strong {
-	font-size: 18px;
-	letter-spacing: 2px;
+	font-size: 14px;
 	font-family: "微软雅黑";
 	color: #666;
 }
@@ -124,7 +123,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" title="新增对账单"><big><img src="static/img/icon/add.png" style="margin-right: 3px;">新增对账单</big></a>&nbsp;&nbsp;&nbsp;
 				<a href="sale/apCheck/allxls?_state={{active}}&searchFilter={{searchFilterXls}}" 
-					target="_self" title="导出Excel表格" class="blue f14"><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>导出</a>
 			</div>
 		</div>
 	</div>
@@ -230,7 +229,7 @@
 					<div class="main">
 						<strong><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.custName}}</strong>
 						<span class="text-muted">
-							  对账期间:<span class="f16 text-num">{{::check.beginDate | date:'yyyy/MM/dd'}} - {{::check.endDate | date:'yyyy/MM/dd'}}</span>
+							  对账期间:<span class="f14 text-num">{{::check.beginDate | date:'yyyy/MM/dd'}} - {{::check.endDate | date:'yyyy/MM/dd'}}</span>
 						</span>
 					</div>
 					<div class="static">

+ 2 - 3
src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -37,8 +37,7 @@
 }
 
 .order-table td .main strong {
-	font-size: 18px;
-	letter-spacing: 2px;
+	font-size: 14px;
 	font-family: "微软雅黑";
 	color: #666;
 }
@@ -183,7 +182,7 @@
 					<div class="main">
 						<strong><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.vendor.enName}}</strong>
 						<span class="text-muted">
-							  对账期间:<span class="f16 text-num">{{::check.fromDate | date:'yyyy/MM/dd'}} - {{::check.toDate | date:'yyyy/MM/dd'}}</span>
+							  对账期间:<span class="f14 text-num">{{::check.fromDate | date:'yyyy/MM/dd'}} - {{::check.toDate | date:'yyyy/MM/dd'}}</span>
 						</span>
 					</div>
 					<div class="static">

+ 3 - 8
src/main/webapp/resources/tpl/index/home/pagingRelease.html

@@ -136,7 +136,7 @@
     </div>
     <div class="menu-message">
         <div style="font-size: 14px; color: rgb(102,102,102); float: left; margin-top: 6px;margin-left: 6px;">
-            <span>消息分类:</span>
+            <span>消息状态:</span>
         </div>
         <div class="btn-group menu-status">
             <div class="btn-group">
@@ -164,7 +164,7 @@
             <span>全选</span>
         </div>
         <div ng-hide="active == 'done'" style="padding: 0 20px;">
-            <a ng-click="setRead()">为已读</a>
+            <a ng-click="setRead()">为已读</a>
         </div>
     </div>
     <table class="block table release-table"
@@ -174,7 +174,6 @@
                 <th width="40" ng-hide="active == 'done'"></th>
                 <th width="150">推送时间</th>
                 <th width="500">信息描述</th>
-                <th width="100">阅读状态</th>
                 <th width="150">阅读时间</th>
             </tr>
         </thead>
@@ -188,11 +187,7 @@
                 <div>{{releaseDetail.pagingRelease.date | date:'yyyy-MM-dd HH:mm'}}</div>
             </td>
             <td>
-                <div>{{releaseDetail.pagingRelease.context}}</div>
-            </td>
-            <td>
-                <div ng-if="releaseDetail.readStatus == 1">已读</div>
-                <div ng-if="releaseDetail.readStatus != 1" style="color: #327EBE;">未读</div>
+                <div style="text-align: left;">{{releaseDetail.pagingRelease.context}}</div>
             </td>
             <td>
                 <div>{{releaseDetail.readDate | date:'yyyy-MM-dd HH:mm'}}</div>

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -433,7 +433,7 @@ tbody td div.text-mould {
 						<div class="text-num text-bold text-ps" >
 							{{items.psCode}}-{{items.psName}}
 						</div>
-						<div class="text-center text-muted text-prod" ng-repeat="prod in items.inquiryMouldDetails">
+						<div class="text-muted text-prod" ng-repeat="prod in items.inquiryMouldDetails">
 							<div>{{prod.prodCode}}-{{prod.prodTitle}}-{{prod.prodSpec}}</div>
 						</div>
 					</div>

+ 5 - 5
src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -79,7 +79,7 @@
 	padding-top: 11px;
 }
 .form-horizontal .control-label{
-	text-align: right;
+	text-align: left;
 	padding-left: 25px;
 }
 .form-horizontal .form-control{
@@ -248,10 +248,10 @@
 			<label for="currency" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>币别:</label>
 			<div class="col-sm-4">
 				<select ng-model="item.quotation.currency" class="form-control" id="currency" ng-readonly="!item.$editing">
-					<option value="RMB">RMB 人民币</option>
-					<option value="USD">USD 美元</option>
-					<option value="EUR">EUR 欧元</option>
-					<option value="HKD">HKD 港币</option>
+					<option value="RMB">RMB</option>
+					<option value="USD">USD</option>
+					<option value="EUR">EUR</option>
+					<option value="HKD">HKD</option>
 				</select>
 			</div>
 			<label for="taxrate" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>税率:</label>