no message

src/App.vue

@@ -10,14 +10,13 @@ export default {
   },
   mounted() {
     let getData = JSON.stringify(this.$route.query)
-    getData = JSON.parse(data)
-    getData = JSON.parse(data.erpOrderObj)
-    console.log(data, '')
-    if (!this.getLocalStorage()&&getData.path) {
+    getData = JSON.parse(getData)
+    getData = getData&&JSON.parse(getData.erpOrderObj)
+    if (!this.getLocalStorage()&&!getData) {
       this.$router.push({
         path: "/login",
       });
-    } else if(getData.path) { // erp自动登陆传过来的参数
+    } else if(getData&&getData.path) { // erp自动登陆传过来的参数
       let parameter = getData
       this.$router.push({
           path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(parameter)}`,

src/components/customerManage/customerOrder.vue

@@ -256,6 +256,10 @@
             }
             this.Employee() //业务员
             this.GetTicketStatusEnumList() //出票枚举
+            let $this = this
+            this.MsgBus.$on("closeGetList", function() { 
+                $this.getList()
+            });
             this.getList()
         },
         methods: {

src/components/customerManage/orderList.vue

 <!--订单列表-->
 <template>
-  <div class="classorder">
+  <div class="classorder classorder-bottom">
     <div class="table-head">
       <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
         <colgroup>
@@ -93,6 +93,7 @@
                   {{item.DueinMoney}}
               </td>
               <td style="border:none">
+                <p class="TicketVoucher-box">
                     <span  @click="modifyStatus(item)" 
                   class="cp tatusText"
                   :class="item.TicketStatus==1?'grey':
@@ -102,6 +103,8 @@
                       {{item.TicketStatusName}}
                   </span>
                   <i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(item)"></i>
+                </p>
+                
               </td>
               <td style="border:none">
                   <div style="background: rgba(2, 196, 153, 0.2);width: 70px;border-radius: 2px;text-align: center"
@@ -188,27 +191,6 @@
                     </div>
                 </div>
               </td>
-              <!-- <td :colspan="3" style="height: 168px;text-align: left">
-                <div class="documents-text num">
-                    <div>实收：</div>
-                    <el-tooltip class="item" effect="dark" content="实收制单" placement="top-start">
-                        <span @click="makeAdocument(item,1)">{{item.IncomeMoney}}</span>
-                    </el-tooltip>
-                    
-                </div>
-                <div class="documents-text num">
-                    <div>退款：</div>
-                    <el-tooltip class="item" effect="dark" content="退款制单" placement="top-start">
-                        <span @click="makeAdocument(item,2)">{{item.BackMoney}}</span>
-                    </el-tooltip>
-                </div>
-                <div class="documents-text num">
-                    <div>成本：</div>
-                    <el-tooltip class="item" effect="dark" content="成本制单" placement="top-start">
-                        <span @click="makeAdocument(item,3)">{{item.PayMoney}}</span>
-                    </el-tooltip>
-                </div>
-              </td> -->
             </tr>
           </tbody>
         </template>
@@ -237,6 +219,10 @@
       loading: {
         type: Boolean,
         default: false,
+      },
+      superManage: {
+        type: String,
+        default: ""
       }
     },
     data() {
@@ -318,9 +304,18 @@
         },
         // 制作单据
         makeAdocument(row,num){
+            if(this.superManage){
+              this.makeAdocumentfun(row,num)
+            }else{
               if(this.userInfo.EmName!=row.EnterName){
                 this.ValidateOperator()
               }else{
+                this.makeAdocumentfun(row,num)
+              }
+            }
+            
+        },
+        makeAdocumentfun(row,num){
           if(row.OrderStatus!='2'){            
             let type
             type = num==1? 1:2 // 1收款 2退款 3成本
@@ -344,7 +339,6 @@
             href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
             window.open(href);
           }
-            }
         },
         // 操作日志
         operationLog(row){
@@ -352,23 +346,36 @@
         },
         // 修改出票状态
         modifyStatus(row){
+          if(this.superManage){
+              this.ModifyStatusfun(row)
+          }else{
             if(this.userInfo.EmName!=row.EnterName){
               this.ValidateOperator()
             }else{
+                this.ModifyStatusfun(row)
+            }
+          }
+        },
+        ModifyStatusfun(row){
           if(row.TicketStatus==3||row.TicketStatus==4||row.OrderStatus=='2'){
               return
           }else{
               this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true);
           }
-        }
-        
-        
         },
         // 取消订单
         cancelOrder(row){
+          if(this.superManage){
+              this.cancelOrderfun(row)
+          }else{
             if(this.userInfo.EmName!=row.EnterName){
               this.ValidateOperator()
             }else{
+              this.cancelOrderfun(row)
+            }
+          }
+        },
+        cancelOrderfun(row){
           if(row.OrderStatus!='2'&&row.IncomeFinance==[]&&row.BackFinance==[]&&row.PayFinance==[]){         
             let tips = '此操作将取消该订单，是否继续取消?'
             this.$confirm(tips, '提示', {
@@ -392,35 +399,47 @@
                     message: '已取消'
                 });          
             });
+            }else{
+              this.$emit('emptyMore')
             }
-          }
-        
         },
         // 编辑订单
         editOrder(row){
+          if(this.superManage){
+              this.editOrderfun(row)
+          }else{
             if(this.userInfo.EmName!=row.EnterName){
                 this.ValidateOperator()
             }else{
+                this.editOrderfun(row)
+            }
+          } 
+        },
+        editOrderfun(row){
           if(row.TicketStatus==1&&row.OrderStatus==1){
             this.MsgBus.$emit("editOrderTicketOrderBoxOpen", row.GuestId, row, true);
           }else{
             this.$emit('emptyMore')
           }
-        }
         },
         // 编辑订单金额
         editOrderAmount(row){
+          if(this.superManage){
+              this.editOrderAmountfun(row)
+          }else{
             if(this.userInfo.EmName!=row.EnterName){
               this.ValidateOperator()
             }else{
+                this.editOrderAmountfun(row)
+            }
+          }
+        },
+        editOrderAmountfun(row){
           if(row.TicketStatus==1&&row.OrderStatus==1){
               this.MsgBus.$emit("editTicketOrderBoxOpen", row.GuestId, row, true);
           }else{
               this.$emit('emptyMore')
           }
-        }
-        
-        
         },
         openDetails(item) {
           let href
@@ -535,11 +554,11 @@
     text-indent: 15px;
   }
 
-  .classorder table td {
+  .enrollTotalSearchTable td {
     background-color: #ffffff;
     padding: 9px 15px;
     color: #333333;
-    /* border: 1px solid rgba(138, 138, 138, 0.09); */
+    border: 1px solid rgba(138, 138, 138, 0.09);
     text-align: left;
   }
 
@@ -764,4 +783,13 @@
 .Credentials{
   color: #2961FE;
 }
+.TicketVoucher-box{
+  display: flex;
+}
+.TicketVoucher-box span{
+  flex-shrink: 0;
+}
+.TicketVoucher-box i{
+  margin-left: 5px;
+}
 </style>
\ No newline at end of file

src/components/guestManagement/ticketOrder.vue

@@ -446,7 +446,7 @@ export default {
           { required: true, message: "选择出票状态", trigger: "change" },
         ],
         Voucher: [{ required: true, message: "上传凭据", trigger: "blur" }],
-        EnterId: [{ required: true, message: "请输入转交人id", trigger: "blur" }],
+        EnterId: [{ required: true, message: "请选择转交人", trigger: "blur" }],
       },
       show: true,
     };
@@ -480,7 +480,6 @@ export default {
     }
   },
   mounted() { 
-    console.log(this.obj,'----')
     this.form.GuestId = this.GuestId
     if(this.name=="编辑机票订单"){
       this.form = {

src/router.js

@@ -17,6 +17,8 @@ import customerApr from "./components/approval/customerApr"
 import customerMap from "./components/customerManage/customerMap"
 import customerConfiguration from "./components/customerManage/customerConfiguration"
 import customerOrder from "./components/customerManage/customerOrder"
+import superCustomerOrder from "./components/customerManage/superCustomerOrder"
+import myCustomerOrder from "./components/customerManage/myCustomerOrder"
 import automaticLogin from './views/automaticLogin'
 Vue.use(Router);
 
@@ -446,6 +448,22 @@ export default new Router({
                     meta: {
                         title: "客户订单"
                     }
+                },
+                {
+                    path: "/superCustomerOrder",
+                    name: "superCustomerOrder",
+                    component: superCustomerOrder,
+                    meta: {
+                        title: "订单统计"
+                    }
+                },
+                {
+                    path: "/myCustomerOrder",
+                    name: "myCustomerOrder",
+                    component: myCustomerOrder,
+                    meta: {
+                        title: "我的订单"
+                    }
                 }
             ]
         },