From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 1 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js
index 3b9dd46..53c7c14 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js
@@ -217,7 +217,23 @@
}
return btn;
}
- }
+ },
+ {title: '是否异常订单', field: 'abnormal', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ return {1:"否",2:"是"}[value];
+ }
+ },
+ {title: '是否推广订单', field: 'promotion', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ return {1:"否",2:"是"}[value];
+ }
+ },
+ {title: '推广员姓名', field: 'promotionUser', visible: true, align: 'center', valign: 'middle',
+
+ },
+ {title: '推广员电话', field: 'promotionPhone', visible: true, align: 'center', valign: 'middle',
+
+ },
];
};
@@ -362,9 +378,79 @@
queryData['driver'] = $("#driver").val();
queryData['lineId'] = $("#lineId").val();
queryData['state'] = $("#state").val();
+ queryData['promotionUser'] = $("#promotionUser").val();
+ queryData['abnormal'] = $("#abnormal").val();
+ queryData['promotion'] = $("#promotion").val();
+
TOrderCrossCity.table.refresh({query: queryData});
};
+
+
+TOrderCrossCity.exportExcel=function (){
+ let p = "";
+ let insertTime = $('#insertTime').val();
+ let orderNum = $('#orderNum').val();
+ let orderSource = $('#orderSource').val();
+ let userName = $('#userName').val();
+ let userPhone = $('#userPhone').val();
+ let passengers = $('#passengers').val();
+ let passengersPhone = $('#passengersPhone').val();
+ let serverCarModelId = $('#serverCarModelId').val();
+ let driver = $('#driver').val();
+ let lineId = $('#lineId').val();
+ let state = $('#state').val();
+ let promotionUser = $('#promotionUser').val();
+ let abnormal = $('#abnormal').val();
+ let promotion = $('#promotion').val();
+ if(null != insertTime && '' != insertTime){
+ p += "insertTime=" + insertTime + "&";
+ }
+ if(null != orderNum && '' != orderNum){
+ p += "orderNum=" + orderNum + "&";
+ }
+ if(null != orderSource && '' != orderSource){
+ p += "orderSource=" + orderSource + "&";
+ }
+ if(null != userName && '' != userName){
+ p += "userName=" + userName + "&" ;
+ }
+ if(null != userPhone && '' != userPhone){
+ p += "userPhone=" + userPhone + "&" ;
+ }
+ if(null != passengers && '' != passengers){
+ p += "passengers=" + passengers + "&" ;
+ }
+ if(null != passengersPhone && '' != passengersPhone){
+ p += "passengersPhone=" + passengersPhone + "&" ;
+ }
+ if(null != serverCarModelId && '' != serverCarModelId){
+ p += "serverCarModelId=" + serverCarModelId + "&" ;
+ }
+ if(null != driver && '' != driver){
+ p += "driver=" + driver + "&" ;
+ }
+ if(null != lineId && '' != lineId){
+ p += "lineId=" + lineId + "&" ;
+ }
+ if(null != state && '' != state){
+ p += "state=" + state + "&" ;
+ }
+ if(null != promotionUser && '' != promotionUser){
+ p += "promotionUser=" + promotionUser + "&" ;
+ }
+ if(null != abnormal && '' != abnormal){
+ p += "abnormal=" + abnormal + "&" ;
+ }
+ if(null != promotion && '' != promotion){
+ p += "promotion=" + promotion + "&" ;
+ }
+ if('' != p){
+ p = "?" + p.substring(0, p.length - 1);
+ }
+ console.log('p['+p+']')
+ window.location.href = Feng.ctxPath + '/tOrderCrossCity/export' + p;
+}
TOrderCrossCity.resetSearch = function () {
$("#insertTime").val("");
$("#orderNum").val("");
@@ -377,6 +463,9 @@
$("#driver").val("");
$("#lineId").val("");
$("#state").val("");
+ $("#promotionUser").val("");
+ $("#abnormal").val("");
+ $("#promotion").val("");
TOrderCrossCity.search();
};
--
Gitblit v1.7.1