客户修改

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -722,7 +722,7 @@ public class DmDealerController {
      */
     @ResponseBody
     @RequestMapping("/dm_download_order_val")
-    @RequiresPermissions("salesOrder:order_statistics:deliver")
+    @RequiresPermissions("dm:order_statistic:list")
     public ResponseJson dmDownloadOrderVal(HttpServletRequest request,SalesOrder so) throws Exception {
         ResponseJson rj = ResponseJson.getFAILURE();
         Integer num = postOrderNumService.listSalesOrderAndItemNum(so);
@@ -740,7 +740,7 @@ public class DmDealerController {
      * @throws IOException
      */
     @RequestMapping("/dm_download_order")
-    @RequiresPermissions("salesOrder:order_statistics:deliver")
+    @RequiresPermissions("dm:order_statistic:list")
     public ModelAndView dmDownloadOrder(HttpServletRequest request,SalesOrder so) throws Exception {
         so.setIsCustmerAddOrder(2);
         List<SalesOrder> temporarySalesOrderList = postOrderNumService.listSalesOrderAndItem(so);

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

@@ -751,7 +751,7 @@
         disable_search_threshold: 0, //当选项少等于于指定个数时禁用搜索。
         inherit_select_classes: true, //是否继承原下拉框的样式类，此处设为继承
         placeholder_text_single: '选择国家', //单选选择框的默认提示信息，当选项为空时会显示。如果原下拉框设置了data-placeholder，会覆盖这里的值。
-        width: '100px', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度，也会被width覆盖。
+        width: '300px', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度，也会被width覆盖。
         max_shown_results: 1000, //下拉框最大显示选项数量
         display_disabled_options: false,
         single_backstroke_delete: false, //false表示按两次删除键才能删除选项，true表示按一次删除键即可删除