|
@@ -4,25 +4,25 @@
|
|
<a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo" >
|
|
<a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo" >
|
|
<template slot="subTitle">
|
|
<template slot="subTitle">
|
|
<a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
|
|
<a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
|
|
- <span style="margin: 0 15px;color: #666;">货架名称:{{ '西安车领主常青二路数字货架' }}</span>
|
|
|
|
|
|
+ <span style="margin: 0 15px;color: #666;"> {{ this.$route.params.shelfName||'--' }} </span>
|
|
</template>
|
|
</template>
|
|
</a-page-header>
|
|
</a-page-header>
|
|
<!-- 额度统计 授信结算类型 显示-->
|
|
<!-- 额度统计 授信结算类型 显示-->
|
|
- <a-card size="small" :bordered="false" style="margin-bottom: 10px;">
|
|
|
|
|
|
+ <a-card size="small" :bordered="false" style="margin-bottom: 10px;" v-if="this.$route.params.settleType=='CREDIT'">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse :activeKey="['1']">
|
|
<a-collapse-panel key="1" header="额度统计">
|
|
<a-collapse-panel key="1" header="额度统计">
|
|
<a-descriptions size="small" :column="4">
|
|
<a-descriptions size="small" :column="4">
|
|
<a-descriptions-item label="授信额度">
|
|
<a-descriptions-item label="授信额度">
|
|
- <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
|
|
|
|
|
|
+ <span>{{ total && total.creditLimit? toThousands(total.creditLimit,2):'--' }}</span>
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
<a-descriptions-item label="待结金额">
|
|
<a-descriptions-item label="待结金额">
|
|
- <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
|
|
|
|
|
|
+ <span>{{ total && total.waitSettleAmount? toThousands(total.waitSettleAmount,2):'--' }}</span>
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
<a-descriptions-item label="冻结金额">
|
|
<a-descriptions-item label="冻结金额">
|
|
- <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
|
|
|
|
|
|
+ <span>{{ total && total.freezeAmount? toThousands(total.freezeAmount,2):'--' }}</span>
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
<a-descriptions-item label="可用额度">
|
|
<a-descriptions-item label="可用额度">
|
|
- <a-statistic :precision="2" :value="112893" ><template #prefix>¥</template></a-statistic>
|
|
|
|
|
|
+ <span>{{ total && total.usableAmount?toThousands(total.usableAmount,2):'--' }}</span>
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
</a-descriptions>
|
|
</a-descriptions>
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
@@ -34,17 +34,17 @@
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="下单时间">
|
|
<a-form-item label="下单时间">
|
|
- <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
|
|
|
|
|
|
+ <a-range-picker v-model="orderDate" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" @change="orderDateChange"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="取货时间">
|
|
<a-form-item label="取货时间">
|
|
- <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
|
|
|
|
|
|
+ <a-range-picker v-model="time" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" @change="dateChange"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
<a-form-item label="取货单编号">
|
|
<a-form-item label="取货单编号">
|
|
- <a-input placeholder="请输入取货单编号"/>
|
|
|
|
|
|
+ <a-input placeholder="请输入取货单编号" v-model="queryParam.orderBillNo" allowClear/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xl="6" :lg="6" :md="6" :sm="6" >
|
|
<a-col :xl="6" :lg="6" :md="6" :sm="6" >
|
|
@@ -56,8 +56,8 @@
|
|
</div>
|
|
</div>
|
|
<a-alert type="info" style="margin:10px 0">
|
|
<a-alert type="info" style="margin:10px 0">
|
|
<div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
|
|
<div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
|
|
- 共<strong>25</strong>条记录;
|
|
|
|
- 待结算金额合计¥<strong>40000.00</strong>
|
|
|
|
|
|
+ 共<strong>{{ count }}</strong>条记录;
|
|
|
|
+ 待结算金额合计¥<strong>{{ priceTotal?toThousands(priceTotal,2):'--' }}</strong>
|
|
</div>
|
|
</div>
|
|
</a-alert>
|
|
</a-alert>
|
|
<s-table
|
|
<s-table
|
|
@@ -70,10 +70,6 @@
|
|
:data="loadData"
|
|
:data="loadData"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
bordered>
|
|
bordered>
|
|
- <template slot="name" slot-scope="text, record">
|
|
|
|
- <a-input allowClear placeholder="请输入货位号" v-if="isEdit" style="width: 80%;"/>
|
|
|
|
- <span v-if="!isEdit">{{ record.name }}</span>
|
|
|
|
- </template>
|
|
|
|
</s-table>
|
|
</s-table>
|
|
</a-card>
|
|
</a-card>
|
|
<!-- 导入货位模板 -->
|
|
<!-- 导入货位模板 -->
|
|
@@ -85,12 +81,15 @@
|
|
<script>
|
|
<script>
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
-import { getPowerUserList } from '@/api/power-user.js'
|
|
|
|
-// import importHuoweiModal from './importHuoweiModal.vue'
|
|
|
|
|
|
+import { toThousands } from '@/libs/tools.js'
|
|
|
|
+import moment from 'moment'
|
|
|
|
+import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOutDetail } from '@/api/merchant'
|
|
export default {
|
|
export default {
|
|
|
|
+ mixins: [commonMixin],
|
|
components: { STable, VSelect, commonMixin },
|
|
components: { STable, VSelect, commonMixin },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
|
|
+ toThousands,
|
|
spinning: false,
|
|
spinning: false,
|
|
disabled: false,
|
|
disabled: false,
|
|
isEdit: false, // 货位号是否为编辑
|
|
isEdit: false, // 货位号是否为编辑
|
|
@@ -100,41 +99,46 @@ export default {
|
|
wrapperCol: { span: 16 }
|
|
wrapperCol: { span: 16 }
|
|
},
|
|
},
|
|
time: [],
|
|
time: [],
|
|
- form: {
|
|
|
|
- isEnable: '',
|
|
|
|
- name: '',
|
|
|
|
- phone: '',
|
|
|
|
- loginName: '',
|
|
|
|
- sex: undefined,
|
|
|
|
- loginFlag: '', // 状态
|
|
|
|
- roleNames: undefined, // 角色
|
|
|
|
- productMsg: '', // 图片
|
|
|
|
- remarks: ''
|
|
|
|
|
|
+ orderDate: [],
|
|
|
|
+ count: 0,
|
|
|
|
+ priceTotal: 0,
|
|
|
|
+ total: null,
|
|
|
|
+ queryParam: {
|
|
|
|
+ orderBeginDate: '',
|
|
|
|
+ orderEndDat: '',
|
|
|
|
+ outBeginDate: '',
|
|
|
|
+ outEndDate: '',
|
|
|
|
+ orderBillNo: ''
|
|
},
|
|
},
|
|
// 表头
|
|
// 表头
|
|
columns: [
|
|
columns: [
|
|
- { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
|
- { title: '取货时间', dataIndex: 'name', width: '11%', align: 'center', scopedSlots: { customRender: 'name' } },
|
|
|
|
- { title: '订单编号', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '货位号', dataIndex: '', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '产品编码', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '产品名称', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
- { title: '产品售价', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '下单数量', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '合计金额', width: '9%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
|
|
|
+ { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
|
+ { title: '下单时间', dataIndex: 'orderDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '取货时间', dataIndex: 'outDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '订单编号', dataIndex: 'orderBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '货位号', dataIndex: 'shelfPlaceCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '产品编码', width: '10%', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '产品名称', width: '15%', dataIndex: 'productName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '结算价', width: '10%', dataIndex: 'settlePrice', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
|
|
|
|
+ { title: '下单数量', width: '8%', dataIndex: 'totalQty', align: 'center', customRender: function (text) { return toThousands(text) || '--' } },
|
|
|
|
+ { title: '合计金额', width: '10%', dataIndex: 'settleAmount', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } }
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
- return getPowerUserList(Object.assign(parameter)).then(res => {
|
|
|
|
|
|
+ const paramsPage = Object.assign(parameter, this.queryParam)
|
|
|
|
+ paramsPage.settleState = 'WAIT'
|
|
|
|
+ paramsPage.billState = 'FINISH'
|
|
|
|
+ paramsPage.shelfSn = this.$route.params.shelfSn
|
|
|
|
+ return queryOrderBillDetailPage(paramsPage).then(res => {
|
|
let data
|
|
let data
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
data = res.data
|
|
data = res.data
|
|
|
|
+ this.getCount(paramsPage)
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (let i = 0; i < data.list.length; i++) {
|
|
for (let i = 0; i < data.list.length; i++) {
|
|
const _item = data.list[i]
|
|
const _item = data.list[i]
|
|
_item.no = no + i + 1
|
|
_item.no = no + i + 1
|
|
- _item.loginFlag = _item.loginFlag + '' === '1'
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.spinning = false
|
|
this.spinning = false
|
|
@@ -143,15 +147,71 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- mounted () {
|
|
|
|
- this.$refs.table.refresh()
|
|
|
|
- },
|
|
|
|
|
|
+
|
|
methods: {
|
|
methods: {
|
|
handleBack () {
|
|
handleBack () {
|
|
this.$router.go(-1)
|
|
this.$router.go(-1)
|
|
},
|
|
},
|
|
|
|
+ orderDateChange (date) {
|
|
|
|
+ console.log(date, date)
|
|
|
|
+ this.orderDate = date
|
|
|
|
+ this.queryParam.orderBeginDate = moment(date[0]).format('YYYY-MM-DD')
|
|
|
|
+ this.queryParam.orderEndDat = moment(date[1]).format('YYYY-MM-DD')
|
|
|
|
+ },
|
|
|
|
+ dateChange (date) {
|
|
|
|
+ this.time = date
|
|
|
|
+ this.queryParam.outBeginDate = moment(date[0]).format('YYYY-MM-DD')
|
|
|
|
+ this.queryParam.outEndDate = moment(date[1]).format('YYYY-MM-DD')
|
|
|
|
+ },
|
|
|
|
+ disabledDate (current) {
|
|
|
|
+ return current && current > moment().endOf('day')
|
|
|
|
+ },
|
|
|
|
+ getPageInfo () {
|
|
|
|
+ this.spinning = true
|
|
|
|
+ merchantCashOutDetail({}).then(res => {
|
|
|
|
+ console.log(res, '===========')
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ this.total = res.data
|
|
|
|
+ } else {
|
|
|
|
+ this.total = null
|
|
|
|
+ }
|
|
|
|
+ this.spinning = false
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ getCount (val) {
|
|
|
|
+ queryOrderBillDetailCount(val).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ this.count = res.data.detailNum
|
|
|
|
+ this.priceTotal = res.data.settleAmount
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 重置
|
|
// 重置
|
|
- resetSearchForm () {}
|
|
|
|
|
|
+ resetSearchForm () {
|
|
|
|
+ this.time = []
|
|
|
|
+ this.orderDate = []
|
|
|
|
+ this.queryParam = {
|
|
|
|
+ orderBeginDate: '',
|
|
|
|
+ orderEndDat: '',
|
|
|
|
+ outBeginDate: '',
|
|
|
|
+ outEndDate: '',
|
|
|
|
+ orderBillNo: ''
|
|
|
|
+ }
|
|
|
|
+ this.$refs.table.refresh(true)
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ mounted () {
|
|
|
|
+ if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
|
|
|
|
+ this.getPageInfo()
|
|
|
|
+ this.resetSearchForm()
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ activated () {
|
|
|
|
+ // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
|
|
|
|
+ if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
|
|
|
|
+ this.getPageInfo()
|
|
|
|
+ this.resetSearchForm()
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|