|
@@ -6,7 +6,7 @@
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="分账时间">
|
|
|
- <rangeDateTime ref="rangeDate" :value="createDate" @change="dateChange" />
|
|
|
+ <rangeDate ref="rangeDate" :value="createDate" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -15,14 +15,14 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="配件名称">
|
|
|
- <a-input id="ledgerRecordList-name" v-model.trim="queryParam.dealerProduct.name" allowClear placeholder="请输入配件名称"/>
|
|
|
+ <a-form-item label="产品名称">
|
|
|
+ <a-input id="ledgerRecordList-name" v-model.trim="queryParam.dealerProduct.name" allowClear placeholder="请输入产品名称"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="配件编码">
|
|
|
- <a-input id="ledgerRecordList-code" v-model.trim="queryParam.dealerProduct.code" allowClear placeholder="请输入配件编码"/>
|
|
|
+ <a-form-item label="产品编码">
|
|
|
+ <a-input id="ledgerRecordList-code" v-model.trim="queryParam.dealerProduct.code" allowClear placeholder="请输入产品编码"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
@@ -61,21 +61,20 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import moment from 'moment'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
-import rangeDateTime from '@/views/common/rangeDateTime.vue'
|
|
|
+import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import custSatelliteList from '@/views/common/custSatelliteList.vue'
|
|
|
import { satelliteWHSeparateList, satelliteWHSeparateTotal } from '@/api/satelliteWH'
|
|
|
export default {
|
|
|
- components: { STable, VSelect, rangeDateTime, custSatelliteList },
|
|
|
+ components: { STable, VSelect, rangeDate, custSatelliteList },
|
|
|
data () {
|
|
|
return {
|
|
|
advanced: false, // 高级搜索 展开/关闭
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
createDate: [
|
|
|
- moment(getDate.getRecentTime().starttime, 'YYYY-MM-DD HH:mm:ss'),
|
|
|
- moment(getDate.getRecentTime().endtime, 'YYYY-MM-DD HH:mm:ss')
|
|
|
+ getDate.getRecentday().starttime,
|
|
|
+ getDate.getRecentday().endtime
|
|
|
],
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
@@ -86,8 +85,8 @@ export default {
|
|
|
name: '',
|
|
|
code: ''
|
|
|
},
|
|
|
- beginDate: getDate.getRecentTime().starttime,
|
|
|
- endDate: getDate.getRecentTime().endtime
|
|
|
+ beginDate: getDate.getRecentday().starttime + ' 00:00:00',
|
|
|
+ endDate: getDate.getRecentday().endtime + ' 23:59:59'
|
|
|
},
|
|
|
// 表头
|
|
|
columns: [
|
|
@@ -95,8 +94,8 @@ export default {
|
|
|
{ title: '分账时间', dataIndex: 'separateTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '客户名称', dataIndex: 'customer.customerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '关联工单号', dataIndex: 'separateBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '配件名称', dataIndex: 'dealerProduct.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '配件编码', dataIndex: 'dealerProduct.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品名称', dataIndex: 'dealerProduct.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '产品编码', dataIndex: 'dealerProduct.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '数量', dataIndex: 'productQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '分账金额(¥)', dataIndex: 'separateAmount', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '分账状态', dataIndex: 'stateDictValue', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -124,8 +123,8 @@ export default {
|
|
|
methods: {
|
|
|
// 时间 change
|
|
|
dateChange (date) {
|
|
|
- this.queryParam.beginDate = date[0]
|
|
|
- this.queryParam.endDate = date[1]
|
|
|
+ this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
|
|
|
+ this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
|
|
|
},
|
|
|
// 合计
|
|
|
getTotal (params) {
|
|
@@ -143,8 +142,8 @@ export default {
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.$refs.rangeDate.resetDate(this.createDate)
|
|
|
- this.queryParam.beginDate = getDate.getRecentTime().starttime
|
|
|
- this.queryParam.endDate = getDate.getRecentTime().endtime
|
|
|
+ this.queryParam.beginDate = getDate.getRecentday().starttime + ' 00:00:00'
|
|
|
+ this.queryParam.endDate = getDate.getRecentday().endtime + ' 23:59:59'
|
|
|
this.queryParam.customer.customerSn = undefined
|
|
|
this.queryParam.dealerProduct.name = ''
|
|
|
this.queryParam.dealerProduct.code = ''
|