Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/AirTicketRes.vue

@@ -155,7 +155,9 @@ export default {
                     Authorization: 'Bearer ' + this.token
                 },
                 data: {
-                    diId: that.DiId
+                    diId: that.DiId,
+                    userId: that.userId,
+                    portType: 1
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {

src/components/OP/InvitationOfficialActivities.vue

@@ -192,13 +192,15 @@ export default {
             this.InvitationOfficialActivities();
         },
         AirTicketResSelectChange() {
-            this.InvitationOfficialActivities();
-            for (let index = 0; index < this.AirTicketResSelectData.length; index++) {
+            if (this.DiId != 0 && this.DiId != null) {
+                this.InvitationOfficialActivities();
+                for (let index = 0; index < this.AirTicketResSelectData.length; index++) {
 
-                if (this.AirTicketResSelectData[index].id == parseInt(this.DiId)) {
-                    debugger
-                    this.delegationInfo = this.AirTicketResSelectData[index];
-                    break;
+                    if (this.AirTicketResSelectData[index].id == parseInt(this.DiId)) {
+                        debugger
+                        this.delegationInfo = this.AirTicketResSelectData[index];
+                        break;
+                    }
                 }
             }
 
@@ -218,6 +220,8 @@ export default {
                     inviter: that.inviter,
                     startInviteTime: that.startInviteTime,
                     endInviteTime: that.endInviteTime,
+                    pageIndex: 0,
+                    pageSize: 0
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {

src/components/OP/OpAirTicketRes.vue

@@ -564,6 +564,8 @@ export default {
                     Authorization: 'Bearer ' + this.token
                 },
                 data: {
+                    userId: that.userId,
+                    portType: 1,
                     diId: that.DiIdSelect
                 }
             }).then(function (res) {

src/components/OP/OpInvitationOfficialActivities.vue

@@ -321,7 +321,8 @@ export default {
                     Authorization: 'Bearer ' + this.token
                 },
                 data: {
-                    Id: that.id
+                    Id: that.id,
+                    portType: 1
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {