添加修改包机团

src/components/SupplierIndex.vue

@@ -1552,8 +1552,113 @@
         let msgs = this.$store.state.currSessionMsgs;
         return msgs;
       },
+},
+    // mounted() {
+    //   let that = this;
+    //   this.MsgBus.$on('doudong', function () {
+    //     that.dou()
+    //   });
+    //   this.MsgBus.$on('openChat', function (obj) {
+    //     that.lt(obj)
+    //   });
+    //   const permissionNow = Notification.requestPermission();
+    //   var hiddenProperty =
+    //     "hidden" in document ?
+    //     "hidden" :
+    //     "webkitHidden" in document ?
+    //     "webkitHidden" :
+    //     "mozHidden" in document ?
+    //     "mozHidden" :
+    //     null;
+    //   var visibilityChangeEvent = hiddenProperty.replace(
+    //     /hidden/i,
+    //     "visibilitychange"
+    //   );
+    //   var onVisibilityChange = function () {
+    //     if (!document[hiddenProperty]) {
+    //       that.isFocus = true;
+    //     } else {
+    //       that.isFocus = false;
+    //     }
+    //   };
+    //   document.addEventListener(visibilityChangeEvent, onVisibilityChange);
+    //   if (!localStorage.menu)
+    //     this.$store.dispatch("connect");
+    //   else {
+    //     this.firstMenuList = JSON.parse(localStorage.menu)
+    //     if (this.firstMenuList.indexOf('IM') != -1) {
+    //       this.$store.dispatch("connect");
+    //     }
+    //   }
 
-    },
+    //   this.getDynamic();
+    //   this.getMyDynamic();
+    //   this.getAboutMeDynamic();
+    //   this.getWebAllPart();
+    //   this.getNoticeList()
+    //   document
+    //     .getElementById("allDynamic")
+    //     .addEventListener("scroll", function () {
+    //       //全部动态
+    //       if (this.scrollHeight - this.scrollTop === this.clientHeight) {
+    //         that.isAppend = true;
+    //         that.dynamicMsg.pageIndex =
+    //           Math.ceil(that.dynamicList.length / 10) + 1;
+    //         that.getDynamic();
+    //       }
+    //     });
+
+    //   document.getElementById("myDynamic").addEventListener("scroll", function () {
+    //     //我的动态
+    //     if (this.scrollHeight - this.scrollTop === this.clientHeight) {
+    //       that.isAppendOne = true;
+    //       that.myDynamicMsg.pageIndex =
+    //         Math.ceil(that.myDynamicList.length / 10) + 1;
+    //       that.getMyDynamic();
+    //     }
+    //   });
+
+    //   document
+    //     .getElementById("aboutMeDynamic")
+    //     .addEventListener("scroll", function () {
+    //       //与我相关
+    //       if (this.scrollHeight - this.scrollTop === this.clientHeight) {
+    //         that.isAppendTwo = true;
+    //         that.aboutMeDynamicMsg.pageIndex =
+    //           Math.ceil(that.aboutMyDynamicList.length / 10) + 1;
+    //         that.getAboutMeDynamic();
+    //       }
+    //     });
+    //   if (
+    //     window.localStorage.msgBoxInfo &&
+    //     window.localStorage.msgBoxInfo != ""
+    //   ) {
+    //     this.boxInfo = JSON.parse(window.localStorage.msgBoxInfo);
+    //   }
+    //   if (this.boxInfo.x == 0) {
+    //     this.boxInfo.x = 560;
+    //   }
+    //   if (this.boxInfo.y == 0) {
+    //     this.boxInfo.y = 280;
+    //   }
+    //   document.title = this.userInfo.GroupName;
+    //   this.getMenu();
+    //   this.getBranchList();
+    //   this.getProvinceList(651, 1);
+    //   this.GetHotelList();
+    //   this.getList2();
+    //   this.GetHotelTipList();
+    //   var url = window.location.href;
+    //   if (String(url).indexOf('SupplierIndex') >= 0) {
+    //     this.showPage = true;
+    //   } else {
+    //     this.showPage = false;
+    //   };
+    //   this.com_onresize();
+    //   window.onresize = () => {
+    //     this.com_onresize();
+    //   }
+    // },
     created() {
       //页面刚进入时开启长连接
       //  this.initWebSocket()

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -159,6 +159,7 @@
             </span>
           </li>
           <li>
+            <button class="hollowFixedBtn" @click="addAirplane">新增</button>
             <button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button>
           </li>
         </ul>
@@ -193,28 +194,28 @@
               <div class="el-colw-25">
                 <div class="p20">
                   <span>操作</span>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名情况")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("RegistrationList", item.GTeamId,"报名情况")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">报名情况
                   </el-button>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"财务入账")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("RegistrationList", item.GTeamId,"财务入账")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">财务入账
                   </el-button>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"财务审核")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("RegistrationList", item.GTeamId,"财务审核")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">财务审核
                   </el-button>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"修改")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("airplaneInfo", item.GTeamId,"修改")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">修改
                   </el-button>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"删除")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("RegistrationList", item.GTeamId,"删除")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">删除
                   </el-button>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"包机结算")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("RegistrationList", item.GTeamId,"包机结算")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">包机结算
                   </el-button>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"查看包机团")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("RegistrationList", item.GTeamId,"查看包机团")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">查看包机团
                   </el-button>
-                  <el-button @click.native='goUrl("RegistrationList", item.TCID,"添加包机团")' type="primary" size="mini"
+                  <el-button @click.native='goUrl("RegistrationList", item.GTeamId,"添加包机团")' type="primary" size="mini"
                     style="background:#00C6FF; border-color:#00C6FF">添加包机团
                   </el-button>
                 </div>
@@ -304,6 +305,21 @@
       },
     },
     methods: {
+      goUrl(path,id, name) {
+        this.$router.push({
+          name: path,
+          query: {
+            id: id,
+            blank: "y",
+            tab: name
+          }
+        });
+      },
+      addAirplane() {
+        this.$router.push({
+          name: 'airplaneInfo',
+        });
+        },
       //翻页
       handleCurrentChange(val) {
         this.queryMsg.pageIndex = val;

src/plug/index.js

@@ -118,9 +118,9 @@ export default {
                 let lxymallUrl = ''; //国内游api
                 let crmUrl = ""; //crm API
                 let locationName = window.location.hostname;
-                // domainUrl = "http://192.168.10.128";
+                domainUrl = "http://192.168.10.128";
                 // domainUrl = "http://192.168.10.11:8083" // 刘东电脑
-                 domainUrl = "http://192.168.10.206:8015";
+                // domainUrl = "http://192.168.10.226:8015";
                 // domainUrl = "http://reborn.oytour.com";
                 let crmLocalFileStreamDownLoadUrl = "";
                 crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";

src/router/config.js

@@ -5837,7 +5837,7 @@ export default {
             title: '团控信息'
           },
         }, {
-          path: '/airplane/apply', //团控信息
+          path: '/airplane/apply', //在线申请
           name: 'airplane/apply',
           component: resolve => require(['@/components/airplane/apply'], resolve),
           meta: {