dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.15

Browse Source
This commit is contained in:
cun-nan 2024-09-15 20:26:35 +08:00
parent edd677bae7
commit 66ace526b8
11 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -650,7 +650,7 @@ export default {
resetForm(formName) {
this.$refs[formName].resetFields();
// this.getInfo()
this.$router.push({path: "/EventMarketing/center/index"})
this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}})
},
indexMethod(index) {
return index * 2;

2
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -328,7 +328,7 @@ export default {
this.$refs[formName].resetFields();
this.ifWrite = true
// this.getInfo()
this.$router.push({path: "/EventMarketing/center/index"})
this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}})
},
/** 查询新人有礼活动列表 */
getList() {

3
fuintAdmin/src/views/EventMarketing/center/index.vue
View File

@ -473,6 +473,9 @@ export default {
} else {
this.getList();
}
if (this.$route.query.activeId){
this.tabindex = 1
}
this.getOldList()
},

2
fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue
View File

@ -608,7 +608,7 @@ export default {
resetForm(formName) {
this.$refs[formName].resetFields();
// this.getInfo()
this.$router.push({path:"/EventMarketing/center/index"})
this.$router.push({path:"/EventMarketing/center/index",query: {activeId:this.activeId}})
},
}
}

6
fuintAdmin/src/views/EventMarketing/openCardGift/TimeLimited.vue
View File

@ -446,13 +446,13 @@
<el-form-item label="适用时间段" prop="timeType">
<div>
<div class="icon-type" v-for="(item,index) in weekMonthTypeList" :key="index"
:class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)">
:class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)" style="margin-bottom: 20px">
<img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex3">
<img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex3">
{{ item }}
<el-select v-model="weekDay" v-if="item=='每周'" placeholder="请选择每月固定日期" multiple
:disabled="tindex3!=0"
style="margin-left: 20px;margin-bottom: 20px">
style="margin-left: 20px;">
<el-option
v-for="(item,index) in weekList"
:key="index"
@ -473,7 +473,7 @@
</div>
</div>
<div style="margin-top: 20px">
<el-form-item label="时间段" prop="timeApplyStart">
<el-form-item label="时间段" prop="timeApplyStart" label-width="60px">
<el-time-picker
v-model="ruleForm1.dayStartTime"
format="HH:mm"

2
fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue
View File

@ -352,7 +352,7 @@ export default {
this.$refs[formName].resetFields();
this.ifWrite = true
// this.getInfo()
this.$router.push({path: "/EventMarketing/center/index"})
this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}})
},
/** 查询新人有礼活动列表 */
getList() {

2
fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue
View File

@ -327,7 +327,7 @@ export default {
this.$refs[formName].resetFields();
this.ifWrite = true
// this.getInfo()
this.$router.push({path: "/EventMarketing/center/index"})
this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}})
},
/** 查询新人有礼活动列表 */
getList() {

2
fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
View File

@ -411,7 +411,7 @@ export default {
this.$refs[formName].resetFields();
this.ifWrite = true
// this.getInfo()
this.$router.push({path: "/EventMarketing/center/index"})
this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}})
},
/** 查询新人有礼活动列表 */
getList() {

2
fuintAdmin/src/views/EventMarketing/openCardGift/userConsume.vue
View File

@ -410,7 +410,7 @@ export default {
this.$refs[formName].resetFields();
this.ifWrite = true
// this.getInfo()
this.$router.push({path: "/EventMarketing/center/index"})
this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}})
},
/** 查询新人有礼活动列表 */
getList() {

2
fuintAdmin/src/views/EventMarketing/openCardGift/userRecharge.vue
View File

@ -357,7 +357,7 @@ export default {
this.$refs[formName].resetFields();
this.ifWrite = true
// this.getInfo()
this.$router.push({path: "/EventMarketing/center/index"})
this.$router.push({path: "/EventMarketing/center/index",query: {activeId:this.activeId}})
},
/** 查询新人有礼活动列表 */
getList() {

14
fuintAdmin/src/views/power/page/mode.vue
View File

@ -106,12 +106,12 @@
<el-form :model="form" label-width="120px" >
<!-- 通知名称 -->
<el-form-item label="通知名称" :required="true">
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 474px"></el-input>
<el-input v-model="form.notificationName" placeholder="请输入通知名称" ></el-input>
</el-form-item>
<!-- 通知类型 -->
<el-form-item label="通知类型" :required="true">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 474px">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 100%">
<el-option label="到期通知" value="到期通知"></el-option>
<el-option label="库存预警" value="库存预警"></el-option>
<el-option label="其他" value="其他"></el-option>
@ -122,7 +122,7 @@
<!-- 通知模板 -->
<el-form-item label="通知模板" :required="true">
<el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容"
:maxlength="200" show-word-limit style="width: 474px"></el-input>
:maxlength="200" show-word-limit ></el-input>
<div>
<span @click="insertText('{油罐名称}')">{油罐名称}</span>
<span @click="insertText('{商品名称}')">{商品名称}</span>
@ -134,7 +134,7 @@
<!-- 接收角色 -->
<el-form-item label="接收角色" :required="true">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 474px">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 100%">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
</el-select>
</el-form-item>
@ -148,20 +148,20 @@
<el-form-item label="发送条件" style="margin-bottom: 10px" :required="true">
<div v-for="(condition, index) in form.conditions" :key="index" class="condition-group"
style="margin-bottom: 10px">
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px"
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 35%;margin-right: 10px"
@change="changeField(index)">
<el-option label="商品库存量" value="商品库存量"></el-option>
<el-option label="剩余可挂账额度" value="剩余可挂账额度"></el-option>
<el-option label="车队总余额" value="车队总余额"></el-option>
<!-- 添加其他选项 -->
</el-select>
<el-select v-model="condition.operator" placeholder="请选择" style="width: 100px;margin-right: 10px">
<el-select v-model="condition.operator" placeholder="请选择" style="width: 15%;margin-right: 10px">
<el-option label="大于" value="大于"></el-option>
<el-option label="等于" value="等于"></el-option>
<el-option label="小于" value="小于"></el-option>
<!-- 添加其他选项 -->
</el-select>
<el-input v-model="condition.value" placeholder="请输入" style="width: 200px;margin-right: 10px">
<el-input v-model="condition.value" placeholder="请输入" style="width: 35%;margin-right: 10px">
<template slot="append">{{ condition.field != '商品库存量' ? '元' : '件' }}</template>
</el-input>
<el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button>