Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/dmc/manager/dmcTotalTable.vue

@@ -578,7 +578,7 @@
           CombinationNum: "",
           //出团公司
           OutBranchIds: [],
-          LineId: 14,
+          LineId: 0,
           PlaceID: 0,
           LineteamId: 0,
           //航空公司
@@ -1200,6 +1200,11 @@
           myDate.getDate();
         this.msg.StartDate = nowDate;
       }
+      var userInfo = this.getLocalStorage();
+      if (userInfo.RB_Group_id == QjGroupId()) {
+        this.msg.LineId = 14;
+      }
+
       this.getLineList();
       this.getList();
       this.getCompanyList();