From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/orderLog/orderLog.js | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/orderLog/orderLog.js b/src/main/webapp/static/js/orderLog/orderLog.js
index 42cb8ad..dbb5bd2 100644
--- a/src/main/webapp/static/js/orderLog/orderLog.js
+++ b/src/main/webapp/static/js/orderLog/orderLog.js
@@ -48,8 +48,8 @@
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160},
- {field: 'memo', align: 'center',title: '澶囨敞', hide: true}
-
+ {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 260}
]],
request: {
pageName: 'curr',
@@ -130,8 +130,9 @@
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- {field: 'owner$', title: '瑙勬牸'},
- {field: 'payment$', title: '瑙勬牸'}
+ {field: 'owner$', title: '璐т富'},
+ {field: 'payment$', title: '璐х墿褰㈡��'},
+ {field: 'weight', title: '閲嶉噺'}
]],
request: {
pageName: 'curr',
@@ -157,6 +158,9 @@
});
}else if (layEvent === 'wrkTrace'){
showWrkTrace(data.id);
+ }
+ else if (layEvent === 'printExcel'){
+ printExcel(data);
}
});
@@ -547,4 +551,13 @@
}
})
}
+ function printExcel(data){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ // location.href = "http://192.168.4.121:8082/stwms/orderCheck/printExport/auth?orderNo="+data.orderNo;
+ location.href = baseUrl+"/orderLog/printExport/auth?orderNo="+data.orderNo;
+ layer.closeAll('loading');
+ });
+ }
});
--
Gitblit v1.9.1