Skip to content

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

111

parent 7a10061c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 132 deletions
src/components/Hotel/DiDa/HotelDetails.vue
View file @ 11424104
This diff is collapsed.
src/components/ShoppingStore/ShoppingStore.vue
View file @ 11424104
......@@ -465,7 +465,9 @@
.IsConflict td {
background-color: pink !important;
}
/* 购物店 */
</style>
<template>
<div class="flexOne shoppingStore">
......@@ -640,7 +642,7 @@
</el-form-item>
</li>
<li>
<el-form-item :label="$t('hotel.hotel_mapLocation')" prop="Address">
<el-form-item :label="$t('hotel.hotel_mapLocation')">
<div class="addressChoice">
<input type="text" v-model="addMsg.Address" class="addChoice">
<span class="addressIcon" @click="selectAddress = true"><i class="iconfont icon-img_dw"></i></span>
......@@ -739,34 +741,39 @@
<td>{{item.EnterTime}}</td>
<td :class="{'redType':item.GuideID==0}">
<span>{{item.GuideName}}
<span v-if="(item.GuideID>0||item.GuideName.length>0)&&item.TCIDExist>-1">
{{item.IsGuideDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
</span>
<span v-if="(item.GuideID>0||item.GuideName.length>0)&&item.TCIDExist>-1">
{{item.IsGuideDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
</span>
</span>
</td>
<td :class="{'redType':item.LeaderID==0}">
<span>{{item.LeaderName}}
<span v-if="(item.LeaderID>0||item.LeaderName.length>0)&&item.TCIDExist>-1">
{{item.IsLeaderDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
</span>
{{item.IsLeaderDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}
</span>
</span>
</td>
<td>{{item.ImportGuideName}}<span v-if="item.IsErrorData==1 && item.GuideName != item.ImportGuideName" style="color:red">[{{$t('objFill.youwu')}}]</span></td>
<td>{{item.ImportLeaderName}}<span v-if="item.IsErrorData==1 && item.LeaderName != item.ImportLeaderName" style="color:red">[{{$t('objFill.youwu')}}]</span></td>
<td>{{item.ImportGuideName}}<span v-if="item.IsErrorData==1 && item.GuideName != item.ImportGuideName"
style="color:red">[{{$t('objFill.youwu')}}]</span></td>
<td>{{item.ImportLeaderName}}<span v-if="item.IsErrorData==1 && item.LeaderName != item.ImportLeaderName"
style="color:red">[{{$t('objFill.youwu')}}]</span></td>
<td>{{item.TotalPrice}}</td>
<td :class="{'redType':item.GroupExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
<span style=" cursor: pointer; "> {{item.GroupExtract}} </span></el-tooltip>
</td>
<span style=" cursor: pointer; "> {{item.GroupExtract}} </span></el-tooltip>
</td>
<td :class="{'redType':item.LeaderExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
<span style=" cursor: pointer; ">{{item.LeaderExtract}} </span></el-tooltip></td>
<span style=" cursor: pointer; ">{{item.LeaderExtract}} </span></el-tooltip>
</td>
<td :class="{'redType':item.GuideExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
<span style=" cursor: pointer; ">{{item.GuideExtract}} </span></el-tooltip> </td>
<span style=" cursor: pointer; ">{{item.GuideExtract}} </span></el-tooltip>
</td>
<td :class="{'redType':item.PICExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
<span style=" cursor: pointer; ">{{item.PICExtract}} </span></el-tooltip></td>
<span style=" cursor: pointer; ">{{item.PICExtract}} </span></el-tooltip>
</td>
<td>{{item.Rate}}</td>
<td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td>
<td>{{item.Remarks}}</td>
......@@ -794,13 +801,15 @@
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload>
<div>--------------------------------------------------------------------------------------------------------------------</div>
<div>
--------------------------------------------------------------------------------------------------------------------
</div>
<div style="text-align:center; margin-bottom:5px;color:tomato;">{{$t('objFill.v101.xinbtdmsgwd')}}</div>
<el-upload drag class="upload-demo" :action="importFileUrl3" :on-success="handleAvatarSuccess"
<el-upload drag class="upload-demo" :action="importFileUrl3" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<i class="el-icon-upload"></i>
<div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
<div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload>
......@@ -825,13 +834,13 @@
defaultImg: 'this.src="' + require("../../assets/img/shoppingstore.jpg") + '"',
importFileUrl2: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=1",
importFileUrl3: this.domainManager().UploadFileUrl +
importFileUrl3: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=20&RB_Group_id=2&Type=20",
downList: "",
TotalPrice: "",
GroupExtract: "",
GuideExtract: "",
PICExtract:"",
PICExtract: "",
LeaderExtract: "",
getShoppType: "",
isShow: false,
......@@ -1073,7 +1082,7 @@
TotalPrice: item.TotalPrice,
GroupExtract: item.GroupExtract,
GuideExtract: item.GuideExtract,
PICExtract : item.PICExtract,
PICExtract: item.PICExtract,
LeaderExtract: item.LeaderExtract,
blank: 'y',
tab: '购物店明细'
......@@ -1283,7 +1292,7 @@
if (res.data.resultCode == 1) {
that.tabLoading = false;
that.fillShow = false;
that.Success(this.$t('objFill.v101.daoruchengg')+'!');
that.Success(this.$t('objFill.v101.daoruchengg') + '!');
that.getList();
} else {
that.Error(res.data.message);
......
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