修改样式

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -56,7 +56,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">          
-            <button class="normalBtn page_EasyReport_search" @click="getData(2)">查询</button>
+            <button class="normalBtn page_EasyReport_search" style="left: 900px;" @click="getData(2)">查询</button>
           </el-col>
         </el-row>
         <el-row >
@@ -872,7 +872,7 @@ export default {
         endDate=that.year+"-"+column.end
       }
       
-      if(rowIndex<9){
+      if(rowIndex<15){
         // 联运收入
         if(rowData.ZhaiYao=="联运收入"){
           that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")

src/components/FinancialModule/groupApproval.vue

@@ -57,6 +57,7 @@
                     <th>实付</th>
                     <th>待付</th>
                     <th>团队利润</th>
+                    <th v-if="active==1">审批人</th>
                     <th v-if="active==2">审批结果</th>
                     <th v-if="active==2">审批信息</th>
                     <th width="200">操作</th>
@@ -77,6 +78,7 @@
                     <td>{{item.ActualPay}}</td>
                     <td>{{item.WaitPay}}</td>
                     <td>{{item.ActualProfit}}</td>
+                    <td v-if="active==1">{{item.AuditEmpName}}</td>
                     <td v-if="active==2">
                         <span v-if="item.OutGroupAuditState == 2" style="color: green;">通过</span>
                         <span v-if="item.OutGroupAuditState == 3" style="color: red;">拒绝</span>
@@ -92,7 +94,7 @@
                         <el-tooltip class="item" effect="dark" content="驳回" placement="top" v-if="active==1 && EmployeeId==item.OutGroupAuditEmpId">
                             <i class="iconfont icon-shenhebohui" @click="bohui(item)" v-if="active==1 && EmployeeId==item.OutGroupAuditEmpId"></i>
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="明细" placement="top">
+                        <el-tooltip class="item" effect="dark" content="收支明细" placement="top">
                             <i class="iconfont icon-mingxi" @click="goTeamBalance(item.TCID)"></i>
                         </el-tooltip>
 
@@ -102,7 +104,7 @@
                 
             </tbody>
             <tr v-if="dataList.length==0">
-                <td colspan="13" align="center">暂无数据</td>
+                <td :colspan="active==1?14:15" align="center">暂无数据</td>
             </tr>
            
             

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -395,7 +395,7 @@
                       class="MainTeam">{{$t('Operation.Op_zhu')}}</span>
                     <span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">{{$t('Operation.Op_lian')}}</span>
                     <span v-if="item.Status==2" title="结团">{{$t('Operation.Op_jietuan')}}</span>
-                    <span v-if="item.Status==5" title="审核" style="background: rgb(0 128 255);">审核中</span>
+                    <span v-if="item.Status==5" title="结团审核中" style="background: rgb(0 128 255);">审核中</span>
                     <span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
                     <span v-if="item.GroupRecommendType==1" title="精品">精</span>
                     <label style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>