修改启用条件

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -4630,7 +4630,8 @@
         LessRule: [],
         LessNPrice: 0,
         LessNAvgPrice: 0,
-        DealDiscountMoney: 0
+        DealDiscountMoney: 0,
+        IsNewNotice:false
       };
     },
     components: {
@@ -4659,6 +4660,18 @@
       },
     },
     methods: {
+      loadLineNoticeInfo() {
+        //if(this.ConfigData.Config.OutNotice == 1) return
+        this.apipost("travel_post_GetNoticeConfigList", {
+          LineId: this.ConfigData.Config.LineID
+        }, res => {
+            if(res.data.resultCode == 1 && res.data.data.length > 0) {
+              this.IsNewNotice = true
+            }else{
+              this.IsNewNotice = false
+            }
+        });
+      },
       //显示订单联运信息
       ShowOrderUnion(item) {
         this.orderTicketInfo.TCID = item.TCID;
@@ -5448,16 +5461,18 @@
         });
       },
       toTrip: function (obj, TicketUnionId, GuestIds) {
-        this.$router.push({
-          name: 'TravelNoticeDownLoad',
-          params: {
-            id: obj.TCID,
-            orderId: obj.OrderId,
-            guestIds: GuestIds?GuestIds:'0',
-            unionfid: TicketUnionId?TicketUnionId:0
-          }
-        })
-        return
+        if(this.IsNewNotice) {
+          this.$router.push({
+            name: 'TravelNoticeDownLoad',
+            params: {
+              id: obj.TCID,
+              orderId: obj.OrderId,
+              guestIds: GuestIds?GuestIds:'0',
+              unionfid: TicketUnionId?TicketUnionId:0
+            }
+          })
+          return
+        }
         this.tripObj.tcid = obj.TCID;
         this.tripObj.configId = obj.ConfigId;
         this.tripObj.orderId = obj.OrderId;
@@ -6615,6 +6630,7 @@
               this.ConfigData.Config = res.data.data.config;
               this.SetNoticeMsg.OutNotice = res.data.data.config.OutNotice;
               this.ConfigData.Leader = res.data.data.leader;
+              this.loadLineNoticeInfo()
             }
           }
         );
@@ -6940,22 +6956,25 @@
       },
       //出团通知书
       getOrderInfo() {
-        if(this.ConfigData.Config.OutNotice == 1) this.SetOutNotice()
+        console.log(this.ConfigData.Config.OutNotice,this.IsNewNotice)
+        if(this.ConfigData.Config.OutNotice && this.IsNewNotice) this.SetOutNotice()
         else{
           this.getFlightInfo();
           this.getCombinTeam();
         }
       },
       SetOutNotice() {
-        this.$router.push({
-          name: 'TravelNoticePreview',
-          params: {
-            id:this.ConfigData.Config.TCID,
-            tab: '出团通知书预览',
-            target:'y'
-          }
-        })
-        return
+        if(this.IsNewNotice) {
+          this.$router.push({
+            name: 'TravelNoticePreview',
+            params: {
+              id:this.ConfigData.Config.TCID,
+              tab: '出团通知书预览',
+              target:'y'
+            }
+          })
+          return
+        }
         var that = this;
         this.Confirm(
           this.$t('objFill.shifou') + "【" +