Переглянути джерело

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl
wangxiang 7 роки тому
батько
коміт
591a8951b7

+ 10 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -180,17 +180,24 @@
         </table>
     </div>
 </div>
-<tfoot>
+<#--<tfoot>-->
 <#include "/base/page_util.ftl">
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.min.js"> </script>
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
-<script type="text/plain" id="upload_ue"></script>
-</tfoot>
+<#--<script type="text/plain" id="upload_ue"></script>-->
+<#--</tfoot>-->
 <script type="text/javascript">
     /*判断上传类型 1:上传excel推送订单   2:下载订单 */
     var editorType;
     var _editor;
+    /**
+     *跳转到详情页面
+     * @param employee
+     */
+    function sales_order_detail(orderSaleId) {
+        window.location.href= "${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId;
+    }
     $(function() {
         //重新实例化一个编辑器,防止在上面的editor编辑器中显示上传的图片或者文件
         _editor = UE.getEditor('upload_ue',{