From 8bb36ed768729cbf5afb340969980ccfef1c1750 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 21 六月 2023 17:22:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder.js | 214 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 186 insertions(+), 28 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder.js b/management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder.js
index 3dc9fae..b0656c8 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder.js
@@ -14,32 +14,76 @@
TOrder.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: '主键', field: 'id', visible: true, align: 'center', valign: 'middle'},
- {title: '编号', field: 'code', visible: true, align: 'center', valign: 'middle'},
- {title: '用户id', field: 'userId', visible: true, align: 'center', valign: 'middle'},
- {title: '司机id', field: 'driverId', visible: true, align: 'center', valign: 'middle'},
- {title: '订单来源（1=小程序）', field: 'source', visible: true, align: 'center', valign: 'middle'},
- {title: '代理商id', field: 'agentId', visible: true, align: 'center', valign: 'middle'},
- {title: '分公司id', field: 'branchOfficeId', visible: true, align: 'center', valign: 'middle'},
- {title: '开始服务时间', field: 'startTime', visible: true, align: 'center', valign: 'middle'},
- {title: '起点地址', field: 'startAddress', visible: true, align: 'center', valign: 'middle'},
- {title: '起点纬度', field: 'startLat', visible: true, align: 'center', valign: 'middle'},
- {title: '起点经度', field: 'startLng', visible: true, align: 'center', valign: 'middle'},
- {title: '终点地址', field: 'endAddress', visible: true, align: 'center', valign: 'middle'},
- {title: '终点纬度', field: 'endLat', visible: true, align: 'center', valign: 'middle'},
- {title: '终点经度', field: 'endLng', visible: true, align: 'center', valign: 'middle'},
- {title: '上车时间', field: 'boardingTime', visible: true, align: 'center', valign: 'middle'},
- {title: '下车时间', field: 'getoffTime', visible: true, align: 'center', valign: 'middle'},
- {title: '预估价', field: 'estimatedPrice', visible: true, align: 'center', valign: 'middle'},
- {title: '订单金额', field: 'orderMoney', visible: true, align: 'center', valign: 'middle'},
- {title: '支付金额', field: 'payMoney', visible: true, align: 'center', valign: 'middle'},
- {title: '优惠金额', field: 'discountedPrice', visible: true, align: 'center', valign: 'middle'},
- {title: '优惠券id', field: 'couponId', visible: true, align: 'center', valign: 'middle'},
- {title: '支付类型（1=线上）', field: 'payType', visible: true, align: 'center', valign: 'middle'},
- {title: '支付时间', field: 'payTime', visible: true, align: 'center', valign: 'middle'},
- {title: '订单状态（1=待接单，2=已接单，3=）', field: 'state', visible: true, align: 'center', valign: 'middle'},
- {title: '状态（1=正常，2=冻结，3=删除）', field: 'status', visible: true, align: 'center', valign: 'middle'},
- {title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'}
+ {title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '下单时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '订单编号', field: 'code', visible: true, align: 'center', valign: 'middle'},
+ {title: '订单来源', field: 'source', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.source === 1){
+ return '<span>小程序</span>'
+ }else if (row.source === 2){
+ return '<span>司机创建</span>'
+ }
+ }},
+ {title: '开始服务时间', field: 'startTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '用户id', field: 'userId', visible: false, align: 'center', valign: 'middle'},
+ {title: '下单用户昵称', field: 'userName', visible: true, align: 'center', valign: 'middle'},
+ {title: '下单用户手机', field: 'userPhone', visible: true, align: 'center', valign: 'middle'},
+ {title: '起点地址', field: 'startAddress', visible: true, align: 'center', valign: 'middle'},
+ {title: '起点纬度', field: 'startLat', visible: false, align: 'center', valign: 'middle'},
+ {title: '起点经度', field: 'startLng', visible: false, align: 'center', valign: 'middle'},
+ {title: '终点地址', field: 'endAddress', visible: true, align: 'center', valign: 'middle'},
+ {title: '终点纬度', field: 'endLat', visible: false, align: 'center', valign: 'middle'},
+ {title: '终点经度', field: 'endLng', visible: false, align: 'center', valign: 'middle'},
+ {title: '司机id', field: 'driverId', visible: false, align: 'center', valign: 'middle'},
+ {title: '接单司机', field: 'driverName', visible: true, align: 'center', valign: 'middle'},
+ {title: '司机电话', field: 'driverPhone', visible: true, align: 'center', valign: 'middle'},
+ {title: '预估价', field: 'estimatedPrice', visible: true, align: 'center', valign: 'middle'},
+ {title: '代理商id', field: 'agentId', visible: false, align: 'center', valign: 'middle'},
+ {title: '分公司id', field: 'branchOfficeId', visible: false, align: 'center', valign: 'middle'},
+ {title: '上车时间', field: 'boardingTime', visible: false, align: 'center', valign: 'middle'},
+ {title: '下车时间', field: 'getoffTime', visible: false, align: 'center', valign: 'middle'},
+ {title: '订单金额', field: 'orderMoney', visible: false, align: 'center', valign: 'middle'},
+ {title: '支付金额', field: 'payMoney', visible: false, align: 'center', valign: 'middle'},
+ {title: '优惠金额', field: 'discountedPrice', visible: false, align: 'center', valign: 'middle'},
+ {title: '优惠券id', field: 'couponId', visible: false, align: 'center', valign: 'middle'},
+ {title: '支付类型', field: 'payType', visible: false, align: 'center', valign: 'middle'},
+ {title: '支付时间', field: 'payTime', visible: false, align: 'center', valign: 'middle'},
+ {title: '取消次数', field: 'cancelCount', visible: true, align: 'center', valign: 'middle'},
+ {title: '订单状态', field: 'state', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.state === 101){
+ return '<span>待接单</span>'
+ }else if (row.state === 102){
+ return '<span>已接单</span>'
+ }else if (row.state === 103){
+ return '<span>前往预约点</span>'
+ }else if (row.state === 104){
+ return '<span>到达预约点</span>'
+ }else if (row.state === 105){
+ return '<span>开始服务</span>'
+ }else if (row.state === 106){
+ return '<span>到达目的地</span>'
+ }else if (row.state === 107){
+ return '<span>待支付</span>'
+ }else if (row.state === 108){
+ return '<span>待评价</span>'
+ }else if (row.state === 109){
+ return '<span>已完成</span>'
+ }else if (row.state === 201){
+ return '<span>转单中</span>'
+ }else if (row.state === 301){
+ return '<span>已取消</span>'
+ }else if (row.state === 401){
+ return '<span>等待中</span>'
+ }
+ }},
+ {title: '状态', field: 'status', visible: false, align: 'center', valign: 'middle'},
+ {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
+ formatter: function (value, row) {
+ return '<a href="#" onclick="TOrder.searchTOrderDetail('+row.id+')" style="color:green">详情</a>'
+ }
+ }
];
};
@@ -90,6 +134,21 @@
};
/**
+ * 打开查看详情(使用中)
+ */
+TOrder.searchTOrderDetail = function (id) {
+ var index = layer.open({
+ type: 2,
+ title: '详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tOrder/orderDetail?orderId=' + id
+ });
+ this.layerIndex = index;
+};
+
+/**
* 删除
*/
TOrder.delete = function () {
@@ -104,19 +163,118 @@
ajax.start();
}
};
+/**
+ * 后台取消订单
+ */
+TOrder.cancelOrderUpdate = function () {
+ if (this.check()) {
+
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+
+ var id = selected[0].id
+ var state = selected[0].state
+
+ console.log(id)
+ console.log(state)
+
+ if (state != 101 && state != 102 && state != 103 && state != 104 && state != 105 && state != 106 && state != 107) {
+ Feng.error("该订单当前状态不可取消!")
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/tOrder/cancelOrderUpdate", function (data) {
+ Feng.success("取消订单成功!");
+ TOrder.table.refresh();
+ }, function (data) {
+ Feng.error("取消订单失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("tOrderId", id);
+ ajax.start();
+ }
+};
+
+/**
+ * 订单信息导出
+ */
+TOrder.export=function(){
+ var createTime=$("#createTime").val()
+ var code=$("#code").val()
+ var source=$("#source").val()
+ var userName=$("#userName").val()
+ var userPhone=$("#userPhone").val()
+ var state=$("#state").val()
+ var driverName=$("#driverName").val()
+ window.location.href=Feng.ctxPath + "/tOrder/export?createTime="+createTime
+ +"&code="+code
+ +"&source="+source
+ +"&userName="+userName
+ +"&userPhone="+userPhone
+ +"&state="+state
+ +"&driverName="+driverName
+ ;
+}
+
+/**
+ * 订单异常页面
+ */
+TOrder.tOrderException = function () {
+ var index = layer.open({
+ type: 2,
+ title: '异常',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tOrder/tOrder-exception'
+ });
+ this.layerIndex = index;
+};
+
+/**
+ * 取消订单页面
+ */
+TOrder.cancelOrder = function () {
+ var index = layer.open({
+ type: 2,
+ title: '取消订单',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tOrder/cancelOrder'
+ });
+ this.layerIndex = index;
+};
/**
* 查询列表
*/
TOrder.search = function () {
var queryData = {};
- queryData['condition'] = $("#condition").val();
+ queryData['createTime'] = $("#createTime").val();
+ queryData['code'] = $("#code").val();
+ queryData['source'] = $("#source").val();
+ queryData['userName'] = $("#userName").val();
+ queryData['userPhone'] = $("#userPhone").val();
+ queryData['state'] = $("#state").val();
+ queryData['driverName'] = $("#driverName").val();
TOrder.table.refresh({query: queryData});
};
+/**
+ * 重置
+ */
+TOrder.resetSearch = function (){
+ $("#createTime").val('');
+ $("#code").val('');
+ $("#source").val('');
+ $("#userName").val('');
+ $("#userPhone").val('');
+ $("#state").val('');
+ $("#driverName").val('');
+ TOrder.search();
+}
+
$(function () {
var defaultColunms = TOrder.initColumn();
- var table = new BSTable(TOrder.id, "/tOrder/list", defaultColunms);
+ var table = new BSTable(TOrder.id, "/tOrder/orderList", defaultColunms);
table.setPaginationType("client");
TOrder.table = table.init();
});
--
Gitblit v1.7.1