完成基本数据绑定工作和模态框样式修改

src/main/webapp/resources/js/index/app.js

@@ -23650,7 +23650,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     }]);
 
     /**
-     * 针对卖家，已转询价单的客户公共询价单明细
+     * 针对买家，已转询价单的客户公共询价单明细
      */
     app.controller('PurcPubInquiryDetailCtrl', ['$scope', '$stateParams', 'publicInquiry', '$filter', 'toaster', '$upload', 'token', 'CurrentRole', function ($scope, $stateParams, publicInquiry, $filter, toaster, $upload, token, CurrentRole) {
         // 获取当前用户是否为普通用户

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

@@ -642,25 +642,31 @@ input[type="radio"], input[type="checkbox"] {
     .detail .middle{
         border-top:1px solid #e5e5e5;
         padding-top:40px;
+        padding-bottom:40px;
     }
-    .detail .middle ul{}
     .detail .middle ul li{
         width:33%;
-        margin-bottom:50px;
+        height:60px;
+        vertical-align:top;
     }
     .detail .middle ul li span{
+        display:inline-block;
+        width:25%;
         color:#333;
-        margin-right:30px;
         font-size: 14px;
         font-weight: bold;
     }
     .detail .middle ul li em{
+        display:inline-block;
+        width:75%;
+        vertical-align: top;
         color:#999;
         font-size: 14px;
         font-style: normal;
     }
     .detail table{
         border:1px solid #dcdcdc;
+        table-layout: fixed;
     }
     .detail table thead th{
         background: #ebf5fe;
@@ -682,9 +688,7 @@ input[type="radio"], input[type="checkbox"] {
     .detail table tr td{
         padding-top:20px;
         padding-bottom:30px;
-    }
-    .detail table td ul li{
-        padding-left:10px;
+        word-break:break-all;
     }
     .detail table td a{
         font-size: 14px;
@@ -694,9 +698,10 @@ input[type="radio"], input[type="checkbox"] {
         text-decoration: underline;
         cursor:pointer;
     }
-    .detail table td ul li p{}
-    .detail table td ul li p span{}
-    .detail table td ul li p span em{}
+    .detail table td>span{
+        font-size: 14px;
+        color:#999;
+    }
     .detail .footer{
         padding-top:20px;
         text-align: center;
@@ -710,26 +715,26 @@ input[type="radio"], input[type="checkbox"] {
     <div class="top">
         <h3>客户公共询价单</h3>
         <div class="top-right">
-            <span>日期：<em>2017-11-11</em></span>
-            <span>报价单号：<em>2017-11-11</em></span>
+            <span>日期：<em>{{::inquiryItem.inquiry.date | date :'yyyy-MM-dd HH:mm'}}</em></span>
+            <span>报价单号：<em ng-bind="::inquiryItem.inquiry.code">2017-11-11</em></span>
         </div>
     </div>
     <div class="middle">
         <ul class="list-inline">
             <li>
-                <span>询价企业</span><em></em>
+                <span>询价企业</span><em ng-bind="::inquiryItem.inquiry.enterprise.enName"></em>
             </li>
             <li>
-                <span>联系人&nbsp;</span><em></em>
+                <span>联系人&nbsp;</span><em ng-bind="::inquiryItem.inquiry.recorder"></em>
             </li>
             <li>
-                <span>联系电话</span><em></em>
+                <span>联系电话</span><em ng-bind="::inquiryItem.inquiry.userBaseInfo.userTel"></em>
             </li>
             <li>
-                <span>企业地址</span><em></em>
+                <span>企业地址</span><em ng-bind="::inquiryItem.inquiry.ship"></em>
             </li>
             <li>
-                <span>报价截止</span><em></em>
+                <span>报价截止</span><em ng-bind="::inquiryItem.inquiry.endDate | date:'yyyy-MM-dd'"></em>
             </li>
         </ul>
     </div>
@@ -740,20 +745,23 @@ input[type="radio"], input[type="checkbox"] {
             <th>产品型号</th>
             <th>品牌</th>
             <th>产品规格</th>
-            <th>单位</th>
-            <th>数量</th>
+            <th width="90">单位</th>
+            <th width="90">数量</th>
             <th>图纸/备注</th>
         </tr>
         </thead>
         <tbody>
         <tr>
-            <td><em></em></td>
-            <td><em></em></td>
-            <td><em></em></td>
-            <td><em></em></td>
-            <td><em></em></td>
-            <td><em></em></td>
-            <td><em></em></td>
+            <td><span ng-bind="::inquiryItem.product.title"></span></td>
+            <td><span ng-bind="::inquiryItem.product.code"></span></td>
+            <td><span ng-bind="::inquiryItem.product.brand"></span></td>
+            <td><span ng-bind="::inquiryItem.product.spec"></span></td>
+            <td><span ng-bind="::inquiryItem.product.unit"></span></td>
+            <td><span ng-bind="::inquiryItem.needquantity"></span></td>
+            <td>
+                <a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
+                <span ng-if="inquiryItem.inquiry.attachs == 0" >无</span>
+            </td>
         </tr>
         </tbody>
     </table>

src/main/webapp/resources/tpl/index/sale/modal/quote_inquiry.html

@@ -118,6 +118,7 @@
     }
 </style>
 <div class="modal-header">
+    <button type="button" class="close"><b>&times;</b></button>
     <span>报价详情</span>
 </div>
 <div class="modal-body">

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

@@ -87,15 +87,22 @@
 	.order-table .order-bd .product {
 		padding-left: 20px;
 	}
+	.order-table .order-bd .product .dropdown-toggle span{
+		color:#333;
+	}
 	.order-table .order-bd .product .dropdown-toggle{
 		position:relative;
 		display:inline-block;
+		color:#333;
 	}
 	.order-table .order-bd .product .dropdown-toggle:hover{
 		text-decoration: none;
-		color:#327ebe;
 		cursor:pointer;
 	}
+	.order-table .order-bd .product .dropdown-toggle:hover span{
+		text-decoration: none;
+		color:#327ebe;
+	}
 	.order-table .order-bd .product .dropdown-toggle i{
 		position:relative;
 		top:-3px;
@@ -158,6 +165,22 @@
 	}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
+<style>
+	.order-table .order-bd .pane-body span{
+		font-size: 14px;
+		color:#333;
+	}
+	.order-table .order-bd .pane-body em{
+		font-size: 14px;
+		color:#999;
+		font-style:normal;
+	}
+	.order-table .order-bd td span{
+		font-size: 14px;
+		color:#999;
+		font-style:normal;
+	}
+</style>
 <div class="block" id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
@@ -354,10 +377,17 @@
 						<i class="fa fa-fw fa-sort-desc"></i>
 						<div class="dropdown-menu pane" style="width: 270px;">
 							<div class="pane-body">
-								<ul class="list-unstyled list-menu">
-									<li ng-repeat="historyItem in ::inquiryItem.history">{{historyItem}}</li>
-								</ul>
-								<div ng-show="!inquiryItem.history || inquiryItem.history.length == 0"
+								<div>
+									<div>
+										<span>产品规格：</span>
+										<em ng-bind="::inquiryItem.product.spec"></em>
+									</div>
+									<div>
+										<span>产品名称：</span>
+										<em ng-bind="::inquiryItem.product.title"></em>
+									</div>
+								</div>
+								<div ng-show="!inquiryItem.product.spec && !inquiryItem.product.title"
 									 class="text-center text-muted">暂无产品信息</div>
 							</div>
 						</div>
@@ -365,49 +395,27 @@
 				</div>
 			</td>
 			<td class="text-center">
-				<span ng-bind="::inquiryItem.brand"></span>
+				<span ng-bind="inquiryItem.product.brand ? inquiryItem.product.brand : '-'"></span>
 			</td>
 			<td class="text-center">
-				<div ng-show="!inquiryItem.$editing">
-					<div ng-repeat="reply in inquiryItem.replies">
-						<span ng-bind="reply.lapQty"></span>
-					</div>
+				<div ng-repeat="reply in inquiryItem.replies">
+					<span ng-bind="reply.lapQty"></span>
 				</div>
 			</td>
 			<td class="text-center">
-				<div ng-show="!inquiryItem.$editing">
-					<div ng-repeat="reply in inquiryItem.replies">
-						<span ng-bind="isUser?'':(reply.price | number:6)"></span>
-						<span ng-show="reply.price == null || isUser" class="text-muted">-</span>
-					</div>
+				<div ng-repeat="reply in inquiryItem.replies">
+					<span ng-bind="isUser?'':(reply.price | number:6)"></span>
+					<span ng-show="reply.price == null || isUser" class="text-muted">-</span>
 				</div>
 			</td>
 			<td class="text-center">
-				<div ng-show="!inquiryItem.$editing">
-					<span ng-bind="inquiryItem.minOrderQty ? inquiryItem.minOrderQty : '-'"></span> /
-					<span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
-				</div>
+				<span ng-bind="inquiryItem.minOrderQty ? inquiryItem.minOrderQty : '-'"></span>
+				<span>/</span>
+				<span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
 			</td>
 			<td class="text-center">
 				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
 					<span class="text-trans warning">已报价</span>
-					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">
-						<div ng-show="!inquiryItem.$editing && inquiryItem.replyable">
-							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;  getToken();">修改报价</a>
-						</div>
-						<div ng-show="inquiryItem.$editing">
-							<div>
-								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>
-							</div>
-							<div>
-								<button ng-click="onReplyClick(inquiryItem, true);setOrdersRead(inquiryItem.id)"
-										ng-disabled="!isValid(inquiryItem, true)"
-										class="btn btn-link btn-xs text-inverse">
-									保存并<br>确认报价
-								</button>
-							</div>
-						</div>
-					</div>
 					<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
 				</div>
 				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1 && inquiryItem.invalid != 1" class="block">
@@ -427,23 +435,6 @@
 						<div ng-show="!inquiryItem.$editing">
 							<a ng-click="getToken()">报 价</a>
 						</div>
-						<!--<div ng-show="inquiryItem.$editing">-->
-							<!--<div>-->
-								<!--<a ng-click="inquiryItem.$editing=!inquiryItem.$editing; cancel()">取消</a>-->
-							<!--</div>-->
-							<!--<div>-->
-								<!--<button ng-click="onReplyClick(inquiryItem);setOrdersRead(inquiryItem.id)"-->
-										<!--ng-disabled="!isValid(inquiryItem)"-->
-										<!--class="btn btn-link btn-xs text-default">保存</button>-->
-							<!--</div>-->
-							<!--<div>-->
-								<!--<button ng-click="onReplyClick(inquiryItem, true);setOrdersRead(inquiryItem.id)"-->
-										<!--ng-disabled="!isValid(inquiryItem, true)"-->
-										<!--class="btn btn-link btn-xs text-inverse">-->
-									<!--保存并<br>确认报价-->
-								<!--</button>-->
-							<!--</div>-->
-						</div>
 					</div>
 					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check == 1">
 						<span class="text-trans half">未报价</span>

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

@@ -29,25 +29,31 @@
 .detail .middle{
 	border-top:1px solid #e5e5e5;
 	padding-top:40px;
+	padding-bottom:40px;
 }
-.detail .middle ul{}
 .detail .middle ul li{
 	width:33%;
-	margin-bottom:50px;
+	height:60px;
+	vertical-align:top;
 }
 .detail .middle ul li span{
+	display:inline-block;
+	width:25%;
 	color:#333;
-	margin-right:30px;
 	font-size: 14px;
 	font-weight: bold;
 }
 .detail .middle ul li em{
+	display:inline-block;
+	width:75%;
+	vertical-align: top;
 	color:#999;
 	font-size: 14px;
 	font-style: normal;
 }
 .detail table{
 	border:1px solid #dcdcdc;
+	table-layout: fixed;
 }
 .detail table thead th{
 	background: #ebf5fe;
@@ -69,9 +75,7 @@
 .detail table tr td{
 	padding-top:20px;
 	padding-bottom:30px;
-}
-.detail table td ul li{
-	padding-left:10px;
+	word-break:break-all;
 }
 .detail table td a{
 	font-size: 14px;
@@ -81,16 +85,19 @@
 	text-decoration: underline;
 	cursor:pointer;
 }
-.detail table td ul li p{}
-.detail table td ul li p span{}
-.detail table td ul li p span em{}
+.detail table td span{
+	font-size: 14px;
+	color:#999;
+}
 .detail table td .info{
-	display:inline-block;
 	position:relative;
-	color:#999;
+}
+.detail table td .info span{
+	color:#333;
 }
 .detail table td .info:hover >span{
 	color:#54a9f0;
+	cursor:pointer;
 }
 .detail table td .info:hover >i{
 	color:#54a9f0;
@@ -104,31 +111,33 @@
 	top:100%;
 	left:0;
 	margin:0;
-	padding:10px;
+	padding:15px 10px;
+}
+.detail table td .info .modal-content ul li{
+	width:270px;
 }
-.detail table td .info .modal-content ul{}
-.detail table td .info .modal-content ul li{}
 .detail table td .info .modal-content ul li span{
 	font-size: 14px;
 	color:#333;
 }
-.detail table td .info .modal-content ul li span em{
+.detail table td .info .modal-content ul li em{
 	font-size: 14px;
 	color:#999;
+	font-style: normal;
 }
 </style>
 <div class="detail">
 	<div class="top">
 		<h3>客户公共询价单</h3>
 		<div class="top-right">
-			<span>日期：<em>2017-11-11</em></span>
-			<span>报价单号：<em>2017-11-11</em></span>
+			<span>日期：<em ng-bind="inquiry.date | date:'yyyy-MM-dd'">2017-11-11</em></span>
+			<span>报价单号：<em ng-bind="::inquiry.code">2017-11-11</em></span>
 		</div>
 	</div>
 	<div class="middle">
 		<ul class="list-inline">
 			<li>
-				<span>询价企业</span><em></em>
+				<span>询价企业</span><em ng-bind="::inquiry.enterprise.enName"></em>
 			</li>
 			<li>
 				<span>联系人&nbsp;</span><em></em>
@@ -137,10 +146,10 @@
 				<span>联系电话</span><em></em>
 			</li>
 			<li>
-				<span>企业地址</span><em></em>
+				<span>企业地址</span><em ng-bind="inquiry.ship"></em>
 			</li>
 			<li>
-				<span>报价截止</span><em></em>
+				<span>报价截止</span><em ng-bind="::inquiry.endDate | date:'yyyy-MM-dd'"></em>
 			</li>
 		</ul>
 	</div>
@@ -149,44 +158,60 @@
 			<tr>
 				<th>产品型号</th>
 				<th>品牌</th>
-				<th>币种</th>
-				<th>税率</th>
-				<th>分段数量</th>
-				<th>价格</th>
+				<th width="60">币种</th>
+				<th width="60">税率</th>
+				<th width="85">分段数量</th>
+				<th width="85">价格</th>
 				<th>交货周期</th>
 				<th>最小订购/包装</th>
 				<th>附件</th>
 			</tr>
 		</thead>
-		<tbody>
+		<tbody ng-repeat="inquiryItem in newinquiryItems | orderBy:'number'">
 			<tr>
 				<td>
 					<div class="info">
-						<span>3242543254</span>&nbsp;&nbsp;<i class="fa fa-caret-down"></i>
+						<span ng-bind="::inquiryItem.product.code"></span>&nbsp;&nbsp;<i class="fa fa-caret-down"></i>
 						<div class="modal-content">
 							<ul class="list-unstyled">
-								<li>
-									<span>品牌：</span><em>人是哪</em>
+								<li><span>产品规格：</span>
+									<em ng-bind="::inquiryItem.product.spec"></em>
+								</li>
+								<li><span>产品名称：</span>
+									<em ng-bind="::inquiryItem.product.title"></em>
 								</li>
 							</ul>
 						</div>
 					</div>
 				</td>
 				<td>
-					<p ng-repeat="">
-						<span></span>
-					</p>
+					<span ng-bind="::inquiryItem.product.brand"></span>
+				</td>
+				<td><span ng-bind="::inquiryItem.currency"></span></td>
+				<td><span ng-bind="::inquiryItem.taxrate"></span><span>%</span></td>
+				<td>
+					<div ng-repeat="reply in inquiryItem.replies">
+						<span ng-bind="reply.lapQty"></span>
+					</div>
+				</td>
+				<td>
+					<div ng-repeat="reply in inquiryItem.replies">
+						<span ng-if="!isUser" ng-bind="reply.price | number:6"></span>
+						<span ng-show="reply.price == null || isUser" class="text-muted">-</span>
+					</div>
+				</td>
+				<td>
+					<span ng-bind="inquiryItem.leadtime ? inquiryItem.leadtime : '-'"></span>
+				</td>
+				<td>
+					<span ng-bind="inquiryItem.minOrderQty ? inquiryItem.minOrderQty : '-'"></span>
+					<span>/</span>
+					<span ng-bind="inquiryItem.minPackQty ? inquiryItem.minPackQty : '-'"></span>
 				</td>
-				<td><span></span></td>
-				<td></td>
-				<td></td>
-				<td></td>
-				<td></td>
-				<td></td>
 				<td>
 					<a href="javescript:void(0)">dsafsa.paf</a>
 				</td>
-		</tr>
+			</tr>
 		</tbody>
 	</table>
 </div>