Skip to content

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

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

parents 4e1e502e bce215bb
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 41 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 7898656f
...@@ -2017,7 +2017,7 @@ ...@@ -2017,7 +2017,7 @@
<el-tooltip effect="dark" :content="$t('pub.more')" placement="top-start" style="float: left"> <el-tooltip effect="dark" :content="$t('pub.more')" placement="top-start" style="float: left">
<el-popover width="100" trigger="hover"> <el-popover width="100" trigger="hover">
<div class="groupTourOrder_more"> <div class="groupTourOrder_more">
<div @click="goUrlT('confirmationOrder', item.orderId)"> <div @click="goUrlT('confirmationOrder', item.orderId)">
{{ $t("salesModule.QRH") {{ $t("salesModule.QRH")
}}{{ }}{{
...@@ -2040,7 +2040,7 @@ ...@@ -2040,7 +2040,7 @@
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div v-if="item.isGuestOk == '1' && item.outNotice == 1" @click="toTrip(item)"> <div v-if="item.outNotice == 1" @click="toTrip(item)">
{{ $t("Operation.Op_teamNotice") {{ $t("Operation.Op_teamNotice")
}}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span> }}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span>
</div> </div>
...@@ -2207,12 +2207,12 @@ ...@@ -2207,12 +2207,12 @@
<tr> <tr>
<td colspan="5"> <td colspan="5">
<div class="groupTourOrder_remarks"> <div class="groupTourOrder_remarks">
<div>
<div> <div>
<span>{{ $t("pub.pubRemark") }}：</span> <div>
<p> <span>{{ $t("pub.pubRemark") }}：</span>
<span v-if="item.tsIdList.length > 0">{{ $t("salesModule.ComplaintNum") }}： <p>
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click=" <span v-if="item.tsIdList.length > 0">{{ $t("salesModule.ComplaintNum") }}：
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="
goUrlTS( goUrlTS(
'ComplaintsDetail', 'ComplaintsDetail',
ts, ts,
...@@ -2220,35 +2220,38 @@ ...@@ -2220,35 +2220,38 @@
'投诉详情' '投诉详情'
) )
">{{ ts }}</a> ">{{ ts }}</a>
;</span><span ;</span><span
v-if="item.clientSource == 1 && item.brandName != ''">{{ item.brandName }}{{ $t("fnc.dingdan") }} v-if="item.clientSource == 1 && item.brandName != ''">{{ item.brandName }}{{ $t("fnc.dingdan") }}
{{ item.platformOrder }};</span>{{ item.remarks }} {{ item.platformOrder }};</span>{{ item.remarks }}
</p> </p>
</div> </div>
<div> <div>
<span>{{ item.remarksName }}&ensp;{{ item.rematksTime }}</span> <span>{{ item.remarksName }}&ensp;{{ item.rematksTime }}</span>
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover"> <div class="groupTourOrder_remarks_popover">
<div>{{ $t("fnc.lsbeizhu") }}</div> <div>{{ $t("fnc.lsbeizhu") }}</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2"> <p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList"
<span>{{ item2.remarks }}</span> :key="index2">
<span>{{ item2.createByName }}&ensp;<span <span>{{ item2.remarks }}</span>
style="color: #666666">{{ item2.createDate }}</span></span> <span>{{ item2.createByName }}&ensp;<span
</p> style="color: #666666">{{ item2.createDate }}</span></span>
<span v-if="item.remarksList.length === 0">{{ </p>
<span v-if="item.remarksList.length === 0">{{
$t("system.content_noData") $t("system.content_noData")
}}</span> }}</span>
</div> </div>
<el-button slot="reference" icon="iconfont icon-gengduo" style=" <el-button slot="reference" icon="iconfont icon-gengduo" style="
padding: 0px; padding: 0px;
border: none; border: none;
background-color: transparent; background-color: transparent;
" class="groupTourOrder_remarks_btn"> " class="groupTourOrder_remarks_btn">
</el-button> </el-button>
</el-popover> </el-popover>
</div>
</div> </div>
</div></div> </div>
<p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}</p> <p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}
</p>
</td> </td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<div> <div>
...@@ -4243,13 +4246,13 @@ ...@@ -4243,13 +4246,13 @@
return; return;
} }
} }
// 选择联运，联运备注必填 // 选择联运，联运备注必填
        if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) { if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
          if (!this.addMsg.UnionRemark) { if (!this.addMsg.UnionRemark) {
            this.Error("请填写联运备注！"); this.Error("请填写联运备注！");
            return; return;
          } }
        } }
//验证人数和机位数 20190807 修改 如果是不是单地接才判断 //验证人数和机位数 20190807 修改 如果是不是单地接才判断
if (this.addMsg.GroupType !== "4" && this.addMsg.GroupType !== "3") { if (this.addMsg.GroupType !== "4" && this.addMsg.GroupType !== "3") {
if ( if (
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 7898656f
...@@ -2204,17 +2204,15 @@ ...@@ -2204,17 +2204,15 @@
<div v-if="isEditOrderCreate == 1 || IsSupperOrderEdit" @click="getSalerInfo(item)"> <div v-if="isEditOrderCreate == 1 || IsSupperOrderEdit" @click="getSalerInfo(item)">
修改业务员 修改业务员
</div> </div>
<!-- <div v-if="item.isGuestOk == '1' && item.outNotice == 1" @click="toTrip(item)">
出团通知书<span v-if="item.outNotice == 1">(OK)</span><span v-else>(暂定)</span>
</div> -->
<template v-if="item.lineId==90"> <template v-if="item.lineId==90">
<div v-if="item.outNotice == 1" @click="toTrip(item)"> <div v-if="item.outNotice == 1" @click="toTrip(item)">
{{ $t("Operation.Op_teamNotice") {{ $t("Operation.Op_teamNotice")
}}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span> }}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span>
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div v-if="item.isGuestOk == '1' && item.outNotice == 1" @click="toTrip(item)"> <div v-if="item.outNotice == 1" @click="toTrip(item)">
{{ $t("Operation.Op_teamNotice") {{ $t("Operation.Op_teamNotice")
}}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span> }}<span v-if="item.outNotice == 1">(OK)</span><span v-else>({{ $t("visa.v_zanding") }})</span>
</div> </div>
......
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