Commit 11424104 authored by 黄奎's avatar 黄奎

111

parent 7a10061c
This diff is collapsed.
...@@ -465,7 +465,9 @@ ...@@ -465,7 +465,9 @@
.IsConflict td { .IsConflict td {
background-color: pink !important; background-color: pink !important;
} }
/* 购物店 */ /* 购物店 */
</style> </style>
<template> <template>
<div class="flexOne shoppingStore"> <div class="flexOne shoppingStore">
...@@ -640,7 +642,7 @@ ...@@ -640,7 +642,7 @@
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item :label="$t('hotel.hotel_mapLocation')" prop="Address"> <el-form-item :label="$t('hotel.hotel_mapLocation')">
<div class="addressChoice"> <div class="addressChoice">
<input type="text" v-model="addMsg.Address" class="addChoice"> <input type="text" v-model="addMsg.Address" class="addChoice">
<span class="addressIcon" @click="selectAddress = true"><i class="iconfont icon-img_dw"></i></span> <span class="addressIcon" @click="selectAddress = true"><i class="iconfont icon-img_dw"></i></span>
...@@ -751,8 +753,10 @@ ...@@ -751,8 +753,10 @@
</span> </span>
</span> </span>
</td> </td>
<td>{{item.ImportGuideName}}<span v-if="item.IsErrorData==1 && item.GuideName != item.ImportGuideName" style="color:red">[{{$t('objFill.youwu')}}]</span></td> <td>{{item.ImportGuideName}}<span v-if="item.IsErrorData==1 && item.GuideName != item.ImportGuideName"
<td>{{item.ImportLeaderName}}<span v-if="item.IsErrorData==1 && item.LeaderName != item.ImportLeaderName" style="color:red">[{{$t('objFill.youwu')}}]</span></td> 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>{{item.TotalPrice}}</td>
<td :class="{'redType':item.GroupExtractExist==-1}"> <td :class="{'redType':item.GroupExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start">
...@@ -760,13 +764,16 @@ ...@@ -760,13 +764,16 @@
</td> </td>
<td :class="{'redType':item.LeaderExtractExist==-1}"> <td :class="{'redType':item.LeaderExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start"> <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}"> <td :class="{'redType':item.GuideExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start"> <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}"> <td :class="{'redType':item.PICExtractExist==-1}">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.yiczxtshuju')" placement="top-start"> <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>{{item.Rate}}</td>
<td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td> <td :class="{'redType':item.CurrencyExist==-1}"><span>{{item.Currency}}</span></td>
<td>{{item.Remarks}}</td> <td>{{item.Remarks}}</td>
...@@ -794,7 +801,9 @@ ...@@ -794,7 +801,9 @@
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div> <div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload> </el-upload>
<div>--------------------------------------------------------------------------------------------------------------------</div> <div>
--------------------------------------------------------------------------------------------------------------------
</div>
<div style="text-align:center; margin-bottom:5px;color:tomato;">{{$t('objFill.v101.xinbtdmsgwd')}}</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"
...@@ -831,7 +840,7 @@ ...@@ -831,7 +840,7 @@
TotalPrice: "", TotalPrice: "",
GroupExtract: "", GroupExtract: "",
GuideExtract: "", GuideExtract: "",
PICExtract:"", PICExtract: "",
LeaderExtract: "", LeaderExtract: "",
getShoppType: "", getShoppType: "",
isShow: false, isShow: false,
...@@ -1073,7 +1082,7 @@ ...@@ -1073,7 +1082,7 @@
TotalPrice: item.TotalPrice, TotalPrice: item.TotalPrice,
GroupExtract: item.GroupExtract, GroupExtract: item.GroupExtract,
GuideExtract: item.GuideExtract, GuideExtract: item.GuideExtract,
PICExtract : item.PICExtract, PICExtract: item.PICExtract,
LeaderExtract: item.LeaderExtract, LeaderExtract: item.LeaderExtract,
blank: 'y', blank: 'y',
tab: '购物店明细' tab: '购物店明细'
...@@ -1283,7 +1292,7 @@ ...@@ -1283,7 +1292,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.tabLoading = false; that.tabLoading = false;
that.fillShow = false; that.fillShow = false;
that.Success(this.$t('objFill.v101.daoruchengg')+'!'); that.Success(this.$t('objFill.v101.daoruchengg') + '!');
that.getList(); that.getList();
} else { } else {
that.Error(res.data.message); 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