Skip to content

S
SuperMan
Commit f24ce74e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7d479422
Show whitespace changes
Inline Side-by-side
Showing with 514 additions and 512 deletions
src/components/DirectCustomer/components/directCustomerList.vue
View file @ f24ce74e
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
}, },
$route:{ $route:{
handler(val, oldVal) { handler(val, oldVal) {
console.log(val,'-----')
}, },
deep: true, deep: true,
immediate:true, immediate:true,
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ f24ce74e
...@@ -3141,8 +3141,6 @@ ...@@ -3141,8 +3141,6 @@
this.czmsgState = true; this.czmsgState = true;
} }
if(this.czmsg.ClientID&&this.czmsg.ClientID>0){ if(this.czmsg.ClientID&&this.czmsg.ClientID>0){
console.log('1:'+this.czmsg.ClientType);
console.log('2:'+this.czmsg.ClientID);
this.msg.IsPublic=1; this.msg.IsPublic=1;
this.msg.ClientType = this.czmsg.ClientType; this.msg.ClientType = this.czmsg.ClientType;
this.msg.ClientID = this.czmsg.ClientID; this.msg.ClientID = this.czmsg.ClientID;
......
src/components/Hotel/DiDa/HotelSure.vue
View file @ f24ce74e
...@@ -1007,7 +1007,6 @@ ...@@ -1007,7 +1007,6 @@
this.params, this.params,
res => { res => {
this.loading = false; this.loading = false;
console.log("GetDiDaPriceConfirm",res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.PriceDetails; this.dataList = res.data.data.PriceDetails;
this.roomRateDetails = res.data.data.PriceDetails.HotelList[0]; this.roomRateDetails = res.data.data.PriceDetails.HotelList[0];
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ f24ce74e
...@@ -1674,7 +1674,7 @@ ...@@ -1674,7 +1674,7 @@
<el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource"> <el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource">
<!--票务修改平台 --> <!--票务修改平台 -->
<el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')"
@change="gettypechange(),getTotalPrice()" :disabled="addMsg.OutBranchId&&addMsg.OutBranchId!=1245" > @change="getTotalPrice()" :disabled="addMsg.OutBranchId!=1245">
<el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -2543,7 +2543,7 @@ ...@@ -2543,7 +2543,7 @@
</td> </td>
<td class="RL-BTNlist" rowspan="2"> <td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow === true"> <el-button-group v-if="isShow === true">
<el-tooltip v-if=" ConfigData.Config.IsCurrentMaxStartData == 0 || IsSupperOrderEdit" class="item" <el-tooltip class="item"
effect="dark" :content="$t('pub.updateMsg')" placement="top-start"> effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" style="background-color: #00c6ff !important;border-color: #00c6ff;" <el-button type="primary" style="background-color: #00c6ff !important;border-color: #00c6ff;"
icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button> icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button>
...@@ -4780,7 +4780,7 @@ ...@@ -4780,7 +4780,7 @@
this.apipost( this.apipost(
"sellorder_post_GetOrderEntity", { "sellorder_post_GetOrderEntity", {
ID: obj.OrderId, ID: obj.OrderId,
IsDealDiscount:1 IsDealDiscount: 1
}, },
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -4789,7 +4789,7 @@ ...@@ -4789,7 +4789,7 @@
this.addObj = res.data.data.modelPrice; this.addObj = res.data.data.modelPrice;
let x = res.data.data.model; let x = res.data.data.model;
this.addMsg = x; this.addMsg = x;
this.DealDiscountMoney = this.addMsg.DiscountMoney+this.addMsg.RedEnvelopeMoney; this.DealDiscountMoney = this.addMsg.DiscountMoney + this.addMsg.RedEnvelopeMoney;
this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价 this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价
this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice; this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice;
if (this.addMsg.IsLessPrice == 1) { if (this.addMsg.IsLessPrice == 1) {
...@@ -5518,10 +5518,11 @@ ...@@ -5518,10 +5518,11 @@
return; return;
} }
} }
var oldUnitPrice=this.addMsg.TC_Price; let userInfo = this.getLocalStorage();
if (userInfo != null && userInfo.EmployeeId != 1) {
if (this.addMsg.GroupType != 5) { if (this.addMsg.GroupType != 5) {
//印象票务 //印象票务
if (this.addMsg.OutBranchId&&this.addMsg.OutBranchId == 1245) { if (this.addMsg.OutBranchId && this.addMsg.OutBranchId == 1245) {
if (this.addMsg.CustomerType == 3 || this.addMsg.CustomerType == 4) { if (this.addMsg.CustomerType == 3 || this.addMsg.CustomerType == 4) {
if (this.addMsg.PlatformPriceList && this if (this.addMsg.PlatformPriceList && this
.addMsg.PlatformPriceList.length > 0) { .addMsg.PlatformPriceList.length > 0) {
...@@ -5535,6 +5536,7 @@ ...@@ -5535,6 +5536,7 @@
} }
} }
} }
}
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1; this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1;
if (this.addObj.IsBirdDiscount == 1) { if (this.addObj.IsBirdDiscount == 1) {
//早鸟优惠 //早鸟优惠
......
src/components/activity/components/addAutorelease.vue
View file @ f24ce74e
<template> <template>
<div class="addAutoreleaseCoupon"> <div class="addAutoreleaseCoupon">
<el-dialog @closed="closedDialog" :modal="true" :visible.sync="dialogTableVisible" <el-dialog @closed="closedDialog" :modal="true" :visible.sync="dialogTableVisible" :close-on-click-modal="false"
:close-on-click-modal="false" class="addContacts" class="addContacts" width="700px">
width="700px">
<div class="add-tit" slot="title"> <div class="add-tit" slot="title">
<p v-if="msg.ID==0"><span></span>{{ $t('objFill.v102.zidongffangyhq') }}</p> <p v-if="msg.ID==0"><span></span>{{ $t('objFill.v102.zidongffangyhq') }}</p>
<p v-else><span></span>{{ $t('objFill.v102.zidongffngyhqbj') }}</p> <p v-else><span></span>{{ $t('objFill.v102.zidongffngyhqbj') }}</p>
...@@ -12,31 +11,25 @@ ...@@ -12,31 +11,25 @@
<el-form :model="msg" style="padding:0 20px;" :rules="rules" ref="msg" label-width="120px" size="small"> <el-form :model="msg" style="padding:0 20px;" :rules="rules" ref="msg" label-width="120px" size="small">
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('objFill.v102.chufasj')" class="is-required" > <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-select v-model="msg.TriggerType" :placeholder="$t('objFill.qingxuanzhe')" style="width: 100%">
<el-option <el-option v-for="item in options" :key="item.Id" :label="item.Name" :value="item.Id">
v-for="item in options"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option> </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.v102.fafangdyhquan')" class="is-required" > <el-form-item :label="$t('objFill.v102.fafangdyhquan')" class="is-required">
<el-select v-model="msg.DiscountCouponId" :placeholder="$t('objFill.qingxuanzhe')" filterable clearable style="width: 100%" @change="handleChange"> <el-select v-model="msg.DiscountCouponId" :placeholder="$t('objFill.qingxuanzhe')" filterable clearable
<el-option style="width: 100%" @change="handleChange">
v-for="item in options2" <el-option v-for="item in options2" :key="item.id"
:key="item.id" :label="item.couponsName+'('+(item.customerType==0?'同行':'直客')+')'" :value="item.id">
:label="item.couponsName+'('+(item.customerType==0?'同行':'直客')+')'"
:value="item.id">
</el-option> </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.v102.kouling')" 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-input v-model="msg.KeyWord" class="el-input--small" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -46,17 +39,22 @@ ...@@ -46,17 +39,22 @@
style="position: absolute;left: -100px;top:10px"> style="position: absolute;left: -100px;top:10px">
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </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-input v-model="msg.GrantNum" class="el-input--small" :disabled="checked" step="1" min="0"
<el-checkbox v-model="checked" @change="checked==true? msg.GrantNum=0:msg.GrantNum=1" style="margin-left: 10px">{{$t('objFill.v102.wuxinzhi')}}</el-checkbox> 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">{{$t('objFill.v102.wuxinzhi')}}</el-checkbox>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('objFill.v102.fafangzhangshu')" prop="GrantCouponNum" class="is-required"> <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-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-form-item>
</el-col> </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%"
value-format="yyyy-MM-dd" :placeholder="$t('fnc.qxzrqshijian')"> value-format="yyyy-MM-dd" :placeholder="$t('fnc.qxzrqshijian')">
</el-date-picker> </el-date-picker>
...@@ -64,27 +62,23 @@ ...@@ -64,27 +62,23 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('sm.company')" > <el-form-item :label="$t('sm.company')">
<el-select v-model="msg.BranchId" :placeholder="$t('rule.company')" style="width: 100%"> <el-select v-model="msg.BranchId" :placeholder="$t('rule.company')" style="width: 100%">
<el-option <el-option v-for="item in companyList" :key="item.Id" :label="item.BName" :value="item.Id">
v-for="item in companyList"
:key="item.Id"
:label="item.BName"
:value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item :label="$t('objFill.v101.FinancialModule.linqur')" > <el-form-item :label="$t('objFill.v101.FinancialModule.linqur')">
<el-radio-group v-model="msg.IsAll" style="display:flex;align-items: center;height:33px;"> <el-radio-group v-model="msg.IsAll" style="display:flex;align-items: center;height:33px;">
<el-radio :label="0">{{$t('objFill.v102.suoyouyonghu')}}</el-radio> <el-radio :label="0">{{$t('objFill.v102.suoyouyonghu')}}</el-radio>
<el-radio :label="1">{{$t('objFill.v102.zhidingyonghu')}}</el-radio> <el-radio :label="1">{{$t('objFill.v102.zhidingyonghu')}}</el-radio>
<el-popover trigger="click" placement="top-start" v-show="msg.IsAll === 1"> <el-popover trigger="click" placement="top-start" v-show="msg.IsAll === 1">
<div class="_TravelPricePopover" style="height: 300px;overflow: auto;width: 350px;"> <div class="_TravelPricePopover" style="height: 300px;overflow: auto;width: 350px;">
<div class="ScenicDiv"> <div class="ScenicDiv">
<el-input class="w180" v-model="msg_t.customerInfo" <el-input class="w180" v-model="msg_t.customerInfo" @keypress.native.enter="search"
@keypress.native.enter="search" :placeholder="$t('objFill.v101.activity.shurugjzhccx')"> :placeholder="$t('objFill.v101.activity.shurugjzhccx')">
</el-input> </el-input>
<table width="100%" border="0" cellspacing="0" cellpadding="0" v-loading="category"> <table width="100%" border="0" cellspacing="0" cellpadding="0" v-loading="category">
<tr> <tr>
...@@ -114,7 +108,8 @@ ...@@ -114,7 +108,8 @@
<template v-if="UserList&&UserList.length>0"> <template v-if="UserList&&UserList.length>0">
<template v-for="(item,index) in UserList"> <template v-for="(item,index) in UserList">
<template v-if="item.ischecked"> <template v-if="item.ischecked">
<el-tag :key="index+10000" closable @close="deleteTag(item)">{{item.customerName}}({{item.contact}}) <el-tag :key="index+10000" closable @close="deleteTag(item)">
{{item.customerName}}({{item.contact}})
</el-tag> </el-tag>
</template> </template>
</template> </template>
...@@ -127,51 +122,57 @@ ...@@ -127,51 +122,57 @@
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" class="add-box-btn" @click="preserve('msg')" :loading="loading2">{{$t('pub.sureBtn')}}</el-button> <el-button type="primary" class="add-box-btn" @click="preserve('msg')" :loading="loading2">{{$t('pub.sureBtn')}}
<el-button class="add-box-btn add-box-cancel" @click="dialogTableVisible = false, resetForm('msg')">{{$t('pub.cancelBtn')}}</el-button> </el-button>
<el-button class="add-box-btn add-box-cancel" @click="dialogTableVisible = false, resetForm('msg')">
{{$t('pub.cancelBtn')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "addAutoreleaseCoupon", name: "addAutoreleaseCoupon",
props:['infoData'], props: ['infoData'],
data(){ data() {
return{ return {
msg:{ msg: {
ID:0, ID: 0,
TriggerType:0, TriggerType: 0,
DiscountCouponId:0, DiscountCouponId: 0,
GrantNum:1, GrantNum: 1,
IsAll:0, IsAll: 0,
UserList:[], UserList: [],
RegisterDate:'', RegisterDate: '',
KeyWord:'', KeyWord: '',
BranchId: -1, BranchId: -1,
SelfMotionType: 1, SelfMotionType: 1,
GrantCouponNum: 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'),
GrantCouponNum:[ trigger: "blur"
{required: true, message: this.$t('objFill.v102.qingsrfafzshu'), trigger: "blur"} }],
], GrantCouponNum: [{
required: true,
message: this.$t('objFill.v102.qingsrfafzshu'),
trigger: "blur"
}],
}, },
checked:false, checked: false,
options:[], options: [],
options2:[], options2: [],
Name:'', Name: '',
category:false, category: false,
tableData: [], tableData: [],
msg_t:{ msg_t: {
pageIndex:1, pageIndex: 1,
pageSize:8, pageSize: 8,
// Name:'', // Name:'',
// SmallShopId:0, // SmallShopId:0,
...@@ -189,48 +190,56 @@ ...@@ -189,48 +190,56 @@
fanYong: -1, fanYong: -1,
STime: '', STime: '',
ETime: '', ETime: '',
customerInfo:"", customerInfo: "",
}, },
count:0, count: 0,
loading:false, loading: false,
UserList:[], UserList: [],
Storage:[], Storage: [],
loading2:false, loading2: false,
dialogTableVisible: true, dialogTableVisible: true,
getCompanyMsg: { getCompanyMsg: {
RB_Group_Id: "0", RB_Group_Id: "0",
Status: "0" Status: "0"
}, },
companyList: [], companyList: [],
SelfMotionList: [ SelfMotionList: [{
{Name: this.$t('active.cl_tongyong'),Id:0}, Name: this.$t('active.cl_tongyong'),
{Name: this.$t('salesModule.Trade'),Id:1}, Id: 0
{Name: this.$t('Operation.Op_direct'),Id:2}, },
{
Name: this.$t('salesModule.Trade'),
Id: 1
},
{
Name: this.$t('Operation.Op_direct'),
Id: 2
},
] ]
} }
}, },
created(){ created() {
if(this.infoData) this.getInfo() 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()
this.getrigger2() this.getrigger2()
this.getCompany() this.getCompany()
// this.getList() // this.getList()
setTimeout(()=>{ setTimeout(() => {
if(this.$route.query.ID){ if (this.$route.query.ID) {
this.gettRepositoryList(this.$route.query.ID) this.gettRepositoryList(this.$route.query.ID)
} }
},10) }, 10)
}, },
mounted(){ mounted() {
}, },
methods:{ methods: {
handleChange(value) { handleChange(value) {
this.options2.forEach(x=>{ this.options2.forEach(x => {
if(x.id ==value){ if (x.id == value) {
this.msg.SelfMotionType =x.customerType this.msg.SelfMotionType = x.customerType
} }
}) })
}, },
...@@ -253,56 +262,47 @@ ...@@ -253,56 +262,47 @@
this.UserList.splice(index, 1); this.UserList.splice(index, 1);
} }
}, },
getInfo(){ getInfo() {
this.apipost("coupon_post_GettRepositoryList",{ this.apipost("coupon_post_GettRepositoryList", {
ID: this.infoData.ID ID: this.infoData.ID
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data let data = res.data.data
this.msg = { this.msg = {
ID: data.ID, ID: data.ID,
TriggerType:data.TriggerType, TriggerType: data.TriggerType,
DiscountCouponId:Number(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, GrantCouponNum: data.GrantCouponNum,
} }
if(data.UserList&&data.UserList.length>0){ if (data.UserList && data.UserList.length > 0) {
data.UserList.forEach(element => { data.UserList.forEach(element => {
this.UserList.push( { this.UserList.push({
contact: element.Contact, contact: element.Contact,
contactNumber: element.ContactNumber, contactNumber: element.ContactNumber,
customerAccountId: element.UserId, customerAccountId: element.UserId,
customerId:element.CustomerId, customerId: element.CustomerId,
customerName: element.CustomerName, customerName: element.CustomerName,
ischecked:true, ischecked: true,
}); });
}); });
} }
console.log(" this.UserList", this.UserList);
// this.UserList = data.UserList
// this.Storage = data.UserList
// if(data.UserList&&data.UserList.length>0){
// for(let i = 0;i<data.UserList.length;i++){
// 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);
} }
}) })
}, },
toggleSelection(rows,ignoreSelectable) { toggleSelection(rows, ignoreSelectable) {
if (rows) { if (rows) {
rows.forEach(row => { rows.forEach(row => {
this.$refs.multipleTable.toggleRowSelection(row,undefined,ignoreSelectable); this.$refs.multipleTable.toggleRowSelection(row, undefined, ignoreSelectable);
}); });
} else { } else {
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
...@@ -319,14 +319,14 @@ ...@@ -319,14 +319,14 @@
resetForm(formName) { resetForm(formName) {
// 重置表单 // 重置表单
this.msg = { this.msg = {
ID:0, ID: 0,
TriggerType:0, TriggerType: 0,
DiscountCouponId:0, DiscountCouponId: 0,
GrantNum:1, GrantNum: 1,
IsAll:0, IsAll: 0,
UserList:[], UserList: [],
RegisterDate:'', RegisterDate: '',
KeyWord:'', KeyWord: '',
}; };
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.$emit("close"); this.$emit("close");
...@@ -334,17 +334,19 @@ ...@@ -334,17 +334,19 @@
closedDialog() { closedDialog() {
this.$emit("close"); this.$emit("close");
}, },
gettRepositoryList(ID){ gettRepositoryList(ID) {
return return
this.apipost("/api/Coupon/GettRepositoryList",{'ID':ID} , res => { this.apipost("/api/Coupon/GettRepositoryList", {
'ID': ID
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.msg = res.data.data this.msg = res.data.data
if(res.data.data.GrantNum==0){ if (res.data.data.GrantNum == 0) {
this.checked=true this.checked = true
} }
if(res.data.data.UserList){ if (res.data.data.UserList) {
this.UserList= res.data.data.UserList this.UserList = res.data.data.UserList
for(let i = 0;i<this.UserList.length;i++){ for (let i = 0; i < this.UserList.length; i++) {
this.UserList[i].CustomerAccountId = this.UserList[i].UserId this.UserList[i].CustomerAccountId = this.UserList[i].UserId
} }
} }
...@@ -365,38 +367,40 @@ ...@@ -365,38 +367,40 @@
Id: -1 Id: -1
}) })
} else { } else {}
}
}, },
err => {} err => {}
); );
}, },
getrigger(){ getrigger() {
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;
if(!this.msg.TriggerType) 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);
} }
}) })
}, },
getrigger2(){ getrigger2() {
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;
if(!this.msg.DiscountCouponId) 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);
} }
}) })
}, },
choice(){ choice() {
this.category = true; this.category = true;
this.options2.forEach(x=>{ this.options2.forEach(x => {
if(x.ID == this.msg.DiscountCouponId){ if (x.ID == this.msg.DiscountCouponId) {
this.msg_t.SmallShopId = x.SmallShopId this.msg_t.SmallShopId = x.SmallShopId
} }
}) })
...@@ -404,29 +408,29 @@ ...@@ -404,29 +408,29 @@
setTimeout(()=>{ setTimeout(() => {
// for(let i =0;i<this.Storage.length;i++){ // for(let i =0;i<this.Storage.length;i++){
// this.handleClose([this.Storage[i]]) // this.handleClose([this.Storage[i]])
// } // }
this.toggleSelection(this.Storage,true) this.toggleSelection(this.Storage, true)
},500) }, 500)
// this.msg_t.pageIndex =1 // this.msg_t.pageIndex =1
// this.getList() // this.getList()
}, },
getList(){ getList() {
this.loading =true this.loading = true
let cmdStr = "app_post_GetCustomerBrandByKeyWord"; let cmdStr = "app_post_GetCustomerBrandByKeyWord";
if (this.msg.SelfMotionType == 1) { if (this.msg.SelfMotionType == 1) {
cmdStr = "Sell_Post_GetDirectCustomerListByKey"; cmdStr = "Sell_Post_GetDirectCustomerListByKey";
} }
//"app_customer_GetCustomerListForCareOf" //"app_customer_GetCustomerListForCareOf"
this.apipost(cmdStr,this.msg_t, res => { this.apipost(cmdStr, this.msg_t, res => {
this.loading =false this.loading = false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// this.tableData = res.data.data; // this.tableData = res.data.data;
var tempData = res.data.data; var tempData = res.data.data;
if (tempData && tempData.length > 0&&this.UserList&&this.UserList.length>0) { if (tempData && tempData.length > 0 && this.UserList && this.UserList.length > 0) {
tempData.forEach(item => { tempData.forEach(item => {
let result = this.UserList.find(temp => temp.customerId === item.customerId); let result = this.UserList.find(temp => temp.customerId === item.customerId);
if (result) { if (result) {
...@@ -445,30 +449,32 @@ ...@@ -445,30 +449,32 @@
}) })
}, },
search(){ search() {
this.msg_t.pageIndex =1 this.msg_t.pageIndex = 1
this.getList(); this.getList();
}, },
preserve(formName){ preserve(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let UList =[]; let UList = [];
if(this.UserList&&this.UserList.length>0&&this.IsAll!=0){ if (this.UserList && this.UserList.length > 0 && this.IsAll != 0) {
for(let i= 0;i<this.UserList.length;i++){ for (let i = 0; i < this.UserList.length; i++) {
UList.push({'UserId':this.UserList[i].customerAccountId}) UList.push({
'UserId': this.UserList[i].customerAccountId
})
} }
this.msg.UserList= UList this.msg.UserList = UList
} }
if(this.msg.RegisterDate==null){ if (this.msg.RegisterDate == null) {
this.msg.RegisterDate='' this.msg.RegisterDate = ''
} }
if(this.msg.TriggerType==5 && this.msg.KeyWord==''){ if (this.msg.TriggerType == 5 && this.msg.KeyWord == '') {
this.Error(this.$t('objFill.v102.qingtianxiekl')) this.Error(this.$t('objFill.v102.qingtianxiekl'))
return false return false
} }
this.loading2 = true; this.loading2 = true;
this.apipost("coupon_post_AddOrUpdateSelfMotion",this.msg, res => { this.apipost("coupon_post_AddOrUpdateSelfMotion", this.msg, res => {
this.loading2 = false; this.loading2 = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -485,14 +491,15 @@ ...@@ -485,14 +491,15 @@
}); });
}, },
cancel(){ cancel() {
this.$router.go(-1) this.$router.go(-1)
} }
} }
} }
</script>
<style > </script>
<style>
.user-item { .user-item {
/* border: 1px #eeeeee solid; */ /* border: 1px #eeeeee solid; */
/* padding: 20px; */ /* padding: 20px; */
...@@ -500,6 +507,7 @@ ...@@ -500,6 +507,7 @@
margin-bottom: 0px; margin-bottom: 0px;
position: relative; position: relative;
} }
.user-item .closeName { .user-item .closeName {
position: absolute; position: absolute;
right: -10px; right: -10px;
...@@ -509,14 +517,17 @@ ...@@ -509,14 +517,17 @@
height: 18px; height: 18px;
/* border-radius: 100px; */ /* border-radius: 100px; */
} }
</style>
<style scoped> </style>
<style scoped>
/deep/.el-table th.el-table__cell { /deep/.el-table th.el-table__cell {
background-color: #E6E6E6; background-color: #E6E6E6;
} }
.el-form-item{
margin-bottom:5px; .el-form-item {
margin-bottom: 5px;
} }
._TravelPricePopover .ScenicDiv { ._TravelPricePopover .ScenicDiv {
width: 100%; width: 100%;
max-height: 300px; max-height: 300px;
...@@ -550,5 +561,5 @@ ...@@ -550,5 +561,5 @@
._TravelPricePopover table td._d_name { ._TravelPricePopover table td._d_name {
background-color: #ededed; background-color: #ededed;
} }
</style>
</style>
src/components/administrative/AllianceContract.vue
View file @ f24ce74e
...@@ -397,7 +397,6 @@ export default { ...@@ -397,7 +397,6 @@ export default {
clickSetAdmin(obj){ clickSetAdmin(obj){
this.dialogFormVisible = true this.dialogFormVisible = true
this.addType = 2 this.addType = 2
console.log(obj)
let list = obj.CustomerChildrenIds.split(',') let list = obj.CustomerChildrenIds.split(',')
this.addMsg = { this.addMsg = {
...JSON.parse(JSON.stringify(obj)), ...JSON.parse(JSON.stringify(obj)),
......
src/components/common/AliOssUploader.vue
View file @ f24ce74e
...@@ -102,7 +102,6 @@ export default { ...@@ -102,7 +102,6 @@ export default {
file, file,
{ {
progress: function* (p) { progress: function* (p) {
console.log('进度：', Math.round(p * 100) + '%');
const speeds = calculator(p); const speeds = calculator(p);
that.speed = that.formatSpeed(speeds); that.speed = that.formatSpeed(speeds);
that.handleProgress(p); that.handleProgress(p);
...@@ -133,7 +132,6 @@ export default { ...@@ -133,7 +132,6 @@ export default {
}) })
}, },
handleProgress(p) { handleProgress(p) {
console.log(p)
const now = Date.now() const now = Date.now()
const loaded = p.loaded const loaded = p.loaded
const total = p.total const total = p.total
......
src/components/commonPage/changeOffer.vue
View file @ f24ce74e
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
}, },
methods: { methods: {
selectChange(item) { selectChange(item) {
console.log("this.sChangeRemark", this.sChangeRemark);
item.ChangeRemarks = this.sChangeRemark; item.ChangeRemarks = this.sChangeRemark;
}, },
getHotel(subItem, HotelId) { getHotel(subItem, HotelId) {
......
src/components/commonPage/comChooseTrip.vue
View file @ f24ce74e
...@@ -266,7 +266,6 @@ ...@@ -266,7 +266,6 @@
watch: { watch: {
priceObj: { priceObj: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log("w_priceObj", this.priceObj);
this.resetPageIndex(); this.resetPageIndex();
}, },
deep: true deep: true
......
src/components/orderCommon/productOrderList.vue
View file @ f24ce74e
...@@ -1198,9 +1198,6 @@ ...@@ -1198,9 +1198,6 @@
getJourney(id, TCID, title) { getJourney(id, TCID, title) {
var that = this; var that = this;
this.tripTitle = title; this.tripTitle = title;
console.log("id",id);
console.log("TCID",TCID);
this.$nextTick(() => { this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id, TCID,2); that.$refs.comTeam.GetTrip(id, TCID,2);
}); });
......
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