处理关于公共询价单相关列表和明细物料的相关数据显示的问题

src/main/java/com/uas/platform/b2b/temporary/model/InquiryProductInfo.java

@@ -37,6 +37,11 @@ public class InquiryProductInfo {
 	 */
 	private String unit;
 
+	/**
+	 * 原厂型号
+	 */
+	private String cmpCode;
+
 	/**
 	 * 询价详情
 	 */
@@ -95,6 +100,14 @@ public class InquiryProductInfo {
 		this.unit = unit;
 	}
 
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
+
 	public Set<PurchaseInquiryItemInfo> getInquiryItems() {
 		return inquiryItems;
 	}

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

@@ -753,7 +753,7 @@ input[type="radio"], input[type="checkbox"] {
         <tbody>
         <tr>
             <td><span ng-bind="::inquiryItem.product.title || inquiryItem.prodTitle"></span></td>
-            <td><span ng-bind="::inquiryItem.product.cmpCode || inquiryItem.prodCode"></span></td>
+            <td><span ng-bind="::inquiryItem.product.cmpCode || inquiryItem.cmpCode"></span></td>
             <td><span ng-bind="::inquiryItem.product.brand || inquiryItem.inbrand"></span></td>
             <td><span ng-bind="::inquiryItem.product.spec || inquiryItem.spec"></span></td>
             <td><span ng-bind="::inquiryItem.product.unit || inquiryItem.unit"></span></td>

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

@@ -474,9 +474,6 @@ margin-left: 55px;
 					<a href="javascript:void(0)" ng-if="isUnread(inquiryItem.id)">
 						<i class="fa fa-circle" style="color: #f40;"></i>
 					</a>&nbsp;&nbsp;
-						<!--<span> <input type="checkbox" class="selector"
-									  ng-model="inquiryItem.$selected">
-						</span> -->
 					<span class="text-num text-bold"
 									  title="{{inquiryItem.inquiry.date}}"
 									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span>
@@ -498,39 +495,18 @@ margin-left: 55px;
 			</td>
 			<td class="text-center">
 				<div class="operates">
-					<!-- <a ng-click="print(inquiryItem)" class="text-muted" title="打印"><i
-                        class="fa fa-print fa-lg"></i></a> -->
 				</div>
 			</td>
 		</tr>
 		<tr class="order-bd">
 			<td class="product">
-				<div class="text-num text-bold" ng-bind="::inquiryItem.product.code"></div>
-				<div ng-bind="::inquiryItem.product.title"></div>
-				<div class="text-muted" ng-bind="inquiryItem.product.spec || inquiryItem.spec"></div>
+				<div ng-bind="inquiryItem.product.title || inquiryItem.prodTitle" title="物料名称：{{inquiryItem.product.title || inquiryItem.prodTitle}}"></div>
+				<div ng-bind="inquiryItem.product.cmpCode || inquiryItem.cmpCode" title="物料型号：{{inquiryItem.product.cmpCode || inquiryItem.cmpCode}}"></div>
+				<div ng-bind="inquiryItem.product.spec || inquiryItem.spec" title="物料规格：{{inquiryItem.product.spec || inquiryItem.spec}}"></div>
+				<div ng-bind="inquiryItem.product.brand || inquiryItem.inbrand" title="物料品牌：{{inquiryItem.product.brand || inquiryItem.inbrand}}"></div>
 				<div ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">
 					<i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
 				</div>
-				<div ng-if="::inquiryItem.brand && !inquiryItem.$editing" class="text-muted">
-					品牌：<spans ng-bind="::inquiryItem.brand"></spans>
-				</div>
-				<div ng-if="::inquiryItem.vendorprodcode && !inquiryItem.$editing" class="text-muted">
-					物料编号：<spans ng-bind="::inquiryItem.vendorprodcode"></spans>
-				</div>
-				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
-					<input type="text" class="form-control input-xs"
-						   ng-model="inquiryItem.brand" placeholder="物料品牌">
-				</div>
-				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
-					<input type="text" class="form-control input-xs"
-						   ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">
-				</div>
-				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">
-					<input type="number" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')"
-						   ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)" style="display: inline-block;width: 180px;">
-					<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
-					<div style="margin-left: 50px;"class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>
-				</div>
 			</td>
 			<td class="text-center">
 				<div ng-bind="inquiryItem.product.unit"></div>

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

@@ -479,7 +479,7 @@ i, em {
                         <div class="comment-oder-text">
                             <ul>
                                 <li class="list-unstyled">
-                                    <span><em style="width: 80px;">物料型号：</em><b title="{{product.code}}">{{product.code}}</b></span>
+                                    <span><em style="width: 80px;">物料型号：</em><b title="{{product.cmpCode}}" ng-bind="product.cmpCode"></b></span>
                                     <span><em>物料名称：</em><b title="{{product.title}}">{{product.title}}</b></span>
                                     <span><em>品牌：</em><b title="{{product.brand}}">{{product.brand}}</b></span>
                                 </li>

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

@@ -373,7 +373,7 @@
 				<div class="text-num text-bold">
 					<a class="dropdown-toggle"
 					   ng-mouseover="getHistory(inquiryItem)">
-						<span ng-bind="::inquiryItem.product.code || inquiryItem.cmpCode"></span>
+						<span ng-bind="::inquiryItem.product.cmpCode || inquiryItem.cmpCode"></span>
 						<i class="fa fa-fw fa-sort-desc"></i>
 						<div class="dropdown-menu pane" style="width: 270px;">
 							<div class="pane-body">

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

@@ -171,7 +171,7 @@
 			<tr>
 				<td>
 					<div class="info">
-						<span ng-bind="::inquiryItem.product.code"></span>&nbsp;&nbsp;<i class="fa fa-caret-down"></i>
+						<span ng-bind="::inquiryItem.product.cmpCode || ::inquiryItem.cmpCode"></span>&nbsp;&nbsp;<i class="fa fa-caret-down"></i>
 						<div class="modal-content">
 							<ul class="list-unstyled">
 								<li><span>产品规格：</span>