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

src/components/FinancialModule/ConsolidationOfAccounts/index.vue

@@ -398,11 +398,26 @@
               <el-table-column v-if="msg.IsAirTicketSelect=='1'"
               prop=""
               :label="$t('objFill.caiwubz')"
-              show-overflow-tooltip width="120">
+              show-overflow-tooltip 
+              width="120">
               <template slot-scope="scope">                
                 <div>{{scope.row.Remark}}</div>
                 <template v-if="scope.row.vorcherInos">
-                  <div v-for="(vitem,index) in scope.row.vorcherInos">{{vitem.Content}}</div>
+                  <div v-for="(vitem,index) in scope.row.vorcherInos" style="display: flex;flex-direction: row;flex-wrap: wrap;">
+                    <el-image v-if="vitem.Type==3"
+                    style="width: 30px; height: 30px;margin-right: 3px;"
+                    :src="vitem.Content"
+                    :preview-src-list="scope.row.srcList"
+                    fit="cover">
+                  </el-image>
+                  <div v-if="vitem.Type==1" style="width: 30px; height: 30px;text-align: center;line-height: 30px;background: #eee;margin-right: 3px;">
+                    <div class="iconfont _wenjian_P"
+                      :class="vitem.Content.substring(vitem.Content.lastIndexOf('.')+1,vitem.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
+                      @click="showUpLoadFile(vitem.Content)">
+        
+                    </div>
+                  </div>
+                  </div>
                 </template>
               </template>
               </el-table-column>
@@ -738,6 +753,16 @@
         this.AccountType_post_GetList();
     },
     methods:{
+      showUpLoadFile(i) { // 预览上传文件
+          if (i.Content.substring(i.Content.lastIndexOf('.') + 1, i.Content.length).toUpperCase() == 'PDF') {
+            this.previewPDF(i.Content)
+          } else {
+            let dom = document.querySelector("#groupTourOrder_DownLoad");
+            dom.href = i.Content;
+            dom.click();
+            window.open("https://view.officeapps.live.com/op/view.aspx?src=" + i.Content)
+          }
+      },
         handleClose(rows){
             if (rows) {
             rows.forEach(row => {
@@ -789,9 +814,16 @@
                       arr.forEach(x=>{
                         x._checked = true
                         x._disabled = false
+                        x.srcList = []
                       })
                     }
+                    
                     arrList(data)
+                    for(let i=0;i<data.length;i++){
+                      if(data[i].vorcherInos) {
+                        data[i].srcList = data[i].vorcherInos.map(x=>{ if(x.Type==3)return x.Content})
+                      }
+                    }
                     let userInfo=this.getLocalStorage();
                     data.forEach(x=>{
                         if((","+userInfo.ActionMenuCode+",").indexOf(',Finance_CreateByCareOf,')!=-1){
@@ -834,7 +866,7 @@
         getCompanyList(){ //获取公司列表
             this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
                 if(res.data.resultCode==1){
-                        this.CompanyList=res.data.data;
+                  this.CompanyList=res.data.data;
                 }else{}
             },err=>{})
         },

src/components/FinancialModule/components/ClientBankAccount.vue

@@ -440,7 +440,7 @@
           this.saveMsg.FrId = this.GetDetail.FrID
           this.saveMsg.Voucher = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?JSON.parse(JSON.stringify(this.GetDetail.FInnerVoucher)):[]
           this.saveMsg.Remark = this.GetDetail.FInnerRemark
-          this.srcList = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?this.GetDetail.FInnerVoucher.map(x=>{return x.Content}):[]
+          this.srcList = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?this.GetDetail.FInnerVoucher.map(x=>{ if(x.Type==3)return x.Content}):[]
         },
         deep: true,
         immediate: false
@@ -454,14 +454,14 @@
         this.IsExpensesMonthlyShare=true;
       }
       if (ActionMenuCode.indexOf('Finance_ExpenseType') != -1) {
-        // this.isFinance_ExpenseType=true;
+        this.isFinance_ExpenseType=true;
       }
 
       this.msg.BaseFinanceId = this.GetDetail.FrID
       this.saveMsg.FrId = this.GetDetail.FrID
       this.saveMsg.Voucher = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?JSON.parse(JSON.stringify(this.GetDetail.FInnerVoucher)):[]
       this.saveMsg.Remark = this.GetDetail.FInnerRemark
-      this.srcList = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?this.GetDetail.FInnerVoucher.map(x=>{return x.Content}):[]
+      this.srcList = this.GetDetail.FInnerVoucher&&this.GetDetail.FInnerVoucher.length>0?this.GetDetail.FInnerVoucher.map(x=>{ if(x.Type==3)return x.Content}):[]
       if(this.GetDetail.SpecialType==11) this.GetExpensesMonthlyShare()
     },
     methods: {
@@ -533,7 +533,7 @@
             Content: this.domainManager().ViittoFileUrl+x.data.FilePath,
             Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
           });
-          this.srcList = this.saveMsg.Voucher.map(x=>{return x.Content})
+          this.srcList = this.saveMsg.Voucher.map(x=>{ if(x.Type==3)return x.Content})
           this.$message.success(this.$t('tips.scchenggong'));
         });
       },