Browse Source

代采订单金额千分位显示

hejq 8 years ago
parent
commit
b747d7d95d

+ 6 - 6
src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -329,7 +329,7 @@
                             <span><input type="text" class="text-center" ng-model="item.amount" ng-required="true"></span>
                             <span><input type="text" class="text-center" ng-model="item.unitprice" ng-required="true"></span>
                             <span><input type="text" class="text-center" ng-model="item.purcprice" ng-required="true"></span>
-                            <span>{{item.unitprice * item.amount | number: 2}}</span>
+                            <span>{{item.unitprice * item.amount | number}}</span>
                             <span><input type="text" class="text-center" ng-model="item.remark"></span>
                             <span><button ng-click="add($index)" style="color: #1f4fb2" ng-disabled="!deOrder.$editing">添加</button>
                             	  <button ng-click="del($index, item.id)" style="color: #d32526" ng-if="item.id != null" ng-disabled="!deOrder.$editing"> 删除</button>
@@ -352,11 +352,11 @@
                         <li>
                             <div class="fl">
                                 <em>总价款({{deOrder.currency}}):</em>
-                                <span >{{deOrder.totalamount}}</span>
+                                <span >{{deOrder.totalamount| number}}</span>
                             </div>
                             <div class="fr">
                             	 <em>订单总价款({{deOrder.currency}}):</em>
-                                <span >{{deOrder.orderamount}}</span>
+                                <span >{{deOrder.orderamount| number}}</span>
                             </div>
                         </li>
                         <li>
@@ -385,7 +385,7 @@
                         <li>
                             <div class="fl">
                                 <em>我方付款金额({{deOrder.currency}}):</em>
-                                <span >{{deOrder.totalpayament}}</span>
+                                <span >{{deOrder.totalpayament| number}}</span>
                             </div>
                             <div class="fr">
                                 <em>我方付款日期:</em>
@@ -446,11 +446,11 @@
                         <li>
                             <div class="fl">
                                 <em>付款金额({{deOrder.currency}}):</em>
-                                <span>{{deOrder.usdpayment}}</span>
+                                <span>{{deOrder.usdpayment| number}}</span>
                             </div>
                             <div class="fr">
                                 <em>实际付款金额({{deOrder.currency}}):</em>
-                                <span ng-bind="deOrder.actusdpayment"></span>
+                                <span ng-bind="deOrder.actusdpayment | number"></span>
                             </div>
                         </li>
                         <li>

+ 6 - 6
src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -332,7 +332,7 @@
                             <span><input type="text" class="text-center" ng-model="item.amount" ng-required="true"></span>
                             <span><input type="text" class="text-center" ng-model="item.unitprice" ng-required="true"></span>
                             <span><input type="text" class="text-center" ng-model="item.purcprice" ng-required="true"></span>
-                            <span>{{item.unitprice * item.amount | number: 2}}</span>
+                            <span>{{item.unitprice * item.amount | number: 2| number}}</span>
                             <span><input type="text" class="text-center" ng-model="item.remark"></span>
                             <span><a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a></span>
                         </dd>
@@ -352,11 +352,11 @@
                         <li>
                             <div class="fl">
                                 <em>总价款({{deOrder.currency}}):</em>
-                                <span >{{deOrder.totalamount| number: 6}}</span>
+                                <span >{{deOrder.totalamount| number:6 | number}}</span>
                             </div>
                             <div class="fr">
                             	 <em>订单总价款({{deOrder.currency}}):</em>
-                                <span >{{deOrder.orderamount| number: 6}}</span>
+                                <span >{{deOrder.orderamount| number:6 | number}}</span>
                             </div>
                         </li>
                         <li>
@@ -385,7 +385,7 @@
                         <li>
                             <div class="fl">
                                 <em>我方付款金额({{deOrder.currency}}):</em>
-                                <span >{{deOrder.totalpayament| number: 6}}</span>
+                                <span >{{deOrder.totalpayament| number: 6 | number}}</span>
                             </div>
                             <div class="fr">
                                 <em>我方付款日期:</em>
@@ -446,11 +446,11 @@
                         <li>
                             <div class="fl">
                                 <em>付款金额({{deOrder.currency}}):</em>
-                                <span>{{deOrder.usdpayment| number: 6}}</span>
+                                <span>{{deOrder.usdpayment| number: 6 | number}}</span>
                             </div>
                             <div class="fr">
                                 <em>实际付款金额({{deOrder.currency}}):</em>
-                                <span ng-bind="deOrder.actusdpayment| number: 6"></span>
+                                <span ng-bind="deOrder.actusdpayment| number: 6 | number"></span>
                             </div>
                         </li>
                         <li>