修改：客诉列表页面下拉框的宽度

watero-rst-web/src/main/webapp/WEB-INF/views/base/add_base.ftl

@@ -2,42 +2,40 @@
  添加页面的基本静态文件
  -->
 <#assign path="${request.contextPath}"/>
+<#assign spath="https://s.iamberry.com/rst"/>
 <!--[if lt IE 9]>
 <script type="text/javascript" src="${path}/common/lib/html5shiv.js"></script>
 <script type="text/javascript" src="${path}/common/lib/respond.min.js"></script>
 <![endif]-->
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui/css/H-ui.min.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/H-ui.admin.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/style.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/lib/Validform/Validform.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/css/iconfont/iconfont.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/chosen/css/chosen.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui/css/H-ui.min.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/css/H-ui.admin.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/lib/Hui-iconfont/1.0.8/iconfont.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/css/style.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/lib/Validform/Validform.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/css/iconfont/iconfont.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/chosen/css/chosen.css" />
 <!--[if IE 6]>
-<script type="text/javascript" src="${path}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+<script type="text/javascript" src="${spath}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
 <![endif]-->
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.min.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
-<script type="text/javascript" src="${path}/common/lib/jquery.validation/1.14.0/jquery.validate.js"></script>
-<script type="text/javascript" src="${path}/common/lib/jquery.validation/1.14.0/validate-methods.js"></script>
-<script type="text/javascript" src="${path}/common/lib/jquery.validation/1.14.0/messages_zh.js"></script>
-<script type="text/javascript" src="${path}/common/lib/Validform/Validform_v5.3.2.js"></script>
-<script type="text/javascript" src="${path}/common/static/chosen/js/chosen.jquery.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${spath}/common/static/h-ui/js/H-ui.min.js"></script>
+<script type="text/javascript" src="${spath}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/jquery.validation/1.14.0/jquery.validate.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/jquery.validation/1.14.0/validate-methods.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/jquery.validation/1.14.0/messages_zh.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/Validform/Validform_v5.3.2.js"></script>
+<script type="text/javascript" src="${spath}/common/static/chosen/js/chosen.jquery.js"></script>
 
 <script type="text/javascript">
     var root_path = "${path}";
 </script>
 <script type="text/javascript" src="${path}/common/js/common/common.js"></script>
 <script type="text/javascript" src="${path}/common/js/common/commonInit.js"></script>
-
 <script type="text/javascript" src="${path}/common/js/common/number.js"></script>
-
 <script type="text/javascript" src="${path}/common/js/common/UnlimitedLevelContact.js"></script>
-
 <script type="text/javascript" src="${path}/common/js/common/address.js"></script>
 <script type="text/javascript" src="${path}/common/js/common/salesChannel.js"></script>
 

watero-rst-web/src/main/webapp/WEB-INF/views/base/index_base.ftl

@@ -2,24 +2,25 @@
  index页面的基本静态文件
  -->
 <#assign path="${request.contextPath}"/>
+<#assign spath="https://s.iamberry.com/rst"/>
 <!--[if lt IE 9]>
-    <script type="text/javascript" src="${path}/common/lib/html5shiv.js"></script>
-    <script type="text/javascript" src="${path}/common/lib/respond.min.js"></script>
+    <script type="text/javascript" src="${spath}/common/lib/html5shiv.js"></script>
+    <script type="text/javascript" src="${spath}/common/lib/respond.min.js"></script>
     <![endif]-->
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui/css/H-ui.min.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/H-ui.admin.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/style.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui/css/H-ui.min.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/css/H-ui.admin.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/lib/Hui-iconfont/1.0.8/iconfont.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/css/style.css" />
 <!--[if IE 6]>
-<script type="text/javascript" src="${path}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+<script type="text/javascript" src="${spath}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
 <![endif]-->
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.min.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
-<script type="text/javascript" src="${path}/common/lib/jquery.contextmenu/jquery.contextmenu.r2.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${spath}/common/static/h-ui/js/H-ui.min.js"></script>
+<script type="text/javascript" src="${spath}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/jquery.contextmenu/jquery.contextmenu.r2.js"></script>
 <script type="text/javascript">
     var root_path = "${path}";
 </script>

watero-rst-web/src/main/webapp/WEB-INF/views/base/list_base.ftl

@@ -2,29 +2,30 @@
  列表页面的基本静态文件
  -->
 <#assign path="${request.contextPath}"/>
+<#assign spath="https://s.iamberry.com/rst"/>
 <!--[if lt IE 9]>
-<script type="text/javascript" src="${path}/common/lib/html5shiv.js"></script>
-<script type="text/javascript" src="${path}/common/lib/respond.min.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/html5shiv.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/respond.min.js"></script>
 <![endif]-->
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui/css/H-ui.min.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/H-ui.admin.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/h-ui.admin/css/style.css" />
-<link rel="stylesheet" type="text/css" href="${path}/common/static/chosen/css/chosen.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui/css/H-ui.min.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/css/H-ui.admin.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/lib/Hui-iconfont/1.0.8/iconfont.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/skin/default/skin.css" id="skin" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/h-ui.admin/css/style.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/static/chosen/css/chosen.css" />
 
-<link rel="stylesheet" type="text/css" href="${path}/common/css/iconfont/iconfont.css" />
+<link rel="stylesheet" type="text/css" href="${spath}/common/css/iconfont/iconfont.css" />
 <!--[if IE 6]>
-<script type="text/javascript" src="${path}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
+<script type="text/javascript" src="${spath}/common/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>
 <![endif]-->
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.min.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
-<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
-<script type="text/javascript" src="${path}/common/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/laypage/1.2/laypage.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${spath}/common/static/h-ui/js/H-ui.min.js"></script>
+<script type="text/javascript" src="${spath}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/datatables/1.10.0/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="${spath}/common/lib/laypage/1.2/laypage.js"></script>
 
 <script type="text/javascript">
     var root_path = "${path}";
@@ -37,4 +38,4 @@
 
 <script type="text/javascript" src="${path}/common/js/common/address.js"></script>
 <script type="text/javascript" src="${path}/common/js/common/salesChannel.js"></script>
-<script type="text/javascript" src="${path}/common/static/chosen/js/chosen.jquery.js"></script>
+<script type="text/javascript" src="${spath}/common/static/chosen/js/chosen.jquery.js"></script>

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

@@ -60,10 +60,10 @@
                     <option value ="11" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 11 >selected="selected"</#if></#if>
                     <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 4 >selected="selected"</#if></#if>>已通知配货</option>
                     <option value ="1" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 1 >selected="selected"</#if></#if>
-                                       <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 5 >selected="selected"</#if></#if>
-                                       <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 6 >selected="selected"</#if></#if>
-                                       <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 7 >selected="selected"</#if></#if>
-                                       <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 8 >selected="selected"</#if></#if>>已打单</option>
+                        <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 5 >selected="selected"</#if></#if>
+                        <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 6 >selected="selected"</#if></#if>
+                        <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 7 >selected="selected"</#if></#if>
+                        <#if salesOrder.statisticalType??><#if salesOrder.statisticalType == 8 >selected="selected"</#if></#if>>已打单</option>
                 </select>
 
                 <select class="my-select" name="salesDeliver" id="salesDeliver" style="height: 31px;width: 9%;margin: 0px;margin-bottom: 10px;">