Skip to content

O
openApi
Commit 6297b295 authored by hangjun83's avatar hangjun83
Browse files
Options

1、修复bug，2、新增任务日志

parent 0056f370
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 44 deletions
front/src/api/index.js
View file @ 6297b295
......@@ -141,6 +141,10 @@ export const addSorderRefundTask = (params) => {
return postRequest('/tools/bh/addSorderRefundTask', params)
}
export const editSorderRefundtask = (params) => {
return postRequest('/tools/bh/editSorderRefundTask', params)
}
export const getBhSordersDataDetail = (params) => {
return postRequest('/tools/bh/getBhSordersDetail', params)
}
......@@ -156,15 +160,19 @@ export const execBhSordersRefundTask = (params) => {
export const getSorderRefundTaskLogs = (params) => {
params.type = 'sorder_refund'
return postRequest('/tools/bh/getSorderRefundTaskLogs', params)
return getRequest('/tools/bh/getSorderRefundTaskLogs', params)
}
export const getBhSordersDetail = (params) => {
return postRequest('/tools/bh/getSorderDetailByTaskId', params)
}
/*=================== 工具类相关接口 结束================================ */
// 加载数据
export const loadPermission = (id, params) => {
return getRequest(`/permission/getByParentId/${id}`, params)
}
// 添加权限
export const addPermission = (params) => {
return postRequest('/permission/add', params)
......
front/src/views/main.less
View file @ 6297b295
......@@ -371,7 +371,7 @@
.ivu-table-border td {
border-color: #f9f9f9;
height: 50px;
height: 120px;
}
.ivu-table-tip td {
......@@ -403,9 +403,8 @@
color: #252b2d;
font-weight: bold;
background-color: #f9f9f9;
border:0px;
height: 75px;
border:1px;
height: 85px;
}
.ivu-table table {
width: calc(~'100% - 0px') !important;
......
front/src/views/sys/menu-manage/menuManage.vue
View file @ 6297b295
......@@ -417,7 +417,6 @@ export default {
}
let str = JSON.stringify(v[0]);
let data = JSON.parse(str);
console.info(data)
this.form = data;
this.editTitle = data.title;
} else {
......
front/src/views/tools/bh/sorders-refund.vue
View file @ 6297b295
......@@ -81,10 +81,12 @@
<script>
import {
getBhSordersDataDetail,
addSorderRefundTask,
addSorderRefundtask,
getBhSordersRefundTask,
execBhSordersRefundTask,
getSorderRefundTaskLogs
getSorderRefundTaskLogs,
getBhSordersDetail,
editSorderRefundtask
} from "@/api/index";
import util from "@/libs/util.js";
export default {
......@@ -95,31 +97,37 @@ export default {
loading: false,
searchLoading: false,
maxHeight: "500px",
type: 0,
form: {
name: '',
orderNo: '',
itemId: 0,
pId: 0,
handleFee: 0,
refundNums: 0,
transferPre: false,
cancelPorder: false
cancelPorder: false
},
searchForm: {
pageNumber: 1,
pageSize: 10,
page:1,
page: 1,
},
searchSorderForm: {
pageNumber: 1,
pageSize: 10,
page:1,
page: 1,
},
formValidate: {
// 表单验证规则
name: [{
required: true,
message: "请输入任务名称",
trigger: "change"
trigger: 'blur',
}, ],
orderNo: [{
required: true,
message: "请输入订单编号",
trigger: "change"
}, ],
refundNums: [{
required: true,
......@@ -131,11 +139,6 @@ export default {
}, ]
},
columns: [{
type: "index",
width: 60,
align: "center",
},
{
title: "任务名称",
key: "name",
minWidth: 105,
......@@ -240,21 +243,25 @@ export default {
"a", {
on: {
click: () => {
this.edit(params.row);
this.exec(params.row);
},
},
},
"编辑"
);
}, "编辑"
)
}
return h("div", [
execJob,
h("Divider", {
h("divider", {
props: {
type: "vertical",
},
}),
edit,
h("divider", {
props: {
type: "vertical",
},
}),
h(
"a", {
on: {
......@@ -458,7 +465,6 @@ export default {
});
},
selectRow(v) {
this.menuModalVisible = false;
if (v) {
let rowData = {}
rowData.orderNo = v.soNo
......@@ -472,8 +478,9 @@ export default {
this.form.orderNo = v.soNo
this.form.itemId = v.siId
this.form.pId = v.pId
this.form.refundNums = v.siNum
this.selectRowVisible = true
}
},
......@@ -498,17 +505,30 @@ export default {
submit() {
this.$refs.form.validate((valid) => {
if (valid) {
this.submitloading = true;
// 添加
this.submitLoading = true;
addSorderRefundTask(this.form).then((res) => {
this.submitLoading = false;
if (res.status == 'success') {
this.$Message.success("操作成功");
this.$emit("on-submit", true);
this.showAddSorderTask = false;
this.getDataList()
}
});
if (this.type == 0) {
addSorderRefundtask(this.form).then((res) => {
this.submitloading = false;
if (res.status == 'success') {
this.$Message.success("操作成功");
this.$emit("on-submit", true);
this.getDataList()
}
});
} else {
editSorderRefundtask(this.form).then((res) => {
this.submitloading = false;
if (res.status == 'success') {
this.$Message.success("操作成功");
this.$emit("on-submit", true);
this.getDataList()
}
});
}
this.showAddSorderTask = false;
this.$refs.form.resetFields();
}
});
},
......@@ -542,15 +562,27 @@ export default {
let str = JSON.stringify(v);
let data = JSON.parse(str);
let content = JSON.parse(data.execContent)
this.form.itemId = content.item_id
this.form.name = data.name
this.form.refundNums = content.refund_nums
this.form.transferPre = content.transfer_pre
this.form.handleFee = content.handle_fee
this.$refs.form.resetFields();
getBhSordersDetail({
'taskId': v.id
}).then((res) => {
this.submitLoading = false;
if (res.status == 'success') {
this.form.taskId = data.id
this.form.name = data.name
this.form.refundNums = parseInt(content.refund_nums)
this.form.transferPre = content.transfer_pre == 1 ? true : false
this.form.cancelPorder = content.cancelPorder == 1 ? true : false
this.form.handleFee = parseInt(content.handle_fee)
this.selectRow(res.data[0])
}
})
this.type = 1;
this.showAddSorderTask = true;
},
showLog(v) {
showLog(v) {
this.searchLoading = true;
this.logModalVisible = true
getSorderRefundTaskLogs({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment