11

src/assets/common/lang/en.js

@@ -128,7 +128,7 @@ export const system = {
   query_stopAir: 'stopover airport',
   query_arrivalCity: 'Reach the city',
   query_arrivalAir: 'Arriving at the airport',
-  query_arrivalAirThreeCode:'Three codes to the airport upon arrival',
+  query_arrivalAirThreeCode: 'Three codes to the airport upon arrival',
   query_arrivalTime: 'Arrival time',
   quety_area: 'area',
   query_workType: 'work type',
@@ -249,9 +249,9 @@ export const system = {
   btn_bindCtrl: 'Bind information',
   btn_addCoin: 'Add a coin',
   label_netName: 'Web group name',
-  payTime:'time of payment',
-  payTotalMoney:'Total payment amount (CNY)',
-  payType:'Bill type',
+  payTime: 'time of payment',
+  payTotalMoney: 'Total payment amount (CNY)',
+  payType: 'Bill type',
 }
 
 
@@ -457,7 +457,7 @@ export const hotel = {
   hotel_GroupStates: 'Group status',
   hotel_OrderStates: 'Order status',
   hotel_StarDate: 'Departure date',
-  hotel_choostDate:'Selected date',
+  hotel_choostDate: 'Selected date',
   hotel_haveSignUp: 'Signed up',
   hotel_Inthe: 'in',
   hotel_expect: 'expect',
@@ -592,7 +592,7 @@ export const scen = {
   sc_bjts: 'Number of quotes',
   sc_dj: 'Lowest price',
   sc_gj: 'Highest price',
-  sc_sfrbhfgs:"Belonging to Japan Kimono Company",
+  sc_sfrbhfgs: "Belonging to Japan Kimono Company",
 }
 //机票库
 export const Airticket = {
@@ -1124,14 +1124,14 @@ export const fnc = {
   dtxjine: 'Amortized balance',
   qishimonth: 'Starting month',
   tanxiaomonth: 'Amortization months',
-  monthUnit:'Month',
-  zhidanInfo:'Document preparation information',
-  zhidanDate:'Production time',
-  nowmonthMoney:'Current amortization amount',
+  monthUnit: 'Month',
+  zhidanInfo: 'Document preparation information',
+  zhidanDate: 'Production time',
+  nowmonthMoney: 'Current amortization amount',
   tanxiaoinfo: 'Amortization situation',
   tanxiaomoney: 'Amortization amount',
   monthMoney: 'Monthly amortization amount',
-  onlyseebalance:'Only look at those with balances',
+  onlyseebalance: 'Only look at those with balances',
   yuanbi: 'original currency',
   sfjine: 'Actual amount paid',
   daxie: '(uppercase)',
@@ -1319,7 +1319,7 @@ export const fnc = {
   a_hkfkshijian: 'Remittance time/payment time',
   a_dhuanlv: 'Exchange rate',
   a_rminbi: 'RMB',
-  a_ynd:"Rupiah",
+  a_ynd: "Rupiah",
   a_qcyue: 'Opening balance',
   a_fkshijian: 'Payment time',
   a_heji: 'Total',
@@ -1431,7 +1431,7 @@ export const Operation = {
   Op_notInvoled: 'not involved',
   Op_ManageDepartment: 'Administrative department',
   Op_LineDirection: "line direction",
-  Op_LineTicket:'Ticket price increase',
+  Op_LineTicket: 'Ticket price increase',
   Op_leaveCountry: 'leave the country',
   Op_theEntry: 'entry',
   Op_Cdreservation: 'Chengdu flight departure',
@@ -1777,7 +1777,7 @@ export const visaT = {
   sqneirong: 'Application type',
   crjtime: 'entry-exit time',
   cfAirport: 'Departure Airport',
-  cfAirportTreeCode:'Departure airport three codes',
+  cfAirportTreeCode: 'Departure airport three codes',
   chujingtime: 'exit time',
   rujingtime: 'time of entry',
   Portofentry: 'port ofentry',
@@ -2126,10 +2126,10 @@ export const salesModule = {
   CustomerStore: 'CustomerStore',
   HYLB: 'Industry Category',
   IsLianYn: 'Intermodal or not',
-  goUnion:"Outbound intermodal transportation",
-  backUnion:"Return intermodal transportation",
+  goUnion: "Outbound intermodal transportation",
+  backUnion: "Return intermodal transportation",
   LYtime: 'Outbound intermodal time',
-  backUnionTime:"Return intermodal time",
+  backUnionTime: "Return intermodal time",
   BackCity: 'Back to the city',
   TeamPrice: 'Unit price of the group',
   StartLY: 'departure rate',
@@ -2170,7 +2170,7 @@ export const salesModule = {
   Nomore60: 'Less than 60%',
   Nomore40: 'Less than 40%',
   GoFlight: 'goflight',
-  updateGoFlight:'Modify flight information',
+  updateGoFlight: 'Modify flight information',
   THQW: 'Peer clear time',
   Hour: 'Hour',
   XSQW: 'Sales clearance time',
@@ -2184,7 +2184,7 @@ export const salesModule = {
   ChildBed: 'Baby in bed',
   ChildNoBed: 'Children dont occupy the bed',
   SingleJ: 'single ground connection',
-  SingleAirticket:'Single Ticket',
+  SingleAirticket: 'Single Ticket',
   OtherPrice: 'other price',
   VisaBack: 'Visa Fee (return fee)',
   PeoPle: 'People',
@@ -2303,7 +2303,7 @@ export const salesModule = {
   PaymentStatus: 'Collection status',
   Collect: 'Collect all',
   NoCollect: 'uncollected',
-  NoPayment:'unpayment',
+  NoPayment: 'unpayment',
   AirNum: 'Number of slots',
   ScoreNUM: 'score',
   ByProgram: 'Enroll through the mini program confirmation order',
@@ -2634,6 +2634,7 @@ export const op = {
   CancelSetjp: 'Unset to Boutique',
   HotelXJ: 'Hotel off the market',
   UploadFFB: 'Upload Matchmaking table',
+  UploadPriceZD: "Upload bill",
   LookPassengerSurvey: 'Look at the passenger survey',
   DJBZTH: 'ground remarks group number',
   CompanyLeader: 'company leader',
@@ -2705,9 +2706,9 @@ export const op = {
   fgszjl: 'Branch General Manager',
   opszje: 'OP set the amount',
   fgszjdb: 'New Japanese impression',
-  IsSelfGuidedTour:'Is it a free trip',
-  EnterpriseWeCh:'Enterprise WeCh',
-  ShareInviteCode:'Share invitation to activate QR code',
+  IsSelfGuidedTour: 'Is it a free trip',
+  EnterpriseWeCh: 'Enterprise WeCh',
+  ShareInviteCode: 'Share invitation to activate QR code',
 }
 
 import invoicesManager from './EN/invoicesManager'

src/assets/common/lang/zh-tw.js

@@ -2616,6 +2616,7 @@ export const op={
   CancelSetjp:'取消設為精品',
   HotelXJ:'飯店下架',
   UploadFFB:'上傳分房錶',
+  UploadPriceZD:"上傳賬單",
   LookPassengerSurvey:'查看旅客調查',
   DJBZTH:'地接備註團號',
   CompanyLeader:'公司領隊',

src/assets/common/lang/zh.js

@@ -2638,6 +2638,7 @@ export const op={
   CancelSetjp:'取消设为精品',
   HotelXJ:'酒店下架',
   UploadFFB:'上传分房表',
+  UploadPriceZD:"上传账单",
   LookPassengerSurvey:'查看旅客调查',
   DJBZTH:'地接备注团号',
   CompanyLeader:'公司领队',

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -798,9 +798,10 @@
                     <span style="color: red">{{ item.AgencyName }}</span>
                   </p>
                   <p class="travelnowrap" v-if="item.WordPath != ''">
-                    <a style="cursor: pointer"
-                      :href="domainManager().ViittoFileUrl + item.WordPath">{{ $t("Operation.Op_downLoadword") }}</a>
+                    <a style="cursor: pointer" :href="domainManager().ViittoFileUrl + item.WordPath"
+                      target="_blank">{{ $t("Operation.Op_downLoadword") }}</a>
                   </p>
+
                   <p class="travelnowrap" v-if="item.FenFangUrl != ''">
                     <a style="cursor: pointer; color: blue" :title="$t('objFill.v101.dmc.dianjscffwj')"
                       v-if="item.FenFangUrl && item.FenFangUrl != ''"
@@ -1064,6 +1065,11 @@
                   <p style="color: red; font-size: 12px">
                     {{ $t("op.TotalClicks") }}：{{ item.TotalClickCount }}
                   </p>
+                  <p style="color: blue; font-size: 13px;margin-top:5px;text-decoration: underline"
+                    v-if="item.ContractUrl != ''">
+                    <a style="cursor: pointer;color:blue;" :href="domainManager().ViittoFileUrl + item.ContractUrl"
+                      target="_blank">账单下载</a>
+                  </p>
                   <p v-if="item.OfferUrlExtArray && item.OfferUrlExtArray.length > 0"
                     style="margin-top: 5px; font-size: 13px">
                     <span>{{ $t("ground.bjd") }}</span>
@@ -1623,12 +1629,15 @@
                       </el-dropdown-item>
                       <el-dropdown-item @click.native="ckSellPoint(item)">{{ $t("Operation.Op_bentuanMaidian") }}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id == 2 || ShangChuanFenFangbiao"
-                        @click.native="ShowUploadWord(item, 1)">{{ $t("Operation.Op_wordTrip") }}
+                      <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id == 2" @click.native="ShowUploadWord(item, 1)">
+                        {{ $t("Operation.Op_wordTrip") }}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id == 2 || ShangChuanFenFangbiao"
+                      <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id == 2 "
                         @click.native="ShowUploadWord(item, 2)">{{ $t("op.UploadFFB") }}
                       </el-dropdown-item>
+                      <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id == 2 &&item.LineID==90"
+                        @click.native="ShowUploadWord(item, 3)">{{ $t("op.UploadPriceZD") }}
+                      </el-dropdown-item>
                       <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id == 2 || ChaKanGuest">
                         <div v-if="item.ScoreNum >= 0" @click="goInvetig('investigationList', item.TCID, 0)">
                           {{ $t("op.LookPassengerSurvey") }}
@@ -1953,7 +1962,10 @@
       <div class="combottomTitle">
         <template v-if="queryCommonData.UploadItem.Type == 1">
           {{ $t("Operation.Op_scTrip") }}</template>
-        <template v-else> {{ $t("op.UploadFFB") }}</template>
+        <template v-else-if="queryCommonData.UploadItem.Type == 2"> {{ $t("op.UploadFFB") }}</template>
+        <template v-else>
+          {{ $t("op.UploadPriceZD") }}
+        </template>
         <button style="float: right; margin-right: 100px" class="hollowFixedBtn" type="primary"
           @click="queryCommonData.UploadWORDTip = false">
           {{ $t("pub.cancelBtn") }}

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -801,6 +801,11 @@
                        <span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
                      </el-popover>
                    </p>
+                   <p style="color: blue; font-size:13px;margin:5px 0px;text-decoration: underline"
+                     v-if="item.ContractUrl != ''">
+                     <a style="cursor: pointer;color:blue;" :href="domainManager().ViittoFileUrl + item.ContractUrl"
+                       target="_blank">账单下载</a>
+                   </p>
                    <p v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0" style="margin-top:5px;">
                      <span>{{$t('ground.bjd')}}</span>
                      <span> <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
@@ -1280,6 +1285,9 @@
                        <el-dropdown-item @click.native="ShowUploadWord(item, 2)">
                          {{ $t("op.UploadFFB") }}
                        </el-dropdown-item>
+                       <el-dropdown-item v-if="CurrentUserInfo.RB_Group_id == 2 &&item.LineID==90 "
+                         @click.native="ShowUploadWord(item, 3)">{{ $t("op.UploadPriceZD") }}
+                       </el-dropdown-item>
                        <el-dropdown-item @click.native='reSubmit(item)' v-if="item.AuditStatus==3">
                          {{$t('objFill.v101.chongxtjshe')}}
                        </el-dropdown-item>
@@ -1546,7 +1554,10 @@
        <div class="combottomTitle">
          <template v-if="queryCommonData.UploadItem.Type == 1">
            {{ $t("Operation.Op_scTrip") }}</template>
-         <template v-else> {{ $t("op.UploadFFB") }}</template>
+         <template v-else-if="queryCommonData.UploadItem.Type == 2"> {{ $t("op.UploadFFB") }}</template>
+         <template v-else>
+           {{ $t("op.UploadPriceZD") }}
+         </template>
          <button style="float: right; margin-right: 100px" class="hollowFixedBtn" type="primary"
            @click="queryCommonData.UploadWORDTip = false">
            {{ $t("pub.cancelBtn") }}