订单统计测试2

.gitignore

 .DS_Store
 node_modules
 /dist
-src/plugins/index.js
 
 # local env files
 .env.local

src/components/customerManage/customerOrder.vue

@@ -259,6 +259,10 @@
                 let data = JSON.parse(this.$route.query.erpOrderObj)
                 this.msg.OrderId = data.OrderId
             }
+            //接收订单统计传过来的参数
+            if(this.$route.query.OrderId){
+                this.msg.OrderId = this.$route.query.OrderId
+            }
             this.Employee() //业务员
             this.GetTicketStatusEnumList() //出票枚举
             let $this = this

src/components/planeTicketOrder/index.vue

@@ -39,32 +39,19 @@
           </el-col>
           <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
             <span class="font-size-12" style="padding-right: 10px"
-              >出发城市</span
+              >出行概述</span
             >
             <el-input
               size="mini"
               class="w210"
               v-model="msg.StartCityName"
-              placeholder="出发城市"
-              clearable
-              @clear="getList"
-              @keyup.enter.native="getList"
-            ></el-input>
-          </el-col>
-          <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
-            <span class="font-size-12" style="padding-right: 10px"
-              >到达城市</span
-            >
-            <el-input
-              size="mini"
-              class="w210"
-              v-model="msg.EndCityName"
-              placeholder="到达城市"
+              placeholder="出行概述"
               clearable
               @clear="getList"
               @keyup.enter.native="getList"
             ></el-input>
           </el-col>
+          
           <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
             <span class="font-size-12" style="padding-right: 10px">业务员</span>
             <el-select
@@ -165,8 +152,9 @@
         style="width: 100%"
         :border="true"
         :fit="true"
-        :header-cell-style="headStyle"
         v-loading="loading"
+        :cell-style="columenStyle"
+        :header-cell-style="getRowClass"
       >
         <el-table-column fixed prop="EnterName" label="业务员">
           <template slot-scope="scope">
@@ -183,7 +171,7 @@
             <div v-if="scope.row.OrderId === 0">
               ---
             </div>
-            <div v-else>
+            <div v-else @click="toOrder(scope.row.OrderId)" class="hover">
               {{scope.row.OrderId}}
             </div>
           </template>
@@ -233,7 +221,9 @@
         <el-table-column label="营业收入" width="960">
           <el-table-column prop="TicketMoney" label="单机票款" width="100">
             <template slot-scope="scope">
-              <span>{{ scope.row.TicketMoney }}</span
+
+              <p v-if="scope.row.TicketMoney == 0">---</p>
+              <p v-else><span>{{ scope.row.TicketMoney }}</span
               >/<span
                 :style="{
                   color:
@@ -241,25 +231,28 @@
                       ? 'red'
                       : '#000',
                 }"
-                >{{ scope.row.TicketIncome }}</span
-              >
+                >{{ scope.row.TicketIncome }}</span></p>
+              
             </template>
           </el-table-column>
           <el-table-column label="单签证款" width="100">
             <template slot-scope="scope">
-              <span>{{ scope.row.VisaMoney }}</span
-              >/<span
+
+              <p v-if="scope.row.VisaMoney == 0">---</p>
+              <p v-else> <span>{{ scope.row.VisaMoney }}</span>/<span
                 :style="{
                   color:
                     scope.row.VisaMoney > scope.row.VisaIncome ? 'red' : '#000',
-                }"
-                >{{ scope.row.VisaIncome }}</span
-              >
+                }">{{ scope.row.VisaIncome }}</span>
+                </p>
+              
             </template>
           </el-table-column>
           <el-table-column label="单地接款" width="100">
             <template slot-scope="scope">
-              <span>{{ scope.row.DiJieMoney }}</span
+
+              <p v-if="scope.row.DiJieMoney == 0">---</p>
+              <p v-else>   <span>{{ scope.row.DiJieMoney }}</span
               >/<span
                 :style="{
                   color:
@@ -268,12 +261,15 @@
                       : '#000',
                 }"
                 >{{ scope.row.DiJieIncome }}</span
-              >
+              > </p>
             </template>
           </el-table-column>
-          <el-table-column prop="MealMoney" label="套餐款">
+          <el-table-column prop="MealMoney" label="套餐款" width="120">
             <template slot-scope="scope">
-              <span>{{ scope.row.MealMoney }}</span
+
+              <p v-if="scope.row.MealMoney == 0">---</p>
+              <p v-else>
+                 <span>{{ scope.row.MealMoney }}</span
               >/<span
                 :style="{
                   color:
@@ -281,6 +277,8 @@
                 }"
                 >{{ scope.row.MealIncome }}</span
               >
+              </p>
+
             </template>
           </el-table-column>
           <el-table-column prop="OtherIncome" label="其他收款" width="100">
@@ -288,7 +286,11 @@
           <el-table-column prop="Money" label="合计应收款" width="100">
           </el-table-column>
           <el-table-column prop="IncomeMoney" label="已收款"> </el-table-column>
-          <el-table-column prop="DueinMoney" label="未收款"> </el-table-column>
+          <el-table-column prop="DueinMoney" label="未收款">
+            <template slot-scope="scope">
+              <span :style="{color:scope.row.DueinMoney>0?'red':'#000'}">{{scope.row.DueinMoney}}</span>
+            </template>
+          </el-table-column>
         </el-table-column>
         <el-table-column label="营业成本">
           <el-table-column prop="TicketCost" label="机票成本">
@@ -302,7 +304,13 @@
         </el-table-column>
         <el-table-column prop="BackMoney" label="退款费用"> </el-table-column>
         <el-table-column prop="TaxMoney" label="平台费用"> </el-table-column>
-        <el-table-column prop="Profit" label="订单毛利"> </el-table-column>
+        <el-table-column prop="Profit" label="订单毛利"> 
+          <template slot-scope="scope">
+            <span :style="{color:scope.row.Profit<=0?'red':'#000'}">
+            {{scope.row.Profit}}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column prop="ProfitRate" label="毛利率">
           <template slot-scope="scope">
             <div>
@@ -312,17 +320,16 @@
         </el-table-column>
       </el-table>
 
-      <el-pagination
-        background
-        @current-change="handleCurrentChange"
-        :page-sizes="[30, 60, 90, 100]"
-        :page-size="msg.pageSize"
-        layout="sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        :total="total"
-        style="margin-top: 12px; float: right"
-      >
-      </el-pagination>
+        <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[30, 60,90,100]"
+      :page-size="msg.pageSize"
+      layout="total,prev,sizes,pager,next"
+      :total="total"
+      style="margin-top: 12px; float: right">
+    </el-pagination>
+
     </div>
   </div>
 </template>
@@ -351,12 +358,11 @@ export default {
       total: 0,
       msg: {
         pageIndex: 1,
-        pageSize: 15,
+        pageSize: 30,
         OrderId: "", //订单id
         GusetName: "", //客人姓名
         GuestId: "", //客人id
-        StartCityName: "", //出发城市
-        EndCityName: "", //到达城市
+        StartCityName: "", //出行概述
         EnterID: "", //业务员id
         TicketStatus: "0", //出票状态
         OrderStatus: "1", //订单状态
@@ -379,10 +385,6 @@ export default {
     };
   },
   methods: {
-    //表格居中
-    headStyle() {
-      return "text-align:center";
-    },
     // 获取业务员
     Employee() {
       let userInfo = this.getLocalStorage();
@@ -431,7 +433,10 @@ export default {
           if (res.data.resultCode == 1) {
             let data = res.data.data.pageData;
             this.tableData = data;
+            this.msg.pageSize = res.data.data.pageSize
+            console.log(this.msg.pageSize)
             this.total = res.data.data.count;
+            console.log(this.total)
           } else {
             this.$message.error(res.data.message);
           }
@@ -462,11 +467,25 @@ export default {
         return;
       }
       this.GetLocalFile(
-        "/api/Order/GetGuestOrderStatisticsToExcel",
+        "/api/Order/GetCRMGuestOrderCheckToExcel",
         this.msg,
         "订单表.xls"
       );
-    }
+    },
+    //订单跳转
+    toOrder(val){
+      this.$router.push({path:'/customerOrder',query:{OrderId:val}})
+    },
+    //改变状态背景颜色
+    columenStyle({columnIndex}){
+      if(columnIndex == 6 ){
+        return "background:#f0f5fb"
+      }
+    },
+     //表格居中
+    getRowClass({rowIndex,columnIndex}) {
+      return "text-align:center";
+    },
   },
 };
 </script>
@@ -492,5 +511,9 @@ export default {
       }
     }
   }
+  .hover:hover{
+    cursor: pointer;
+    color: skyblue;
+  }
 }
 </style>