Skip to content

S
SuperMan
Commit a766ebab authored by youjie's avatar youjie
Browse files
Options

会员新增录入时间

parent 20545d46
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 35 deletions
src/assets/common/lang/zhCN/fill.js
View file @ a766ebab
......@@ -8090,6 +8090,18 @@ export const obj = {
v102:{
tianjzdfffa: '添加自动发放方案',
chufasj: '触发事件',
nurushijian: '录入时间',
zidongffangyhq: '自动发放优惠券',
zidongffngyhqbj: '自动发放优惠券编辑',
fafangdyhquan: '发放的优惠券',
kouling: '口令',
fafangcishu: '发放次数',
meigyhuffcs: '每个用户可发放次数；如不限制发放次数，请填写0',
wuxinzhi: '无限制',
fafangkeix: '发放类型',
suoyouyonghu: '所有用户',
zhidingyonghu:'指定用户',
zuiduoffcsbnwk: '最多发放次数不能为空',
},
//#endregion
}
......
src/components/SalesModule/customerTransfer.vue
View file @ a766ebab
......@@ -93,11 +93,21 @@
{{$t('scen.sc_ftTime')}}
</em>
</span>
<el-date-picker class="h34" v-model="missionDate" @change="timeAdd()" type="daterange"
<el-date-picker class="h34 w250" v-model="missionDate" @change="timeAdd()" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</li>
<li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li>
<li>
<span>
<em>
{{ $t('objFill.v102.nurushijian') }}
</em>
</span>
<el-date-picker class="h34 w250" v-model="EnterTime" @change="timeAdd(2)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()">
......@@ -133,6 +143,7 @@
</li>
</ul>
</div>
<ul style="overflow: initial!important"><li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li></ul>
<div class="clearfix"></div>
<div class="_customerTransferTable" :class="addShow==true?'_edHeight':''">
<table class="customerTransferTable customerTransferTable2 mt20" border="0" cellspacing="0" cellpadding="0"
......@@ -446,12 +457,13 @@
datainfo: {},
CustomerBrandList: [],
missionDate: [],
EnterTime: [],
DepartmentId: null,
isSelLayer: false,
layerShow: false,
msg: {
pageIndex: 1,
pageSize: 15,
pageSize: 14,
CustomerName: "",
CreateBy: "-1",
DepartmentId: "-1",
......@@ -465,7 +477,9 @@
ExceptionCount: 0,
fanYong: -1,
STime: '',
ETime: ''
ETime: '',
StartCreate: '',
EndCreate: '',
},
RecipientMsg: {
CustomerIdArr: [],
......@@ -607,6 +621,15 @@
},
methods: {
timeAdd(t) { // 日期格式
if(t){
if (!this.EnterTime) {
this.msg.StartCreate = '';
this.msg.EndCreate = '';
return
}
this.msg.StartCreate = this.EnterTime[0];
this.msg.EndCreate = this.EnterTime[1];
}else{
if (!this.missionDate) {
this.msg.STime = '';
this.msg.ETime = '';
......@@ -614,6 +637,7 @@
}
this.msg.STime = this.missionDate[0];
this.msg.ETime = this.missionDate[1];
}
},
changeSort(type, name) {
if (type == 1) {
......
src/components/activity/components/addAutorelease.vue
View file @ a766ebab
......@@ -4,16 +4,16 @@
:close-on-click-modal="false" class="addContacts"
width="700px">
<div class="add-tit" slot="title">
<p v-if="msg.ID==0"><span></span>自动发放优惠券</p>
<p v-else><span></span>自动发放优惠券编辑</p>
<p v-if="msg.ID==0"><span></span>{{ $t('objFill.v102.zidongffangyhq') }}</p>
<p v-else><span></span>{{ $t('objFill.v102.zidongffngyhqbj') }}</p>
<span icon="el-icon-close"></span>
</div>
<div class="form-box">
<el-form :model="msg" style="padding:0 20px;" :rules="rules" ref="msg" label-width="120px" size="small">
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="触发事件" class="is-required" >
<el-select v-model="msg.TriggerType" placeholder="请选择" style="width: 100%">
<el-form-item :label="$t('objFill.v102.chufasj')" class="is-required" >
<el-select v-model="msg.TriggerType" :placeholder="$t('objFill.qingxuanzhe')" style="width: 100%">
<el-option
v-for="item in options"
:key="item.Id"
......@@ -24,8 +24,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发放的优惠券" class="is-required" >
<el-select v-model="msg.DiscountCouponId" placeholder="请选择" style="width: 100%">
<el-form-item :label="$t('objFill.v102.fafangdyhquan')" class="is-required" >
<el-select v-model="msg.DiscountCouponId" :placeholder="$t('objFill.qingxuanzhe')" style="width: 100%">
<el-option
v-for="item in options2"
:key="item.id"
......@@ -36,22 +36,22 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="口令" class="is-required" v-if="msg.TriggerType==5" >
<el-form-item :label="$t('objFill.v102.kouling')" class="is-required" v-if="msg.TriggerType==5" >
<el-input v-model="msg.KeyWord" class="el-input--small" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发放次数" prop="GrantNum" class="is-required">
<el-tooltip class="item" effect="dark" content="每个用户可发放次数；如不限制发放次数，请填写0" placement="top"
<el-form-item :label="$t('objFill.v102.fafangcishu')" prop="GrantNum" class="is-required">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v102.meigyhuffcs')" placement="top"
style="position: absolute;left: -100px;top:10px">
<i class="el-tooltip el-icon-info"></i>
</el-tooltip>
<el-input v-model="msg.GrantNum" class="el-input--small" :disabled="checked" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\d{0,2})?/) ? this.value.match(/\d+(\d{0,2})?/)[0] : ''" style="width: 50%;"/>
<el-checkbox v-model="checked" @change="checked==true? msg.GrantNum=0:msg.GrantNum=1" style="margin-left: 10px">无限制</el-checkbox>
<el-checkbox v-model="checked" @change="checked==true? msg.GrantNum=0:msg.GrantNum=1" style="margin-left: 10px">{{$t('objFill.v102.wuxinzhi')}}</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开始时间" >
<el-form-item :label="$t('system.table_begTime')" >
<el-date-picker size="small" v-model="msg.RegisterDate" type="date" style="width: 100%"
value-format="yyyy-MM-dd" placeholder="选择日期时间">
</el-date-picker>
......@@ -59,7 +59,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="公司" >
<el-form-item :label="$t('sm.company')" >
<el-select v-model="msg.BranchId" placeholder="请选择公司" style="width: 100%">
<el-option
v-for="item in companyList"
......@@ -71,7 +71,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发放类型" >
<el-form-item :label="$t('objFill.v102.fafangkeix')" >
<el-select v-model="msg.SelfMotionType" placeholder="请选择发放类型" style="width: 100%">
<el-option
v-for="item in SelfMotionList"
......@@ -83,11 +83,11 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="领取人" >
<el-form-item :label="$t('objFill.v101.FinancialModule.linqur')" >
<el-radio-group v-model="msg.IsAll" >
<el-radio :label="0">所有用户</el-radio>
<el-radio :label="1">指定用户</el-radio>
<button class="el-button el-button--text" v-if="msg.IsAll ==1" @click="choice">选择用户</button>
<el-radio :label="0">{{$t('objFill.v102.suoyouyonghu')}}</el-radio>
<el-radio :label="1">{{$t('objFill.v102.zhidingyonghu')}}</el-radio>
<button class="el-button el-button--text" v-if="msg.IsAll ==1" @click="choice">{{$t('objFill.v101.LeaveGroupDownload.xuanzheyh')}}</button>
</el-radio-group>
<div style="display: flex; flex-wrap: wrap;">
<div class="user-item" v-for="(item,index) in UserList"
......@@ -107,11 +107,11 @@
</div>
</el-dialog>
<!--选择用户-->
<el-dialog title="选择用户" :visible.sync="category" width="612px">
<el-dialog :title="$t('objFill.v101.LeaveGroupDownload.xuanzheyh')" :visible.sync="category" width="612px">
<div class="el-input el-input--small el-input-group el-input-group--append">
<input type="text" autocomplete="off" placeholder="输入名称搜索" class="el-input__inner" v-model="msg_t.CustomerName">
<input type="text" autocomplete="off" :placeholder="$t('objFill.v101.qingsrmincss')" class="el-input__inner" v-model="msg_t.CustomerName">
<div class="el-input-group__append">
<button type="button" class="el-button el-button--default" @click="search"><span>搜索</span></button>
<button type="button" class="el-button el-button--default" @click="search"><span>{{$t('objFill.v101.header.sousuo')}}</span></button>
</div>
</div>
<el-table
......@@ -133,7 +133,7 @@
width="100">
</el-table-column>
<el-table-column
label="客户">
:label="$t('pub.Customer')">
<template slot-scope="scope">
{{ scope.row.CustomerName }}
</template>
......@@ -145,7 +145,7 @@
</template>
</el-table-column> -->
<el-table-column
label="联系电话">
:label="$t('scen.sc_tel')">
<template slot-scope="scope">
{{ scope.row.ContactNumber }}
</template>
......@@ -166,8 +166,8 @@
</el-pagination>
<div slot="footer" class="dialog-footer">
<el-button @click="category = false">取 消</el-button>
<el-button type="primary" @click="getProductList">确 定</el-button>
<el-button @click="category = false">{{$t('pub.cancelBtn')}}</el-button>
<el-button type="primary" @click="getProductList">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -193,7 +193,7 @@
},
rules:{
GrantNum:[
{required: true, message: "最多发放次数不能为空", trigger: "blur"}
{required: true, message: this.$t('objFill.v102.zuiduoffcsbnwk'), trigger: "blur"}
]
},
......@@ -236,9 +236,9 @@
},
companyList: [],
SelfMotionList: [
{Name:'通用',Id:0},
{Name:'同业',Id:1},
{Name:'直客',Id:2},
{Name: this.$t('active.cl_tongyong'),Id:0},
{Name: this.$t('salesModule.Trade'),Id:1},
{Name: this.$t('Operation.Op_direct'),Id:2},
]
}
},
......@@ -352,7 +352,7 @@
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
this.companyList.unshift({
BName: '不限',
BName: this.$t('pub.unlimitedSel'),
Id: -1
})
......@@ -443,7 +443,7 @@
this.msg.RegisterDate=''
}
if(this.msg.TriggerType==5 && this.msg.KeyWord==''){
this.Error('请填写口令')
this.Error(this.$t('objFill.v102.qingtianxiekl'))
return false
}
this.loading2 = true;
......
src/components/commonPage/changeOffer.vue
View file @ a766ebab
......@@ -85,7 +85,7 @@
<el-input v-model="item.ChangeValue" style="width:100px;" max="6"></el-input>
</td>
<td>
<el-select v-model="item.ChangeRemarks" placeholder="请选择">
<el-select v-model="item.ChangeRemarks" :placeholder="$t('objFill.qingxuanzhe')">
<el-option v-for="(cItem,cIndex) in changeRemarkList" :key="cIndex" :label="cItem.Name"
:value="cItem.Name"></el-option>
</el-select>
......
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