Skip to content

S
SuperMan
Commit 95c9d1cc authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents b66ea26b 0f442408
Hide whitespace changes
Inline Side-by-side
Showing with 1729 additions and 1270 deletions
src/components/activity/pushManagement.vue
View file @ 95c9d1cc
......@@ -36,7 +36,7 @@
<th>创建日期</th>
<th>操作</th>
</tr>
<tr v-for="(item, index) in dataList">
<tr v-for="(item, index) in dataList" :key="index">
<td>{{index}}</td>
<td>{{item.SendTitle}}</td>
<td>{{item.SendContent}}</td>
......@@ -68,81 +68,115 @@
:total="total"
></el-pagination>
<el-dialog
custom-class="w400"
custom-class="w800"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item label="主题" prop="SendTitle">
<el-input type="text" v-model="addMsg.SendTitle" class="w217"></el-input>
</el-form-item>
<el-form-item label="内容" prop="SendContent">
<el-input type="textarea" v-model="addMsg.SendContent" class="w217"></el-input>
</el-form-item>
<el-form-item label="推送方式">
<el-select filterable v-model="addMsg.SendProgramType">
<el-option label="不限" :value="0" :key="0"></el-option>
<el-option
v-for="item in modeList"
:label="item.name"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="App链接" v-if="addMsg.SendProgramType == 0 || addMsg.SendProgramType == 2">
<el-input type="text" v-model="addMsg.AppUrl" class="w217"></el-input>
</el-form-item>
<el-form-item label="小程序链接" v-if="addMsg.SendProgramType == 0 || addMsg.SendProgramType == 1">
<el-input type="text" v-model="addMsg.MinProgram" class="w217"></el-input>
</el-form-item>
<el-form-item label="推送时间" prop="SendDate">
<el-date-picker v-model='addMsg.SendDate' :picker-options="pickerOptions0" class='w217' value-format="yyyy-MM-dd HH:mm" type="datetime"></el-date-picker>
</el-form-item>
<el-form-item label="所属公司">
<el-select filterable v-model="addMsg.RB_Branch_id">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-select filterable class='w217' v-model='addMsg.CustomerStatus' :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="0"></el-option>
<el-option label="未审核" :value="1"></el-option>
<el-option label="已审核" :value="2"></el-option>
<el-option label="已拒绝" :value="3"></el-option>
<el-option label="黑名单" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="幸福存折">
<el-input type="number" v-model="addMsg.MinPassbook" class="w100"></el-input>
-
<el-input type="number" v-model="addMsg.MaxPassbook" class="w100"></el-input>
</el-form-item>
<el-form-item label="交易额" >
<el-input type="number" v-model="addMsg.MinTurnover" class="w100"></el-input>
-
<el-input type="number" v-model="addMsg.MaxTurnover" class="w100"></el-input>
</el-form-item>
<el-form-item label="优惠券">
<el-input type="number" v-model="addMsg.MinCoupons" class="w100"></el-input>
-
<el-input type="number" v-model="addMsg.MaxCoupons" class="w100"></el-input>
</el-form-item>
<el-form-item label="提示内容">
<el-checkbox-group v-model="addMsg.ISShowList">
<el-checkbox :label="1">幸福存折</el-checkbox>
<el-checkbox :label="2">优惠券</el-checkbox>
<el-checkbox :label="3">大红包</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="主题" prop="SendTitle">
<el-input type="text" v-model="addMsg.SendTitle" class="w217"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态">
<el-select filterable class='w217' v-model='addMsg.CustomerStatus' :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="0"></el-option>
<el-option label="未审核" :value="1"></el-option>
<el-option label="已审核" :value="2"></el-option>
<el-option label="已拒绝" :value="3"></el-option>
<el-option label="黑名单" :value="4"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="内容" prop="SendContent">
<el-input type="textarea" v-model="addMsg.SendContent" @change="changeText" class="w217"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="幸福存折">
<el-input type="number" v-model="addMsg.MinPassbook" class="w100"></el-input>
-
<el-input type="number" v-model="addMsg.MaxPassbook" class="w100"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="推送方式">
<el-select filterable v-model="addMsg.SendProgramType">
<el-option label="不限" :value="0" :key="0"></el-option>
<el-option
v-for="item in modeList"
:label="item.name"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="交易额" >
<el-input type="number" v-model="addMsg.MinTurnover" class="w100"></el-input>
-
<el-input type="number" v-model="addMsg.MaxTurnover" class="w100"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="App链接" v-if="addMsg.SendProgramType == 0 || addMsg.SendProgramType == 2">
<el-input type="text" v-model="addMsg.AppUrl" class="w217"></el-input>
</el-form-item>
<el-form-item label="小程序链接" v-if="addMsg.SendProgramType == 0 || addMsg.SendProgramType == 1">
<el-input type="text" v-model="addMsg.MinProgram" class="w217"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="优惠券">
<el-input type="number" v-model="addMsg.MinCoupons" class="w100"></el-input>
-
<el-input type="number" v-model="addMsg.MaxCoupons" class="w100"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="推送时间" prop="SendDate">
<el-date-picker v-model='addMsg.SendDate' :picker-options="pickerOptions0" class='w217' value-format="yyyy-MM-dd HH:mm" type="datetime"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属公司">
<el-select filterable v-model="addMsg.RB_Branch_id">
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</el-form-item>
<el-form-item label="提示内容">
<el-checkbox-group v-model="addMsg.ISShowList" @change="changeCheckbox">
<el-checkbox v-for="(item, index) in tipsMsgList" :key="index" :label="item.id">{{item.lable}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<button
......@@ -168,6 +202,29 @@ export default {
id: 2
}
],
tipsMsgList: [
{
id: 0,
lable: '幸福存折',
text: '{Client_Balance}',
},
{
id: 1,
lable: '优惠券',
text: '{CouponNum}',
},
{
id: 2,
lable: '交易总金额',
text: '{TotalPrice}',
},
{
id: 3,
lable: '预计返佣',
text: '{PpredictBalance}',
}
],
tipsMsgId: [0,1,2,3],
//请求
msg: {
SendTitle: '',
......@@ -228,6 +285,50 @@ export default {
this.getCompany()
},
methods: {
changeText: function (params) {
let list = []
this.tipsMsgList.map(x=>{
if (params.indexOf(x.text) !== -1){
list.push(x.id)
}
})
this.addMsg.ISShowList = list
},
diff(arr1,arr2){
var a = [];
var b = [];
for(var i=0;i<arr2.length;i++){
a[arr2[i]]=true;
}
for(var i=0;i<arr1.length;i++){
if(!a[arr1[i]]){
b.push(arr1[i]);
}
}
return b
},
changeCheckbox: function (list){
let SendContent = this.addMsg.SendContent
let Ids = []
if (list.length > 0) {
Ids = this.diff(this.tipsMsgId, list)
} else {
this.tipsMsgList.map(x=>{
SendContent = SendContent.replace(x.text, '')
})
}
Ids.map(x=>{
if(SendContent.indexOf(this.tipsMsgList[x].text) !== -1 ){
SendContent = SendContent.replace(this.tipsMsgList[x].text, '')
}
})
list.map(x => {
if(SendContent.indexOf(this.tipsMsgList[x].text) == -1 ){
SendContent = SendContent + this.tipsMsgList[x].text
}
})
this.addMsg.SendContent = SendContent
},
// 禁用
deleteItem: function (id) {
this.$confirm('确认禁用？', this.$t('tips.tips'), {
......
src/components/onedayTripContract.vue
View file @ 95c9d1cc
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment