|
@@ -12,7 +12,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="客户名称">
|
|
|
- <a-input id="salesCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入客户名称"/>
|
|
|
+ <dealerSubareaScopeList ref="settleClientName" id="salesCollectionList-settleClientName" @change="custChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -28,7 +28,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="收货客户名称">
|
|
|
- <a-input id="salesCollectionList-receiverName" v-model.trim="queryParam.receiverName" allowClear placeholder="请输入收货客户名称"/>
|
|
|
+ <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -44,7 +44,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="收款时间">
|
|
|
- <rangeDate ref="rangeSettleDate" @change="dateSettleChange" />
|
|
|
+ <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -210,12 +210,13 @@ import Area from '@/views/common/area.js'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
import detailModal from './detailModal.vue'
|
|
|
import voucherModal from './voucherModal.vue'
|
|
|
+import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
import { settleReceiptList, settleReceiptBatch } from '@/api/settleReceipt'
|
|
|
|
|
|
export default {
|
|
|
name: 'SalesCollectionList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal },
|
|
|
+ components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal,dealerSubareaScopeList },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -224,8 +225,8 @@ export default {
|
|
|
showVoucher: false,
|
|
|
tableHeight: 0,
|
|
|
queryParam: { // 查询条件
|
|
|
- beginDate: getDate.getThreeMonthDays().starttime + ' 00:00:00',
|
|
|
- endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
|
|
|
+ beginDate: '',
|
|
|
+ endDate: '',
|
|
|
bizNo: '',
|
|
|
dispatchBillNo: '',
|
|
|
beginDateSettle: '',
|
|
@@ -244,10 +245,8 @@ export default {
|
|
|
dealerCountySn: undefined
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
- auditDate: [
|
|
|
- moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
|
|
|
- moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
|
- ], // 审核时间
|
|
|
+ auditDate: [], // 审核时间
|
|
|
+ settleDate: [],
|
|
|
advanced: false,
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -314,6 +313,12 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ custChange (val) {
|
|
|
+ this.queryParam.settleClientName = val.name
|
|
|
+ },
|
|
|
+ receiverChange(val){
|
|
|
+ this.queryParam.receiverName = val.name
|
|
|
+ },
|
|
|
// 表格选中项
|
|
|
rowSelectionFun (obj) {
|
|
|
this.rowSelectionInfo = obj || null
|
|
@@ -330,12 +335,16 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
+ this.auditDate = []
|
|
|
this.$refs.rangeAuditDate.resetDate(this.auditDate)
|
|
|
+ this.$refs.settleClientName.resetForm()
|
|
|
if (this.advanced) { // 查询条件未展开时,该组件未渲染
|
|
|
+ this.settleDate = []
|
|
|
this.$refs.rangeSettleDate.resetDate()
|
|
|
+ this.$refs.receiverName.resetForm()
|
|
|
}
|
|
|
- this.queryParam.beginDate = getDate.getThreeMonthDays().starttime + ' 00:00:00'
|
|
|
- this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
|
|
|
+ this.queryParam.beginDate = ''
|
|
|
+ this.queryParam.endDate = ''
|
|
|
this.queryParam.bizNo = ''
|
|
|
this.queryParam.dispatchBillNo = ''
|
|
|
this.queryParam.beginDateSettle = ''
|