客户采购验收、验退单样式调整。

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

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

@@ -2778,7 +2778,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 #order-detail-list .row{
 	width: 96%;
 	margin: 0 auto;
-	line-height: 40px;
+	line-height: 30px;
 }
 #order-detail-list .title{
 	font-weight: inherit;

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

@@ -429,22 +429,22 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-list02 dl span {
-	width: 13%;
+	width: 13% !important;
 	font-size: 14px;
 	float: left;
 	text-align: center;
 }
 
 .tender-list02 dl span.wid01 {
-	width: 20%;
+	width: 20% !important;
 }
 
 .tender-list02 dl span.wid02 {
-	width: 20%;
+	width: 20% !important;
 }
 
 .tender-list02 dl span.wid03 {
-	width: 3%;
+	width: 3% !important;
 }
 
 .tender-list02 .editable {
@@ -911,7 +911,7 @@ input[type="radio"], input[type="checkbox"] {
                             <div class="com_title01"><span>招标明细</span><span style="opacity: 0.8; margin-left: 10px; font-weight: normal;"><i class="fa fa-info-circle"></i>您可以在页面下方选择本企业物料</span><a ng-click="uplodaByBatch()">批量导入</a></div>
                             <dl>
                                 <dt>
-                                    <span style="width: 90px;">序号</span>
+                                    <span style="width: 90px !important;">序号</span>
                                     <span class="wid01">型号</span>
                                     <span class="wid01">产品名称</span>
                                     <span class="wid02">品牌</span>
@@ -921,7 +921,7 @@ input[type="radio"], input[type="checkbox"] {
                                 </dt>
                                 <div class="scroll-y">
                                     <dd ng-repeat="prod in tenderProd" id="li01">
-                                        <span style="width: 90px;">{{$index + 1}}</span>
+                                        <span style="width: 90px !important;">{{$index + 1}}</span>
                                         <span class="wid01 codeInput">
                                             <input type="text" name="code" ng-model="prod.prodCode" ng-change="getSimilarCodes(prod.prodCode)" ng-focus="onFocus('code')" placeholder="请输入标准原厂型号" typeahead="prod.code for prod in getSimilarCodes($viewValue)" autocomplete="off" typeahead-on-select="onAssociateCmpClick($item, prod)" spellcheck = "false" required>
                                         </span>

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

@@ -12,6 +12,12 @@
 		font-size: 14px;
 		font-style: inherit;
 	}
+	.base-info .title{
+		width: 85px;
+	}
+	#order-detail-list .title-div:first-child{
+		margin-bottom: 10px;
+	}
 </style>
 <div class="pane base-info" id="order-detail-list">
 	<div class="pub-com_head">
@@ -23,7 +29,7 @@
 			<span class="f14">单据信息</span>
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<div class="col-xs-6">
 				<span class="title">验收单号：</span>
 				<div class="content" ng-bind="::accept.code"></div>
 			</div>
@@ -31,13 +37,13 @@
 				<span class="title">客户：</span>
 				<div class="content" ng-bind="::accept.enterprise.enName"></div>
 			</div>
-			<div class="col-xs-3">
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-6">
 				<span class="title">验收日期：</span>
 				<div class="content" ng-bind="::accept.date | date:'yyyy-MM-dd'"></div>
 			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-12">
+			<div class="col-xs-6">
 				<div class="title">应付供应商：</div>
 				<div class="unchanged-info">{{accept.receivename}}</div>
 			</div>
@@ -57,6 +63,12 @@
 				<div class="title">币别：</div>
 				<div class="unchanged-info">{{accept.currency}}</div>
 			</div>
+			<div class="col-xs-6">
+				<div class="title">金额：</div>
+				<div class="unchanged-info">{{accept.price}}</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>
@@ -69,9 +81,9 @@
 			<table class="block table table-default table-striped" style=" margin-bottom: 0">
 				<thead>
 					<tr class="header">
-						<th width="60">序号</th>
-						<th width="260">采购单号</th>
-						<th width="90">产品名称</th>
+						<th width="50">序号</th>
+						<th width="180">采购单号</th>
+						<th width="180">产品名称</th>
 						<th width="100">品牌</th>
 						<th width="50">单位</th>
 						<th width="60">单价</th>
@@ -85,15 +97,15 @@
 				<tbody>
 					<tr
 						ng-repeat="acceptitem in accept.acceptItems | orderBy:'number'" ng-class="{'scoroll':order.orderItems.length>10}">
-						<td width="40">
+						<td width="50">
 							<div ng-bind="::acceptitem.number">
 							</div>
 						</td>
-						<td width="270">
+						<td width="180">
 							<div ng-bind="::acceptitem.orderItem.order.code"></div>
 						</td>
-						<td class="text-center" width="90">
-							<div ng-bind="::acceptitem.orderItem.product.title"></div>
+						<td class="text-center" width="180">
+							<div><span ng-bind="::acceptitem.orderItem.product.title"></span><span ng-bind="::acceptitem.orderItem.product.cmpcode"></span></div>
 						</td>
 						<td class="text-center" width="100">
 							<div ng-bind="::acceptitem.orderItem.product.brand"></div>

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

@@ -1,156 +1,111 @@
 <style>
-    .p-right em{
-        font-style: normal;
+    #order-detail-list .table-default tbody tr td{
+        vertical-align: top;
     }
-    .p-right .fr{
-        font-size: 14px;
-        color: #959595;
+    .pub-com_head span.fr {
         margin-right: 20px;
-    }
-    .p-right span.fr em {
-        margin-right: 50px;
-        font-size: 14px;
-    }
-    .sale-content{
-        width: 100%;
-        margin: 0 auto;
-        background: #fff;
-        padding: 20px 0;
-    }
-    .sale-content .row{
-        line-height: 34px;
-        font-size: 14px;
-        margin-left: 0px;
-        margin-right: 0px;
-        padding-left: 15px;
-        padding-right: 15px;
-    }
-    .sale-content .row .title{
-        width: 75px;
-        float: left;
         color: #959595;
+        float: right;
     }
-    .sale-content .row .content{
-        text-align: left;
-    }
-    .sale-tab{
-        width: 95%;
-        margin: 0 auto;
-        margin-top: 20px;
-    }
-    .sale-tab .table{
-        margin-bottom: 0;
-        border: #cfcfcf 1px solid;
-    }
-    .sale-tab .table thead tr{
-        height: 30px;
-        background: #ebf5fe;
-    }
-    .sale-tab .table thead tr th{
-        border-bottom: none;
-        vertical-align: middle;
-        font-weight: normal;
+    .pub-com_head span.fr em {
+        margin-right: 50px;
         font-size: 14px;
-        position: relative;
-    }
-    .sale-tab .table thead tr th em{
         font-style: inherit;
-        float: right;
-        color: #9f9fa0;
-        position: absolute;
-        right: 2px;
-    }
-    .sale-tab .table tbody tr{
-        height: 40px;
     }
-    .sale-tab .table tbody tr td{
-        border-bottom: #cfcfcf 1px solid;
-        border-top: none;
-        vertical-align: middle;
-        font-size: 12px;
+    .base-info .title{
+        width: 85px;
     }
-    .sale-tab .table tbody tr:last-child td{
-        border-bottom: none;
+    #order-detail-list .title-div:first-child{
+        margin-bottom: 10px;
     }
 </style>
-<div class="ng-scope" style="width: 1170px; margin-left: -240px;">
+<div class="pane base-info" id="order-detail-list">
     <div class="pub-com_head">
-        <span>客户采购验退单</span>
-        <div class="p-right">
-            <!-- <span class="fr"><em class="ng-binding">录入人：{{::inquiryItem.inquiry.recorder}}</em><time class="ng-binding">日期：{{::inquiryItem.inquiry.date | date :'yyyy-MM-dd HH:mm'}}</time></span>-->
-        </div>
+        <span>客户采购验收单</span>
+        <span class="fr"><em>操作员：{{accept.recorder}}</em><time>日期：{{accept.date | date:'yyyy-MM-dd'}}</time></span>
     </div>
-    <div class="sale-content">
-        <div class="row">
-            <div class="col-md-3">
+    <div class="pane-body">
+        <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+            <span class="f14">单据信息</span>
+        </div>
+        <div class="row row-sm item">
+            <div class="col-xs-6">
                 <span class="title">验退单号：</span>
-                <span class="content" ng-bind="::returns.code"></span>
+                <div class="content" ng-bind="::returns.code"></div>
             </div>
-            <div class="col-md-4">
+            <div class="col-xs-6">
                 <span class="title">客户名称：</span>
-                <span class="content" ng-bind="::returns.receivename"></span>
+                <div class="content" ng-bind="::returns.receivename"></div>
             </div>
-            <div class="col-md-2">
+        </div>
+        <div class="row row-sm item">
+            <div class="col-xs-6">
                 <span class="title">验退日期：</span>
-                <span class="content" ng-bind="::returns.date | date: 'yyyy-mm-dd'"></span>
+                <div class="content" ng-bind="::returns.date | date: 'yyyy-mm-dd'"></div>
             </div>
-            <div class="col-md-3">
-                <span class="title" style="width: 90px;">应付供应商：</span>
-                <span class="content" ng-bind="::returns.receivename"></span>
+            <div class="col-xs-6">
+                <div class="title">应付供应商：</div>
+                <div class="unchanged-info" ng-bind="::returns.receivename"></div>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-3">
-                <span class="title">送货单号：</span>
-                <span class="content" ng-bind="::returns.sendCode"></span>
+        <div class="row row-sm item">
+            <div class="col-xs-6">
+                <div class="title">送货单号：</div>
+                <div class="unchanged-info" ng-bind="::returns.sendCode"></div>
             </div>
-            <div class="col-md-4">
+            <div class="col-xs-6">
                 <span class="title">付款方式：</span>
-                <span class="content" ng-bind="::returns.payments"></span>
+                <div class="content" ng-bind="::returns.payments"></div>
             </div>
-            <div class="col-md-2">
-                <span class="title">币&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种：</span>
-                <span class="content" ng-bind="::returns.currency"></span>
+        </div>
+        <div class="row row-sm item">
+            <div class="col-xs-6">
+                <div class="title">币别：</div>
+                <div class="unchanged-info"  ng-bind="::returns.currency"></div>
             </div>
-            <div class="col-md-3">
-                <span class="title" style="width: 90px;">金&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;额：</span>
-                <span class="content"></span>
+            <div class="col-xs-6">
+                <div class="title">金额：</div>
+                <div class="unchanged-info"></div>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-12">
-                <span class="title">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注：</span>
-                <span class="content" ng-bind="::returns.remark"></span>
+        <div class="row row-sm item">
+            <div class="col-xs-6">
+                <span class="title">备注：</span>
+                <div class="content" ng-bind="::returns.remark"></div>
             </div>
         </div>
-        <!--表单-->
-        <div class="sale-tab">
-            <table class="table">
+        <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" style=" margin-bottom: 0">
                 <thead>
-                    <tr>
-                        <th width="50">序号<em>|</em></th>
-                        <th width="180">客户采购单号<em>|</em></th>
-                        <th>产品<em>|</em></th>
-                        <th width="150">品牌<em>|</em></th>
-                        <th width="90">单位<em>|</em></th>
-                        <th width="100">单价<em>|</em></th>
-                        <th width="100">入库数<em>|</em></th>
-                        <th width="100">金额<em>|</em></th>
-                        <th width="130">批号</th>
-                    </tr>
+                <tr class="header">
+                    <th width="50">序号</th>
+                    <th width="180">采购单号</th>
+                    <th width="180">产品名称</th>
+                    <th width="100">品牌</th>
+                    <th width="50">单位</th>
+                    <th width="60">单价</th>
+                    <th width="80">入库数</th>
+                    <th width="80">金额</th>
+                    <th width="120">批号</th>
+                </tr>
                 </thead>
+            </table>
+            <table class="block table table-default table-striped">
                 <tbody>
-                    <tr ng-repeat="returnitem in return.returnItems| orderBy:'number'">
-                        <td><span ng-bind="::returnitem.number"></span></td>
-                        <td><span ng-bind="::returnitem.orderItem.order.code"></span></td>
-                        <td><span ng-bind="::returnitem.product.title"></span></td>
-                        <td><span ng-bind="::returnitem.product.brand"></span></td>
-                        <td><span ng-bind="::returnitem.product.unit"></span></td>
-                        <td><span ng-bind="::returnitem.orderItem.price"></span></td>
-                        <td><span ng-bind="::returnitem.acceptQty"></span></td>
-                        <td>{{returnitem.acceptQty*returnitem.orderItem.price| number: 6}}</td>
-                        <td><span ng-bind="::returnitem.batchCode"></span></td>
-                    </tr>
+                <tr ng-repeat="returnitem in returns.returnItems| orderBy:'number'" ng-class="{'scoroll':order.orderItems.length>10}">
+                    <td width="50"><span ng-bind="::returnitem.number"></span></td>
+                    <td width="180"><span ng-bind="::returnitem.orderItem.order.code"></span></td>
+                    <td width="180" class="text-center"><span ng-bind="::returnitem.product.title"></span></td>
+                    <td width="100" class="text-center"><span ng-bind="::returnitem.product.brand"></span></td>
+                    <td width="50" class="text-center"><span ng-bind="::returnitem.product.unit"></span></td>
+                    <td width="60" class="text-center"><span ng-bind="::returnitem.orderItem.price"></span></td>
+                    <td width="80" class="text-center"><span ng-bind="::returnitem.acceptQty"></span></td>
+                    <td width="80" class="text-center">{{returnitem.acceptQty*returnitem.orderItem.price| number: 6}}</td>
+                    <td width="120" class="text-center"><span ng-bind="::returnitem.batchCode"></span></td>
+                </tr>
                 </tbody>
             </table>
         </div>