增加团队收入确认单

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -677,7 +677,7 @@
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==1&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
-                                        @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)" style="display:none;">收入确认单
+                                        @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
                       </el-dropdown-item>
                       <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
                                         @click.native="goB2B(item.ConfigId, item.TCID)">

src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue

@@ -33,45 +33,71 @@
         float:left;
         width:95%;
     }
+    .priceContent{
+        width:830px;
+        padding:15px;
+        background-color: #fff;
+        min-height:500px;
+        color:#c94052;
+    }
+    .pri_title{
+        font-size: 18px;
+        text-align: center;
+        margin-bottom:20px;
+    }
+    .priceContent table td,.priceContent table th{
+        height:34px;
+        padding:10px;
+    }
 </style>
 
 <template>
-    <div>
-        <table class="singeRowTable">
+    <div class="priceContent">
+        <p class="pri_title">团队收入确认单</p>
+        <table border="1" bordercolor="#c94052" style="border-collapse: collapse;width:100%;font-size:14px;text-align:center;">
             <tr>
-                <th colspan="10">团队收入确认单</th>
+                <th>部门</th>
+                <th>{{dataList.DepartmentName}}</th>
+                <th>单号</th>
+                <th width="200" style="text-align:left;">
+                    <span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
+                </th>
             </tr>
             <tr>
-                <th>部门</th>
-                <th width="250">单号</th>
-                <th width="180">团号</th>
+                <th>团号</th>
                 <th>团队编号</th>
                 <th>人数</th>
-                <th width="100">领队</th>
-                <th>团费收入合计</th>
-                <th>直客收入</th>
-                <th>同行交客收入</th>
-                <th>平台收入</th>
+                <th>领队</th>
             </tr>
             <tr>
-                <td>{{dataList.DepartmentName}}</td>
-                <td>
-                    <span class="princeOrderSpan" v-for="item in dataList.OrderIds">{{item}}</span>
-                </td>
                 <td>{{dataList.TCNUM}}</td>
                 <td>{{dataList.TCID}}</td>
                 <td>{{dataList.PeopleNum}}</td>
                 <td>{{dataList.LeaderName}}</td>
-                <td>{{dataList.TotalIncome}}</td>
-                <td>{{dataList.DirectGuestIncome}}</td>
-                <td>{{dataList.PlatformGuestIncome}}</td>
-                <td>{{dataList.PlatformIncome}}</td>
+            </tr>
+            <tr>
+                <td>团费收入合计</td>
+                <td colspan="3">{{dataList.TotalIncome}}</td>
+            </tr>
+            <tr>
+                <td rowspan="3">其中</td>
+                <td>直客收入</td>
+                <td colspan="2">{{dataList.DirectGuestIncome}}</td>
+            </tr>
+            <tr>
+                <td>同行交客收入</td>
+                <td colspan="2">{{dataList.PlatformGuestIncome}}</td>
+            </tr>
+            <tr>
+                <td>平台收入</td>
+                <td colspan="2">{{dataList.PlatformIncome}}</td>
+            </tr>
+            <tr>
+                <td colspan="4" style="text-align:left;">
+                    备注：{{dataList.Remark}}
+                </td>
             </tr>
         </table>
-        <div class="PriceRemark clearfix">
-             <div class="leftRemarkTitle">备注：</div>   
-             <div class="rightRemarkContent">{{dataList.Remark}} </div>
-        </div>
     </div>
 </template>
 <script>