订单列表修改订单的展示处理

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -7,7 +7,6 @@ import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.dm.DealerChannel;
 import com.iamberry.rst.core.dm.DealerProduct;
 import com.iamberry.rst.core.dm.DealerProductStore;
-import com.iamberry.rst.core.dm.SupplierProduct;
 import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
@@ -45,7 +44,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -997,14 +995,6 @@ public class AdminSalesOrderController {
                 return  new ResponseJson(500, "添加商品错误", 500);
             }
         }
-
-//        salesOrder.setSalesAmount(salesOrder.getSalesAmount()*100);
-//        salesOrder.setSalesDiscountMoney(salesOrder.getSalesDiscountMoney()*100);;
-//        salesOrder.setSalesPayMoney(salesOrder.getSalesPayMoney()*100);
-//        salesOrder.setSalesWaitMoney(salesOrder.getSalesWaitMoney()*100);
-//        salesOrder.setSalesLastMoney(salesOrder.getSalesLastMoney()*100);
-//        salesOrder.setSalesShippingFee(salesOrder.getSalesShippingFee()*100);
-
         salesOrder.setSalesOrderItemList(salesOrderItemList);
 
         if(salesOrder.getSalesBatchId() == null || "1".equals(salesOrder.getSalesBatchId())){

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/update_fr.ftl

@@ -61,7 +61,11 @@
                     <span class="select-box">
                          <select name="dealerId" class="select chosen" id="dealerId">
                          <#if dmDealerList?? &&  (dmDealerList?size > 0) >
-                             <option value="0" <#if financialReceipt.dealerId == 0>selected</#if>>未知客户</option>
+                             <#if financialReceipt?? >
+                                 <option value="0" selected>未知客户</option>
+                             <#else >
+                                 <option value="0" <#if financialReceipt.dealerId == 0>selected</#if>>未知客户</option>
+                             </#if>
                              <#list dmDealerList as dmDealer >
                                  <option value="${dmDealer.dealerId}" <#if financialReceipt.dealerId??><#if financialReceipt.dealerId == dmDealer.dealerId>selected</#if></#if> >${dmDealer.dealerName}</option>
                              </#list>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -385,12 +385,12 @@
                        }
                    }
                }
-               <#if admin??  >
-                   var adminDept = ${admin.adminDept!''};
-                   if(adminDept == 1){
-                       tr.find(".edit_order_target").show();
-                   }
-               </#if>
+               <#--<#if admin??  >-->
+                  <#--/// var adminDept = ${admin.adminDept!''};-->
+                  <#--// if(adminDept == 1){-->
+                   <#--//    tr.find(".edit_order_target").show();-->
+                   <#--//}-->
+               <#--</#if>-->
            }
        }
     });