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

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -949,7 +949,7 @@
               <!-- <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)">
                 <span class="_jump_page _font_bold">签证收支</span></td> -->
               <td v-if="GetDetail.OrderSource==10&&o.TCNUM&&o.TCID" @click="jumpPage('VisaFinancialDocuments',o.TCID,3,o.TCNUM)">
-                <span class="_jump_page _font_bold">签证收支--</span></td>
+                <span class="_jump_page _font_bold">签证收支</span></td>
               <td v-if="GetDetail.OrderID&&OrderSource==10">签证订单：<span
                   @click="jumpPage(isOrderOP?'VisaProductEditOrderQZ':'VisaProductEditOrder',GetDetail,8,GetDetail.OrderID)"
                   class="_jump_page _font_bold">{{GetDetail.OrderID}}</span></td>

src/components/FinancialModule/components/CostmonthDetails.vue

@@ -29,7 +29,7 @@
               <table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
                 <tr>
                     <th>单号</th>
-                    <!-- <th>类型</th> -->
+                    <th>单据类型</th>
                     <th>公司</th>
                     <th>费用类型</th>
                     <th>币种</th>
@@ -41,25 +41,16 @@
                 </tr>
                 <tr class="_color_b" v-for="(item,index) in DataList" :key="index">
                     <td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
-                    <!--
                     <td>
                       <span v-if="item.Type==2" style="display: inline-block;
-                        padding: 2px 8px;
-                        color: white;
-                        background-color: #E95252;
-                        line-height: 16px;
-                        border-radius: 4px;">
+                        color: #E95252;">
                         支出
                     </span>
                     <span v-if="item.Type==1" style="display: inline-block;
-                        padding: 2px 8px;
-                        color: white;
-                        background-color: #2BB87C;
-                        line-height: 16px;
-                        border-radius: 4px;">
+                        color: #2BB87C;">
                         收入
                     </span>
-                    </td> -->
+                    </td>
                     <td>{{item.BranchName}}</td>
                     <td>{{item.CostTypeName}}</td>
                     <td>{{item.CurrencyName}}</td>
@@ -74,7 +65,7 @@
 
                 </tr>
                 <tr class="_color_b">
-                    <td colspan="4">原币合计</td>
+                    <td colspan="5">原币合计</td>
                     <td>{{ybtotal}}</td>
                     <td colspan="2">合计</td>
                     <td>{{cdtotal}}</td>
@@ -144,13 +135,19 @@
                   let data = res.data.data.pageData;
                   let ybtotal = 0
                   let cdtotal = 0
+                  let closedtotal = 0
                   data.forEach(item => {
                     cdtotal+=(item.Money*100);
-                    ybtotal+=(item.WBMoney*100)
+                    if(item.Type==2){
+                      ybtotal+=(item.WBMoney*100)
+                    }
+                    if(item.Type==1){
+                      closedtotal+=(item.WBMoney*100);
+                    }
 
                 });
                 this.cdtotal = cdtotal/100
-                this.ybtotal = ybtotal/100
+                this.ybtotal = (ybtotal-closedtotal)/100
                 this.DataList = data
 
               }else{

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -7,16 +7,16 @@
   ._btn:hover{
     color: red;
   }
-  .right>.iconfont {
+  .right .iconfont {
     font-size: 12px;
     display: inline-block;
     margin-left: 10px;
   }
-  .right>.iconfont.icon-gengduo {
+  .iconfont.icon-gengduo {
     transform: rotate(0deg);
     font-size: 12px;
   }
-  .right>.iconfont.icon-gengduo._rotate{
+  .right .icon-gengduo._rotate{
     transform: rotate(180deg);
   }
   .Finance-box{
@@ -163,8 +163,8 @@
         <p class="sfd_tit clearfix"><span>名单</span></p>
         <div v-if="RollCallListAll&&RollCallListAll.length>3" class="right" style="display: flex;align-items: end;margin-bottom: 5px;">
           <span class="_btn" v-if="tableShow" @click="tableShow=false,RollCallList=RollCallListLess">收起 <i
-            class="iconfont icon-gengduo _rotate" style="font-size: 12px;"></i> </span>
-          <span class="_btn" v-else @click="tableShow=true,RollCallList=RollCallListAll">展开 <i class="iconfont icon-gengduo" style="font-size: 12px;"></i> </span>
+            class="iconfont icon-gengduo _rotate"></i> </span>
+          <span class="_btn" v-else @click="tableShow=true,RollCallList=RollCallListAll">展开 <i class="iconfont icon-gengduo"></i> </span>
         </div>
       </div>
       <div>