|
@@ -19,7 +19,8 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="客户名称">
|
|
<a-form-model-item label="客户名称">
|
|
- <a-input id="returnGoodsPresentationList-dealerName" v-model.trim="queryParam.dealer.dealerName" allowClear placeholder="请输入客户名称"/>
|
|
|
|
|
|
+ <custList id="salesPresentationList-dealerSn" ref="custList" @change="custChange"></custList>
|
|
|
|
+ <!-- <a-input id="returnGoodsPresentationList-dealerName" v-model.trim="queryParam.dealer.dealerName" allowClear placeholder="请输入客户名称"/> -->
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -112,6 +113,7 @@
|
|
<script>
|
|
<script>
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
|
|
+import custList from '@/views/common/custList.vue'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import subarea from '@/views/common/subarea.js'
|
|
import subarea from '@/views/common/subarea.js'
|
|
import AreaList from '@/views/common/areaList.js'
|
|
import AreaList from '@/views/common/areaList.js'
|
|
@@ -121,7 +123,7 @@ import { returnDocReportTitle, reportSalesReturnThjdReportList, reportSalesRetur
|
|
export default {
|
|
export default {
|
|
name: 'ReturnGoodsPresentationList',
|
|
name: 'ReturnGoodsPresentationList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, rangeDate, subarea, AreaList, reportModal },
|
|
|
|
|
|
+ components: { STable, VSelect, rangeDate, subarea, AreaList, reportModal, custList },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -132,12 +134,12 @@ export default {
|
|
beginDate: '',
|
|
beginDate: '',
|
|
endDate: '',
|
|
endDate: '',
|
|
salesReturnBillNo: '',
|
|
salesReturnBillNo: '',
|
|
- subareaArea:{
|
|
|
|
|
|
+ subareaArea: {
|
|
subareaSn: undefined,
|
|
subareaSn: undefined,
|
|
subareaAreaSn: undefined
|
|
subareaAreaSn: undefined
|
|
},
|
|
},
|
|
dealer: {
|
|
dealer: {
|
|
- 'dealerName': '',
|
|
|
|
|
|
+ 'dealerSn': '',
|
|
'provinceSn': undefined,
|
|
'provinceSn': undefined,
|
|
'citySn': undefined,
|
|
'citySn': undefined,
|
|
'districtSn': undefined,
|
|
'districtSn': undefined,
|
|
@@ -146,7 +148,7 @@ export default {
|
|
},
|
|
},
|
|
columns: [],
|
|
columns: [],
|
|
countLabel: [],
|
|
countLabel: [],
|
|
- countBrandLabel:[],
|
|
|
|
|
|
+ countBrandLabel: [],
|
|
rules: {
|
|
rules: {
|
|
'time': [{ required: true, message: '请选择调拨日期', trigger: 'change' }]
|
|
'time': [{ required: true, message: '请选择调拨日期', trigger: 'change' }]
|
|
},
|
|
},
|
|
@@ -218,6 +220,9 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ custChange (val) {
|
|
|
|
+ this.queryParam.dealer.dealerSn = val.key
|
|
|
|
+ },
|
|
// 创建时间 change
|
|
// 创建时间 change
|
|
dateChange (date) {
|
|
dateChange (date) {
|
|
if (date[0] && date[1]) {
|
|
if (date[0] && date[1]) {
|
|
@@ -228,7 +233,7 @@ export default {
|
|
this.queryParam.beginDate = date[0] || ''
|
|
this.queryParam.beginDate = date[0] || ''
|
|
this.queryParam.endDate = date[1] || ''
|
|
this.queryParam.endDate = date[1] || ''
|
|
},
|
|
},
|
|
- subareaChange(val){
|
|
|
|
|
|
+ subareaChange (val) {
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
},
|
|
},
|
|
@@ -255,6 +260,7 @@ export default {
|
|
this.$refs.subarea.clearData()
|
|
this.$refs.subarea.clearData()
|
|
this.$refs.areaList.clearData()
|
|
this.$refs.areaList.clearData()
|
|
}
|
|
}
|
|
|
|
+ this.$refs.custList.resetForm()
|
|
this.$refs.ruleForm.resetFields()
|
|
this.$refs.ruleForm.resetFields()
|
|
this.$refs.table.clearTable()
|
|
this.$refs.table.clearTable()
|
|
},
|
|
},
|
|
@@ -268,8 +274,8 @@ export default {
|
|
const _this = this
|
|
const _this = this
|
|
const tableTitle = await returnDocReportTitle().then(res => res.data)
|
|
const tableTitle = await returnDocReportTitle().then(res => res.data)
|
|
this.columns = tableTitle.list
|
|
this.columns = tableTitle.list
|
|
- this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
|
|
|
|
- this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
|
|
|
|
|
|
+ this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') < 0)
|
|
|
|
+ this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') >= 0)
|
|
this.columns.map(item => {
|
|
this.columns.map(item => {
|
|
let mw = 40
|
|
let mw = 40
|
|
if (item.customRender == 'amount') {
|
|
if (item.customRender == 'amount') {
|