修改一些展示问题

src/components/FinancialModule/FinancialDocuments.vue

@@ -38,6 +38,17 @@
     ._r_mt10{margin-top: 10px;}
     ._bg__{display: inline-block;padding: 2px 8px;color: white;border-radius: 4px}
     ._bg_red{background-color: #E95252;}
+    .zhuiClass{
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        border-radius: 50%;
+        text-align: center;
+        line-height:  20px;
+        color: #E95252;
+        border: 1px solid #E95252;
+        font-size: 12px;
+    }
     ._bg_green{background-color: #2BB87C}
     .text_d{text-decoration: underline;cursor: pointer;}
     .PingFangSC{font-weight: bold}
@@ -432,7 +443,13 @@
                             <span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC" >{{item.FrID}}</span>
                         </el-popover>
                     </td>
-                    <td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span></td>
+                    <td>
+                        <span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span> 
+                        <el-tooltip class="item" effect="dark" content="追加团款"  placement="top">
+                           <span v-if="item.OtherType == 1" class="zhuiClass">追</span>
+                        </el-tooltip>
+                        
+                    </td>
                     <td class="_number">
                         <template v-if="item.TCIDAndTCNUMList.length>0">
                             <div class="_TCIDAndTCNUMList">

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -78,9 +78,26 @@
   ._p_time{
     top: 40px;
   }
+  .zhuiClass{
+        width: 20px;
+        height: 20px;
+        display: inline-block;
+        border-radius: 50%;
+        text-align: center;
+        line-height:  20px;
+        color: #E95252;
+        border: 1px solid #E95252;
+        font-size: 12px;
+    }
+  .zhuiClass.zhuiClassdetails{
+    position: absolute;
+  }
 </style>
 <template v-if="GetDetail.DetailList.length>0">
     <div class="Receipt_box" :class="[GetDetail.Type==1 || GetDetail.Type==5?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
+            <el-tooltip class="item" effect="dark" content="追加团款"  placement="top">
+              <span v-if="GetDetail.OtherType == 1" class="zhuiClass zhuiClassdetails">追</span>
+            </el-tooltip>
             <p class="rb_tit" style="font-size: 16px !important;">{{GetDetail.CompanyName}}（{{GetDetail.BranchName}}）</p>
             <p class="rb_stit">
                 <span :class="isPrintPage?'_rb_stit_print':''">{{GetDetail.FinanceName}}</span>
@@ -105,16 +122,19 @@
                 <p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
             </div>
             <div class="rb_top_row _r_mb5">
-                <p v-if="GetDetail.Type==1 || GetDetail.Type==5">
+                <p v-if="(GetDetail.Type==1 || GetDetail.Type==5) &&GetDetail.IsPublic!=4">
                     <span>{{$t('fnc.fkzhlshuihao')}}：</span>
                     <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}} （{{GetDetail.TradeDate}}）</span>
                     <span class="_r_name" v-else>{{GetDetail.AccountNumber}}</span>
                 </p>
-                <p v-if="GetDetail.Type==2 || GetDetail.Type==6" style="max-width: 500px">
+                <p v-if="(GetDetail.Type==2 || GetDetail.Type==6) &&GetDetail.IsPublic!=4" style="max-width: 500px">
                     <span>{{$t('fnc.fkzhanghu')}}：</span>
                     <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}}（{{GetDetail.TradeDate}}）</span>
                     <span class="_r_name" v-else>{{GetDetail.AccountNumber?GetDetail.AccountNumber:$t('fnc.no')}}</span>
                 </p>
+                <p v-if="GetDetail.IsPublic==4" style="max-width: 500px">
+                  <span class="_r_name" style="color: #fff;">,</span>
+                </p>
                 <p class="_r_time">{{GetDetail.CreateDate}}</p>
 
             </div>

src/components/FinancialModule/RecPayQuery.vue

@@ -55,6 +55,9 @@
     .icon-yiquxiao{color: #959595}
     .icon-shenhebohui{color: #E95252}
     .icon-icon-zancun{color: #FF9C01}
+     .zhuiClass{
+        
+    }
     .singeRowTable tr:hover{background-color: white}
     ._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
     ._bold{font-weight: bold}
@@ -472,7 +475,7 @@ Vue.component('table-RecPay',{  //收支样式
                 background-color: #2BB87C;
                 line-height: 16px;
                 border-radius: 4px;">
-                收入
+                收入 
             </span>
              <span v-if="rowData.Type==5" style="display: inline-block;
                 padding: 2px 8px;
@@ -490,6 +493,17 @@ Vue.component('table-RecPay',{  //收支样式
                 border-radius: 4px;">
                 应付
             </span>
+            <el-tooltip class="item" effect="dark" content="追加团款"  placement="top">
+                <span v-if="rowData.OtherType == 1" style="width: 20px;
+                    height: 20px;
+                    display: inline-block;
+                    border-radius: 50%;
+                    text-align: center;
+                    line-height:  20px;
+                    color: #E95252;
+                    border: 1px solid #E95252;
+                    font-size: 12px;" class="zhuiClass">追</span>
+            </el-tooltip>
         </span>`,
     props:{
         rowData:{

src/components/FinancialModule/addFinancialDocuments.vue

@@ -244,7 +244,7 @@
                     <p><span class="">{{$t('hotel.hotel_SerialNumber')}}.</span>{{GetDetail.FrID==0?$t('fnc.daishengcheng'):GetDetail.FrID}}</p>
                 </div>
                 <div class="rb_top_row _r_mb5">
-                    <template v-if="msg.IsPublic!=2&&msg.IsPublic!=3&&(msg.ClientType==7&&msg.IsLeader==1)">
+                    <template v-if="msg.IsPublic!=2&&msg.IsPublic!=3&&(msg.ClientType==7&&msg.IsLeader==1)&&msg.IsPublic!=4">
                         <p>{{$t('fnc.fkzhanghu')}}：
                             <el-select  filterable  v-model='msg.AccountNumber' :placeholder="$t('fnc.qxzfkzh')"  class="w425 _border_b_1">
                                 <el-option v-for='item in ClientAccountListS'
@@ -255,7 +255,7 @@
                             </el-select>
                         </p>
                     </template>
-                    <template v-if="msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3">
+                    <template v-if="msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3&&msg.IsPublic!=4">
                         <p>{{$t('fnc.fkzhanghu')}}：
                             <el-select  filterable  v-model='msg.AccountNumber' :placeholder="$t('fnc.qxzfkzh')"  class="w425 _border_b_1">
                                 <el-option v-for='item in ClientAccountListS'
@@ -558,7 +558,7 @@ export default {
               Status:1,
               URL:this.$route.query.path,
               vorcherInos:[],
-              IsPublic:1,
+              IsPublic: '',
               Cmd:'',
               emList:[],
               TCIDList:[],
@@ -1069,6 +1069,7 @@ export default {
             })
         },
         financeinfo_post_GetClientAccountList(t,i){  //获取付款 对象类型  新增用
+        console.log(1111111111)
             let msg = {
                 ID:0,
                 Type:t,
@@ -1231,7 +1232,7 @@ export default {
                     this.BillName = data.CompanyName;
                     this.BillSonName = data.FinanceName;
                     this.IsUploadPic = data.IsUploadPic;
-                    this.msg.IsPublic = data.IsPublic;
+                    this.msg.IsPublic = data.IsPublic!==0 ? data.IsPublic : '';
                     this.GetDetail = data;
                     if(this.orderObj!=null&&this.orderObj.OrderSource===10){
 
@@ -1251,6 +1252,7 @@ export default {
                         this.detailList.CostTypeId = this.orderObj.CostType?this.orderObj.CostType: '';
                         this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
                         this.detailList.Number = this.orderObj.CostType ? 1 : 0
+                        this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType:0;
                         if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
                             this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
                         }

src/components/LeaderManagement/leaderReimbursement.vue

@@ -755,7 +755,8 @@ import { constants } from 'os';
           Obj: {},
           SourceID: 0,
           TCIDList: TCIDARR,
-          TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id
+          TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$route.query.id,
+          OtherType: 1,
         } 
         this.$router.push({
           name: 'ChoiceAddFinancialDocuments',