Skip to content

C
chinafrica
提交 16b7a70c authored 作者: 陆's avatar 陆
浏览文件
操作

测试订单问题

上级 0a0949a0
隐藏空白字符变更
内嵌 并排
正在显示 包含 133 行增加 和 11 行删除
platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java
浏览文件 @ 16b7a70c
...@@ -364,7 +364,7 @@ public class TbCfOrderController extends AbstractController { ...@@ -364,7 +364,7 @@ public class TbCfOrderController extends AbstractController {
return R.ok().put("page", pageUtil); return R.ok().put("page", pageUtil);
} }
@PutMapping("/setToTestOrder") @PostMapping("/setToTestOrder")
@ResponseBody @ResponseBody
public R setToTestOrder(@RequestParam(value = "tested", required = false) String tested, public R setToTestOrder(@RequestParam(value = "tested", required = false) String tested,
@RequestParam("orderId") String orderId) { @RequestParam("orderId") String orderId) {
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html
浏览文件 @ 16b7a70c
...@@ -71,6 +71,55 @@ ...@@ -71,6 +71,55 @@
margin-top: 5px; margin-top: 5px;
display: contents; display: contents;
} }
.btnbox{
display: inline-block;
height: 30px;
line-height: 25px;
padding: 1px 18px;
background-color: #49C8F2;
font-size: 10px;
-webkit-border-radius: 2px;
border-radius: 6px;
color: #fff;
cursor: pointer;
border: 0;
margin: 1px 6px;
}
.closebtnbox{
display: inline-block;
height: 30px;
line-height: 25px;
padding: 1px 18px;
background-color: #999c9e;
font-size: 10px;
-webkit-border-radius: 2px;
border-radius: 6px; color: #fff;
cursor: pointer;
border: 0;
margin: 1px 6px;
}
.gobtnbox{
display: inline-block;
height: 30px;
line-height: 25px;
padding: 1px 18px;
background-color: magenta;
font-size: 10px;
-webkit-border-radius: 2px;
border-radius: 6px;
color: #fff;
cursor: pointer;
border: 0;
margin: 1px 6px;
}
.testbtn{
display: block;
background-color: #f90 !important;
}
.truebtn{
display: block;
background-color: #00E8D7;
}
</style> </style>
</head> </head>
<body> <body>
...@@ -128,6 +177,14 @@ ...@@ -128,6 +177,14 @@
v-for="(el,i) in payWayCodeList" :key = 'el.pay_way_code' v-for="(el,i) in payWayCodeList" :key = 'el.pay_way_code'
:value="el.pay_way_code">{{el.pay_way_code}}</el-option> :value="el.pay_way_code">{{el.pay_way_code}}</el-option>
</el-select> </el-select>
<el-select v-model="orderlisttype" placeholder="订单类型">
<el-option
v-for="item in ordertype"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<!-- <el-select v-model="deliveryFlag" placeholder="物流状态"> <!-- <el-select v-model="deliveryFlag" placeholder="物流状态">
<el-option <el-option
v-for="item in deliveryFlagOptions" v-for="item in deliveryFlagOptions"
......
platform-admin/src/main/webapp/js/sys/tbcforderList.js
浏览文件 @ 16b7a70c
...@@ -30,19 +30,23 @@ $(function () { ...@@ -30,19 +30,23 @@ $(function () {
{label: '优惠券名称', name: 'couponTitle', index: 'coupon_title', hidden: true}, {label: '优惠券名称', name: 'couponTitle', index: 'coupon_title', hidden: true},
{label: '邮箱', name: 'email', index: 'email'}, {label: '邮箱', name: 'email', index: 'email'},
{ {
name: '操作', index: 'operate', width: '160px', name: '操作', index: 'operate', width: '230px',
formatter: function (value, grid, rows) { formatter: function (value, grid, rows) {
console.log(grid.colModel.formatter.arguments[2].orderStatus) console.log(grid.colModel.formatter.arguments[2].orderStatus)
if (grid.colModel.formatter.arguments[2].orderStatus == 10 || grid.colModel.formatter.arguments[2].orderStatus == 60) { if (grid.colModel.formatter.arguments[2].orderStatus == 10 || grid.colModel.formatter.arguments[2].orderStatus == 60) {
return '<button onclick="closeList" style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #49C8F2;font-size: 10px; ' + if (grid.colModel.formatter.arguments[2].tested == 'T'){
'-webkit-border-radius: 2px; border-radius: 6px; color: #fff; cursor: pointer; border: 0;margin: 1px 6px;" class="orderdescbutton">查看订单' + return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="closeOrder closebtnbox">订单关闭</button><button onclick="fakertotrue" class="btnbox testbtn">测试订单</button>';
'</button><button style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #999c9e;font-size: 10px; ' + }else {
'-webkit-border-radius: 2px; border-radius: 6px; color: #fff; cursor: pointer; border: 0;margin: 1px 6px;" class="closeOrder">订单关闭</button>'; return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="closeOrder closebtnbox">订单关闭</button><button onclick="truetofaker" class="btnbox truebtn">真实订单</button>';
}
} else { } else {
return '<button onclick="closeList" style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #49C8F2;font-size: 10px; ' + if (grid.colModel.formatter.arguments[2].tested == 'T'){
'-webkit-border-radius: 2px; border-radius: 6px; color: #fff; cursor: pointer; border: 0;margin: 1px 6px;" class="orderdescbutton">查看订单' + return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="diybutton gobtnbox">订单发货</button><button onclick="fakertotrue" class="btnbox testbtn">测试订单</button>';
'</button><button style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: magenta;font-size: 10px; ' + }else {
'-webkit-border-radius: 2px; border-radius: 6px; color: #fff; cursor: pointer; border: 0;margin: 1px 6px;" class="diybutton">订单发货</button>'; return '<button onclick="closeList" class="orderdescbutton btnbox">查看订单</button><button class="diybutton gobtnbox">订单发货</button><button onclick="truetofaker" class="btnbox truebtn">真实订单</button>';
}
// } else if (grid.colModel.formatter.arguments[2].orderStatus == 40) { // } else if (grid.colModel.formatter.arguments[2].orderStatus == 40) {
// return '<button style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #49C8F2;font-size: 10px; ' + // return '<button style="display: inline-block;height: 30px; line-height: 25px; padding: 1px 18px; background-color: #49C8F2;font-size: 10px; ' +
// '-webkit-border-radius: 2px; border-radius: 6px; color: #fff; cursor: pointer; border: 0;margin: 1px 6px;" class="orderdescbutton">查看订单' + // '-webkit-border-radius: 2px; border-radius: 6px; color: #fff; cursor: pointer; border: 0;margin: 1px 6px;" class="orderdescbutton">查看订单' +
...@@ -117,6 +121,16 @@ $(function () { ...@@ -117,6 +121,16 @@ $(function () {
vm.closeOrder($(e.target).parent().parent().attr('id')) vm.closeOrder($(e.target).parent().parent().attr('id'))
return false return false
}) })
//修改成真实订单
$('#jqGrid').on('click', '.testbtn', e => {
vm.fakertotrue($(e.target).parent().parent().attr('id'))
return false
})
//修改成虚拟订单
$('#jqGrid').on('click', '.truebtn', e => {
vm.truetofaker($(e.target).parent().parent().attr('id'))
return false
})
})()) })())
}); });
...@@ -174,6 +188,14 @@ let vm = new Vue({ ...@@ -174,6 +188,14 @@ let vm = new Vue({
value: '50', value: '50',
label: '已签收' label: '已签收'
}], }],
//订单类型
ordertype: [{
value: 'T',
label: '测试订单'
}, {
value: '',
label: '真实订单'
}],
payStatusOptions: [{ payStatusOptions: [{
value: '20', value: '20',
label: "已支付" label: "已支付"
...@@ -234,6 +256,8 @@ let vm = new Vue({ ...@@ -234,6 +256,8 @@ let vm = new Vue({
formLabelWidthOfMemoOrder: '100px', formLabelWidthOfMemoOrder: '100px',
//代购状态 //代购状态
deliveryFlag: '', deliveryFlag: '',
//订单状态
orderlisttype: '',
//代购弹窗大小 //代购弹窗大小
formLabelWidth: '120px', formLabelWidth: '120px',
//商店集合 //商店集合
...@@ -792,6 +816,44 @@ let vm = new Vue({ ...@@ -792,6 +816,44 @@ let vm = new Vue({
}); });
}); });
}, },
// 切换成测试订单
truetofaker:function (e){
let orderId = e;
if (orderId == null) {
return;
}
confirm('确定要修改为测试订单？', function () {
Ajax.request({
url: "../tbcforder/setToTestOrder?"+'tested=T'+'&orderId='+orderId,
type: "POST",
contentType: "application/json",
successCallback: function () {
alert('操作成功', function (index) {
vm.reload();
});
}
});
});
},
//切换成真实订单
fakertotrue:function (e){
let orderId = e;
if (orderId == null) {
return;
}
confirm('确定要修改为真实订单？', function () {
Ajax.request({
url: "../tbcforder/setToTestOrder?"+'orderId='+orderId,
type: "POST",
contentType: "application/json",
successCallback: function () {
alert('操作成功', function (index) {
vm.reload();
});
}
});
});
},
//订单详情 //订单详情
orderDesc: function (e) { orderDesc: function (e) {
vm.showList = false; vm.showList = false;
...@@ -941,6 +1003,7 @@ let vm = new Vue({ ...@@ -941,6 +1003,7 @@ let vm = new Vue({
let userName = vm.userName; let userName = vm.userName;
let orderStatus = vm.orderStatus; let orderStatus = vm.orderStatus;
let payStatus = vm.payStatus; let payStatus = vm.payStatus;
let tested = vm.orderlisttype;
let page = $("#jqGrid").jqGrid('getGridParam', 'page'); let page = $("#jqGrid").jqGrid('getGridParam', 'page');
$("#jqGrid").jqGrid('setGridParam', { $("#jqGrid").jqGrid('setGridParam', {
postData: { postData: {
...@@ -951,7 +1014,8 @@ let vm = new Vue({ ...@@ -951,7 +1014,8 @@ let vm = new Vue({
'deliveryFlag': deliveryFlag, 'deliveryFlag': deliveryFlag,
'userName': userName, 'userName': userName,
'orderStatus': orderStatus, 'orderStatus': orderStatus,
'payStatus': payStatus 'payStatus': payStatus,
'tested':tested,
}, },
page: page page: page
}).trigger("reloadGrid"); }).trigger("reloadGrid");
...@@ -966,6 +1030,7 @@ let vm = new Vue({ ...@@ -966,6 +1030,7 @@ let vm = new Vue({
vm.userName = ''; vm.userName = '';
vm.orderStatus = ''; vm.orderStatus = '';
vm.payStatus = ''; vm.payStatus = '';
vm.orderlisttype='';
vm.reload(); vm.reload();
}, },
handleSubmit: function (name) { handleSubmit: function (name) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论