|
@@ -6,16 +6,16 @@
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="单位名称">
|
|
<a-form-item label="单位名称">
|
|
- <a-input id="companyCollectionPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入单位名称"/>
|
|
|
|
|
|
+ <a-input id="companyCollectionPaymentList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入单位名称"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="单位类型">
|
|
<a-form-item label="单位类型">
|
|
<v-select
|
|
<v-select
|
|
- v-model="queryParam.billStatus"
|
|
|
|
- ref="billStatus"
|
|
|
|
- id="companyCollectionPaymentList-billStatus"
|
|
|
|
- code="PAYMENT_TYPE"
|
|
|
|
|
|
+ v-model="queryParam.settleClientType"
|
|
|
|
+ ref="settleClientType"
|
|
|
|
+ id="companyCollectionPaymentList-settleClientType"
|
|
|
|
+ code="SETTLE_CLIENT_TYPE"
|
|
placeholder="请选择单位类型"
|
|
placeholder="请选择单位类型"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -23,10 +23,10 @@
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="结算类型">
|
|
<a-form-item label="结算类型">
|
|
<v-select
|
|
<v-select
|
|
- v-model="queryParam.billStatus"
|
|
|
|
- ref="billStatus"
|
|
|
|
- id="companyCollectionPaymentList-billStatus"
|
|
|
|
- code="PAYMENT_TYPE"
|
|
|
|
|
|
+ v-model="queryParam.settleType"
|
|
|
|
+ ref="settleType"
|
|
|
|
+ id="companyCollectionPaymentList-settleType"
|
|
|
|
+ code="SETTLE_TYPE"
|
|
placeholder="请选择结算类型"
|
|
placeholder="请选择结算类型"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -34,23 +34,25 @@
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="结算单号">
|
|
<a-form-item label="结算单号">
|
|
- <a-input id="companyCollectionPaymentList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入结算单号"/>
|
|
|
|
|
|
+ <a-input id="companyCollectionPaymentList-unitSettleNo" v-model.trim="queryParam.unitSettleNo" allowClear placeholder="请输入结算单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="结算时间">
|
|
<a-form-item label="结算时间">
|
|
- <a-range-picker v-model="queryParam.creatDate" id="companyCollectionPaymentList-creatDate"/>
|
|
|
|
|
|
+ <a-range-picker
|
|
|
|
+ style="width:100%"
|
|
|
|
+ id="companyCollectionPaymentList-createDate"
|
|
|
|
+ :disabledDate="disabledDate"
|
|
|
|
+ v-model="createDate"
|
|
|
|
+ :format="dateFormat"
|
|
|
|
+ :placeholder="['开始时间', '结束时间']" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="结算方式">
|
|
<a-form-item label="结算方式">
|
|
- <v-select
|
|
|
|
- v-model="queryParam.billStatus"
|
|
|
|
- ref="billStatus"
|
|
|
|
- id="companyCollectionPaymentList-billStatus"
|
|
|
|
- code="PAYMENT_TYPE"
|
|
|
|
- placeholder="请选择结算方式"
|
|
|
|
- allowClear></v-select>
|
|
|
|
|
|
+ <a-select id="companyCollectionPaymentList-settleStyleSn" v-model="queryParam.settleStyleSn" placeholder="请选择结算方式" allowClear>
|
|
|
|
+ <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
|
|
|
|
+ </a-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
</template>
|
|
</template>
|
|
@@ -69,7 +71,7 @@
|
|
</div>
|
|
</div>
|
|
<!-- alert -->
|
|
<!-- alert -->
|
|
<a-alert type="info" showIcon style="margin-bottom:15px">
|
|
<a-alert type="info" showIcon style="margin-bottom:15px">
|
|
- <div slot="message">共 <strong>6</strong> 条记录,其中收款单 <strong>{{ (productTotal&&productTotal.receiptCount) || 0 }}</strong> 条,收款金额合计 <strong>¥{{ (productTotal&&productTotal.receiptAmount) || 0 }}</strong> ,付款单 <strong>{{ (productTotal&&productTotal.payCount) || 0 }}</strong> 条,付款金额合计 <strong>¥{{ (productTotal&&productTotal.payAmount) || 0 }}</strong> </div>
|
|
|
|
|
|
+ <div slot="message">共 <strong>{{ total }}</strong> 条记录,其中收款单 <strong>{{ (productTotal&&productTotal.receiptCount) || 0 }}</strong> 条,收款金额合计 <strong>¥{{ (productTotal&&productTotal.receiptAmount) || 0 }}</strong> ,付款单 <strong>{{ (productTotal&&productTotal.payCount) || 0 }}</strong> 条,付款金额合计 <strong>¥{{ (productTotal&&productTotal.payAmount) || 0 }}</strong> </div>
|
|
</a-alert>
|
|
</a-alert>
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
<s-table
|
|
<s-table
|
|
@@ -79,22 +81,20 @@
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
- :scroll="{ x: 1180 }"
|
|
|
|
|
|
+ :scroll="{ x: 1340, y: tableHeight }"
|
|
bordered>
|
|
bordered>
|
|
<!-- 结算单号 -->
|
|
<!-- 结算单号 -->
|
|
<template slot="unitSettleNo" slot-scope="text, record">
|
|
<template slot="unitSettleNo" slot-scope="text, record">
|
|
<span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
|
|
<span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
|
|
</template>
|
|
</template>
|
|
- <!-- 结算方式 -->
|
|
|
|
- <template slot="sss" slot-scope="text, record">
|
|
|
|
- <span>{{ record.state == 1 ? '现金' : '微信' }}</span>
|
|
|
|
- </template>
|
|
|
|
</s-table>
|
|
</s-table>
|
|
</a-card>
|
|
</a-card>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
|
+import moment from 'moment'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
|
|
+import { settleStyleQueryAll } from '@/api/settleStyle'
|
|
import { settleUnitList, settleUnitQuerySum } from '@/api/settle'
|
|
import { settleUnitList, settleUnitQuerySum } from '@/api/settle'
|
|
export default {
|
|
export default {
|
|
components: { STable, VSelect },
|
|
components: { STable, VSelect },
|
|
@@ -102,23 +102,43 @@ export default {
|
|
return {
|
|
return {
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
|
+ createDate: [], // 创建时间
|
|
|
|
+ dateFormat: 'YYYY-MM-DD',
|
|
|
|
+ tableHeight: 0,
|
|
// 查询参数
|
|
// 查询参数
|
|
- queryParam: {},
|
|
|
|
|
|
+ queryParam: {
|
|
|
|
+ settleClientName: '',
|
|
|
|
+ settleClientType: undefined,
|
|
|
|
+ settleType: undefined,
|
|
|
|
+ unitSettleNo: '',
|
|
|
|
+ settleStyleSn: undefined
|
|
|
|
+ },
|
|
// 表头
|
|
// 表头
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
- { title: '单位名称', dataIndex: 'settleClientName', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '结算类型', dataIndex: 'settleTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: 140, align: 'center' },
|
|
|
|
|
|
+ { title: '单位名称', dataIndex: 'settleClientName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '结算类型', dataIndex: 'settleTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '结算单号', scopedSlots: { customRender: 'unitSettleNo' }, width: 220, align: 'center' },
|
|
{ title: '结算金额', dataIndex: 'settleAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '结算金额', dataIndex: 'settleAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '结算时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '结算时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '操作人', dataIndex: 'operateName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '结算方式', dataIndex: 'settleStyleName', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
|
|
|
+ { title: '操作人', dataIndex: 'operateName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '结算方式', dataIndex: 'settleStyleName', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
|
|
+ if (this.tableHeight == 0) {
|
|
|
|
+ this.tableHeight = window.innerHeight - 440
|
|
|
|
+ }
|
|
|
|
+ // 结算时间
|
|
|
|
+ if (this.createDate && this.createDate.length > 0) {
|
|
|
|
+ this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)
|
|
|
|
+ this.queryParam.endDate = moment(this.createDate[1]).format(this.dateFormat)
|
|
|
|
+ } else {
|
|
|
|
+ this.queryParam.beginDate = undefined
|
|
|
|
+ this.queryParam.endDate = undefined
|
|
|
|
+ }
|
|
return settleUnitList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
return settleUnitList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
const data = res.data
|
|
const data = res.data
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
@@ -126,15 +146,21 @@ export default {
|
|
data.list[i].no = no + i + 1
|
|
data.list[i].no = no + i + 1
|
|
}
|
|
}
|
|
this.disabled = false
|
|
this.disabled = false
|
|
|
|
+ this.total = data.list.length
|
|
this.getTotal(Object.assign(parameter, this.queryParam))
|
|
this.getTotal(Object.assign(parameter, this.queryParam))
|
|
return data
|
|
return data
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ settleStyleList: [],
|
|
total: 0, // 总条数
|
|
total: 0, // 总条数
|
|
productTotal: null
|
|
productTotal: null
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 不可选日期
|
|
|
|
+ disabledDate (date, dateStrings) {
|
|
|
|
+ return date && date.valueOf() > Date.now()
|
|
|
|
+ },
|
|
// 详情
|
|
// 详情
|
|
handleDetail (row) {
|
|
handleDetail (row) {
|
|
this.$router.push({ path: `/financialManagement/companyCollectionPayment/detail/${row.id}` })
|
|
this.$router.push({ path: `/financialManagement/companyCollectionPayment/detail/${row.id}` })
|
|
@@ -149,36 +175,31 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- // 审核
|
|
|
|
- handleExamine (row, type) {
|
|
|
|
- const _this = this
|
|
|
|
- this.$confirm({
|
|
|
|
- title: '提示',
|
|
|
|
- content: '操作后不可恢复,确定要进行' + (type == 1 ? ' 通过 ' : ' 不通过 ') + '操作吗?',
|
|
|
|
- centered: true,
|
|
|
|
- onOk () {
|
|
|
|
- // delectRolePower({
|
|
|
|
- // id: row.id
|
|
|
|
- // }).then(res => {
|
|
|
|
- // console.log(res, 'res1111')
|
|
|
|
- // if (res.status == 200) {
|
|
|
|
- // _this.$message.success(res.message)
|
|
|
|
- // _this.$refs.table.refresh()
|
|
|
|
- // }
|
|
|
|
- // })
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- this.queryParam.orderBundleNo = ''
|
|
|
|
- this.queryParam.orderBundle.custMobile = ''
|
|
|
|
- this.queryParam.bundleName = ''
|
|
|
|
- this.queryParam.itemName = ''
|
|
|
|
- this.oldTime = undefined
|
|
|
|
- this.newTime = undefined
|
|
|
|
|
|
+ this.queryParam.settleClientName = ''
|
|
|
|
+ this.queryParam.settleClientType = undefined
|
|
|
|
+ this.queryParam.settleType = undefined
|
|
|
|
+ this.queryParam.unitSettleNo = ''
|
|
|
|
+ this.queryParam.settleStyleSn = undefined
|
|
|
|
+ this.createDate = []
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
|
|
+ },
|
|
|
|
+ // 结算方式
|
|
|
|
+ getSettleStyle () {
|
|
|
|
+ settleStyleQueryAll({}).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ this.settleStyleList = res.data
|
|
|
|
+ } else {
|
|
|
|
+ this.settleStyleList = []
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ beforeRouteEnter (to, from, next) {
|
|
|
|
+ next(vm => {
|
|
|
|
+ vm.getSettleStyle()
|
|
|
|
+ })
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|