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

src/assets/common/lang/zh.js

@@ -1117,6 +1117,7 @@ export const fnc = {
   ljhaoshi: '累计耗时',
   xsfujian: '显示附件',
   ycfujian: '隐藏附件',
+  ysjine: '应收金额',
 }
 export const tips = {
   tips: '提示',
@@ -1284,7 +1285,7 @@ export const rule = {
   qxzkhmingcheng: '请选择客户名称!',
   qxzfkdzhanghu: '请选择付款账户',
   qxzxybsheren: '请选择下一步审核人',
-  qxzzdbumen:' 请选择制单部门',
+  qxzzdbumen:' 请选择制单部门！',
   qsrbmmingchen:"请输入部门名称",
   qxzbmcengji:"请选择部门层级",
   qxzfuzeren:"请选择负责人",
@@ -1300,6 +1301,10 @@ export const rule = {
   qtxshuoming: '请填写说明',
   qxzygxytjddanju: '请选择一个需要提交的单据！',
   qxzbmen: '请选择部门',
+  qtxhkuanren: '请填写汇款人！',
+  qtxhkshijian: '请选择汇款时间！',
+  qxzjylshuihao: '请选择交易流水号！',
+  qxzskzhanghao: '请选择收款账号！',
 }
 
 export const adm={

src/components/FinancialModule/addFinancialDocuments.vue

@@ -179,7 +179,7 @@
                 <p class="rb_stit">
                     <span>{{BillSonName}}</span>
                 </p>
-                <p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?this.$t('fnc.no'):msg.OrderID}}</span></p>
+                <p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
                 <div class="rb_top_row _r_mb5">
                     <el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
                         <el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.gongzhang')}}</el-radio>

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,11 @@ import googleMap from "../commonPage/googleMap.vue";
 export default {
   data() {
     return {
+      imageOptions:{
+        navbar:false,
+        title:false
+      },
+      images: [],
       //是否显示添加图片
       addimg: false,
       //地图选中地址
@@ -443,6 +452,24 @@ export default {
       this.HotelImageArray.splice(index, 1);
       //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)
+      } else {
+        this.$viewer.view(this.images.indexOf(src))
+      }
+      this.$viewer.show()
+    },
     addImgOpen() {
       this.addimg = true;
       this.initimgList();