no message

src/components/customerManage/orderDetailsDrawer.vue

@@ -169,7 +169,7 @@ export default {
     this.MsgBus.$on("RefreshInfoBox", function() {
       $this.init();
     });
-    if(this.activeNameNum){
+    if(this.activeNameNum=="2"){
       this.activeName = this.activeNameNum
     }
   },

src/components/customerManage/orderList.vue

@@ -235,7 +235,7 @@
 </el-drawer>
 <!-- 单号抽屉 -->
 <el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
-    <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" />
+    <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum" />
 </el-drawer>
 
 </div>
@@ -266,6 +266,7 @@ export default {
   },
   data() {
     return {
+        activeNameNum:"1",
         MultipleChoiceList: [ //多选项目
             {
                 Name: '机票',
@@ -474,16 +475,25 @@ export default {
       }
     },
     makeAdocumentFun(row, index, num) {
+      
+      if (this.superManage) {
+        this.makeAdocumentFunction(row, index, num)
+      }else{
+        if (this.userInfo.EmName != row.EnterName) {
+          this.ValidateOperator();
+        } else {
+          this.makeAdocumentFunction(row, index, num)
+        }
+      }
+    },
+    makeAdocumentFunction(row, index, num){
       let type;
       type = num == 1 ? 1 : 2; // 1收款 2退款 3成本
       let href;
       let url = this.domainManager().erpRoutingUrl;
       let data;
       let list = row.OrderType && row.OrderType.split(",");
-      if (this.userInfo.EmName != row.EnterName) {
-        this.ValidateOperator();
-      } else {
-        if (row.OrderStatus != "2") {
+      if (row.OrderStatus != "2") {
           if (list && list.length > 1) {
             let typeList = row.selectedType.split(",");
             if (num == 1 && typeList.length >= 2) {
@@ -583,9 +593,7 @@ export default {
             }
           }
         }
-      }
     },
-
     // 操作日志
     operationLog(row) {
       this.MsgBus.$emit("logTicketOrderBoxOpen", row.GuestId, row, true);
@@ -608,6 +616,13 @@ export default {
         row.TicketStatus == 4 ||
         row.OrderStatus == "2"
       ) {
+        this.$confirm('该订单已经无法修改出票状态', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          
+        }).catch(() => {})
         return;
       } else {
         this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true);
@@ -648,7 +663,6 @@ export default {
               (res) => {
                 if (res.data.resultCode == 1) {
                   this.$message.success(res.data.message);
-                  this.getList();
                 }
               }
             );
@@ -661,6 +675,13 @@ export default {
             });
           });
       } else {
+        this.$confirm('该订单已经无法取消', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          
+        }).catch(() => {})
         this.$emit("emptyMore");
       }
     },
@@ -685,6 +706,13 @@ export default {
           true
         );
       } else {
+        this.$confirm('该订单已经无法编辑', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          
+        }).catch(() => {})
         this.$emit("emptyMore");
       }
     },
@@ -704,6 +732,13 @@ export default {
       if (row.TicketStatus == 1 && row.OrderStatus == 1) {
         this.MsgBus.$emit("editTicketOrderBoxOpen", row.GuestId, row, true);
       } else {
+        this.$confirm('该订单已经无法编辑金额', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          
+        }).catch(() => {})
         this.$emit("emptyMore");
       }
     },

src/components/guestManagement/ticketOrder.vue

@@ -200,7 +200,7 @@
         position: absolute;
         width: 5px;
         height: 5px;
-        left: -3px;
+        left: -8px;
         border-radius: 100%;
         top: 15px;
         background: rgba(255, 164, 117, 1);
@@ -645,7 +645,6 @@
                               :multiple="true"
                               accept="image/jpeg,image/gif,image/png,image/bmp"
                               :before-upload="handleAvatarUpload"
-                              :on-progress="handleAvatarProgres"
                               :on-success="handleAvatarSuccess"
                               >
                               <i class="el-icon-upload"></i>
@@ -987,7 +986,6 @@
                             action=""
                             :http-request="uploadImg"
                             :multiple="true"
-                            :on-progress="handleAvatarprogress"
                             :before-upload="handleAvatarUploadType"
                             :on-success="handleAvatarSuccess"
                             >

src/components/planeTicketOrder/index.vue

@@ -181,7 +181,7 @@
             <div v-if="scope.row.OrderId === 0">
               -
             </div>
-            <div v-else>
+            <div v-else @click="openNameDetails(scope.row)" class="hover">
               {{scope.row.GuestName}}
             </div>
           </template>
@@ -325,6 +325,9 @@
     </div>
 
     </div>
+    <el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
+      <customerInfoBox :CustomerId="CustomerId" />
+    </el-drawer>
     <!-- 单号抽屉 -->
     <el-drawer  @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
       <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum"/>
@@ -333,10 +336,12 @@
 </template>
 
 <script>
+import customerInfoBox from "../guestManagement/customerInfoBox";
 import orderDetailsDrawer from "../customerManage/orderDetailsDrawer";
 export default {
   components: {
-      orderDetailsDrawer
+    customerInfoBox,
+    orderDetailsDrawer
   },
   created() {
     // erp自动登陆传过来的参数
@@ -386,7 +391,11 @@ export default {
       StatModel:[],
       currentOrder:null,
       orderDrawer:false,
-      activeNameNum:"2"
+      activeNameNum:"2",
+      drawer:false,
+      CustomerId:"",
+      CustomerName:""
+
     };
   },
   methods: {
@@ -494,6 +503,12 @@ export default {
       return
       this.$router.push({path:'/customerOrder',query:{OrderId:val}})
     },
+    // 点击客人名称
+    openNameDetails(item) {
+      this.drawer = true;
+      this.CustomerId = item.GuestId;
+      this.CustomerName = item.GuestName;
+    },
     //改变状态背景颜色
     columenStyle({columnIndex}){
       if(columnIndex == 6 ){