|
@@ -91,7 +91,7 @@ import { commonMixin } from '@/utils/mixin'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import { toThousands } from '@/libs/tools.js'
|
|
import { toThousands } from '@/libs/tools.js'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
-import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOutDetail } from '@/api/merchant'
|
|
|
|
|
|
+import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOut } from '@/api/merchant'
|
|
export default {
|
|
export default {
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
components: { STable, VSelect, commonMixin },
|
|
components: { STable, VSelect, commonMixin },
|
|
@@ -177,7 +177,7 @@ export default {
|
|
getPageInfo () {
|
|
getPageInfo () {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
const info = JSON.parse(sessionStorage.getItem('settlementDetail'))
|
|
const info = JSON.parse(sessionStorage.getItem('settlementDetail'))
|
|
- merchantCashOutDetail({shelfSn:this.$route.params.shelfSn}).then(res => {
|
|
|
|
|
|
+ merchantCashOut({shelfSn:this.$route.params.shelfSn}).then(res => {
|
|
console.log(res, info, '===========')
|
|
console.log(res, info, '===========')
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.total = res.data
|
|
this.total = res.data
|