Skip to content

S
SuperMan
Commit 8cdfb122 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents c78a729d a30480d2
Hide whitespace changes
Inline Side-by-side
Showing with 251 additions and 33 deletions
src/assets/common/lang/EN/fill.js
View file @ 8cdfb122
...@@ -8083,6 +8083,46 @@ export const obj = { ...@@ -8083,6 +8083,46 @@ export const obj = {
xitongxiaoxi: 'System message ', xitongxiaoxi: 'System message ',
xiazapdf: 'Download PDF', xiazapdf: 'Download PDF',
qiyemdijiefjs: 'Enterprise Code Ground Connection Fee Settlement ', qiyemdijiefjs: 'Enterprise Code Ground Connection Fee Settlement ',
zicaidan: ' Secondary menu ',
beijinse: ' Background color ',
caistpccjsfoot: ' Color (image size: 128x107) ',
},
//#endregion
//#region ending v1.0.2
v102:{
tianjzdfffa: ' Add automatic distribution plan ',
chufasj: ' Trigger event ',
nurushijian: ' Enter time ',
zidongffangyhq: ' Automatically distribute coupons',
zidongffngyhqbj: ' Automatic coupon distribution editing ',
fafangdyhquan: ' The coupons issued',
kouling: ' Password ',
fafangcishu: ' Number of distribution times',
meigyhuffcs: ' Each user can distribute multiple times; If there is no limit on the number of distribution times, please fill in 0 ',
wuxinzhi: ' Unrestricted ',
fafangkeix: ' Distribution type ',
suoyouyonghu: ' All users',
zhidingyonghu:' Specify user ',
zuiduoffcsbnwk: ' The maximum number of distribution times cannot be empty',
qingtianxiekl: ' Please fill in the password ',
shifang: ' Release ',
qingxuanzfflx: ' Please select the type of distribution',
xiugailianxr: ' Modify contact person ',
qingxuanzlxrzw: ' Please select the contact persons job title',
qingxzlxrxinb: ' Please select the gender of the contact person',
baomi: ' Confidentiality ',
shifoujuecr: ' Whether it is a decision maker',
qingxuanzsfjcr: ' Please choose whether to be the decision-maker',
tuanqikaishi: ' The group period has begun',
tuanqijieshu: ' The group period has ended',
lingquanzhongxin: ' Coupon Center ',
qingxuanzsypint: ' Please choose to use the platform ',
fafangzhangshu: ' Number of issued sheets',
qingsrfafzshu: ' Please enter the number of cards to be distributed',
bianjiyouhuiquan: ' Edit Coupon ',
appjihuozhuant: 'App activation status',
yijihuo: ' Activated ',
weijihuo: ' Not activated ',
}, },
//#endregion //#endregion
} }
......
src/assets/common/lang/Japan/fill.js
View file @ 8cdfb122
...@@ -8088,5 +8088,42 @@ export const obj = { ...@@ -8088,5 +8088,42 @@ export const obj = {
caistpccjsfoot: 'カラー（画像サイズ：128x107)', caistpccjsfoot: 'カラー（画像サイズ：128x107)',
}, },
//#endregion //#endregion
//#region ending v1.0.2
v102:{
tianjzdfffa: '自動リリース・シナリオの追加',
chufasj: 'イベント',
nurushijian: '入力時間',
zidongffangyhq: 'クーポンを自動配布します',
zidongffngyhqbj: 'クーポン編集の自動配布',
fafangdyhquan: '配布されたクーポン',
kouling: 'パスワード',
fafangcishu: '発行回数',
meigyhuffcs: '1ユーザーあたりの発行可能回数、発給回数を制限しない場合は、0を記入してください',
wuxinzhi: '制限なし',
fafangkeix: 'リリース・タイプ',
suoyouyonghu: 'すべてのユーザー',
zhidingyonghu:'ユーザー',
zuiduoffcsbnwk: '最大発行回数は空白にできません',
qingtianxiekl: 'パスワードを入力してください',
shifang: '釈放する',
qingxuanzfflx: 'リリース・タイプを選択してください',
xiugailianxr: '連絡先',
qingxuanzlxrzw: '連絡先役職を選択してください',
qingxzlxrxinb: '連絡先性別を選択してください。',
baomi: '秘密にしておく',
shifoujuecr: '意思決定者かどうか',
qingxuanzsfjcr: '意思決定者を選択してください',
tuanqikaishi: '団期が始まる',
tuanqijieshu: '団期が終わる',
lingquanzhongxin: 'チケットセンター',
qingxuanzsypint: 'プラットフォームの使用を選択してください',
fafangzhangshu: '発行枚数',
qingsrfafzshu: '発行枚数を入力してください',
bianjiyouhuiquan: 'クーポンの編集',
appjihuozhuant: 'Appアクティブ状態',
yijihuo: 'アクティブ化されています',
weijihuo: '非アクティブ',
},
//#endregion
} }
export default obj; export default obj;
src/assets/common/lang/zhCN/fill.js
View file @ 8cdfb122
...@@ -8113,6 +8113,16 @@ export const obj = { ...@@ -8113,6 +8113,16 @@ export const obj = {
baomi: '保密', baomi: '保密',
shifoujuecr: '是否决策人', shifoujuecr: '是否决策人',
qingxuanzsfjcr: '请选择是否决策人', qingxuanzsfjcr: '请选择是否决策人',
tuanqikaishi: '团期开始',
tuanqijieshu: '团期结束',
lingquanzhongxin: '领券中心',
qingxuanzsypint: '请选择使用平台',
fafangzhangshu: '发放张数',
qingsrfafzshu: '请输入发放张数',
bianjiyouhuiquan: '编辑优惠券',
appjihuozhuant: 'App激活状态',
yijihuo: '已激活',
weijihuo: '未激活',
}, },
//#endregion //#endregion
} }
......
src/assets/common/lang/zhTW/fill.js
View file @ 8cdfb122
...@@ -8088,5 +8088,42 @@ export const obj = { ...@@ -8088,5 +8088,42 @@ export const obj = {
caistpccjsfoot: '彩色(圖片尺寸：128x107)', caistpccjsfoot: '彩色(圖片尺寸：128x107)',
}, },
//#endregion //#endregion
//#region ending v1.0.2
v102:{
tianjzdfffa: '添加自動發放方案',
chufasj: '觸發事件',
nurushijian: '錄入時間',
zidongffangyhq: '自動發放優惠券',
zidongffngyhqbj: '自動發放優惠券編輯',
fafangdyhquan: '發放的優惠券',
kouling: '口令',
fafangcishu: '發放次數',
meigyhuffcs: '每個用戶可發放次數；如不限製發放次數，請填寫0',
wuxinzhi: '無限製',
fafangkeix: '發放類型',
suoyouyonghu: '所有用戶',
zhidingyonghu:'指定用戶',
zuiduoffcsbnwk: '最多發放次數不能為空',
qingtianxiekl: '請填寫口令',
shifang: '釋放',
qingxuanzfflx: '請選擇發放類型',
xiugailianxr: '修改聯系人',
qingxuanzlxrzw: '請選擇聯系人職務',
qingxzlxrxinb: '請選擇聯系人性別',
baomi: '保密',
shifoujuecr: '是否決策人',
qingxuanzsfjcr: '請選擇是否決策人',
tuanqikaishi: '團期開始',
tuanqijieshu: '團期結束',
lingquanzhongxin: '領券中心',
qingxuanzsypint: '請選擇使用平臺',
fafangzhangshu: '發放張數',
qingsrfafzshu: '請輸入發放張數',
bianjiyouhuiquan: '編輯優惠券',
appjihuozhuant: 'App激活狀態',
yijihuo: '已激活',
weijihuo: '未激活',
},
//#endregion
} }
export default obj; export default obj;
src/components/FinancialModule/ReportForm/NumberStatistics.vue
View file @ 8cdfb122
...@@ -442,7 +442,7 @@ tr._item_list td:last-child { ...@@ -442,7 +442,7 @@ tr._item_list td:last-child {
</el-col> --> </el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('advmanager.v_line')"> <el-form-item :label="$t('advmanager.v_line')">
<el-select filterable v-model="msg.LineId" @change="getLineTeamList(msg.LineId)"> <el-select filterable multiple v-model="msg.LineIDList">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option <el-option
v-for="item in LineList" v-for="item in LineList"
...@@ -582,6 +582,8 @@ export default { ...@@ -582,6 +582,8 @@ export default {
OutBranchId: "", OutBranchId: "",
TCID: "", TCID: "",
LineId:"", LineId:"",
LineIDList:[],
QLineIds:"",
QStartDate: "", QStartDate: "",
QEndDate: "", QEndDate: "",
EmployeeId:'' EmployeeId:''
...@@ -635,6 +637,7 @@ export default { ...@@ -635,6 +637,7 @@ export default {
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.msg.OutBranchId=0; this.msg.OutBranchId=0;
this.msg.LineId=14; this.msg.LineId=14;
this.msg.LineIDList=[14];
this.getCompanyList(); this.getCompanyList();
// this.getPageList(); // this.getPageList();
...@@ -656,6 +659,9 @@ export default { ...@@ -656,6 +659,9 @@ export default {
this.msg.OutBranchId = -1; this.msg.OutBranchId = -1;
if (!this.msg.TCID) this.msg.TCID = 0; if (!this.msg.TCID) this.msg.TCID = 0;
if (this.msg.QStartDate == "") this.msg.QStartDate = new Date().getFullYear()+""; if (this.msg.QStartDate == "") this.msg.QStartDate = new Date().getFullYear()+"";
this.msg.LineId=0;
this.msg.QLineIds = "";
this.msg.QLineIds = this.msg.LineIDList.join(',');
this.apipost('financestatistics_post_GetPeopleMonthReportList', this.msg, res=>{ this.apipost('financestatistics_post_GetPeopleMonthReportList', this.msg, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
......
src/components/SalesModule/Common/addCustomerContact.vue
View file @ 8cdfb122
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
display: inline-block; display: inline-block;
width: 6px; width: 6px;
height: 6px; height: 6px;
background: #409efe; /* background: #409efe; */
border-radius: 50%; border-radius: 50%;
margin-right: 10px; margin-right: 10px;
} }
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</el-col> </el-col>
<el-col v-if="ContactData.ID==0" :span="12"> <el-col v-if="ContactData.ID==0" :span="12">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item :label="$t('admin.admin_departsort')" prop="Password"> <el-form-item :label="$t('admin.admin_password')" prop="Password">
<el-input :placeholder="$t('admin.admin_lnLoginPwd')" v-model="form.Password" class="w200"></el-input> <el-input :placeholder="$t('admin.admin_lnLoginPwd')" v-model="form.Password" class="w200"></el-input>
</el-form-item> </el-form-item>
</div> </div>
......
src/components/SalesModule/MyCustomer.vue
View file @ 8cdfb122
...@@ -482,6 +482,17 @@ ...@@ -482,6 +482,17 @@
:placeholder="$t('salesModule.enterPhone')"></el-input> :placeholder="$t('salesModule.enterPhone')"></el-input>
</span> </span>
</li> </li>
<li style="margin-left: 10px">
<span>
<em>{{$t('objFill.v102.appjihuozhuant')}}：</em>
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable
v-model="msg.OpenIdStatus"
@change="reSearchPage">
<el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id"
:key="item.Id"></el-option>
</el-select>
</span>
</li>
<li> <li>
<button class="hollowFixedBtn" @click="reSearchPage">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="reSearchPage">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="clickAdd">{{$t('salesModule.addCustomer')}}</button> <button class="normalBtn" @click="clickAdd">{{$t('salesModule.addCustomer')}}</button>
...@@ -521,6 +532,7 @@ ...@@ -521,6 +532,7 @@
<th>{{$t('system.query_name')}}</th> <th>{{$t('system.query_name')}}</th>
<th>{{$t('restaurant.res_ContactNumber')}}</th> <th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>{{$t('salesModule.storeName')}}</th> <th>{{$t('salesModule.storeName')}}</th>
<th>{{$t('objFill.v102.appjihuozhuant')}}</th>
<th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Yuefang')}}</th> <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Yuefang')}}</th>
<th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Visit')}}</th> <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.Visit')}}</th>
<th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.TotalVisit')}}</th> <th v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">{{$t('salesModule.TotalVisit')}}</th>
...@@ -559,6 +571,11 @@ ...@@ -559,6 +571,11 @@
{{$t('objFill.dai')}}{{item.departmentManagerStr}}{{$t('fnc.shenhe')}} {{$t('objFill.dai')}}{{item.departmentManagerStr}}{{$t('fnc.shenhe')}}
</span> </span>
</td> </td>
<td>
<span :style="{'color':item.openIdStatus==1?'red':''}">
{{ item.openIdStatus==1?$t('objFill.v102.yijihuo'):$t('objFill.v102.weijihuo') }}
</span>
</td>
<td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2"> <td v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
<p v-if="item.customerVisitList.length>0"> <p v-if="item.customerVisitList.length>0">
{{item.customerVisitList[0].visitDateTime}} {{item.customerVisitList[0].visitDateTime}}
...@@ -1065,7 +1082,8 @@ ...@@ -1065,7 +1082,8 @@
Province: '-1', Province: '-1',
City: '-1', City: '-1',
District: '-1', District: '-1',
SigningType: 0 SigningType: 0,
OpenIdStatus: 0// 0-全部，1-已激活，2-未激活
}, },
addMsg: { addMsg: {
CustomerId: 0, CustomerId: 0,
...@@ -1218,6 +1236,11 @@ ...@@ -1218,6 +1236,11 @@
inputVisible: false, inputVisible: false,
inputValue: '', inputValue: '',
currentUserInfo: {}, //当前登录用户 currentUserInfo: {}, //当前登录用户
OpenStatusList:[
{ Name: this.$t('objFill.v101.activity.col3.t4'),Id: 0 },
{ Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
{ Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
]
} }
}, },
methods: { methods: {
......
src/components/activity/CouponDetail.vue
View file @ 8cdfb122
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>{{$t('active.cl_hdtujing')}}</th> <th>{{$t('active.cl_hdtujing')}}</th>
<th>{{$t('active.cl_hdqudao')}}</th> <!-- <th>{{$t('active.cl_hdqudao')}}</th> -->
<th>{{$t('active.cl_syzhuangtai')}}</th> <th>{{$t('active.cl_syzhuangtai')}}</th>
<th>{{$t('hotel.order_Number')}}</th> <th>{{$t('hotel.order_Number')}}</th>
<th>{{$t('active.cl_orderType')}}</th> <th>{{$t('active.cl_orderType')}}</th>
...@@ -35,9 +35,18 @@ ...@@ -35,9 +35,18 @@
<tbody v-loading="loading"> <tbody v-loading="loading">
<tr v-for="(item,index) in DataList" :key="index"> <tr v-for="(item,index) in DataList" :key="index">
<td> <td>
<span v-if="item.accessType == 1">{{$t('active.cl_choujiang')}}</span> <span v-if="item.accessType == 1">活动</span>
<span v-else-if="item.accessType == 2">{{$t('active.cl_choujiang')}}</span>
<span v-else-if="item.accessType == 3">完款自动发放</span>
<span v-else-if="item.accessType == 4">后台发放</span>
<span v-else-if="item.accessType == 5">分享</span>
<span v-else-if="item.accessType == 6">购买并付款</span>
<span v-else-if="item.accessType == 7">新人领券</span>
<span v-else-if="item.accessType == 8">新人购买并付款</span>
<span v-else-if="item.accessType == 9">口令发放</span>
<span v-else-if="item.accessType == 10">新人购买</span>
</td> </td>
<td>{{item.acessName}}</td> <!-- <td>{{item.acessName}}</td> -->
<td> <td>
<span v-if="item.useState == 1" style="color: green">{{$t('active.cl_wsyong')}}</span> <span v-if="item.useState == 1" style="color: green">{{$t('active.cl_wsyong')}}</span>
<span v-if="item.useState == 2" style="color: gary">{{$t('active.cl_ysyong')}}</span> <span v-if="item.useState == 2" style="color: gary">{{$t('active.cl_ysyong')}}</span>
......
src/components/activity/CouponList.vue
View file @ 8cdfb122
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button v-if="EditBtn" type="danger" icon="iconfont icon-xiugai" circle style="padding:4px;" <el-button v-if="EditBtn" type="danger" icon="iconfont icon-xiugai" circle style="padding:4px;"
@click="outerVisible=true,EditItem(item)"></el-button> @click="dialogTitle=$t('objFill.v102.bianjiyouhuiquan'),outerVisible=true,EditItem(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.activity.fafangyhq')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.activity.fafangyhq')" placement="top">
...@@ -345,6 +345,18 @@ ...@@ -345,6 +345,18 @@
type="datetime"></el-date-picker> type="datetime"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.v102.tuanqikaishi')">
<el-date-picker format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.TeamStartDate"
type="datetime"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.v102.tuanqijieshu')">
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.TeamEndDate"
type="datetime"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('objFill.v101.activity.xuanzhetuan')" prop=""> <el-form-item :label="$t('objFill.v101.activity.xuanzhetuan')" prop="">
<el-select filterable multiple v-model="addMsg.couponPriceLists" :placeholder="$t('objFill.v101.activity.qingxuanzxlxlrq')" class="w217" <el-select filterable multiple v-model="addMsg.couponPriceLists" :placeholder="$t('objFill.v101.activity.qingxuanzxlxlrq')" class="w217"
...@@ -399,7 +411,7 @@ ...@@ -399,7 +411,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('objFill.v101.activity.shiyongpint')" prop="OpenPlatformList"> <el-form-item :label="$t('objFill.v101.activity.shiyongpint')" prop="openPlatformList">
<el-select filterable class="w217" :multiple="true" v-model="addMsg.openPlatformList" <el-select filterable class="w217" :multiple="true" v-model="addMsg.openPlatformList"
:placeholder="$t('system.ph_choice')"> :placeholder="$t('system.ph_choice')">
<el-option :label="$t('system.ph_buxian')" :value="0" :key="0"></el-option> <el-option :label="$t('system.ph_buxian')" :value="0" :key="0"></el-option>
...@@ -409,14 +421,15 @@ ...@@ -409,14 +421,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('objFill.v101.activity.shifouzdff')" prop="OpenPlatformList"> <el-form-item :label="$t('objFill.v101.activity.shifouzdff')" prop="autoGrant">
<el-select filterable class="w217" v-model="addMsg.autoGrant" :placeholder="$t('system.ph_choice')"> <el-select filterable class="w217" v-model="addMsg.autoGrant" :placeholder="$t('system.ph_choice')">
<el-option :label="$t('objFill.v101.activity.buzhidongfaf')" :value="0" :key="0"></el-option> <el-option :label="$t('objFill.v101.activity.buzhidongfaf')" :value="0" :key="0"></el-option>
<el-option :label="$t('objFill.v101.activity.wankuanhzdfaf')" :value="1" :key="1"></el-option> <el-option :label="$t('objFill.v101.activity.wankuanhzdfaf')" :value="1" :key="1"></el-option>
<el-option :label="$t('objFill.v102.lingquanzhongxin')" :value="3" :key="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('objFill.v101.activity.fafangxianlu')"> <el-form-item :label="$t('objFill.v101.activity.fafangxianlu')">
<el-select filterable v-model="addMsg.checkInLineList" :multiple="true"> <el-select filterable v-model="addMsg.checkInLineList" :multiple="true">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
...@@ -444,7 +457,7 @@ ...@@ -444,7 +457,7 @@
<el-input v-model="addMsg.expansionModel.orderGuestNum" class="w217" type="number" /> <el-input v-model="addMsg.expansionModel.orderGuestNum" class="w217" type="number" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item :label="$t('active.cl_orderType')" prop="lineId"> <el-form-item :label="$t('active.cl_orderType')" prop="lineId">
<el-select filterable v-model="addMsg.expansionModel.orderType"> <el-select filterable v-model="addMsg.expansionModel.orderType">
<el-option :label="$t('objFill.xiaobaot')" :value="2"></el-option> <el-option :label="$t('objFill.xiaobaot')" :value="2"></el-option>
...@@ -653,7 +666,12 @@ ...@@ -653,7 +666,12 @@
required: true, required: true,
message: this.$t('objFill.v101.activity.qinxuanzhetuan'), message: this.$t('objFill.v101.activity.qinxuanzhetuan'),
trigger: "change" trigger: "change"
}] }],
openPlatformList: [{
required: true,
message: this.$t('objFill.v102.qingxuanzsypint'),
trigger: "change"
}],
}, },
addMsg: { addMsg: {
couponsName: "", couponsName: "",
...@@ -687,7 +705,9 @@ ...@@ -687,7 +705,9 @@
orderType: "", orderType: "",
denomination: "", denomination: "",
orderGuestNum: "" orderGuestNum: ""
} },
TeamStartDate: "",
TeamEndDate: "",
}, },
pwdMsg: { pwdMsg: {
Id: "", Id: "",
......
src/components/activity/components/addAutorelease.vue
View file @ 8cdfb122
...@@ -50,6 +50,11 @@ ...@@ -50,6 +50,11 @@
<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-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-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.v102.fafangzhangshu')" prop="GrantCouponNum" class="is-required">
<el-input v-model="msg.GrantCouponNum" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\d{0,2})?/) ? this.value.match(/\d+(\d{0,2})?/)[0] : ''" style="width: 100%;"/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('system.table_begTime')" > <el-form-item :label="$t('system.table_begTime')" >
<el-date-picker size="small" v-model="msg.RegisterDate" type="date" style="width: 100%" <el-date-picker size="small" v-model="msg.RegisterDate" type="date" style="width: 100%"
...@@ -189,12 +194,16 @@ ...@@ -189,12 +194,16 @@
RegisterDate:'', RegisterDate:'',
KeyWord:'', KeyWord:'',
BranchId: -1, BranchId: -1,
SelfMotionType: 1 SelfMotionType: 1,
GrantCouponNum: 1,
}, },
rules:{ rules:{
GrantNum:[ GrantNum:[
{required: true, message: this.$t('objFill.v102.zuiduoffcsbnwk'), trigger: "blur"} {required: true, message: this.$t('objFill.v102.zuiduoffcsbnwk'), trigger: "blur"}
] ],
GrantCouponNum:[
{required: true, message: this.$t('objFill.v102.qingsrfafzshu'), trigger: "blur"}
],
}, },
checked:false, checked:false,
...@@ -243,6 +252,7 @@ ...@@ -243,6 +252,7 @@
} }
}, },
created(){ created(){
if(this.infoData) this.getInfo()
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id
this.getrigger() this.getrigger()
...@@ -256,7 +266,7 @@ ...@@ -256,7 +266,7 @@
},10) },10)
}, },
mounted(){ mounted(){
if(this.infoData) this.getInfo()
}, },
methods:{ methods:{
getInfo(){ getInfo(){
...@@ -268,20 +278,23 @@ ...@@ -268,20 +278,23 @@
this.msg = { this.msg = {
ID: data.ID, ID: data.ID,
TriggerType:data.TriggerType, TriggerType:data.TriggerType,
DiscountCouponId:data.DiscountCouponId, DiscountCouponId:Number(data.DiscountCouponId),
GrantNum:data.GrantNum, GrantNum:data.GrantNum,
IsAll:data.IsAll, IsAll:data.IsAll,
UserList:[], UserList:[],
RegisterDate:data.RegisterDate, RegisterDate:data.RegisterDate,
KeyWord:data.KeyWord, KeyWord:data.KeyWord,
BranchId: data.BranchId, BranchId: data.BranchId,
SelfMotionType: data.SelfMotionType SelfMotionType: data.SelfMotionType,
GrantCouponNum: data.GrantCouponNum,
} }
this.UserList = data.UserList this.UserList = data.UserList
this.Storage = data.UserList this.Storage = data.UserList
for(let i = 0;i<data.UserList.length;i++){ if(data.UserList&&data.UserList.length>0){
this.UserList[i].CustomerAccountId = data.UserList[i].UserId for(let i = 0;i<data.UserList.length;i++){
this.Storage[i].CustomerAccountId = data.UserList[i].UserId this.UserList[i].CustomerAccountId = data.UserList[i].UserId
this.Storage[i].CustomerAccountId = data.UserList[i].UserId
}
} }
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
...@@ -365,7 +378,7 @@ ...@@ -365,7 +378,7 @@
this.apipost("coupon_post_GetTriggerTypeEnumList",{}, res => { this.apipost("coupon_post_GetTriggerTypeEnumList",{}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.options = res.data.data; this.options = res.data.data;
this.msg.TriggerType = res.data.data[0].Id if(!this.msg.TriggerType) this.msg.TriggerType = res.data.data[0].Id
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
...@@ -376,7 +389,7 @@ ...@@ -376,7 +389,7 @@
this.apipost("coupon_post_GetDropDowmList",{"CouponsName":"","BranchId":-1}, res => { this.apipost("coupon_post_GetDropDowmList",{"CouponsName":"","BranchId":-1}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.options2 = res.data.data; this.options2 = res.data.data;
this.msg.DiscountCouponId = res.data.data[0].id if(!this.msg.DiscountCouponId) this.msg.DiscountCouponId = res.data.data[0].id
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ 8cdfb122
...@@ -217,9 +217,10 @@ ...@@ -217,9 +217,10 @@
<GGMap></GGMap> <GGMap></GGMap>
</div> </div>
<div class="Travel_ImgList clearfix" :class="{'showOther':TeamType==3}"> <div class="Travel_ImgList clearfix" :class="{'showOther':TeamType==3}">
{{PostConfig.fileList}}
<div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode"> <div class="TFimgList" v-for="(item,index) in PostConfig.fileList" :key="item.subCode">
<img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png"> <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png">
<img v-else :src='compressImg(item.Url, "filt", 170, "")'> <img v-else :src='item.Url'>
<div class="TFIMGzhe"> <div class="TFIMGzhe">
<div class="TFreupload" @click="updateTFimg(index)"> <div class="TFreupload" @click="updateTFimg(index)">
<el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true" <el-upload :file-list="PostConfig.fileList" :http-request="reUpload" :multiple="true"
...@@ -454,8 +455,8 @@ ...@@ -454,8 +455,8 @@
var str = this.domainManager().ViittoFileUrl + x.data.FilePath; var str = this.domainManager().ViittoFileUrl + x.data.FilePath;
that.PostConfig.fileList[ that.PostConfig.fileList[
this.updateChoseIndex this.updateChoseIndex
].Url = this.$commonUtils.GetALiFileUrl(str); ].Url = str;
that.PostConfig.fileList[this.updateChoseIndex].Name = fileName; that.PostConfig.fileList[this.updateChoseIndex].Name = "";
}); });
}, },
//修改图片 //修改图片
...@@ -494,7 +495,7 @@ ...@@ -494,7 +495,7 @@
obj.ID = 0; obj.ID = 0;
obj.Path = this.$commonUtils.removeDomain(imgItem.Path); obj.Path = this.$commonUtils.removeDomain(imgItem.Path);
obj.PicID = imgItem.ID; obj.PicID = imgItem.ID;
obj.ShowPath = imgItem.Path + "?x-oss-process=image/resize,l_140"; obj.ShowPath = imgItem.Path ;
that.PostConfig.fileList[this.ChooseImgIndex].Url = obj.ShowPath; that.PostConfig.fileList[this.ChooseImgIndex].Url = obj.ShowPath;
}); });
} else { } else {
......
src/main.js
View file @ 8cdfb122
...@@ -41,7 +41,11 @@ import { VTable, VPagination } from 'vue-easytable' ...@@ -41,7 +41,11 @@ import { VTable, VPagination } from 'vue-easytable'
import 'viewerjs/dist/viewer.css' import 'viewerjs/dist/viewer.css'
import Viewer from 'v-viewer' import Viewer from 'v-viewer'
import locale from 'element-ui/lib/locale';
import enLocale from 'element-ui/lib/locale/lang/en'
import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
import twLocale from 'element-ui/lib/locale/lang/zh-TW'
import jaLocale from 'element-ui/lib/locale/lang/ja'
Vue.component(VTable.name, VTable) Vue.component(VTable.name, VTable)
Vue.component(VPagination.name, VPagination) Vue.component(VPagination.name, VPagination)
...@@ -154,13 +158,31 @@ const i18n = new VueI18n({ ...@@ -154,13 +158,31 @@ const i18n = new VueI18n({
locale: 'zh-CN', // 语言标识 locale: 'zh-CN', // 语言标识
//this.$i18n.locale // 通过切换locale的值来实现语言切换 //this.$i18n.locale // 通过切换locale的值来实现语言切换
messages: { messages: {
'zh-CN': require('./assets/common/lang/zh'), // 中文语言包 // 'zh-CN': require('./assets/common/lang/zh'), // 中文语言包
'en-US': require('./assets/common/lang/en'), // 英文语言包 // 'en-US': require('./assets/common/lang/en'), // 英文语言包
'zh-TW': require('./assets/common/lang/zh-tw'), // 台湾语言包 // 'zh-TW': require('./assets/common/lang/zh-tw'), // 台湾语言包
'Japanese': require('./assets/common/lang/jp') // 日本语言包 // 'Japanese': require('./assets/common/lang/jp') // 日本语言包
'zh-CN': {
...require('./assets/common/lang/zh'),
...zhLocale,
}, // 中文语言包
'en-US': {
...require('./assets/common/lang/en'),
...enLocale,
}, // 英文语言包
'zh-TW': {
...require('./assets/common/lang/zh-tw'),
...twLocale,
}, // 台湾语言包
'Japanese': {
...require('./assets/common/lang/jp'),
jaLocale,
} // 日本语言包
} }
}) })
locale.i18n((key, value) => i18n.t(key, value))
import Router from 'vue-router' import Router from 'vue-router'
const originalPush = Router.prototype.push const originalPush = Router.prototype.push
......
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