|
@@ -15,12 +15,12 @@
|
|
@keyup.enter.native="handleSearch" >
|
|
@keyup.enter.native="handleSearch" >
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-model-item label="连锁店" prop="dealerSn">
|
|
|
|
|
|
+ <a-form-model-item label="连锁店" prop="tenantId">
|
|
<a-select
|
|
<a-select
|
|
placeholder="请选择连锁店"
|
|
placeholder="请选择连锁店"
|
|
- id="sendStorageReportList-dealerSn"
|
|
|
|
|
|
+ id="sendStorageReportList-tenantId"
|
|
allowClear
|
|
allowClear
|
|
- v-model="queryParam.dealerSn"
|
|
|
|
|
|
+ v-model="queryParam.tenantId"
|
|
:showSearch="true"
|
|
:showSearch="true"
|
|
option-filter-prop="children"
|
|
option-filter-prop="children"
|
|
:filter-option="filterOption">
|
|
:filter-option="filterOption">
|
|
@@ -129,7 +129,7 @@ export default {
|
|
time: [],
|
|
time: [],
|
|
beginDate: '',
|
|
beginDate: '',
|
|
endDate: '',
|
|
endDate: '',
|
|
- dealerSn: undefined,
|
|
|
|
|
|
+ tenantId: undefined,
|
|
productEntity: {
|
|
productEntity: {
|
|
code: '', // 产品编码
|
|
code: '', // 产品编码
|
|
name: '', // 产品名称
|
|
name: '', // 产品名称
|
|
@@ -142,7 +142,7 @@ export default {
|
|
labelCol: { span: 8 },
|
|
labelCol: { span: 8 },
|
|
wrapperCol: { span: 16 },
|
|
wrapperCol: { span: 16 },
|
|
rules: {
|
|
rules: {
|
|
- 'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
|
|
|
|
|
|
+ 'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
|
|
'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
|
|
'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
|
|
},
|
|
},
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
@@ -173,7 +173,7 @@ export default {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
const params = Object.assign(parameter, this.queryParam)
|
|
this.spinning = true
|
|
this.spinning = true
|
|
- if (this.queryParam.beginDate && this.queryParam.dealerSn) {
|
|
|
|
|
|
+ if (this.queryParam.beginDate && this.queryParam.tenantId) {
|
|
return linkageReportPageList(params).then(res => {
|
|
return linkageReportPageList(params).then(res => {
|
|
// 总计
|
|
// 总计
|
|
this.getCount(params)
|
|
this.getCount(params)
|
|
@@ -239,7 +239,7 @@ export default {
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- this.queryParam.dealerSn = undefined
|
|
|
|
|
|
+ this.queryParam.tenantId = undefined
|
|
this.$refs.rangeDate.resetDate()
|
|
this.$refs.rangeDate.resetDate()
|
|
this.queryParam.time = []
|
|
this.queryParam.time = []
|
|
this.queryParam.beginDate = ''
|
|
this.queryParam.beginDate = ''
|
|
@@ -289,11 +289,10 @@ export default {
|
|
// 连锁店
|
|
// 连锁店
|
|
getLinkageGroup () {
|
|
getLinkageGroup () {
|
|
linkageGroupList({}).then(res => {
|
|
linkageGroupList({}).then(res => {
|
|
- const all = [{ dealerName: '全部', dealerSn: 'all' }]
|
|
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
const data = res.data || []
|
|
const data = res.data || []
|
|
if (data.length > 0) {
|
|
if (data.length > 0) {
|
|
- this.linkageGroupData = [...all, ...data]
|
|
|
|
|
|
+ this.linkageGroupData = data
|
|
} else {
|
|
} else {
|
|
this.linkageGroupData = []
|
|
this.linkageGroupData = []
|
|
}
|
|
}
|