no message

src/components/customerManage/orderDetailsDrawer.vue

@@ -32,7 +32,6 @@
 .orderDetails-content {
   flex: 1;
   position: relative;
-  padding: 0 20px;
 }
 .no-relative .el-tabs__content {
   position: unset !important;
@@ -41,14 +40,38 @@
   margin-top: 20px;
 }
 .order-lable {
+  flex: 1;
   display: flex;
   flex-direction: column;
 }
-.order-lable span:last-child {
+.order-lable span {
   font-size: 18px;
   font-weight: bold;
+  
+  margin-top: 10px;
+}
+.order-lable span.text{
+  color: #333;
+}
+.orderDetails-content .el-tabs__header{
+  padding: 0 20px;
+  margin: 0;
+}
+.orderDetails-content .el-tabs__nav-wrap::after{
+  height: 0;
+  
+}
+.orderDetails-content .el-tabs__content{
+  height: 100%;
+  position: absolute;
+  width: calc(100%);
+  padding: 17px 0 0 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  background-color: #f6f4fc;
+}
+.tatusText.greyb {
   color: #333;
-  margin-top: 5px;
 }
 </style>
     <template>
@@ -61,29 +84,35 @@
                     
                 </div>
             </div>
-            <div class="orderDetails-body">
+            <div class="orderDetails-body" v-loading="loading">
                 <div class="order-info">
                     <div class="order-lable-box">
-                        <div class="order-lable"><span>关联销售：</span><span>5555</span></div>
-                        <div class="order-lable"><span>订单号：</span><span >111</span></div>
-                        <div class="order-lable"><span>客户姓名：</span><span>1</span></div>
+                        <div class="order-lable"><span>关联销售：</span><span class="text">{{detailsData.EnterName}}</span></div>
+                        <div class="order-lable"><span>订单号：</span><span class="text">{{detailsData.OrderId}}</span></div>
+                        <div class="order-lable"><span>客户姓名：</span><span class="text">{{detailsData.GuestName}}</span></div>
                     </div>
                     <div class="order-lable-box">  
-                        <div class="order-lable"><span>性质：</span><span>1</span></div>
-                        <div class="order-lable"><span>形成概述：</span><span>111</span></div>
-                        <div class="order-lable"><span>状态：</span><span>1</span></div>
+                        <div class="order-lable"><span>性质：</span><span class="text">{{detailsData.GuestCount>1?'多人':'单人'}}</span></div>
+                        <div class="order-lable"><span>行程概述：</span><span class="text">{{detailsData.StartCityName}}</span></div>
+                        <div class="order-lable"><span>状态：</span>
+                          <span 
+                          class="cp tatusText"
+                          :class="detailsData.TicketStatus==1?'greyb':
+                          (detailsData.TicketStatus==2?'success':
+                          (detailsData.TicketStatus==3?'error':
+                          (detailsData.TicketStatus==4?'Black':'')))">{{detailsData.TicketStatusName}}</span></div>
                     </div>
                 </div>
                 <div class="orderDetails-content">
                     <el-tabs v-model="activeName" class="no-relative" @tab-click="handleClick">
                         <el-tab-pane label="产品详情" name="1">
-                            
+                          <productDetails :detailsData="detailsData"></productDetails>
                         </el-tab-pane>
                         <el-tab-pane label="订单核算" name="2">
                             <orderProfits :orderId="orderId"></orderProfits>
                         </el-tab-pane>
                         <el-tab-pane label="订单日志" name="3">
-                            
+                            <orderLog :orderId="orderId"></orderLog>
                         </el-tab-pane>
                        
                     </el-tabs>
@@ -93,11 +122,13 @@
     </template>
     <script>
 import orderProfits from "./orderProfits.vue";
-// import Activity from "../guestManagement/Activity";
+import productDetails from "./productDetails";
+import orderLog from "./orderLog";
 export default {
   components: {
-    // Activity,
     orderProfits,
+    productDetails,
+    orderLog
   },
   props: {
     orderId: {
@@ -109,14 +140,16 @@ export default {
     return {
       activeName: "1",
       detailsData: {},
-      loading: true,
+      loading: false,
+      
     };
   },
   watch: {
-    CustomerId: {
+    orderId: {
       handler(val, oldVal) {
         this.init();
         this.activeName = "1";
+        this.orderId = val
       },
       deep: true,
     },
@@ -131,42 +164,17 @@ export default {
   },
   methods: {
     init() {
-      return;
+      this.loading = true;
       this.apipost(
-        "/api/Customer/GetAllCustmersModel",
-        { CustomerId: this.CustomerId },
+        "/api/Order/GetGuestOrderInfo",
+        { OrderId: this.orderId },
         (res) => {
           if (res.data.resultCode == 1) {
             let data = res.data.data;
-            if (!data.HousePhotos) {
-              data.HousePhotos = [];
-            }
-            if (!data.BusinessCardPhotos) {
-              data.BusinessCardPhotos = [];
-            }
-            if (!data.Images) {
-              data.Images = [];
-            }
-            if (!data.CustomerSourceType) {
-              data.CustomerSourceType = "";
-            }
-            if (!data.CustomerSource) {
-              data.CustomerSource = "";
-            }
-            if (!data.Province) {
-              data.Province = "";
-            }
-            if (!data.Country) {
-              data.Country = "";
-            }
-            if (!data.City) {
-              data.City = "";
-            }
-            if (!data.District) {
-              data.District = "";
-            }
             this.detailsData = data;
-            this.loading = true;
+            this.loading = false;
+          }else{
+            this.loading = false;
           }
         }
       );

src/components/customerManage/orderList.vue

@@ -384,7 +384,7 @@ export default {
     // 点击单号
     clickSingleNumber(item) {
       this.currentOrder = item;
-    //   this.orderDrawer = true;
+      this.orderDrawer = true;
     },
     closeOrderDrawerHandler() {
       this.currentOrder = null;

src/components/customerManage/orderProfits.vue

 <template>
   <div class="finance-list-box" v-loading="loading">
-      <div style="font-size:16px;">订单利润核算表</div>
+      <div style="font-size:16px;padding: 20px 0 0 0;">订单利润核算表</div>
       <div class="Team_Content" v-if="d">
           <el-row :gutter="12" v-if="d">
             <el-col :span="4">

src/components/guestManagement/ticketOrder.vue

@@ -350,7 +350,7 @@
         display: flex;
         flex-direction: row;
         /* margin: 20px 0; */
-        padding: 20px 10px 0 10px;
+        padding: 10px 10px 0 10px;
         background-color: #fff;
     }
     .BillMakingType-left{
@@ -380,7 +380,7 @@
         display: flex;
         align-items: center;
         margin-right: 10px;
-        margin-bottom: 10px;
+        margin-bottom: 5px;
     }
     .BillMakingType-right-center span:first-child{
         flex-shrink: 0;
@@ -398,7 +398,7 @@
         display: flex;
         justify-content: flex-end;
         background-color: #fff;
-        padding: 0 10px 20px 0;
+        padding: 0 10px 10px 0;
         margin-bottom: 20px;
     }
     .BillingTotal-center{
@@ -427,6 +427,7 @@
         margin-right: 10px;
         position: relative;
         display: flex;
+        border: 1px solid #eee;
     }
     .appendix-img{
         width: 120px;
@@ -437,7 +438,7 @@
         font-size: 38px;
         color: green;
         line-height: 75px;
-        border: 1px solid #eee;
+        
     }
     .imgdelete{
         position: absolute;
@@ -1839,6 +1840,8 @@
                 let newArr = [];
                 newArr.push(file.file);
                 let path = "/Upload/Temporary/";
+                this.imgShow = true
+                this.$message.info('上传中...')
                 this.UploadSelfFileT(path, newArr, (x) => {
                     let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
                     let data = x.data.FilePath

src/components/planeTicketOrder/index.vue

@@ -320,7 +320,7 @@
         </el-table-column>
       </el-table>
     <div v-if="total>0">
-      <el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
+      <el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
       </el-pagination>
     </div>
 
@@ -352,7 +352,7 @@ export default {
       total: 0,
       msg: {
         pageIndex: 1,
-        pageSize: 30,
+        pageSize: 15,
         OrderId: "", //订单id
         GusetName: "", //客人姓名
         GuestId: "", //客人id