增加国际化和酒店餐厅预览大图

src/assets/common/lang/zh.js

@@ -1194,6 +1194,19 @@ export const Operation = {
   Op_Project:'项目',
   Op_notInvoled:'未参与',
   Op_ManageDepartment:'管理部门',
+  Op_LineDirection:'线路方向',
+  Op_leaveCountry:'出境',
+  Op_theEntry:'入境',
+  Op_Cdreservation:'成都机位出发',
+  Op_localrevervation:'当地机位出发',
+  Op_headOfficePrice:'总公司价格',
+  Op_branchPrice:'分公司价格',
+  Op_affiliate:'代销商价格',
+  Op_profitsBelong:'当团利润归属',
+  Op_localzongprice:'当地总公司价格',
+  Op_localBranchPrice:'当地分公司价格',
+  Op_localdaiPrice:'当地代销商价格',
+  Op_localDangPrice:'当地当团利润归属',
 }
 export const rule = {
   company: '请选择公司',

src/components/Hotel/HotelInfo.vue

@@ -211,6 +211,7 @@
               <div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
                 <img :src="item.ShowPath" />
                 <div class="imgzhe">
+                  <div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
                   <div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
 
                   <!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
@@ -251,6 +252,9 @@
       <button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
       <button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
     </div>
+    <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
+      <img v-for="src in images" :src="src" :key="src">
+    </viewer>
   </div>
 </template>
 <script>
@@ -259,6 +263,10 @@ import googleMap from "../commonPage/googleMap.vue";
 export default {
   data() {
     return {
+      imageOptions:{
+        navbar:false,
+        title:false
+      },
       //是否显示添加图片
       addimg: false,
       //地图选中地址
@@ -304,6 +312,7 @@ export default {
       HotelTypeList: [],
       //酒店价格
       HotelPirceTypeList:[],
+      images: [],
       addMsg: {
         ID: 0,
         Name: "",
@@ -415,6 +424,23 @@ export default {
         //this.updatePic();
       });
     },
+    inited (viewer){
+      this.$viewer = viewer
+    },
+    //显示图片详情
+    showImg: function (src) {
+      let srcArr = src.split('?')
+      src = srcArr[0]
+      let isExsit=false
+      this.images.forEach(x=>{
+        if(x===src)
+          isExsit=true
+      })
+      if(!isExsit)
+        this.images.push(src)
+        this.$viewer.show()
+        this.$viewer.view(this.images.indexOf(src))
+    },
     //更新酒店图片
     updatePic() {
       if (this.hotelID > 0) {

src/components/Restaurant/restaurantInfoManage.vue

@@ -858,6 +858,7 @@
                 <img v-if="!item" src="../../assets/img/bg_c3@3x.png">
                 <img :src="item.ShowPath" :onerror='defaultImg' />
                 <div class="imgzhe">
+                  <div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
                   <div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
 
                   <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
@@ -899,6 +900,9 @@
       <button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
       <button class="cancel-Btn" @click="goUrl('restaurantList')">{{$t('pub.cancelBtn')}}</button>
     </div>
+    <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
+      <img v-for="src in images" :src="src" :key="src">
+    </viewer>
   </div>
 </template>
 <script>
@@ -908,6 +912,11 @@
   export default {
     data() {
       return {
+        imageOptions:{
+          navbar:false,
+          title:false
+        },
+        images: [],
         selectAddress: false,
         addimg: false,
         //图片选取数组
@@ -1043,6 +1052,23 @@
       DMCchooseImg: DMCchooseImg
     },
     methods: {
+      inited (viewer){
+        this.$viewer = viewer
+      },
+      //显示图片详情
+      showImg: function (src) {
+        let srcArr = src.split('?')
+        src = srcArr[0]
+        let isExsit=false
+        this.images.forEach(x=>{
+          if(x===src)
+            isExsit=true
+        })
+        if(!isExsit)
+          this.images.push(src)
+          this.$viewer.show()
+          this.$viewer.view(this.images.indexOf(src))
+      },
       //上传餐厅图片
       UploadImage(file) {
         let newArr = [];

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -676,7 +676,7 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
+                      <el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
                                         @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
                       </el-dropdown-item>
                       <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"

src/components/systemManagement/destinationManagement.vue

@@ -41,7 +41,7 @@
         <li>
           <label>{{$t('system.query_lineName')}}</label>
           <el-select v-model="msg.LineID" filterable :placeholder="$t('system.ph_choice')" class="w210">
-            <el-option label='不限' :value='defaultSelectValue'></el-option>
+            <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
             <el-option v-for='item in lineList' :key="item.LineID" :label="item.LineName" :value="item.LineID">
             </el-option>
           </el-select>
@@ -51,8 +51,8 @@
           <el-input v-model="msg.PlaceName" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210"></el-input>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
-          <input type="button" class="normalBtn" value="添加" @click="outerVisible=true,dialogTitle='新增'" />
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
+          <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible=true,dialogTitle='新增'" />
         </li>
       </ul>
     </div>

src/components/systemManagement/lineManagement.vue

@@ -491,10 +491,10 @@ input[type="number"] {
             </el-form-item>
           </el-col>
           <el-col :span="5">
-              <el-form-item label="线路方向" prop="LineDirection">
+              <el-form-item :label="$t('Operation.Op_LineDirection')" prop="LineDirection">
                 <el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')" class="w290">
-                  <el-option label='入境' :value='1'></el-option>
-                  <el-option label='出境' :value='2'></el-option>
+                  <el-option :label="$t('Operation.Op_theEntry')" :value='1'></el-option>
+                  <el-option :label="$t('Operation.Op_leaveCountry')" :value='2'></el-option>
                 </el-select>
               </el-form-item>
           </el-col>

src/components/systemManagement/seriesManagement.vue

@@ -77,7 +77,7 @@
         <li>
           <label class="">{{$t('system.table_ssLine')}}</label>
           <el-select v-model="msg.LineID" filterable :placeholder="$t('system.ph_choice')" class="w210">
-            <el-option label='不限' :value='defaultSelectValue'></el-option>
+            <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
             <el-option v-for='item in lineList' :key="item.LineID" :label="item.LineName" :value="item.LineID">
             </el-option>
           </el-select>
@@ -90,12 +90,12 @@
           </el-select>
         </li>
         <li>
-           <label class="">系列名</label>
+           <label class="">{{$t('active.ad_xlmc')}}</label>
            <el-input type="text" v-model="msg.LtName" :placeholder="$t('system.ph_LtName')" @keyup.native.enter="getList" maxlength="20" class="w210"></el-input>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
-          <input type="button" class="normalBtn" value="添加" @click="outerVisible=true,dialogTitle='新增团名资料'" />
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
+          <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible=true,dialogTitle='新增团名资料'" />
         </li>
       </ul>
     </div>
@@ -103,8 +103,8 @@
       <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
         <tr>
           <th width="">{{$t('system.table_ssLine')}}</th>
-          <th>目的地</th>
-          <th>系列名</th>
+          <th>{{$t('system.query_dest')}}</th>
+          <th>{{$t('active.ad_xlmc')}}</th>
           <th>{{$t('system.table_isShow')}}</th>
           <th width="200">{{$t('system.table_operation')}}</th>
         </tr>
@@ -140,14 +140,14 @@
         <el-form-item :label="$t('system.table_ssLine')" prop="LineID">
           <el-select v-model="addMsg.LineID" filterable :placeholder="$t('system.ph_choice')" @change="getDestinationList(1)"
             class="w210">
-            <el-option label='不限' :value='defaultSelectValue'></el-option>
+            <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
             <el-option v-for='item in lineList' :key="item.LineID" :label="item.LineName" :value="item.LineID">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system.query_dest')" prop="placeID">
           <el-select v-model="addMsg.placeID" filterable :placeholder="$t('system.ph_choice')" class="w210">
-            <el-option label='不限' :value='defaultSelectValue'></el-option>
+            <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelectValue'></el-option>
             <el-option v-for='item in destinationList' :key="item.PlaceID" :label="item.PlaceName" :value="item.PlaceID">
             </el-option>
           </el-select>
@@ -158,7 +158,7 @@
             {{$t('system.table_codeTips')}}
           </div>
         </el-form-item>
-        <el-form-item label="系列名" prop="LtName">
+        <el-form-item :label="$t('active.ad_xlmc')" prop="LtName">
           <el-input type="text" v-model="addMsg.LtName" :placeholder="$t('system.ph_LtName')" maxlength="20" class="w210"></el-input>
         </el-form-item>
         <el-form-item :label="$t('system.table_isSaleInNET')" class="seriesMg_tips_f">
@@ -175,8 +175,8 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> &nbsp;
-        <button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取消</button>
+        <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
+        <button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
   </div>

src/components/systemManagement/transportCostsManagement.vue

@@ -18,36 +18,36 @@
         <li>
           <span>
             <em>{{$t('system.query_lineName')}}</em>
-            <el-select filterable v-model='msg.lineID' placeholder="不限">
-              <el-option label='不限' value='0'></el-option>
+            <el-select filterable v-model='msg.lineID'>
+              <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
               <el-option v-for='item in lineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
               </el-option>
             </el-select>
           </span>
         </li>
         <li>
-          <input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" value="查询" />
-          <input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增联运成本'" value="新增" />
+          <input type="button" class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()" :value="$t('pub.unlimitedSel')" />
+          <input type="button" class="normalBtn" @click="clearInfo(),outerVisible=true,dialogTitle='新增联运成本'" :value="$t('pub.addBtn')" />
         </li>
       </ul>
     </div>
     <div class="commonContent" v-loading="loading">
       <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
         <tr>
-          <th rowspan="2" class="TCMRightborder">线路</th>
-          <th colspan="4" class="TCMRightbottom">成都机位出发</th>
-          <th colspan="4" class="TCMRightbottom">当地机位出发</th>
-          <th rowspan="2" class="TCMRightleft">操作</th>
+          <th rowspan="2" class="TCMRightborder">{{$t('advmanager.v_line')}}</th>
+          <th colspan="4" class="TCMRightbottom">{{$t('Operation.Op_Cdreservation')}}</th>
+          <th colspan="4" class="TCMRightbottom">{{$t('Operation.Op_localrevervation')}}</th>
+          <th rowspan="2" class="TCMRightleft">{{$t('hotel.table_operat')}}</th>
         </tr>
         <tr>
-          <th>总公司价格</th>
-          <th>分公司价格</th>
-          <th>代销商价格</th>
-          <th class="TCMRightborder">当团利润归属</th>
-          <th>总公司价格</th>
-          <th>分公司价格</th>
-          <th>代销商价格</th>
-          <th>当团利润归属</th>
+          <th>{{$t('Operation.Op_headOfficePrice')}}</th>
+          <th>{{$t('Operation.Op_branchPrice')}}</th>
+          <th>{{$t('Operation.Op_affiliate')}}</th>
+          <th class="TCMRightborder">{{$t('Operation.Op_profitsBelong')}}</th>
+          <th>{{$t('Operation.Op_headOfficePrice')}}</th>
+          <th>{{$t('Operation.Op_branchPrice')}}</th>
+          <th>{{$t('Operation.Op_affiliate')}}</th>
+          <th>{{$t('Operation.Op_profitsBelong')}}</th>
         </tr>
         <tr v-for="item in tableInfo" :key="item.subCode">
           <td>{{item.LineName}}</td>
@@ -76,38 +76,38 @@
     </div>
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
-        <el-form-item label="线路" prop="lineID">
-          <el-select filterable clearable v-model='addMsg.lineID' placeholder="不限" class="w210">
+        <el-form-item :label="$t('advmanager.v_line')" prop="lineID">
+          <el-select filterable clearable v-model='addMsg.lineID' class="w210">
             <el-option v-for='item in lineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="总公司价格" prop="HeadofficePrice">
+        <el-form-item :label="$t('Operation.Op_headOfficePrice')" prop="HeadofficePrice">
           <el-input type="text" v-model="addMsg.HeadofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'HeadofficePrice')"></el-input>
         </el-form-item>
-        <el-form-item label="分公司价格" prop="BranchofficePrice">
+        <el-form-item :label="$t('Operation.Op_branchPrice')" prop="BranchofficePrice">
           <el-input type="text" v-model="addMsg.BranchofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'BranchofficePrice')"></el-input>
         </el-form-item>
-        <el-form-item label="代销商价格" prop="AffiliatePrice">
+        <el-form-item :label="$t('Operation.Op_affiliate')" prop="AffiliatePrice">
           <el-input type="text" v-model="addMsg.AffiliatePrice" class="w210" @keyup.native="checkPrice(addMsg,'AffiliatePrice')"></el-input>
         </el-form-item>
-        <el-form-item label="当团利润归属" prop="ProfitAffiliation">
-          <el-select filterable clearable v-model='addMsg.ProfitAffiliation' placeholder="不限" class="w210">
+        <el-form-item :label="$t('Operation.Op_profitsBelong')" prop="ProfitAffiliation">
+          <el-select filterable clearable v-model='addMsg.ProfitAffiliation' class="w210">
             <el-option v-for='item in profitBelong' :label='item.label' :value='item.value' :key='item.value'>
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="当地总公司价格" prop="LocalHeadofficePrice">
+        <el-form-item :label="$t('Operation.Op_localzongprice')" prop="LocalHeadofficePrice">
           <el-input type="text" v-model="addMsg.LocalHeadofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalHeadofficePrice')"></el-input>
         </el-form-item>
-        <el-form-item label="当地分公司价格" prop="LocalBranchofficePrice">
+        <el-form-item :label="$t('Operation.Op_localBranchPrice')" prop="LocalBranchofficePrice">
           <el-input type="text" v-model="addMsg.LocalBranchofficePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalBranchofficePrice')"></el-input>
         </el-form-item>
-        <el-form-item label="当地代销商价格" prop="LocalAffiliatePrice">
+        <el-form-item :label="$t('Operation.Op_localdaiPrice')" prop="LocalAffiliatePrice">
           <el-input type="text" v-model="addMsg.LocalAffiliatePrice" class="w210" @keyup.native="checkPrice(addMsg,'LocalAffiliatePrice')"></el-input>
         </el-form-item>
-        <el-form-item label="当地当团利润归属" prop="LocalProfitAffiliation">
-          <el-select filterable clearable v-model='addMsg.LocalProfitAffiliation' placeholder="不限" class="w210">
+        <el-form-item :label="$t('Operation.Op_localDangPrice')" prop="LocalProfitAffiliation">
+          <el-select filterable clearable v-model='addMsg.LocalProfitAffiliation' class="w210">
             <el-option v-for='item in profitBelong' :label='item.label' :value='item.value' :key='item.value'>
             </el-option>
           </el-select>
@@ -116,8 +116,8 @@
       </el-form>
 
       <div slot="footer" class="dialog-footer">
-        <button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> &nbsp;
-        <button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">取消</button>
+        <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
+        <button class="hollowFixedBtn" @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>