|
@@ -1,9 +1,9 @@
|
|
|
<template>
|
|
|
- <div class="goodsAllocationSet-page">
|
|
|
+ <div class="unSettlement-page">
|
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo" >
|
|
|
+ <a-page-header :ghost="false" :backIcon="false" class="unSettlement-baseInfo" >
|
|
|
<template slot="subTitle">
|
|
|
- <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
|
|
|
+ <a href="javascript:;" id="unSettlement-back-btn" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
|
|
|
<span style="margin: 0 15px;color: #666;"> {{ this.$route.params.shelfName||'--' }} </span>
|
|
|
</template>
|
|
|
</a-page-header>
|
|
@@ -38,28 +38,28 @@
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
|
</a-card>
|
|
|
- <a-card :bordered="false" size="small" class="goodsAllocationSet-baseInfo">
|
|
|
+ <a-card :bordered="false" size="small" class="unSettlement-baseInfo">
|
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
|
<a-form-item label="下单时间">
|
|
|
- <rangeDate ref="orderDate" :value="orderDate" @change="orderDateChange" />
|
|
|
+ <rangeDate id="unSettlement-time" ref="orderDate" :value="orderDate" @change="orderDateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
|
<a-form-item label="取货时间">
|
|
|
- <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
+ <rangeDate id="unSettlement-qhtime" ref="rangeDate" :value="time" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :xl="6" :lg="6" :md="12" :sm="24">
|
|
|
<a-form-item label="取货单编号">
|
|
|
- <a-input placeholder="请输入取货单编号" v-model.trim="queryParam.orderBillNo" allowClear/>
|
|
|
+ <a-input id="unSettlement-orderNo" placeholder="请输入取货单编号" v-model.trim="queryParam.orderBillNo" allowClear/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :xl="6" :lg="6" :md="6" :sm="6" >
|
|
|
- <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
|
|
|
- <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
|
|
|
+ <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="unSettlement-refresh" >查询</a-button>
|
|
|
+ <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="unSettlement-reset">重置</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
</a-form>
|
|
@@ -88,10 +88,10 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import moment from 'moment'
|
|
|
import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import { toThousands } from '@/libs/tools.js'
|
|
|
-import moment from 'moment'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOut } from '@/api/merchant'
|
|
|
export default {
|
|
@@ -104,22 +104,22 @@ export default {
|
|
|
disabled: false,
|
|
|
isEdit: false, // 货位号是否为编辑
|
|
|
openModal: false, // 货位模板弹窗初始状态
|
|
|
- tableHeight: 0,
|
|
|
+ tableHeight: 0, // 表格高度
|
|
|
formItemLayout: {
|
|
|
labelCol: { span: 6 },
|
|
|
wrapperCol: { span: 16 }
|
|
|
},
|
|
|
- time: [],
|
|
|
- orderDate: [],
|
|
|
- count: 0,
|
|
|
- priceTotal: 0,
|
|
|
- total: null,
|
|
|
+ time: [], // 取货时间
|
|
|
+ orderDate: [], //
|
|
|
+ count: 0, // 总记录数
|
|
|
+ priceTotal: 0, // 待结算金额合计
|
|
|
+ total: null, // 授信额度
|
|
|
queryParam: {
|
|
|
- orderBeginDate: '',
|
|
|
- orderEndDat: '',
|
|
|
- outBeginDate: '',
|
|
|
- outEndDate: '',
|
|
|
- orderBillNo: ''
|
|
|
+ orderBeginDate: '', // 下单时间开始
|
|
|
+ orderEndDat: '', // 下单时间结束
|
|
|
+ outBeginDate: '', // 取货时间开始
|
|
|
+ outEndDate: '', // 取货时间结束
|
|
|
+ orderBillNo: ''// 订单号
|
|
|
},
|
|
|
columns: [// 表头
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
@@ -159,25 +159,27 @@ export default {
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
+ // 返回列表
|
|
|
handleBack () {
|
|
|
- this.$router.push({ path: '/numsGoodsShelves/settlementManagement/list' })
|
|
|
+ this.$router.push({ name: 'settlementManagementList' })
|
|
|
},
|
|
|
+ // 下单时间选择
|
|
|
orderDateChange (date) {
|
|
|
- console.log(date, date)
|
|
|
this.orderDate = date
|
|
|
this.queryParam.orderBeginDate = date[0] || ''
|
|
|
this.queryParam.orderEndDat = date[1] || ''
|
|
|
},
|
|
|
+ // 取货时间选择
|
|
|
dateChange (date) {
|
|
|
this.time = date
|
|
|
this.queryParam.outBeginDate = date[0] ? moment(date[0]).format('YYYY-MM-DD') : ''
|
|
|
this.queryParam.outEndDate = date[1] ? moment(date[1]).format('YYYY-MM-DD') : ''
|
|
|
},
|
|
|
+ // 获取授信数据
|
|
|
getPageInfo () {
|
|
|
this.spinning = true
|
|
|
const info = JSON.parse(sessionStorage.getItem('settlementDetail'))
|
|
|
merchantCashOut({ shelfSn: this.$route.params.shelfSn }).then(res => {
|
|
|
- console.log(res, info, '===========')
|
|
|
if (res.status == 200) {
|
|
|
this.total = res.data
|
|
|
this.total.creditLimit = info.creditLimit
|
|
@@ -188,6 +190,7 @@ export default {
|
|
|
this.spinning = false
|
|
|
})
|
|
|
},
|
|
|
+ // 获取统计数据
|
|
|
getCount (val) {
|
|
|
queryOrderBillDetailCount(val).then(res => {
|
|
|
if (res.status == 200) {
|
|
@@ -211,6 +214,7 @@ export default {
|
|
|
this.$refs.orderDate.resetDate(this.orderDate)
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
+ // 页面初始化
|
|
|
pageInit () {
|
|
|
const _this = this
|
|
|
this.getPageInfo()
|
|
@@ -218,6 +222,7 @@ export default {
|
|
|
_this.setTableH()
|
|
|
})
|
|
|
},
|
|
|
+ // 计算表格高度
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
this.tableHeight = window.innerHeight - tableSearchH - (this.$route.params.settleType == 'CREDIT' ? 415 : 300)
|
|
@@ -240,12 +245,12 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style lang="less">
|
|
|
- .goodsAllocationSet-page{
|
|
|
+ .unSettlement-page{
|
|
|
position: relative;
|
|
|
height: 100%;
|
|
|
padding-bottom: 51px;
|
|
|
box-sizing: border-box;
|
|
|
- .goodsAllocationSet-baseInfo{
|
|
|
+ .unSettlement-baseInfo{
|
|
|
margin-bottom: 10px;
|
|
|
}
|
|
|
.bzj-collapse{
|