‘新增简易报表页面@@@@@’

src/assets/css/cssReset.css

@@ -482,6 +482,24 @@ vertical-align:middle
     .column-cell-class-name-test .v-table-body-cell{
         background-color: yellow;
     }
+    .column-cell-class-name-test-pink .v-table-body-cell{
+        background-color: #FFCCFF;
+    }
+    .column-cell-class-name-test-greed .v-table-body-cell{
+        background-color: #C2D69A;
+    }
+    .column-cell-class-name-test-gray .v-table-body-cell{
+        background-color:#E5E0EC;
+    }
+    .column-cell-class-name-test-pink-t .v-table-body-cell{
+        background-color:#FCD5B4;
+    }
+    .column-cell-class-name-test-t .v-table-body-cell{
+        background-color: #FFFF99;
+    }
+    .column-cell-class-name-test-greed-s .v-table-body-cell{
+        background-color: #92D050;
+    }
     .column-cell-class-name-test .v-table-body-cell:hover span{
         color: #000000
     }

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -386,6 +386,24 @@ tr._item_list td:last-child {
 ._TCIDAndTCNUMList {
   display: flex;
 }
+.other_report{
+  padding: 0 28px 15px 28px;
+}
+.other_report li{
+  float: left;
+  color: #fff;
+  background-color: #b00;
+  border-color: #b00;
+  min-width: 80px;
+  padding: 4px 12px;
+  margin-bottom: 0;
+  font-size: 14px;
+  font-weight: normal;
+  text-align: center;
+  cursor: pointer;
+  border-radius: 4px;
+  margin-bottom: 10px;
+}
 </style>
 
 <template>
@@ -472,14 +490,17 @@ tr._item_list td:last-child {
       </el-form>
       <ul class="clearfix">
         <li class="hight_query">
-          <button class="normalBtn" @click="openKaiQiZzBox('一键开启')">一键开启</button>
-          <button class="hollowFixedBtn" @click="openKaiQiZzBox('一键关闭')">一键关闭</button>
+          <!-- <button class="normalBtn" @click="openKaiQiZzBox('一键开启')">一键开启</button>
+          <button class="hollowFixedBtn" @click="openKaiQiZzBox('一键关闭')">一键关闭</button> -->
           <button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
           <button class="hollowFixedBtn" @click="method5()">导出</button>
           <!--<button class="hollowFixedBtn" @click="exportExcelCurrentPage">导出2</button>-->
         </li>
       </ul>
     </div>
+    <ul class="other_report clearfix">
+      <li>简易报表</li>
+    </ul>
     <div class="_fnDm_content" v-loading="loading">
       <v-table
         is-horizontal-resize
@@ -620,7 +641,7 @@ export default {
       userId: 0,
       msg: {
         pageIndex: 1,
-        pageSize: 18,
+        pageSize: 16,
         OutBranchId: "",
         StartCityId: "",
         LineId: "",
@@ -1216,7 +1237,7 @@ export default {
     allH = document.documentElement.clientHeight;
     allW = document.documentElement.clientWidth;
     cW = allW - 90;
-    cH = allH - 350;
+    cH = allH - 350 -52;
     this.msg.pageSize = parseInt(cH / 30) - 1;
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1479,7 +1479,7 @@
                   <tr v-if='orderList.length>0' v-for="(item2,index2) in orderList" :key="index2">
                     <td>{{item2.FrID}}</td>
                     <td>
-                      <span v-if="isUpdateOrder">{{item2.PayMoney}}</span>
+                      <span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item2.PayMoney}}</span>
                       <span v-else>******</span>
                     </td>
                     <td>{{item2.TypeName}}</td>
@@ -1490,21 +1490,21 @@
                   </tr>
                 </table>
               </div>	
-                <span v-if='item.isEnd==0 && isUpdateOrder' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
-                <span v-else-if='item.isEnd!=0 && isUpdateOrder' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
+                <span v-if='item.isEnd==0 || isUpdateOrder' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
+                <span v-else-if='item.isEnd!=0 || isUpdateOrder' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
                 <span v-else>******</span>
               </el-popover>
             </td>
             <td>
-              <span v-if="isUpdateOrder">{{item.refund}}</span>
+              <span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.refund}}</span>
               <span v-else>******</span>
             </td>
             <td>
-              <span v-if="isUpdateOrder">{{item.platformTax}}</span>
+              <span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.platformTax}}</span>
               <span v-else>******</span>
             </td>
             <td>
-              <span v-if="isUpdateOrder" :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
+              <span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder" :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
               <span v-else>******</span>
             </td>
             <td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>

src/router/config.js

@@ -2252,6 +2252,13 @@ export default {
               meta: {
                 title: '联运收入'
               },
+            }, { //财务 报表 简易报表
+              path: '/EasyReport',
+              name: 'EasyReport',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/EasyReport'], resolve),
+              meta: {
+                title: '联运收入'
+              },
             }, { // 销售   制作广告
               path: '/advert',
               name: 'advert',