代采订单新增和详情增加合同编号和采购单编号，手动输入

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

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

@@ -312,6 +312,10 @@ width:152px;
                         </li>
                         <li>
                         	<div class="fl">
+                            	 <em>订单编号：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.salecode"></span>
+                            </div>
+                        	<div class="fr">
                                 <em>我方付款提货时间：</em>
                                  <div class="input-group">
 									<input ng-model="deOrder.paydeldate" type="text" class="form-control" 
@@ -449,24 +453,19 @@ width:152px;
                             </div>
                         </li>
                         <li>
-                            <div class="fl">
-                                <em>供应商方传真： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.enfax"  ng-readonly="!deOrder.$editing"></span>
+                        	<div class="fl">
+                                <em>合同编号： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.salepocode" ng-readonly="!deOrder.$editing"></span>
                             </div>
                             <div class="fr">
-                                <em>客户名称：{{!deOrder.$editing}}</em>
+                                <em>客户名称：</em>
                                 <span><input type="text" class="input01" ng-model="deOrder.customer"  ng-readonly="!deOrder.$editing"></span>
                             </div>
                         </li>
                         <li>
                             <div class="fl">
-                                <em>货款支付方式：</em>
-                                <span>
-                                    <input ng-model="deOrder.paymethod" list="paymethod" class="select" ng-disabled="!deOrder.$editing">
-                                	<datalist id="paymethod">
-                                	 	<option value="月结30天">月结30天</option>
-                                	</datalist>
-                                </span>
+                                <em>供应商方传真： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.enfax"  ng-readonly="!deOrder.$editing"></span>
                             </div>
                             <div class="fr">
                                 <em>货款支付时间：</em>
@@ -487,7 +486,16 @@ width:152px;
                             </div>
                         </li>
                         <li>
-                            <div class="fl">
+                        	<div class="fl">
+                                <em>货款支付方式：</em>
+                                <span>
+                                    <input ng-model="deOrder.paymethod" list="paymethod" class="select" ng-disabled="!deOrder.$editing">
+                                	<datalist id="paymethod">
+                                	 	<option value="月结30天">月结30天</option>
+                                	</datalist>
+                                </span>
+                            </div>
+                            <div class="fr">
                                 <em>交货时间：</em>
                                  <div class="input-group">
 									<input ng-model="deOrder.deliverydate" type="text" class="form-control" 

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

@@ -313,6 +313,10 @@ width:146px;
                         </li>
                         <li>
                         	<div class="fl">
+                            	 <em>订单编号：</em>
+                                <span><input type="text" class="input01" ng-model="deOrder.salecode"></span>
+                            </div>
+                        	<div class="fr">
                                 <em>我方付款提货时间：</em>
                                  <div class="input-group">
 									<input ng-model="deOrder.paydeldate" type="text" class="form-control" 
@@ -451,8 +455,8 @@ width:146px;
                         </li>
                         <li>
                             <div class="fl">
-                                <em>供应商方传真： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.enfax"></span>
+                                <em>合同编号： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.salepocode"></span>
                             </div>
                             <div class="fr">
                                 <em>客户名称：</em>
@@ -460,14 +464,9 @@ width:146px;
                             </div>
                         </li>
                         <li>
-                            <div class="fl">
-                                <em>货款支付方式：</em>
-                                <span>
-                                	<input ng-model="deOrder.paymethod" list="paymethod" class="select">
-                                	<datalist id="paymethod">
-                                	 	<option value="月结30天"></option>
-                                	</datalist>
-                                </span>
+                        	<div class="fl">
+                                <em>供应商方传真： </em>
+                                <span><input type="text" class="input01" ng-model="deOrder.enfax"></span>
                             </div>
                             <div class="fr">
                                 <em>货款支付时间：</em>
@@ -488,7 +487,16 @@ width:146px;
                             </div>
                         </li>
                         <li>
-                            <div class="fl">
+                       	 	<div class="fl">
+                                <em>货款支付方式：</em>
+                                <span>
+                                	<input ng-model="deOrder.paymethod" list="paymethod" class="select">
+                                	<datalist id="paymethod">
+                                	 	<option value="月结30天"></option>
+                                	</datalist>
+                                </span>
+                            </div>
+                            <div class="fr">
                                 <em>交货时间：</em>
                                  <div class="input-group">
 									<input ng-model="deOrder.deliverydate" type="text" class="form-control"