Skip to content

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

报价单新增分公司总经理审核

parent 1a6b01bb
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 32 deletions
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ a37f2743
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
<li> <li>
<span> <span>
<em>报价单号</em> <em>报价单号</em>
<el-input type="text" class="multiple_input" v-model="queryData.OfferId" clearable ></el-input> <el-input type="text" class="multiple_input" v-model="queryData.OfferId" clearable></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('visa.v_tuanhao')}}</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input type="text" class="multiple_input" v-model="queryData.TCNUMS" clearable></el-input> <el-input type="text" class="multiple_input" v-model="queryData.TCNUMS" clearable></el-input>
</span> </span>
</li> </li>
<li> <li>
...@@ -124,7 +124,8 @@ ...@@ -124,7 +124,8 @@
<template v-else> <template v-else>
{{item.TeamTypeName}} {{item.TeamTypeName}}
</template> </template>
<template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template> <template
v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
</div> </div>
</div> </div>
...@@ -174,7 +175,8 @@ ...@@ -174,7 +175,8 @@
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span> <span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
<span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span> <span
class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
</div> </div>
<div class="priceDivCon"> <div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span> <span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span>
...@@ -184,25 +186,35 @@ ...@@ -184,25 +186,35 @@
<div>{{$t('sm.laoren')}}</div> <div>{{$t('sm.laoren')}}</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span> <span
class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
</div> </div>
</div> </div>
<div>{{$t('Operation.Op_zafei')}}</div> <div>{{$t('Operation.Op_zafei')}}</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span> <span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span> <span
class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
</div> </div>
</div> </div>
<div>{{$t('op.SingleQuotes')}}</div> <div>{{$t('op.SingleQuotes')}}</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span> <span
class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<span slot="reference" class="diPrice">{{item.JPYSalePrice}}<span class="qi">{{$t('op.Qi')}}</span></span> <span slot="reference" class="diPrice">
<template v-if="item.OutBranchId==1222||item.OutBranchId==1218">
{{item.JPYSalePrice}}
</template>
<template>
{{item.SalesPrice}}
</template>
<span class="qi">{{$t('op.Qi')}}</span></span>
</el-popover> </el-popover>
</div> </div>
</div> </div>
...@@ -219,7 +231,15 @@ ...@@ -219,7 +231,15 @@
</div> </div>
<div class="AuditStatus"> <div class="AuditStatus">
<div v-if="item.TravelState==2"> <div v-if="item.TravelState==2">
<div>{{$t('objFill.dsh')}}</div> <div>
<template v-if="item.ManagerAduitDate==''">
{{item.ManagerAduitName}}
</template>
<template v-else>
{{item.AuditByName}}
</template>
{{$t('fnc.shenhe')}}
</div>
</div> </div>
<div v-if="item.TravelState==3"> <div v-if="item.TravelState==3">
<div class="Auditapproved">{{$t('fnc.ytongguo')}}</div> <div class="Auditapproved">{{$t('fnc.ytongguo')}}</div>
...@@ -227,10 +247,9 @@ ...@@ -227,10 +247,9 @@
<div v-if="item.TravelState==4"> <div v-if="item.TravelState==4">
<div class="Auditrejected">{{$t('objFill.yibohui')}}</div> <div class="Auditrejected">{{$t('objFill.yibohui')}}</div>
</div> </div>
<template <template v-if="(item.ManagerAduitDate&&item.ManagerAduitDate!='')||(item.AuditDate&&item.AuditDate!='')">
v-if="(item.AuditByName&&item.AuditByName!='')||(item.ManagerAduitName&&item.ManagerAduitName!='')">
<el-popover popper-class="salsSetPrice" trigger="click"> <el-popover popper-class="salsSetPrice" trigger="click">
<template v-if="item.ManagerAduitName&&item.ManagerAduitName!=''"> <template v-if="item.ManagerAduitDate&&item.ManagerAduitDate!=''">
<div class="priceContentDiv" style="margin-bottom:5px;"> <div class="priceContentDiv" style="margin-bottom:5px;">
<div> <div>
<span>审批结果</span> <span>审批结果</span>
...@@ -242,7 +261,7 @@ ...@@ -242,7 +261,7 @@
</template> </template>
<template v-else> <template v-else>
{{$t('fnc.no')}} {{$t('fnc.no')}}
</template> </template>
</div> </div>
</div> </div>
</template> </template>
...@@ -257,7 +276,7 @@ ...@@ -257,7 +276,7 @@
</template> </template>
<template v-else> <template v-else>
{{$t('fnc.no')}} {{$t('fnc.no')}}
</template> </template>
</div> </div>
</div> </div>
<div slot="reference" class="AuditLookDetail">{{$t('fnc.rizhi')}}</div> <div slot="reference" class="AuditLookDetail">{{$t('fnc.rizhi')}}</div>
...@@ -266,12 +285,14 @@ ...@@ -266,12 +285,14 @@
</div> </div>
<div class="AD_Operation"> <div class="AD_Operation">
<span class="openGroup opbdList"> <span class="openGroup opbdList">
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"
popper-class="max-w250">
<span @click="offerAudit(item,1)">查</span> <span @click="offerAudit(item,1)">查</span>
</el-tooltip> </el-tooltip>
</span> </span>
<span class="openGroup opbdList" v-if="item.TravelState==2"> <span class="openGroup opbdList" v-if="item.TravelState==2">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start"
popper-class="max-w250">
<span @click="offerAudit(item,2)">{{$t('objFill.v101.FinancialModule.shen')}}</span> <span @click="offerAudit(item,2)">{{$t('objFill.v101.FinancialModule.shen')}}</span>
</el-tooltip> </el-tooltip>
</span> </span>
...@@ -281,7 +302,8 @@ ...@@ -281,7 +302,8 @@
</el-tooltip> </el-tooltip>
</span> </span>
<span class="openGroup opbdList"> <span class="openGroup opbdList">
<el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start"
popper-class="max-w250">
<el-popover popper-class="salsSetPrice" trigger="click"> <el-popover popper-class="salsSetPrice" trigger="click">
<div class="priceContentDiv"> <div class="priceContentDiv">
<div class="AuditLog">报价单日志</div> <div class="AuditLog">报价单日志</div>
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ a37f2743
...@@ -132,7 +132,8 @@ ...@@ -132,7 +132,8 @@
<template v-else> <template v-else>
{{item.TeamTypeName}} {{item.TeamTypeName}}
</template> </template>
<template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template> <template
v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
</div> </div>
</div> </div>
</div> </div>
...@@ -174,7 +175,8 @@ ...@@ -174,7 +175,8 @@
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span> <span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
<span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span> <span
class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
</div> </div>
<div class="priceDivCon"> <div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span> <span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span>
...@@ -184,20 +186,23 @@ ...@@ -184,20 +186,23 @@
<div>{{$t('sm.laoren')}}</div> <div>{{$t('sm.laoren')}}</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span> <span
class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
</div> </div>
</div> </div>
<div>{{$t('Operation.Op_zafei')}}</div> <div>{{$t('Operation.Op_zafei')}}</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span> <span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span> <span
class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
</div> </div>
</div> </div>
<div>{{$t('op.SingleQuotes')}}</div> <div>{{$t('op.SingleQuotes')}}</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span> <span
class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -225,7 +230,14 @@ ...@@ -225,7 +230,14 @@
</div> </div>
<div class="AuditStatus" style="width:80px;"> <div class="AuditStatus" style="width:80px;">
<div v-if="item.TravelState==2"> <div v-if="item.TravelState==2">
<div>{{$t('objFill.dsh')}}</div> <div> <template v-if="item.ManagerAduitDate==''">
{{item.ManagerAduitName}}
</template>
<template v-else>
{{item.AuditByName}}
</template>
{{$t('fnc.shenhe')}}
</div>
</div> </div>
<div v-if="item.TravelState==3"> <div v-if="item.TravelState==3">
<div class="Auditapproved">{{$t('fnc.ytongguo')}}</div> <div class="Auditapproved">{{$t('fnc.ytongguo')}}</div>
...@@ -233,10 +245,9 @@ ...@@ -233,10 +245,9 @@
<div v-if="item.TravelState==4"> <div v-if="item.TravelState==4">
<div class="Auditrejected">{{$t('objFill.yibohui')}}</div> <div class="Auditrejected">{{$t('objFill.yibohui')}}</div>
</div> </div>
<template <template v-if="(item.ManagerAduitDate&&item.ManagerAduitDate!='')||(item.AuditDate&&item.AuditDate!='')">
v-if="(item.AuditByName&&item.AuditByName!='')||(item.ManagerAduitName&&item.ManagerAduitName!='')">
<el-popover popper-class="salsSetPrice" trigger="click"> <el-popover popper-class="salsSetPrice" trigger="click">
<template v-if="item.ManagerAduitName&&item.ManagerAduitName!=''"> <template v-if="item.ManagerAduitDate&&item.ManagerAduitDate!=''">
<div class="priceContentDiv" style="margin-bottom:5px;"> <div class="priceContentDiv" style="margin-bottom:5px;">
<div> <div>
<span>审批结果</span> <span>审批结果</span>
...@@ -248,7 +259,7 @@ ...@@ -248,7 +259,7 @@
</template> </template>
<template v-else> <template v-else>
{{$t('fnc.no')}} {{$t('fnc.no')}}
</template> </template>
</div> </div>
</div> </div>
</template> </template>
...@@ -263,7 +274,7 @@ ...@@ -263,7 +274,7 @@
</template> </template>
<template v-else> <template v-else>
{{$t('fnc.no')}} {{$t('fnc.no')}}
</template> </template>
</div> </div>
</div> </div>
<div slot="reference" class="AuditLookDetail">{{$t('fnc.rizhi')}}</div> <div slot="reference" class="AuditLookDetail">{{$t('fnc.rizhi')}}</div>
...@@ -292,17 +303,20 @@ ...@@ -292,17 +303,20 @@
</el-tooltip> </el-tooltip>
</span> </span>
<span style="background:#85ce61; " class="newAopbdd"> <span style="background:#85ce61; " class="newAopbdd">
<el-tooltip class="item" effect="dark" w450:content="$t('fnc.chakan')" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" w450:content="$t('fnc.chakan')" placement="top-start"
popper-class="max-w250">
<i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i> <i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span style="background:#85ce61; " class="newAopbdd" @click="copyOffer(item)"> <span style="background:#85ce61; " class="newAopbdd" @click="copyOffer(item)">
<el-tooltip class="item" effect="dark" :content="$t('objFill.copy')" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="$t('objFill.copy')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-copy"></i> <i class="iconfont icon-copy"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span style="background:#85ce61;" class="newAopbdd" @click="downLoadOffer(item)"> <span style="background:#85ce61;" class="newAopbdd" @click="downLoadOffer(item)">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xz')" placement="top-start" popper-class="max-w250"> <el-tooltip class="item" effect="dark" :content="$t('objFill.xz')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-bb-xiazai"></i> <i class="iconfont icon-bb-xiazai"></i>
</el-tooltip> </el-tooltip>
</span> </span>
...@@ -448,7 +462,8 @@ ...@@ -448,7 +462,8 @@
<td colspan="2" style="text-align:center;"> <td colspan="2" style="text-align:center;">
<el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">保存 <el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">保存
</el-button> </el-button>
<input type="button" class="normalBtn" :value="$t('pub.closeSel')" @click="isShowImportOffer=false,clearMsg()" /> <input type="button" class="normalBtn" :value="$t('pub.closeSel')"
@click="isShowImportOffer=false,clearMsg()" />
</td> </td>
</tr> </tr>
</table> </table>
......
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