Merge branch 'feature_0.2_add_expire_num' into test

rjg

2025-06-04 68ad5e2bac31fc3e9717d37651d19334d6bbde5a

Merge branch 'feature_0.2_add_expire_num' into test

 src/views/tickets/orderLog.vue

@@ -1189,6 +1189,20 @@

      this.detailVisible = true;

  // 更新航线列表，追加 wayline_file_region_vo 数据
  if (data.wayline_file_region_vo) {
    const newWayline = data.wayline_file_region_vo;

    // 检查是否已经存在于 this.wayLineList 中
    const isDuplicate = this.wayLineList.some(
      (item) => item.wayline_id === newWayline.wayline_id
    );

    if (!isDuplicate) {
      this.wayLineList.push(newWayline);
    }
  }

      this.initMapLine(data.device_map_infos);
    },
    async handleCheckDetail(row) {
@@ -1197,7 +1211,20 @@
      this.form = {
        ...data,
      };
  // 更新航线列表，追加 wayline_file_region_vo 数据
  // 更新航线列表，追加 wayline_file_region_vo 数据
  if (data.wayline_file_region_vo) {
    const newWayline = data.wayline_file_region_vo;

    // 检查是否已经存在于 this.wayLineList 中
    const isDuplicate = this.wayLineList.some(
      (item) => item.wayline_id === newWayline.wayline_id
    );

    if (!isDuplicate) {
      this.wayLineList.push(newWayline);
    }
  }
      // 更新机巢列表
      this.device_sns = data.device_list;
      this.detailVisibleCopy = true;