|
|
@@ -9,7 +9,7 @@
|
|
|
<link rel="Bookmark" href="/favicon.ico" >
|
|
|
<link rel="Shortcut Icon" href="/favicon.ico" />
|
|
|
<#include "/base/list_base.ftl">
|
|
|
- <title>客诉列表</title>
|
|
|
+ <title>订单列表</title>
|
|
|
<style>
|
|
|
*{padding: 0;margin: 0;}
|
|
|
.my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
|
|
|
@@ -25,7 +25,7 @@
|
|
|
<body>
|
|
|
<nav class="breadcrumb"><i class="Hui-iconfont"></i> 首页
|
|
|
<span class="c-gray en">></span> 客诉管理
|
|
|
- <span class="c-gray en">></span> 客诉列表
|
|
|
+ <span class="c-gray en">></span> 订单列表
|
|
|
<a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont"></i></a>
|
|
|
</nav>
|
|
|
|
|
|
@@ -64,7 +64,11 @@
|
|
|
<input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
|
|
|
<button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont"></i> 搜索</button>
|
|
|
<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont"></i> 导出</button>
|
|
|
- <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont"></i> 同步订单</button>
|
|
|
+ <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont"></i> 同步订单</button><br>
|
|
|
+ <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont"></i> 上传Excel(仅支持XLS类型)</button>
|
|
|
+ <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont"></i> 下载订单</button>
|
|
|
+
|
|
|
+ </div>
|
|
|
</form>
|
|
|
</div>
|
|
|
|
|
|
@@ -84,6 +88,7 @@
|
|
|
<th width="50">支付金额</th>
|
|
|
<th width="50">是否付款</th>
|
|
|
<th width="50">是否发货</th>
|
|
|
+ <th width="50">订单备注</th>
|
|
|
<th width="60">创建时间</th>
|
|
|
<th width="50">操作</th>
|
|
|
</tr>
|
|
|
@@ -155,6 +160,7 @@
|
|
|
备货中
|
|
|
</#if>
|
|
|
</td>
|
|
|
+ <td>${order.salesAdminRemark!''}</td>
|
|
|
<td>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
|
|
|
<td>
|
|
|
<a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="sales_order_detail(${order.salesId!''})">
|
|
|
@@ -172,8 +178,59 @@
|
|
|
</div>
|
|
|
<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/javascript">
|
|
|
+ /*判断上传类型 1：上传excel推送订单 2:下载订单 */
|
|
|
+ var editorType;
|
|
|
+ var _editor;
|
|
|
+ $(function() {
|
|
|
+ //重新实例化一个编辑器，防止在上面的editor编辑器中显示上传的图片或者文件
|
|
|
+ _editor = UE.getEditor('upload_ue',{
|
|
|
+ initialFrameWidth : 375,
|
|
|
+ initialFrameHeight: 600
|
|
|
+ });
|
|
|
+ _editor.ready(function () {
|
|
|
+ _editor.setDisabled("attachment");//设置编辑器不可用
|
|
|
+ _editor.hide();//隐藏编辑器，因为不会用到这个编辑器实例，所以要隐藏
|
|
|
+ //侦听图片上传
|
|
|
+ _editor.addListener('beforeInsertImage', function (t, arg) {
|
|
|
+ console.log(arg[0].src);
|
|
|
+ $("#picture").attr("value", arg[0].src);//将地址赋值给相应的input,只去第一张图片的路径
|
|
|
+ $("#preview").attr("src", arg[0].src); //图片预览
|
|
|
+ });
|
|
|
+ //侦听文件上传，取上传文件列表中第一个上传的文件的路径
|
|
|
+ _editor.addListener('afterUpfile', function (t, arg) {
|
|
|
+ console.log(arg[0].url);
|
|
|
+ if(editorType == 1){
|
|
|
+ window.location.href=root_path + '/admin/order/upload_excel?file='+arg[0].url;
|
|
|
+ $("#file").attr("value", _editor.options.filePath + arg[0].url);
|
|
|
+ }else{
|
|
|
+ window.location.href=root_path + '/admin/order/download_excel?file='+arg[0].url;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ });
|
|
|
+ //弹出文件上传的对话框
|
|
|
+ function upFiles() {
|
|
|
+ var myFiles = _editor.getDialog("attachment");
|
|
|
+ myFiles.open();
|
|
|
+ editorType = 1;
|
|
|
+ }
|
|
|
+ /* 交易号文件上传 */
|
|
|
+ function downloadOrder(){
|
|
|
+ var myFiles = _editor.getDialog("attachment");
|
|
|
+ myFiles.open();
|
|
|
+ editorType = 2;
|
|
|
+ }
|
|
|
+ //弹出图片上传的对话框
|
|
|
+ function upImage() {
|
|
|
+ var myImage = _editor.getDialog("insertimage");
|
|
|
+ myImage.open();
|
|
|
+ }
|
|
|
|
|
|
/*进入订单详情*/
|
|
|
function sales_order_detail(salesId) {
|
