|
@@ -18,10 +18,10 @@
|
|
<a-col :md="5" :sm="24">
|
|
<a-col :md="5" :sm="24">
|
|
<a-form-item label="发布状态">
|
|
<a-form-item label="发布状态">
|
|
<v-select
|
|
<v-select
|
|
- v-model="queryParam.publishStatus"
|
|
|
|
- ref="publishStatus"
|
|
|
|
- id="promotionList-publishStatus"
|
|
|
|
- code="SPARE_PARTS_RETURN_REASON"
|
|
|
|
|
|
+ v-model="queryParam.enabledFlag"
|
|
|
|
+ ref="enabledFlag"
|
|
|
|
+ id="promotionList-enabledFlag"
|
|
|
|
+ code="NOTITY_SEND_STATUS"
|
|
placeholder="请选择发布状态"
|
|
placeholder="请选择发布状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -32,7 +32,7 @@
|
|
v-model="queryParam.state"
|
|
v-model="queryParam.state"
|
|
ref="state"
|
|
ref="state"
|
|
id="promotionList-state"
|
|
id="promotionList-state"
|
|
- code="SPARE_PARTS_RETURN_STATE"
|
|
|
|
|
|
+ code="PROMOTION_STATE"
|
|
placeholder="请选择活动状态"
|
|
placeholder="请选择活动状态"
|
|
allowClear
|
|
allowClear
|
|
></v-select>
|
|
></v-select>
|
|
@@ -88,10 +88,11 @@
|
|
<!-- 发布状态 -->
|
|
<!-- 发布状态 -->
|
|
<template slot="releaseStatus" slot-scope="text, record">
|
|
<template slot="releaseStatus" slot-scope="text, record">
|
|
<a-switch
|
|
<a-switch
|
|
- v-if="record.state === 'NOT_START'||record.state ==='RUNNING'"
|
|
|
|
|
|
+ v-if="record.state === 'NOT_START'||record.state ==='RUNNING'||record.state ==='IS_OVER'"
|
|
id="promotionList-enable"
|
|
id="promotionList-enable"
|
|
@change="changeStatus(record)"
|
|
@change="changeStatus(record)"
|
|
:checked="record.enabledFlag == 1 ? true : false"></a-switch>
|
|
:checked="record.enabledFlag == 1 ? true : false"></a-switch>
|
|
|
|
+ <span v-else>--</span>
|
|
</template>
|
|
</template>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<!-- state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
|
|
<!-- state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
|
|
@@ -185,18 +186,15 @@ import { commonMixin } from '@/utils/mixin'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import addModal from './addModal.vue'
|
|
import addModal from './addModal.vue'
|
|
import lookUpCustomersModal from '../promotionManagement/lookUpCustomersModal'
|
|
import lookUpCustomersModal from '../promotionManagement/lookUpCustomersModal'
|
|
-// import detailModal from './detailModal.vue'
|
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
-// import chooseDepartUserModal from './chooseDepartUserModal.vue'
|
|
|
|
import editActiveEndTime from './editActiveEndTime.vue'
|
|
import editActiveEndTime from './editActiveEndTime.vue'
|
|
-import reportModal from '@/views/common/reportModal.vue'
|
|
|
|
import supplier from '@/views/common/supplier.js'
|
|
import supplier from '@/views/common/supplier.js'
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
import warehouse from '@/views/common/chooseWarehouse.js'
|
|
import { dealerPromotionList, dealerPromotionDel, modifyEnabledFlag, promotionAudit, promotionIsOver } from '@/api/promotion'
|
|
import { dealerPromotionList, dealerPromotionDel, modifyEnabledFlag, promotionAudit, promotionIsOver } from '@/api/promotion'
|
|
export default {
|
|
export default {
|
|
name: 'PromotionManagementList',
|
|
name: 'PromotionManagementList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, supplier, VSelect, reportModal, rangeDate, warehouse, lookUpCustomersModal, addModal, editActiveEndTime },
|
|
|
|
|
|
+ components: { STable, supplier, VSelect, rangeDate, warehouse, lookUpCustomersModal, addModal, editActiveEndTime },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -211,7 +209,7 @@ export default {
|
|
beginDate: undefined,
|
|
beginDate: undefined,
|
|
endDate: undefined,
|
|
endDate: undefined,
|
|
title: '',
|
|
title: '',
|
|
- publishStatus: undefined, // 发布状态
|
|
|
|
|
|
+ enabledFlag: undefined, // 发布状态
|
|
state: undefined
|
|
state: undefined
|
|
},
|
|
},
|
|
columns: [
|
|
columns: [
|
|
@@ -391,7 +389,7 @@ export default {
|
|
beginDate: undefined,
|
|
beginDate: undefined,
|
|
endDate: undefined,
|
|
endDate: undefined,
|
|
title: '',
|
|
title: '',
|
|
- publishStatus: undefined, // 发布状态
|
|
|
|
|
|
+ enabledFlag: undefined, // 发布状态
|
|
state: undefined
|
|
state: undefined
|
|
}
|
|
}
|
|
this.$refs.rangeDate.resetDate()
|
|
this.$refs.rangeDate.resetDate()
|