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

src/components/FinancialModule/addCapitalAllocation.vue

-<style> 
+<style>
 .page_addCapitalAllocation{
   width: 800px;
   /* position: absolute; */
@@ -332,19 +332,19 @@
                         <div style="width:100%;height:100%;overflow: hidden;">
                             <img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
                         </div>
-                        <span class="iconfont icon-guanbi1" @click="deleteUploadFile(1, index, fIndex)"></span>
+                        <span class="iconfont icon-guanbi1" @click="deleteUploadFile(2, index, fIndex)"></span>
                     </div>
                     <div v-if="file.Type==1">
                       <div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1, file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"  @click="showUpLoadFile(file)">
 
                       </div>
-                      <span class="iconfont icon-guanbi1" @click="deleteUploadFile(1, index, fIndex)"></span>
+                      <span class="iconfont icon-guanbi1" @click="deleteUploadFile(2, index, fIndex)"></span>
                     </div>
                     <div v-if="file.Type==2">
                         <div class="iconfont icon-excel"  @click="showUpLoadFile(file)">
 
                         </div>
-                        <span class="iconfont icon-guanbi1" @click="deleteUploadFile(1, index, fIndex)"></span>
+                        <span class="iconfont icon-guanbi1" @click="deleteUploadFile(2, index, fIndex)"></span>
                     </div>
                 </template>
                 <div class="_pic_upload" @click="inUploadIndex = index,inUploadTrue = false">
@@ -437,7 +437,7 @@ export default {
       if(this.msg.RB_Branch_Id==1218||this.msg.RB_Branch_Id==1220){
         this.queryAccMsg.StandCurrBranchId = this.msg.RB_Branch_Id;
       }
-      
+
       this.BillName = userInfo.GroupName;
       if(userInfo.RB_Group_id==96){
         this.msg.TemplateId = 145;
@@ -456,11 +456,11 @@ export default {
       this.apipost('Financial_get_GetFundTransfer', {ID: id}, res=>{
         if(res.data.resultCode==1){
           let data = res.data.data;
-          
+
           this.inList = data.SBankList;
-          
+
           this.outList = data.FBankList;
-          
+
           this.msg.FrID = data.FrID
           this.msg.TemplateId = data.TemplateId
           this.msg.Status = data.Status
@@ -485,12 +485,12 @@ export default {
       }, null)
     },
     AddFinancial: function () {
-      
+
 
       this.loading = true
       let c = this.inList.concat(this.outList);
       this.msg.BankList=c;
-      
+
       this.msg.BankList.forEach(x=>{
         delete x.shouAccNumList
       })
@@ -506,7 +506,7 @@ export default {
       }else{
         this.msg.ImportType=0;
       }
-    
+
       // return;
       this.apipost('Financial_post_SetFundTransfer', this.msg, res=>{
         if(res.data.resultCode==1){
@@ -533,11 +533,11 @@ export default {
         let Rate = (this.outList[index].Rate && !isNaN(this.outList[index].Rate)) ? parseFloat(this.outList[index].Rate) : 0
         // this.outList[index].Money = OriginalMoney*Rate
         this.outList[index].Money =Math.round(OriginalMoney*Rate*100)/100;
-        
+
       }
     },
     clearItem: function (type, index) {
-      if (type===1) { 
+      if (type===1) {
         this.inList[index].ID = 0
         this.inList[index].Type = ''
         this.inList[index].mode = ''
@@ -552,7 +552,7 @@ export default {
         this.inList[index].AllotType = 1
         this.inList[index].Sort = ''
         this.inList[index].allName = ''
-        this.inList[index].vorcherInos = [] 
+        this.inList[index].vorcherInos = []
       }else if(type===2) {
         this.outList[index].ID = 0
         this.outList[index].Type = ''
@@ -624,7 +624,7 @@ export default {
         allName: '',
         vorcherInos: [],
         IsExChange:0,
-        
+
       })
     },
     initMsg: function (t) {
@@ -725,7 +725,7 @@ export default {
       newArr.push(file.file)
       let path = "/Upload/Temporary/"
       this.$message.info(this.$t('tips.shangchuanzhong'))
-      this.UploadSelfFileT(path, newArr, x => { 
+      this.UploadSelfFileT(path, newArr, x => {
           let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
           if (this.inUploadTrue) {
             this.inList[this.inUploadIndex].vorcherInos.push({
@@ -767,7 +767,7 @@ export default {
         }
         this.$viewer.show()
       }else{
-        if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){ 
+        if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
             this.previewPDF(i.Url)
         }else{
             window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)