|
@@ -5,17 +5,17 @@
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="创建时间">
|
|
<a-form-item label="创建时间">
|
|
<rangeDate ref="rangeDate" @change="dateChange" />
|
|
<rangeDate ref="rangeDate" @change="dateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="促销名称/简称">
|
|
<a-form-item label="促销名称/简称">
|
|
<a-input id="promotionList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入促销名称/简称"/>
|
|
<a-input id="promotionList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入促销名称/简称"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="发布状态">
|
|
<a-form-item label="发布状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.enabledFlag"
|
|
v-model="queryParam.enabledFlag"
|
|
@@ -26,7 +26,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="5" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="活动状态">
|
|
<a-form-item label="活动状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.state"
|
|
v-model="queryParam.state"
|
|
@@ -38,7 +38,19 @@
|
|
></v-select>
|
|
></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="创建人">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.state"
|
|
|
|
+ ref="state"
|
|
|
|
+ id="promotionList-state"
|
|
|
|
+ code="PROMOTION_STATE"
|
|
|
|
+ placeholder="请选择创建人"
|
|
|
|
+ allowClear
|
|
|
|
+ ></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<span class="table-page-search-submitButtons">
|
|
<span class="table-page-search-submitButtons">
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="promotionList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="promotionList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="promotionList-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="promotionList-reset">重置</a-button>
|
|
@@ -130,7 +142,7 @@
|
|
<a-button
|
|
<a-button
|
|
size="small"
|
|
size="small"
|
|
type="link"
|
|
type="link"
|
|
- v-if="$hasPermissions('B_editTime')&&(record.state == 'NOT_START' || record.state=='RUNNING')"
|
|
|
|
|
|
+ v-if="$hasPermissions('B_editTime')&&(record.state == 'NOT_START' || record.state=='RUNNING' ||record.state == 'IS_OVER')"
|
|
@click="handleTime(record)"
|
|
@click="handleTime(record)"
|
|
class="button-info"
|
|
class="button-info"
|
|
id="promotionList-edit-btn">促销时间变更</a-button>
|
|
id="promotionList-edit-btn">促销时间变更</a-button>
|
|
@@ -148,7 +160,12 @@
|
|
@click="handleDel(record)"
|
|
@click="handleDel(record)"
|
|
class="button-error"
|
|
class="button-error"
|
|
id="promotionList-del-btn">删除</a-button>
|
|
id="promotionList-del-btn">删除</a-button>
|
|
- <div v-if="record.state == 'IS_OVER'">--</div>
|
|
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ type="link"
|
|
|
|
+ @click="openCopyModal = true"
|
|
|
|
+ class="button-info"
|
|
|
|
+ id="promotionList-edit-btn">复制</a-button>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</a-spin>
|
|
</a-spin>
|
|
@@ -187,6 +204,34 @@
|
|
>审核通过</a-button>
|
|
>审核通过</a-button>
|
|
</div>
|
|
</div>
|
|
</a-modal>
|
|
</a-modal>
|
|
|
|
+ <!-- 复制弹窗 -->
|
|
|
|
+ <a-modal
|
|
|
|
+ closable
|
|
|
|
+ v-model="openCopyModal"
|
|
|
|
+ :footer="null"
|
|
|
|
+ width="416px"
|
|
|
|
+ centered>
|
|
|
|
+ <div class="copyContent">
|
|
|
|
+ <p>提示:</p>
|
|
|
|
+ <p>复制选择的促销活动,将在列表生成一条相同的【待提交】的促销活动,可进行编辑!</p>
|
|
|
|
+ <p>是否确认生成?</p>
|
|
|
|
+ <p>附件无法复制,请重新上传</p>
|
|
|
|
+ </div>
|
|
|
|
+ <!-- 按钮 -->
|
|
|
|
+ <div class="copyBtn">
|
|
|
|
+ <a-button
|
|
|
|
+ id="copyModal-cancel"
|
|
|
|
+ class="button-cancel"
|
|
|
|
+ @click="closeAuditModal"
|
|
|
|
+ style="margin-right: 15px;">取消</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ type="primary"
|
|
|
|
+ id="copyModal-save"
|
|
|
|
+ class="button-primary"
|
|
|
|
+ @click="handleAuditModal"
|
|
|
|
+ >确定</a-button>
|
|
|
|
+ </div>
|
|
|
|
+ </a-modal>
|
|
</a-card>
|
|
</a-card>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -253,7 +298,8 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
itemSn: null, // 经销商促销活动SN
|
|
itemSn: null, // 经销商促销活动SN
|
|
- openAuditModal: false // 审核弹窗
|
|
|
|
|
|
+ openAuditModal: false, // 审核弹窗,
|
|
|
|
+ openCopyModal: false // 复制弹窗
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -405,6 +451,7 @@ export default {
|
|
this.$refs.rangeDate.resetDate()
|
|
this.$refs.rangeDate.resetDate()
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
|
|
+
|
|
pageInit () {
|
|
pageInit () {
|
|
const _this = this
|
|
const _this = this
|
|
this.$nextTick(() => { // 页面渲染完成后的回调
|
|
this.$nextTick(() => { // 页面渲染完成后的回调
|
|
@@ -418,7 +465,7 @@ export default {
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 240
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 235
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
@@ -457,10 +504,30 @@ export default {
|
|
.joinCustomer{
|
|
.joinCustomer{
|
|
cursor:pointer;
|
|
cursor:pointer;
|
|
}
|
|
}
|
|
- .tableBtnSet{
|
|
|
|
- display: flex;
|
|
|
|
- align-items: center;
|
|
|
|
- justify-content: space-between;
|
|
|
|
|
|
+ }
|
|
|
|
+ .copyContent{
|
|
|
|
+ margin:30px 10px 20px;
|
|
|
|
+ p{
|
|
|
|
+ margin-bottom:6px !important;
|
|
|
|
+ font-size:14px;
|
|
|
|
+ }
|
|
|
|
+ p:last-child{
|
|
|
|
+ font-size:12px;
|
|
|
|
+ color:#666;
|
|
|
|
+ text-align:right;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ .copyBtn{
|
|
|
|
+ text-align:center;
|
|
|
|
+ button{
|
|
|
|
+ width: 45%;
|
|
|
|
+ height:40px;
|
|
|
|
+ line-height:40px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .tableBtnSet{
|
|
|
|
+ display: flex;
|
|
|
|
+ align-items: center;
|
|
|
|
+ justify-content: space-between;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|