确认页添加物料编码字段

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -396,6 +396,7 @@ define(['app/app'], function(app) {
 					number: v.number,
 					taxUnitprice: v.taxUnitprice,
 					remark : v.remark,
+					goodsnumber : v.goodsnumber,
 					storeid : v.storeid
 				});
 			});

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -386,12 +386,14 @@
 							<!--物料编码-->
 							<span class="wd01" style="line-height: 18px;">
 							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
+							<em ng-if="!detail.goodsnumber">&nbsp;</em>
 							<div class="text-area">
-								<i>金石为开取数据五块钱叫稍微亲上加亲</i>
+								<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
 							</div>
 						</span>
 							<span class="wd01" style="line-height: 18px;">
 							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
+							<em ng-if="!detail.remark">&nbsp;</em>
 							<div class="text-area" ng-if="detail.remark">
 								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
 							</div>

src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -431,6 +431,23 @@
 		overflow: hidden;
 		margin-top: 0;
 	}
+	.text-area{
+		width: 120px;
+		height: 60px;
+		background: #fff;
+		margin-top: 15px;
+		overflow-y: auto;
+		text-align: left;
+		padding: 0 3px;
+		margin-left: 5px;
+	}
+	.text-area i{
+		text-align: left;
+		position: relative;
+		top: 4px;
+		font-size: 12px;
+		color: #666;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay-cart">
@@ -582,19 +599,26 @@
 									</table>
 								</p>
 							</span>
-							<span>
-                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" ng-model="detail.remark"></textarea>
-                        		<em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>
+							<span style="line-height: 18px;">
+                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" ng-model="detail.goodsnumber"></textarea>
+                        		<div class="text-area" ng-if="order.status!=501">
+									<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
+								</div>
+								<!--<em ng-if="order.status!=501" ng-bind="detail.goodsnumber" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>-->
 							</span>
-							<span>
+							<span style="line-height: 18px;">
                             	<textarea ng-if="order.status==501" placeholder="可填写产品备注" ng-model="detail.remark"></textarea>
-                        		<em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>
+								<div class="text-area" ng-if="order.status!=501">
+									<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+								</div>
+                        		<!--<em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>-->
 							</span>
 						</dd>
 						<dd class="oder-remark">
 							<span style="width: 100%;">
 								<em style="margin-left: 40px;">订单备注：</em>
-								<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]"/>
+								<input ng-if="order.status==501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]"/>
+								<em ng-if="order.status!=501" style="margin-left: 0px">{{order.orderRemark}}</em>
 							</span>
 						</dd>
 						<dd class="line60">

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -430,13 +430,13 @@
 							<span ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
 							<!--物料编码-->
 							<span class="wd01" style="line-height: 18px;">
-						<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
-							<div class="text-area">
-								<i>金石为开取数据五块钱叫稍微亲上加亲</i>
+							<em ng-if="!detail.goodsnumber">&nbsp;</em>
+							<div class="text-area" ng-if="detail.goodsnumber">
+								<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
 							</div>
 						</span>
 							<span class="wd01" style="line-height: 18px;">
-							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
+							<em ng-if="!detail.remark">&nbsp;</em>
 							<div class="text-area" ng-if="detail.remark">
 								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
 							</div>