This commit is contained in:
parent
e67e3525e4
commit
79e1282c68
|
|
@ -36,20 +36,25 @@
|
||||||
<el-table-column label="退款金额" prop="returnAmount"></el-table-column>
|
<el-table-column label="退款金额" prop="returnAmount"></el-table-column>
|
||||||
<el-table-column label="总收入" prop="totalAmount"></el-table-column>
|
<el-table-column label="总收入" prop="totalAmount"></el-table-column>
|
||||||
<el-table-column label="备用金" prop="imprest"></el-table-column>
|
<el-table-column label="备用金" prop="imprest"></el-table-column>
|
||||||
<el-table-column label="开始时间" prop="createTime">
|
<el-table-column label="开始时间" prop="startTime">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<div>
|
<div>
|
||||||
{{ scope.row.createTime }}
|
{{ scope.row.startTime }}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="交班时间" prop="endTime">
|
<el-table-column label="交班时间" prop="endTime">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<div>
|
<div>
|
||||||
{{ scope.row.createTime }}
|
{{ scope.row.endTime }}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="">
|
||||||
|
<template v-slot="scope">
|
||||||
|
<el-button type="primary" @click="clicksee(scope.row)">查看</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<div class="head-container">
|
<div class="head-container">
|
||||||
|
|
@ -57,6 +62,13 @@
|
||||||
@current-change="paginationChange" @size-change="sizeChange"
|
@current-change="paginationChange" @size-change="sizeChange"
|
||||||
layout="total, sizes, prev, pager, next, jumper"></el-pagination>
|
layout="total, sizes, prev, pager, next, jumper"></el-pagination>
|
||||||
</div>
|
</div>
|
||||||
|
<el-dialog title="商品销量" :visible.sync="dialogshow">
|
||||||
|
<el-table :data="tableDatainfo.data" style="width: 100%">
|
||||||
|
<el-table-column prop="productName" label="商品名称"/>
|
||||||
|
<el-table-column prop="num" label="数量"/>
|
||||||
|
<el-table-column prop="amount" label="金额" />
|
||||||
|
</el-table>
|
||||||
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -83,8 +95,17 @@ export default {
|
||||||
loading: false,
|
loading: false,
|
||||||
total: 0
|
total: 0
|
||||||
},
|
},
|
||||||
|
tableDatainfo: {
|
||||||
|
data: [],
|
||||||
|
page: 0,
|
||||||
|
size: 10,
|
||||||
|
loading: false,
|
||||||
|
total: 0
|
||||||
|
},
|
||||||
payCountList: "",
|
payCountList: "",
|
||||||
payCountTotal: 0
|
payCountTotal: 0,
|
||||||
|
dialogshow: false, //弹框显示
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
filters: {
|
filters: {
|
||||||
|
|
@ -99,7 +120,6 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
//携带table id跳转到订单列表页面
|
//携带table id跳转到订单列表页面
|
||||||
toTableOrderList(data) {
|
toTableOrderList(data) {
|
||||||
console.log(data)
|
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path: '/order_manage/order_list',
|
path: '/order_manage/order_list',
|
||||||
query: {
|
query: {
|
||||||
|
|
@ -126,17 +146,17 @@ export default {
|
||||||
},
|
},
|
||||||
async getTableData() {
|
async getTableData() {
|
||||||
this.tableData.loading = true;
|
this.tableData.loading = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let urlData = null
|
let urlData = null
|
||||||
if (this.query.createdAt.length == 0) { // 为什么这么写 因为后端让我有时候传key值有时候不传 为啥不按照框架走后端处理起来太麻烦 前端处理 -- 魏文政 2024.7.30 15:50
|
if (this.query.createdAt.length == 0) { // 为什么这么写 因为后端让我有时候传key值有时候不传 为啥不按照框架走后端处理起来太麻烦 前端处理 -- 魏文政 2024.7.30 15:50
|
||||||
urlData = `/api/tbHandover?page=${this.tableData.page + 1}&size=${this.tableData.size}&shopId=${localStorage.getItem("shopId")}&sort=${this.query.sort}`
|
urlData = `/api/tbHandover?page=${this.tableData.page}&size=${this.tableData.size}&shopId=${localStorage.getItem("shopId")}&sort=${this.query.sort}`
|
||||||
} else {
|
} else {
|
||||||
urlData = `/api/tbHandover?page=${this.tableData.page + 1}&size=${this.tableData.size}&shopId=${localStorage.getItem("shopId")}&tradeDay=${this.query.createdAt[0] ? this.query.createdAt[0] : ''}&tradeDay=${this.query.createdAt[1] ? this.query.createdAt[1] : ''}&sort=${this.query.sort}`
|
urlData = `/api/tbHandover?page=${this.tableData.page}&size=${this.tableData.size}&shopId=${localStorage.getItem("shopId")}&tradeDay=${this.query.createdAt[0] ? this.query.createdAt[0] : ''}&tradeDay=${this.query.createdAt[1] ? this.query.createdAt[1] : ''}&sort=${this.query.sort}`
|
||||||
}
|
}
|
||||||
const res = await tbHandoverGet(urlData);
|
const res = await tbHandoverGet(urlData);
|
||||||
this.tableData.loading = false;
|
this.tableData.loading = false;
|
||||||
this.tableData.data = res.content;
|
this.tableData.data = res.content;
|
||||||
|
console.log(this.tableData.productInfos)
|
||||||
this.tableData.total = res.totalElements;
|
this.tableData.total = res.totalElements;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
|
|
@ -216,6 +236,12 @@ export default {
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
// 查看
|
||||||
|
clicksee(e) {
|
||||||
|
this.dialogshow = true
|
||||||
|
console.log(JSON.parse(e.productInfos))
|
||||||
|
this.tableDatainfo.data = JSON.parse(e.productInfos)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue