更新代采订单、新增采购单页面UI

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

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

@@ -140,6 +140,11 @@
 	font-size: 14px;
 }
 
+#currency select {
+	width: 100px;
+	height: 30px;
+}
+
 </style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
@@ -164,8 +169,6 @@
 							{{::order.code}}
 						</div>
 					</div>
-				</div>
-				<div class="form-group form-group-sm" ng-if="order.code">
 					<label class="col-sm-2 text-right">录入时间：</label>
 					<div class="col-sm-2">
 						<div class="">
@@ -180,42 +183,49 @@
 							<input ng-model="order.cust.enName" readonly="readonly" type="text" class="form-control" id="customer" 
 								placeholder="点击选择供应商" style="cursor: pointer;" ng-click="dbfindCust()" ng-required="true">
 							<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+							<!-- <input ng-model="order.cust.enName" list="vendors">
+							<datalist id="vendors" >
+								<option ng-repeat="vendor in vendors" value="{{vendor.vendorEnterprise.enName}}"></option>
+							</datalist> -->
 						</div>
 					</div>
+					<label class="col-sm-2 text-right" ng-if="order.custUser.userName">供应商联系人:</label>
+					<span ng-bind="order.custUser.userName"></span> {{::order.custUser.userTel}}
 				</div>
-				<div class="form-group form-group-sm" ng-if="order.cust.enName">
-					<label class="col-sm-2 text-right">地址：</label>
-					<div class="col-sm-6">
-						<span ng-bind="order.cust.enAddress"></span>
-					</div>
-				</div>
-				<div class="form-group form-group-sm " ng-if="order.cust.enName">
-					<label class="col-sm-2 text-right">供应商联系人:</label>
-					<div class="col-sm-6">
-						<span ng-bind="order.custUser.userName"></span>
+				<div class="form-group form-group-sm has-feedback">
+					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>付款方式:</label>
+					<div class="col-sm-4">
+						<div id="">
+							<input ng-model="order.payments" type="text" class="form-control"  
+								placeholder="请填写付款方式" style="cursor: pointer;" ng-required="true">
+						</div>
 					</div>
-				</div>
-				<div class="form-group form-group-sm " ng-if="order.cust.enName">
-					<label class="col-sm-2 text-right">联系方式:</label>
-					<div class="col-sm-6">
-						{{::order.custUser.userTel}}
+					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>交易币别:</label>
+					<div class="col-sm-4">
+						<div id="currency">
+							<select name="" class="select" ng-model="order.currency" ng-init="order.currency = 'RMB'">
+                                <option value="USD">USD</option>
+                                <option value="HDK">HDK</option>
+                                <option value="RMB">RMB</option>
+                            </select>
+						</div>
 					</div>
 				</div>
 				<div class="form-group form-group-sm has-feedback">
-					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>交易币别:</label>
+					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>收货地址:</label>
 					<div class="col-sm-4">
 						<div id="">
-							<input ng-model="order.currency"  type="text" class="form-control" 
-								placeholder="请填写交易币别" style="cursor: pointer;"  ng-required="true">
+							<input ng-model="order.payments" type="text" class="form-control"  
+								placeholder="请填收货地址" style="cursor: pointer;" ng-required="true">
 						</div>
 					</div>
 				</div>
 				<div class="form-group form-group-sm has-feedback">
-					<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>付款方式:</label>
+				<label for="customer" class="col-sm-2 text-right"><span class="text-inverse text-bold">* </span>备注:</label>
 					<div class="col-sm-4">
 						<div id="">
-							<input ng-model="order.payments" type="text" class="form-control"  
-								placeholder="请填写付款方式" style="cursor: pointer;" ng-required="true">
+							<input ng-model="order.remark" type="text" class="form-control"  
+								placeholder="请填写备注" style="cursor: pointer;" ng-required="true">
 						</div>
 					</div>
 				</div>
@@ -247,11 +257,11 @@
 							<td>
 								<div class="col-sm-10">
 									<input ng-model="item.price" type="text" class="form-control input-dbfind" id="product" 
-											placeholder="单价" style="cursor: pointer;" required="true">
+											placeholder="单价" style="cursor: pointer;" required="true" ng-pattern="/[1-9]\d*(\.\d*[1-9])?/">
 								</div>
 								<div class="col-sm-10">
 									<input ng-model="item.qty" type="text" class="form-control input-dbfind" id="product" 
-											placeholder="数量" style="cursor: pointer;" required="true">
+											placeholder="数量" style="cursor: pointer;" required="true" ng-pattern="/^[1-9]d*$/">
 								</div>
 							</td>
 							<td class="text-center">
@@ -302,7 +312,7 @@
 		</div>
 		<div class="modal-body" style="min-height: 500px;">
 			<div class="headerline">
-				<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择客户物料</span>
+				<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择供应商物料</span>
 			</div>
 			<form class="form-horizontal" id="prodSearch">
 				<div class="form-group">

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

@@ -68,16 +68,14 @@
 }
 .purchase_form01 ul li .input-group .input-group-btn .btn-sm{
 	width: 37px;
-    height: 33px;
-    top: -33px;
-    z-index: 100;
-    right: 120px;
+    height: 34px;
+    z-index: 3;
     position: absolute;
     background: #5078cb;
     border: 1px solid #5078cb;
 }
 .purchase_form01 ul li .input-group .form-control {
-width:135px;
+width:146px;
 	}
 .purchase_form01 ul li .dropdown-menu li{
   line-height: 30px;
@@ -116,6 +114,13 @@ width:135px;
 .purchase .input-group .input-group-btn i{
 	color: #fff;
 }
+
+.purchase .input-group .input-group-btn {
+	width: 37px;
+	height: 34px;
+	position: absolute;
+	right: 74px;
+}
 </style>
 <div class="warp">
     <div class=" purchase">
@@ -148,9 +153,9 @@ width:135px;
                             </div>
                         </li>
                         <li>
-                            <div  class="input-group input-trigger date-picker">
+                           <div class="fl">
                                 <em>主协议签订日期：</em>
-                                <div class="input-group">
+                                 <div class="input-group">
 									<input ng-model="deOrder.madealdate" type="text" class="form-control" 
 										placeholder="点击选择时间" datepicker-popup="yyyy-MM-dd" is-open="deOrder.$madealdate"
 										min-date="getMinDate()" ng-required="true"
@@ -159,13 +164,12 @@ width:135px;
 										ng-focus="openDatePicker($event, deOrder.madealdate.$dateOpen)" readonly>
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
-											ng-click="openDatePicker($event, deOrder, '$madealdate')">
+											ng-click="openDatePicker($event, deOrder, '$madealdate')" ng-disabled="!deOrder.$editing">
 											<i class="fa fa-calendar fa-lg"></i>
 										</button>
 									</span>
                                 </div>
                             </div>
-                            
                             <div class="fr">
                                 <em>主协议编号：</em>
                                 <span><input type="text" class="input01" ng-model="deOrder.madealcode" ng-readonly="!deOrder.$editing"></span>
@@ -197,7 +201,7 @@ width:135px;
 										ng-focus="openDatePicker($event, deOrder.$dateOpen)"  ng-readonly="!deOrder.$editing">
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
-											ng-click="openDatePicker($event, deOrder, '$shipdate')">
+											ng-click="openDatePicker($event, deOrder, '$shipdate')" ng-disabled="!deOrder.$editing">
 											<i class="fa fa-calendar fa-lg"></i>
 										</button>
 									</span>
@@ -220,7 +224,7 @@ width:135px;
                             <div class="fl">
                                 <em>我方提货方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.pickupmethod" ng-init="deOrder.pickupmethod = '自提'" ng-readonly="!deOrder.$editing">
+                                    <select name="" class="select" ng-model="deOrder.pickupmethod" ng-disabled="!deOrder.$editing">
                                         <option value="自提">自提</option>
                                         <option value="委托第三方提货">委托第三方提货</option>
                                         <option value="贵公司送货">贵公司送货</option>
@@ -231,21 +235,32 @@ width:135px;
                             <div class="fr">
                                 <em>我方付款方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.paymentmethod" ng-readonly="!deOrder.$editing">
-                                        <option value="T">T/T支付</option>
-                                    </select>
+                                	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-disabled="!deOrder.$editing">
+                                    <datalist id="paymentmethod">
+                                    	 <option value="T/T支付">T/T支付</option>
+                                    </datalist>
                                 </span>
                             </div>
                         </li>
                         <li>
-                         	<div class="fr">
+                         	<div class="fl">
                                 <em>我方提货时间：</em>
                                <span><input type="text" class="input01" ng-model="deOrder.pickupdate" ng-readonly="!deOrder.$editing"></span>
                             </div>
+                            <div class="fr">
+                                <em>交易币别：</em>
+                               <span> 
+	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'" ng-disabled="!deOrder.$editing">
+	                                    <option value="USD">USD</option>
+	                                    <option value="RMB">RMB</option>
+	                                    <option value="HKD">HKD</option>
+	                                </select>
+                                </span>
+                            </div>
                         </li>
                     </ul>
                 </div>
-                <div class="com_title01"><span>下单明细(注：金额单位为USD)</span><a ng-click="uplodaByBatch()" ng-readonly="!deOrder.$editing">批量导入</a>  </div>
+                <div class="com_title01"><span>下单明细(注：金额单位为{{deOrder.currency}})</span><a ng-click="uplodaByBatch()" ng-readonly="!deOrder.$editing">批量导入</a>  </div>
                 <div class="purchase_xq clearfix">
                     <dl>
                         <dt>
@@ -287,12 +302,12 @@ width:135px;
                     <ul>
                         <li>
                             <div class="fl">
-                                <em>总价款：</em>
-                                <span >${{deOrder.totalamount}}</span>
+                                <em>总价款({{deOrder.currency}})：</em>
+                                <span >{{deOrder.totalamount}}</span>
                             </div>
                             <div class="fr">
-                            	 <em>订单总价款：</em>
-                                <span >${{deOrder.orderamount}}</span>
+                            	 <em>订单总价款({{deOrder.currency}})：</em>
+                                <span >{{deOrder.orderamount}}</span>
                             </div>
                         </li>
                         <li>
@@ -307,7 +322,7 @@ width:135px;
 										ng-focus="openDatePicker($event, deOrder.$dateOpen)" ng-readonly="!deOrder.$editing">
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
-											ng-click="openDatePicker($event, deOrder, '$paydeldate')">
+											ng-click="openDatePicker($event, deOrder, '$paydeldate')" ng-disabled="!deOrder.$editing">
 											<i class="fa fa-calendar fa-lg"></i>
 										</button>
 									</span>
@@ -316,8 +331,8 @@ width:135px;
                         </li>
                         <li>
                             <div class="fl">
-                                <em>我方付款金额：</em>
-                                <span >${{deOrder.totalpayament}}</span>
+                                <em>我方付款金额({{deOrder.currency}})：</em>
+                                <span >{{deOrder.totalpayament}}</span>
                             </div>
                             <div class="fr">
                                 <em>我方付款日期：</em>
@@ -364,7 +379,7 @@ width:135px;
 										ng-focus="openDatePicker($event, deOrder.$dateOpen)"  ng-readonly="!deOrder.$editing">
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
-											ng-click="openDatePicker($event, deOrder, '$requirepaydate')">
+											ng-click="openDatePicker($event, deOrder, '$requirepaydate')" ng-disabled="!deOrder.$editing">
 											<i class="fa fa-calendar fa-lg"></i>
 										</button>
 									</span>
@@ -377,11 +392,11 @@ width:135px;
                         </li>
                         <li>
                             <div class="fl">
-                                <em>付款金额(USD)：</em>
+                                <em>付款金额({{deOrder.currency}})：</em>
                                 <span>{{deOrder.usdpayment}}</span>
                             </div>
                             <div class="fr">
-                                <em>实际付款金额（USD）:</em>
+                                <em>实际付款金额({{deOrder.currency}}):</em>
                                 <span ng-bind="deOrder.actusdpayment"></span>
                             </div>
                         </li>
@@ -439,7 +454,7 @@ width:135px;
                                 <span><input type="text" class="input01" ng-model="deOrder.enfax"  ng-readonly="!deOrder.$editing"></span>
                             </div>
                             <div class="fr">
-                                <em>客户名称：</em>
+                                <em>客户名称：{{!deOrder.$editing}}</em>
                                 <span><input type="text" class="input01" ng-model="deOrder.customer"  ng-readonly="!deOrder.$editing"></span>
                             </div>
                         </li>
@@ -447,11 +462,10 @@ width:135px;
                             <div class="fl">
                                 <em>货款支付方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.paymethod" ng-init="deOrder.paymethod = '1'"  ng-readonly="!deOrder.$editing">
-                                        <option value="1">月结30天</option>
-                                        <option value="2">交货方式02</option>
-                                        <option value="3">交货方式03</option>
-                                    </select>
+                                    <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">
@@ -465,7 +479,7 @@ width:135px;
 										ng-focus="openDatePicker($event, deOrder.$dateOpen)"  ng-readonly="!deOrder.$editing">
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
-											ng-click="openDatePicker($event, deOrder, '$paydate')">
+											ng-click="openDatePicker($event, deOrder, '$paydate')" ng-disabled="!deOrder.$editing">
 											<i class="fa fa-calendar fa-lg"></i>
 										</button>
 									</span>
@@ -484,7 +498,7 @@ width:135px;
 										ng-focus="openDatePicker($event, deOrder.$dateOpen)"  ng-readonly="!deOrder.$editing">
 									<span class="input-group-btn">
 										<button type="button" class="btn btn-default btn-sm"
-											ng-click="openDatePicker($event, deOrder, '$deliverydate')">
+											ng-click="openDatePicker($event, deOrder, '$deliverydate')" ng-disabled="!deOrder.$editing">
 											<i class="fa fa-calendar fa-lg"></i>
 										</button>
 									</span>
@@ -497,7 +511,7 @@ width:135px;
                 <div class="save" >
                 	<span ng-if="deOrder.entrystatus == '保存'"><a href="#" ng-click="submit()">提交</a></span>
                 	<span  ng-if="!deOrder.$editing && deOrder.entrystatus == '保存'"><a ng-click="update()">更新</a></span>
-                	<span ng-if="deOrder.$editing"><a ng-click="cancel()">取消</a></span>
+                	<span ng-if="deOrder.$editing && deOrder.entrystatus == '保存'"><a ng-click="cancel()">取消</a></span>
                 </div>
             </div>
         </div>

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

@@ -68,16 +68,14 @@
 }
 .purchase_form01 ul li .input-group .input-group-btn .btn-sm{
 	width: 37px;
-    height: 33px;
-    top: -33px;
-    z-index: 100;
-    right: 120px;
+    height: 34px;
+    z-index: 3;
     position: absolute;
     background: #5078cb;
     border: 1px solid #5078cb;
 }
 .purchase_form01 ul li .input-group .form-control {
-width:135px;
+width:146px;
 	}
 .purchase_form01 ul li .dropdown-menu li{
   line-height: 30px;
@@ -116,6 +114,13 @@ width:135px;
 .purchase .input-group .input-group-btn i{
 	color: #fff;
 }
+
+.purchase .input-group .input-group-btn {
+	width: 37px;
+	height: 34px;
+	position: absolute;
+	right: 74px;
+}
 </style>
 <div class="warp">
     <div class=" purchase">
@@ -148,9 +153,9 @@ width:135px;
                             </div>
                         </li>
                         <li>
-                            <div  class="input-group input-trigger date-picker">
+                         	<div class="fl">
                                 <em>主协议签订日期：</em>
-                                <div class="input-group">
+                                 <div class="input-group">
 									<input ng-model="deOrder.madealdate" type="text" class="form-control" 
 										placeholder="点击选择时间" datepicker-popup="yyyy-MM-dd" is-open="deOrder.$madealdate"
 										min-date="getMinDate()" ng-required="true"
@@ -165,7 +170,6 @@ width:135px;
 									</span>
                                 </div>
                             </div>
-                            
                             <div class="fr">
                                 <em>主协议编号：</em>
                                 <span><input type="text" class="input01" ng-model="deOrder.madealcode"></span>
@@ -231,21 +235,32 @@ width:135px;
                             <div class="fr">
                                 <em>我方付款方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.paymentmethod" ng-init="deOrder.paymentmethod = 'T'">
-                                        <option value="T">T/T支付</option>
-                                    </select>
+                                    <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select">
+                                    <datalist id="paymentmethod">
+                                    	 <option value="T/T支付">T/T支付</option>
+                                    </datalist>
                                 </span>
                             </div>
                         </li>
                         <li>
-                         	<div class="fr">
+                         	<div class="fl">
                                 <em>我方提货时间：</em>
                                <span><input type="text" class="input01" ng-model="deOrder.pickupdate"></span>
                             </div>
+                            <div class="fr">
+                                <em>交易币别：</em>
+                               <span> 
+	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'">
+	                                    <option value="USD">USD</option>
+	                                    <option value="RMB">RMB</option>
+	                                    <option value="HKD">HKD</option>
+	                                </select>
+                                </span>
+                            </div>
                         </li>
                     </ul>
                 </div>
-                <div class="com_title01"><span>下单明细(注：金额单位为USD)</span><a ng-click="uplodaByBatch()">批量导入</a>  </div>
+                <div class="com_title01"><span>下单明细(注：金额单位为<span ng-bind="deOrder.currency"></span>)</span><a ng-click="uplodaByBatch()">批量导入</a>  </div>
                 <div class="purchase_xq clearfix">
                     <dl>
                         <dt>
@@ -287,12 +302,12 @@ width:135px;
                     <ul>
                         <li>
                             <div class="fl">
-                                <em>总价款：</em>
-                                <span >${{deOrder.totalamount}}</span>
+                                <em>总价款({{deOrder.currency}})：</em>
+                                <span >{{deOrder.totalamount}}</span>
                             </div>
                             <div class="fr">
-                            	 <em>订单总价款：</em>
-                                <span >${{deOrder.orderamount}}</span>
+                            	 <em>订单总价款({{deOrder.currency}})：</em>
+                                <span >{{deOrder.orderamount}}</span>
                             </div>
                         </li>
                         <li>
@@ -316,8 +331,8 @@ width:135px;
                         </li>
                         <li>
                             <div class="fl">
-                                <em>我方付款金额：</em>
-                                <span >${{deOrder.totalpayament}}</span>
+                                <em>我方付款金额({{deOrder.currency}})：</em>
+                                <span >{{deOrder.totalpayament}}</span>
                             </div>
                             <div class="fr">
                                 <em>我方付款日期：</em>
@@ -377,12 +392,12 @@ width:135px;
                         </li>
                         <li>
                             <div class="fl">
-                                <em>付款金额(USD)：</em>
+                                <em>付款金额({{deOrder.currency}})：</em>
                                 <span>{{deOrder.usdpayment}}</span>
                             </div>
                             <div class="fr">
-                                <em>实际付款金额（USD）:</em>
-                                <span ng-bind="deOrder.actusdpayment">$2536.23</span>
+                                <em>实际付款金额({{deOrder.currency}}):</em>
+                                <span ng-bind="deOrder.actusdpayment">2536.23</span>
                             </div>
                         </li>
                         <li>
@@ -447,11 +462,10 @@ width:135px;
                             <div class="fl">
                                 <em>货款支付方式：</em>
                                 <span>
-                                    <select name="" class="select" ng-model="deOrder.paymethod" ng-init="deOrder.paymethod = '1'">
-                                        <option value="1">月结30天</option>
-                                        <option value="2">交货方式02</option>
-                                        <option value="3">交货方式03</option>
-                                    </select>
+                                	<input ng-model="deOrder.paymethod" list="paymethod" class="select">
+                                	<datalist id="paymethod">
+                                	 	<option value="月结30天"></option>
+                                	</datalist>
                                 </span>
                             </div>
                             <div class="fr">