|
@@ -96,7 +96,7 @@
|
|
|
<template slot="joinCustomers" slot-scope="text, record">
|
|
|
<span class="joinCustomer" v-if="record.dealerScope ==='ALL_DEALER'" @click="handleCustomers(record)">全部客户</span>
|
|
|
<span class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</span>
|
|
|
- <a-badge count="审" v-show="record.dealerAuditFlag == 1" :number-style="{ backgroundColor: '#f30', zoom:'80%' }" />
|
|
|
+ <a-badge count="审" v-show="record.dealerAuditFlag == 1 &&(record.state==='NOT_START'||record.state==='RUNNING') " :number-style="{ backgroundColor: '#f30', zoom:'80%' }" />
|
|
|
<!-- dealerAuditFlag 1 是 0否 -->
|
|
|
</template>
|
|
|
<!-- 发布状态 -->
|
|
@@ -110,6 +110,7 @@
|
|
|
<span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
+ <!-- state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button
|
|
|
size="small"
|
|
@@ -332,7 +333,6 @@ export default {
|
|
|
},
|
|
|
// 参与客户
|
|
|
handleCustomers (row) {
|
|
|
- this.openCustomerModal = true
|
|
|
this.itemPromotionSn = row.promotionSn
|
|
|
if ((row.state === 'NOT_START' || row.state === 'RUNNING') && row.dealerAuditFlag && (row.dealerAuditFlag == 0 || row.dealerAuditFlag == 2)) {
|
|
|
this.itemStatusType = 'isEdit'
|
|
@@ -346,6 +346,7 @@ export default {
|
|
|
} else {
|
|
|
this.getAllDealerSnList()
|
|
|
}
|
|
|
+ this.openCustomerModal = true
|
|
|
},
|
|
|
async getAllDealerSnList () {
|
|
|
const dealerSnArr = await allDealerSnList({})
|
|
@@ -523,18 +524,25 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
+ // 获取创建人默认值
|
|
|
+ const creatorObj = this.$store.state.user.info
|
|
|
+ const newObj = {
|
|
|
+ key: creatorObj.userid,
|
|
|
+ name: creatorObj.userNameCN,
|
|
|
+ label: creatorObj.userNameCN
|
|
|
+ }
|
|
|
+ this.$refs.creatorList.setDefaultVal(newObj)
|
|
|
this.queryParam = {
|
|
|
beginDate: undefined,
|
|
|
endDate: undefined,
|
|
|
queryWord: '',
|
|
|
enabledFlag: undefined, // 发布状态
|
|
|
state: undefined,
|
|
|
- creatorId: undefined,
|
|
|
+ creatorId: creatorObj.userid,
|
|
|
dealerAuditFlag: undefined
|
|
|
}
|
|
|
this.$refs.rangeDate.resetDate()
|
|
|
this.$refs.table.refresh(true)
|
|
|
- // this.$refs.dealerSubareaScopeList.resetForm()
|
|
|
},
|
|
|
|
|
|
pageInit () {
|
|
@@ -545,16 +553,7 @@ export default {
|
|
|
this.openModal = false
|
|
|
this.openDetailModal = false
|
|
|
this.itemSn = null
|
|
|
- this.rowSelectionInfo = null
|
|
|
this.$refs.table.clearTable()
|
|
|
- // 获取创建人默认值
|
|
|
- const creatorObj = this.$store.getters.userInfo
|
|
|
- const newObj = {
|
|
|
- key: creatorObj.userid,
|
|
|
- name: creatorObj.rootOrgName,
|
|
|
- label: creatorObj.rootOrgName
|
|
|
- }
|
|
|
- this.$refs.creatorList.setDefaultVal(newObj)
|
|
|
},
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|