|
@@ -14,8 +14,15 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
+ <!-- :disabledDate="disabledDate" -->
|
|
|
<a-form-model-item label="促销时间">
|
|
|
- <rangeDate ref="rangeTimeDate" :value="time" @change="dateChange" />
|
|
|
+ <a-range-picker
|
|
|
+ style="width:100%"
|
|
|
+
|
|
|
+ v-model="time"
|
|
|
+ :format="dateFormat"
|
|
|
+ :placeholder="['开始时间', '结束时间']"
|
|
|
+ @change="dateChange"></a-range-picker>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -153,6 +160,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
import subarea from '@/views/common/subarea.js'
|
|
|
import Area from '@/views/common/area.js'
|
|
|
+import moment from 'moment'
|
|
|
export default {
|
|
|
name: 'PriceDifferenceDetailReportList',
|
|
|
mixins: [commonMixin],
|
|
@@ -160,7 +168,7 @@ export default {
|
|
|
data () {
|
|
|
return {
|
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
|
- time: [],
|
|
|
+ time: undefined,
|
|
|
spinning: false,
|
|
|
queryParam: {
|
|
|
salesDate: [
|
|
@@ -190,6 +198,7 @@ export default {
|
|
|
rules: {
|
|
|
salesDate: [{ required: true, message: '请选择销售审核日期', trigger: 'change' }]
|
|
|
},
|
|
|
+ dateFormat: 'YYYY-MM-DD',
|
|
|
tabVal: 1,
|
|
|
disabled: false,
|
|
|
tableHeight: 0,
|
|
@@ -254,10 +263,18 @@ export default {
|
|
|
this.queryParam.beginAuditDate = date[0] || ''
|
|
|
this.queryParam.endAuditDate = date[1] || ''
|
|
|
},
|
|
|
- dateChange (date) {
|
|
|
- this.queryParam.promoRuleReport.promotionDateStart = date[0]
|
|
|
- this.queryParam.promoRuleReport.promotionDateEnd = date[1]
|
|
|
+ dateChange (date, dateString) {
|
|
|
+ this.time = date
|
|
|
+ if (dateString[0] != '' && dateString[1] != '') {
|
|
|
+ this.queryParam.promoRuleReport.promotionDateStart = dateString[0] + ' 00:00:00'
|
|
|
+ this.queryParam.promoRuleReport.promotionDateEnd = dateString[1] + ' 23:59:59'
|
|
|
+ }
|
|
|
},
|
|
|
+ // // 不可选日期
|
|
|
+ // disabledDate (date, dateStrings) {
|
|
|
+ // return date && date.valueOf('day') < moment().subtract(1, 'day') // 今天以后,包含今天
|
|
|
+ // },
|
|
|
+ // 统计
|
|
|
getCount (params) {
|
|
|
salesPromoReportQueryCount(params).then(res => {
|
|
|
if (res.status == 200) {
|
|
@@ -347,7 +364,7 @@ export default {
|
|
|
dealerCitySn: undefined, // 城市编码
|
|
|
dealerDistrictSn: undefined // 区域编码
|
|
|
}
|
|
|
- this.time = []
|
|
|
+ this.time = time
|
|
|
this.$refs.subarea.clearData()
|
|
|
this.$refs.rangeDate.resetDate(this.queryParam.salesDate)
|
|
|
this.$refs.rangeTimeDate.resetDate(this.time)
|