1

src/components/customerManage/orderList.vue

@@ -375,6 +375,7 @@ export default {
   },
   mounted() {
     let $this = this;
+    this.userInfo = this.getLocalStorage();
     this.MsgBus.$on("closeaddContacts", function() {
       $this.commissionPopUpVisible = false;
     });
@@ -494,7 +495,7 @@ export default {
       if (this.superManage) {
         this.endOfLossfun(row)
       }else{
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.endOfLossfun(row)
@@ -532,7 +533,7 @@ export default {
       if (this.superManage) {
         this.lossOperationfun(row)
       }else{
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.lossOperationfun(row)
@@ -552,7 +553,7 @@ export default {
       if (this.superManage) {
         this.orderCompletedfun(row)
       }else{
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.orderCompletedfun(row)
@@ -590,7 +591,7 @@ export default {
       if (this.superManage) {
         this.convertOrderfun(row)
       }else{
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.convertOrderfun(row)
@@ -654,7 +655,7 @@ export default {
       if (this.superManage) {
         this.makeAdocumentFunction(row, index, num)
       }else{
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.makeAdocumentFunction(row, index, num)
@@ -762,7 +763,7 @@ export default {
       if (this.superManage) {
         this.AmendVisafun(row);
       } else {
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.AmendVisafun(row);
@@ -787,7 +788,7 @@ export default {
       if (this.superManage) {
         this.ModifyStatusfun(row);
       } else {
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.ModifyStatusfun(row);
@@ -818,7 +819,7 @@ export default {
       if (this.superManage) {
         this.cancelOrderfun(row);
       } else {
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.cancelOrderfun(row);
@@ -877,7 +878,7 @@ export default {
       if (this.superManage) {
         this.editOrderfun(row);
       } else {
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.editOrderfun(row);
@@ -908,7 +909,7 @@ export default {
       if (this.superManage) {
         this.editOrderAmountfun(row);
       } else {
-        if (this.userInfo.EmName != row.EnterName) {
+        if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
           this.ValidateOperator();
         } else {
           this.editOrderAmountfun(row);

src/components/guestManagement/Agreement.vue

@@ -647,7 +647,7 @@
             },
             //   订单收损完结
             endOfLoss(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator();
                 } else {
                     this.endOfLossfun(row)
@@ -681,7 +681,7 @@
             },
             // 收损
             lossOperation(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator();
                 } else {
                     this.lossOperationfun(row)
@@ -697,7 +697,7 @@
             },
             // 订单完结
             orderCompleted(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator();
                 } else {
                     this.orderCompletedfun(row)
@@ -730,7 +730,7 @@
             },
             // 转换订单  
             convertOrder(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator();
                 } else {
                     this.convertOrderfun(row)
@@ -809,7 +809,7 @@
                 let url = this.domainManager().erpRoutingUrl
                 let data
                 let list = row.OrderType && row.OrderType.split(',')
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator()
                 } else {
                     if (row.OrderStatus != '2') {
@@ -893,7 +893,7 @@
             },
             // 修改签证状态
             AmendVisa(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator()
                 } else {
                     this.AmendVisafun(row);
@@ -914,7 +914,7 @@
             },
             // 修改出票状态
             modifyStatus(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator()
                 } else {
                     if (row.OrderStatus == 2) {
@@ -933,7 +933,7 @@
             },
             // 取消订单
             cancelOrder(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator()
                 } else {
                     if (row.OrderStatus != '2' && row.IncomeFinance.length == 0 && row.BackFinance.length == 0 && row
@@ -972,7 +972,7 @@
             },
             // 编辑订单
             editOrder(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator()
                 } else {
                     if (row.TicketStatus == 1 && row.OrderStatus == 1) {
@@ -985,7 +985,7 @@
             },
             // 编辑订单金额
             editOrderAmount(row) {
-                if (this.userInfo.EmName != row.EnterName) {
+                if (this.userInfo.EmployeeId != row.EnterID && this.userInfo.EmployeeId != row.CreateBy) {
                     this.ValidateOperator()
                 } else {
                     if (row.TicketStatus == 1 && row.OrderStatus == 1) {