From 2506c3f8e3ef1ace4a258a8c5f93ddd47a51bbd2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 19 九月 2025 16:06:14 +0800
Subject: [PATCH] 修改后台司机授权逻辑判断

---
 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
index 607fcbc..8e96992 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
@@ -25,11 +25,20 @@
                 return btn;
             }
         },
-        {title: '订单编号', field: 'orderNum', visible: true, align: 'center', valign: 'middle',
+        {title: '系统订单编号', field: 'orderNum', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";
                 if(row.orderNum != '' && row.orderNum != null) {
                     btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.orderNum + '" onfocus="TUser.tooltip()">' + row.orderNum + '</p>']
+                }
+                return btn;
+            }
+        },
+        {title: '订单中心编号', field: 'travelId', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row) {
+                var btn = "";
+                if(row.travelId != '' && row.travelId != null) {
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.travelId + '" onfocus="TUser.tooltip()">' + row.travelId + '</p>']
                 }
                 return btn;
             }
@@ -53,7 +62,7 @@
                 return btn;
             }
         },
-        {title: '订单类型', field: 'rideType', visible: true, align: 'center', valign: 'middle',
+        {title: '订单类型', field: 'rideType', visible: false, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";
                 if(row.rideType != '' && row.rideType != null) {
@@ -67,6 +76,8 @@
                 }
                 return btn;
             }
+        },
+        {title: '所属公司', field: 'companyName', visible: true, align: 'center', valign: 'middle',
         },
         {title: '乘车时间', field: 'travelTime', visible: true, align: 'center', valign: 'middle',width:'10%',
             formatter: function (value, row) {
@@ -219,6 +230,21 @@
                         btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="改派中" onfocus="TUser.tooltip()">改派中</p>']
                     } else if (row.state == 12){
                         btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="取消待支付" onfocus="TUser.tooltip()">取消待支付</p>']
+                    }
+                }
+                return btn;
+            }
+        },
+        {title: '支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row) {
+                var btn = "";
+                if(row.payType != '' && row.payType != null) {
+                    if (row.payType == 1){
+                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="微信" onfocus="TUser.tooltip()">微信</p>']
+                    } else if (row.payType == 3){
+                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="余额" onfocus="TUser.tooltip()">余额</p>']
+                    } else if (row.payType == 5){
+                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="备付金" onfocus="TUser.tooltip()">备付金</p>']
                     }
                 }
                 return btn;
@@ -405,6 +431,7 @@
     queryData['promotionUser'] = $("#promotionUser").val();
     queryData['abnormal'] = $("#abnormal").val();
     queryData['promotion'] = $("#promotion").val();
+    queryData['payType'] = $("#payType").val();
     TOrderPrivateCar.table.refresh({query: queryData});
 };
 
@@ -426,6 +453,7 @@
     let promotionUser = $('#promotionUser').val();
     let abnormal = $('#abnormal').val();
     let promotion = $('#promotion').val();
+    let payType = $('#payType').val();
     if(null != insertTime && '' != insertTime){
         p += "insertTime=" + insertTime + "&";
     }
@@ -468,6 +496,9 @@
     if(null != promotion && '' != promotion){
         p += "promotion=" + promotion + "&" ;
     }
+    if(null != payType && '' != payType){
+        p += "payType=" + payType + "&" ;
+    }
     if('' != p){
         p = "?" + p.substring(0, p.length - 1);
     }
@@ -491,6 +522,7 @@
     $("#promotionUser").val("");
     $("#abnormal").val("");
     $("#promotion").val("");
+    $("#payType").val("");
     TOrderPrivateCar.search();
 };
 

--
Gitblit v1.7.1