Skip to content

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

罗恩工具类更新

parent ca7d079a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 808 additions and 38 deletions
front/src/api/index.js
View file @ ba6f28e0
......@@ -170,6 +170,46 @@ export const getBhSordersDetail = (params) => {
return postRequest('/tools/bh/getSorderDetailByTaskId', params)
}
/*=========== rhawn =========================*/
export const getRhawnSordersDataDetail = (params) => {
return postRequest('/tools/rhawn/getSordersDetail', params)
}
export const getRhawnSordersRefundTask = (params) => {
params.type = 'rhawn_sorder_refund'
return getRequest('/tools/rhawn/getSorderRefundTask', params)
}
export const getRhawnSordersStock = (params) => {
return getRequest('/tools/rhawn/getRhawnSordersStock', params)
}
export const addRhawnSorderRefundTask = (params) => {
return postRequest('/tools/rhawn/addSorderRefundTask', params)
}
export const execRhawnSordersRefundTask = (params) => {
return postRequest('/tools/rhawn/execRhawnSorderRefundTask', params)
}
export const delRhawnSorderRefundTask = (params) => {
return postRequest('/tools/rhawn/delSorderRefundTask', params)
}
export const getRhawnSorderRefundTaskLogs = (params) => {
params.type = 'rhawn_sorder_refund'
return getRequest('/tools/rhawn/getSorderRefundTaskLogs', params)
}
export const getRhawnSordersDetail = (params) => {
return postRequest('/tools/rhawn/getSorderDetailByTaskId', params)
}
export const editRhawnSorderRefundTask = (params) => {
return postRequest('/tools/rhawn/editSorderRefundTask', params)
}
/*=================== 工具类相关接口 结束================================ */
......
front/src/views/Main.vue
View file @ ba6f28e0
......@@ -11,7 +11,6 @@
}">
<shrinkable-menu :shrink="shrink" @on-change="handleSubmenuChange" :theme="menuTheme" :before-push="beforePush" :menu-list="menuList">
<div slot="top" class="logo-content" v-if="showLogo || fixNav">
<Icon type="ios-game-controller-b" size="100"></Icon>
<img v-show="!shrink && menuTheme == 'light' && mainTheme != 'darkMode'" src="@/assets/logo-black.png" />
<img v-show="shrink" src="@/assets/logo-min.png" key="min-logo" />
</div>
......
front/src/views/main.less
View file @ ba6f28e0
......@@ -371,7 +371,7 @@
.ivu-table-border td {
border-color: #f9f9f9;
height: 70px;
height: 10px;
}
.ivu-table-tip td {
......@@ -404,7 +404,7 @@
font-weight: bold;
background-color: #f9f9f9;
border:1px;
height: 85px;
height: 65px;
}
.ivu-table table {
width: calc(~'100% - 0px') !important;
......
front/src/views/sys/role-manage/roleManage.vue
View file @ ba6f28e0
......@@ -22,7 +22,7 @@
</div>
</Col>
</Row>
<Table stripe border class="tableInfoBox":loading="loading" :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
<Table stripe class="tableInfoBox":loading="loading" :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect"></Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" show-total show-sizer></Page>
</Row>
......
front/src/views/sys/user-manage/userManage.vue
View file @ ba6f28e0
......@@ -50,7 +50,7 @@
</div>
</Col>
</Row>
<Table stripe class="tableInfoBox" :loading="loading" :columns="columns" :data="data" sortable="custom" @on-sort-change="changeSort" @on-selection-change="showSelect"></Table>
<Table stripe class="tableInfoBox" :loading="loading" :columns="columns" :data="data" sortable="custom" @on-sort-change="changeSort" @on-selection-change="showSelect"></Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
</Row>
......
front/src/views/tools/bh/orders.vue
View file @ ba6f28e0
......@@ -16,7 +16,7 @@
</FormItem>
</Form>
</Row>
<Table :loading="loading" :columns="columns" :data="data" sortable="custom" ref="table"></Table>
<Table stripe class="tableInfoBox" :loading="loading" :columns="columns" :data="data" sortable="custom" ref="table"></Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
</Row>
......
front/src/views/tools/bh/sorders-refund.vue
View file @ ba6f28e0
......@@ -8,7 +8,7 @@
<Row>
<Button @click="add" type="primary" size="large" icon="md-add">添加任务</Button>
</Row>
<Table border :loading="loading" class="tableInfoBox" stripe :columns="columns" :data="data" sortable="custom" ref="table"></Table>
<Table :loading="loading" class="tableInfoBox" stripe :columns="columns" :data="data" sortable="custom" ref="table"></Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator show-sizer></Page>
</Row>
......@@ -107,7 +107,7 @@ export default {
handleFee: 0,
refundNums: 0,
transferPre: true,
cancelPorder: true
cancelPorder: true
},
searchForm: {
pageNumber: 1,
......@@ -139,26 +139,32 @@ export default {
message: "请输入手续费费用",
}, ]
},
columns: [
{
columns: [{
title: "ID",
key: "id",
minWidth: 105,
minWidth: 55,
},
{
title: "任务名称",
key: "name",
minWidth: 105,
minWidth: 185,
},
{
title: "任务内容",
key: "contentString",
minWidth: 335,
minWidth: 435,
render: (h, params) => {
return h("div", {
domProps: {
innerHTML: params.row.contentString
}
})
},
},
{
title: "状态",
key: "status",
minWidth: 55,
minWidth: 105,
render: (h, params) => {
if (params.row.status == 'notexec') {
return h("div", [
......@@ -207,22 +213,22 @@ export default {
{
title: "执行次数",
key: "execNums",
minWidth: 55,
minWidth: 85,
},
{
title: "创建人",
key: "createBy",
minWidth: 55,
minWidth: 105,
},
{
title: "创建日期",
key: "createdAt",
minWidth: 125,
minWidth: 175,
},
{
title: "更新日期",
key: "updatedAt",
minWidth: 125,
minWidth: 175,
},
{
title: "操作",
......@@ -235,17 +241,17 @@ export default {
let edit = "";
let del = "";
if (params.row.status != 'finish') {
execJob = h("span",[h(
"a", {
on: {
click: () => {
this.exec(params.row);
execJob = h("span", [h(
"a", {
on: {
click: () => {
this.exec(params.row);
},
},
},
},
"手动执行"
),
h("divider", {
"手动执行"
),
h("divider", {
props: {
type: "vertical",
},
......@@ -268,13 +274,13 @@ export default {
},
}),
h(
"a", {
on: {
click: () => {
this.del(params.row);
"a", {
on: {
click: () => {
this.del(params.row);
},
},
},
}, "删除"
}, "删除"
),
h("divider", {
props: {
......@@ -300,8 +306,7 @@ export default {
},
}
],
orderColumns: [
{
orderColumns: [{
title: "品牌",
key: "bCnName",
minWidth: 145,
......@@ -535,7 +540,7 @@ export default {
this.submitloading = true;
// 添加
if (this.type == 0) {
if(this.form.taskId){
if (this.form.taskId) {
this.form.taskId = '';
}
addSorderRefundTask(this.form).then((res) => {
......@@ -562,10 +567,10 @@ export default {
}
});
},
cleanAll(){
cleanAll() {
this.$refs.form.resetFields();
this.selectRowData = [];
this.searchData =[];
this.searchData = [];
},
exec(v) {
this.$Modal.confirm({
......
front/src/views/tools/rhawn/sorders-refund.less 0 → 100644
View file @ ba6f28e0
.url-remark {
font-size: 14px;
color: #515a6e;
display: block;
color: #9a9a9a;
margin-bottom: -16px;
font-style: italic;
}
\ No newline at end of file
front/src/views/tools/rhawn/sorders-refund.vue 0 → 100644
View file @ ba6f28e0
This diff is collapsed.
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