modify

@@ -3,7 +3,7 @@
     <div class="row">
       <div class="col-6">
         <draggable class="list-group" tag="ul" v-model="routeList" v-bind="dragOptions" @start="dragStart" @end="dragEnd">
-          <transition-group type="transition" :name="!drag ? 'flip-list' : null">
+          <transition-group type="transition" name="flip-list">
             <li class="list-group-item" v-for="item in routeList" :key="item.routePriority">
               <i :class="item.fixed ? 'fa fa-anchor' : 'glyphicon glyphicon-pushpin'
                 " @click="item.fixed = !item.fixed" aria-hidden="true"></i>

@@ -24,30 +24,31 @@
                 <el-button
                   type="primary"
                   size="mini"
-                  :disabled="item.status == '3'"
+                  :disabled="item.status == '3' || status"
                   :loading="item.loading"
-                  v-if="item.status == '1'"
                   >保 存</el-button
                 >
                 <el-button
+                  v-if="showBtnRule(item)"
                   type="primary"
                   size="mini"
                   icon="el-icon-video-pause"
-                  :disabled="item.status == '3'"
                   :loading="item.loading"
-                  v-if="item.status == '1' && item.ruleDate"
-                  >{{ item.status == '1' ? '停 用' : item.status == '3' ? '启 用' : '停 用'}}</el-button
+                  :disabled="status"
+                  >{{ item.status | statusBtn }}</el-button
                 >
                 <el-button
+                  v-if="showBtnRule(item)"
                   type="danger"
                   size="mini"
                   icon="el-icon-delete"
-                  :disabled="item.disabled"
+                  :disabled="item.status !== '3' || status"
                   :loading="item.loading"
-                  v-if="item.status == '1' && item.ruleDate"
                   >删 除</el-button
                 >
-                <span class="flight-route-title">普通规则</span>
+                <span class="flight-route-title">
+                  {{ item.ruleDate ? "日期级别规则" : "普通规则" }}</span
+                >
               </div>
               <el-divider></el-divider>
               <div class="route-config-info">
@@ -59,6 +60,7 @@
                           <el-radio-group
                             v-model="item.isLocation"
                             @change="changeLocation"
+                            :disabled="status"
                           >
                             <el-radio label="1">包含始发站</el-radio>
                             <el-radio label="2">不包含始发站</el-radio>
@@ -67,6 +69,7 @@
                         <el-col :span="10">
                           <el-input
                             v-if="item.isLocation == '1'"
+                            :disabled="status"
                             type="textarea"
                             v-model="item.location"
                             :rows="4"
@@ -76,6 +79,7 @@
                           </el-input>
                           <el-input
                             v-else
+                            :disabled="status"
                             type="textarea"
                             v-model="item.notLocation"
                             :rows="4"
@@ -90,6 +94,7 @@
                       <el-form-item label="目的站">
                         <el-col :span="2">
                           <el-radio-group
+                            :disabled="status"
                             v-model="item.isDestinationSite"
                             @change="changeDestinationSite"
                           >
@@ -100,6 +105,7 @@
                         <el-col :span="10">
                           <el-input
                             v-if="item.isDestinationSite == '1'"
+                            :disabled="status"
                             type="textarea"
                             v-model="item.destinationSite"
                             :rows="4"
@@ -109,6 +115,7 @@
                           </el-input>
                           <el-input
                             v-else
+                            :disabled="status"
                             type="textarea"
                             v-model="item.notDestinationSite"
                             :rows="4"
@@ -123,6 +130,7 @@
                       <el-col :span="10">
                         <el-form-item label="URSA包含">
                           <el-input
+                            :disabled="status"
                             type="textarea"
                             v-model="item.includeUrsa"
                             :rows="4"
@@ -134,6 +142,7 @@
                       <el-col :span="10">
                         <el-form-item label="URSA不包含">
                           <el-input
+                            :disabled="status"
                             type="textarea"
                             v-model="item.notIncludeUrsa"
                             :rows="4"
@@ -148,6 +157,7 @@
                         <el-form-item label="件数">
                           <el-col :span="10">
                             <el-input
+                              :disabled="status"
                               class="numberInput"
                               v-model.trim="item.minNumOfPieces"
                             >
@@ -162,6 +172,7 @@
                           >
                           <el-col :span="10">
                             <el-input
+                              :disabled="status"
                               class="numberInput"
                               v-model.trim="item.maxNumOfPieces"
                             >
@@ -173,6 +184,7 @@
                         <el-form-item label="重量(KG)">
                           <el-col :span="10">
                             <el-input
+                              :disabled="status"
                               class="numberInput"
                               v-model.trim="item.minWeight"
                             >
@@ -187,6 +199,7 @@
                           >
                           <el-col :span="10">
                             <el-input
+                              :disabled="status"
                               class="numberInput"
                               v-model.trim="item.maxWeight"
                             >
@@ -199,6 +212,7 @@
                       <el-form-item label="申报类别">
                         <el-card shadow="never" style="width: 95%">
                           <el-checkbox-group
+                            :disabled="status"
                             v-model="item.typeOfGoods"
                             @change="changeCargoType"
                           >
@@ -229,6 +243,7 @@
                       <el-form-item label="货物类型">
                         <el-card shadow="never" style="width: 95%">
                           <el-checkbox-group
+                            :disabled="status"
                             v-model="item.cargoType"
                             @change="changeCargoStatus"
                           >
@@ -260,6 +275,7 @@
                       <el-form-item label="取件扫描号">
                         <el-card shadow="never" style="width: 95%">
                           <el-checkbox-group
+                            :disabled="status"
                             v-model="item.puporpuxCode"
                             @change="changePuporpux"
                           >
@@ -290,6 +306,7 @@
                       <el-form-item label="Service Code">
                         <el-card shadow="never" style="width: 95%">
                           <el-checkbox-group
+                            :disabled="status"
                             v-model="item.serviceCode"
                             @change="changeServiceCode"
                           >
@@ -320,6 +337,7 @@
                       <el-form-item label="Handling Code">
                         <el-card shadow="never" style="width: 95%">
                           <el-checkbox-group
+                            :disabled="status"
                             v-model="item.handlingCode"
                             @change="changeHandlingCode"
                           >
@@ -350,6 +368,7 @@
                       <el-form-item label="Sub Category">
                         <el-card shadow="never" style="width: 95%">
                           <el-checkbox-group
+                            :disabled="status"
                             v-model="item.subCategory"
                             @change="changeSubCategory"
                           >
@@ -436,6 +455,11 @@ export default {
       type: Array,
       default: () => [],
     },
+    status: {
+      // 标识是详情还是编辑
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -444,12 +468,46 @@ export default {
   },
   computed: {},
   filters: {
-    statusBtn(status){
-
+    // 状态：0 无效，1 有效   2 配置中   3 停用
+    statusBtn(status) {
+      //  console.log(this)
+      if (status == "0") {
+        return "无 效";
+      } else if (status == "1") {
+        return "停 用";
+      } else if (status == "3") {
+        return "开 启";
+      } else {
+        return "保 存";
+      }
     },
   },
   mounted() {},
   methods: {
+    showBtnRule(item) {
+      /*
+       展示保存按钮、开启按钮/停用按钮、删除按钮逻辑如下：
+       1：当status状态等于3的时候展示：保存按钮、开启按钮/停用按钮、删除按钮；
+       2：当status状态等于1并且ruleDate字段有值的时候展示：保存按钮、开启按钮/停用按钮、删除按钮；
+       3：当从航班配置设置不查询日期的时候“查看&修改”的时候，
+       有效的航线也就是status状态等于1的时候也要展示：保存按钮、开启按钮/停用按钮、删除按钮；
+       4：那么问题来了当从航班配置设置不查询日期的时候状态为1的时候也要展示：保存按钮、开启按钮/停用按钮、删除按钮；
+       那么要么跳转的时候传过来一个参数；
+       5：如果是从【航班顺位】和【DM数据处理】跳转过来，那么航班航线设置维度只作为详情查看，禁用所有的操作。
+       所以展示不展示保存按钮、开启按钮/停用按钮、删除按钮毫无意义
+      */
+      if (item.status == "3" || (item.status == "1" && item.ruleDate)) {
+        return true;
+      } else if (item.status == "1" && item.remark) {
+        // 航班配舱设置非日期级别情况下
+        return true;
+      } else if (item.status == "2") {
+        // 航班配舱设置非日期级别情况下
+        return true;
+      } else {
+        return false;
+      }
+    },
     // 当前激活面板改变时触发
     collapseChange(name) {
       this.$emit("collapse", name);

@@ -22,8 +22,8 @@ export const formConfig = [
   {
     label: "航线",
     type: "Input",
-    name: "flightRoute",
-    prop: "flightRoute",
+    name: "flightRouteListStr",
+    prop: "flightRouteListStr",
     placeholder: "",
     span: 5,
     labelWidth: "40px",
@@ -43,6 +43,7 @@ export const formConfig = [
 // 航线规则表单
 export const routeRuleForm = {
   config: true,
+  remark: true,
   flightRoute: "", // 飞行航线
   location: null, // 包含始发站
   notLocation: null, // 不包含始发站

@@ -147,27 +147,15 @@ export default {
       this.$router.push({
         path: "/routeInfo",
         query: {
-          purposeOfFlightNo: purposeOfFlightNo,
           flightDate: ruleDate,
-          flightRoute: flightRoute,
+          purposeOfFlightNo: purposeOfFlightNo,
+          flightRouteListStr: flightRoute,
           status: status,
-          name: name,
+          pageName: "flightAllocConfig",
+          dataStatus: name,
+          querySpecifyData: this.queryParams.querySpecifyData
         },
       });
-      // let obj = {
-      //   id: ' ',
-      //   handle: handle,
-      //   fltNo: fltNo,
-      //   fltDate: fltDate != null ? fltDate : ' ',
-      //   route: ' ',
-      //   routeStatus: 'FlightAllocConfig',
-      //   status: status == '3' ? '3' : ' ',
-      //   createStatus: 1
-      // }
-      // this.$router.push({
-      //   name: "FlightAllocConfigInfo",
-      //   params: obj,
-      // });
     },
     //航班优先级修改
     toRouteOrder(val) {

+export default {
+  computed: {
+    // 获取路由参数
+    getRouter() {
+      if (this.$route.query.dataStatus == "view") {
+        return true;
+      } else if (this.$route.query.dataStatus == "edit") {
+        return false;
+      } else {
+        return false;
+      }
+    },
+  },
+  methods: {
+    // 获取所有数据字典
+    getAllDictData() {
+      allDictData()
+        .then((res) => {
+          if (res.code != 200) {
+            this.msgError(res.msg);
+            return;
+          }
+          // 给checkBox表单赋值做展示信息
+          const { data } = res;
+          this.cargoType = data.cargoType; // 申报类别
+          this.cargoStatus = data.cargoStatus; // 货物类型
+          this.puporpux = data.puporpux; // 取件扫描号
+          this.serviceCode = data.serviceCode; // Service Code
+          this.handlingCode = data.handlingCode; // Handling Code
+          this.subCategory = data.subCategory; // Sub Category
+        })
+        .catch(() => {});
+    },
+    // 判断对象是否存在某个属性，并且把这个属性值使用分号分隔
+    hasOwnProperty(item, key) {
+      if (item.hasOwnProperty(key)) {
+        if (item[key]) {
+          item[key] = item[key].split(";");
+        } else {
+          item[key] = [];
+        }
+      }
+    },
+    // 设置属性值
+    setattrVal(item) {
+      if (item.location) {
+        // 始发站
+        item.isLocation = "1";
+      }
+      if (item.notLocation) {
+        item.isLocation = "2";
+      }
+      if (item.location == null && item.notLocation == null) {
+        item.isLocation = "1";
+      }
+      if (item.destinationSite) {
+        // 目的站
+        item.isDestinationSite = "1";
+      }
+      if (item.notDestinationSite) {
+        item.isDestinationSite = "2";
+      }
+      if (item.destinationSite == null && item.notDestinationSite == null) {
+        item.isDestinationSite = "1";
+      }
+    },
+    // 失焦事件
+    blurEvent({ originOfFlightNo }) {
+      this.queryForm.originOfFlightNo = this.upCase(originOfFlightNo);
+    },
+    // 当前激活面板改变时触发
+    collapseChange(name) {
+      // console.log(name);
+    },
+    // 始发站
+    changeLocation(val) {
+      console.log("始发站：", val);
+    },
+    // 目的站
+    changeDestinationSite(val) {
+      console.log("目的站：", val);
+    },
+    // 申报类别
+    changeCargoType(arr) {
+      console.log("申报类别：", arr);
+    },
+    // 货物类型
+    changeCargoStatus(arr) {
+      console.log("货物类型：", arr);
+    },
+    // 取件扫描号
+    changePuporpux(arr) {
+      console.log("取件扫描号：", arr);
+    },
+    // Service Code
+    changeServiceCode(arr) {
+      console.log("Service Code：", arr);
+    },
+    // Handling Code
+    changeHandlingCode(arr) {
+      console.log("Handling Code：", arr);
+    },
+    // Sub Category
+    changeSubCategory(arr) {
+      console.log("Sub Category：", arr);
+    },
+  },
+};

@@ -67,7 +67,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit"
-              @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate, ' ', ' ')">查看配置维度
+              @click="handleClick(scope.row)">查看配置维度
             </el-button>
           </template>
         </el-table-column>
@@ -275,21 +275,17 @@ export default {
   },
   methods: {
     //跳转到查看，修改页面
-    handleClick(fltNo, handle, fltDate, route, status) {
+    handleClick({ actualFlight, flightDate, route }) {
       this.openFlightDate = false;
-      let obj = {
-        id: ' ',
-        handle: handle,
-        fltNo: fltNo,
-        fltDate: fltDate != null ? fltDate : ' ',
-        route: route,
-        routeStatus: 'FlightRandConfig',
-        status: status,
-        createStatus: 1,
-      }
       this.$router.push({
-        name: "FlightAllocConfigInfo",
-        params: obj,
+        path: "/routeInfo",
+        query: {
+          flightDate: flightDate,
+          purposeOfFlightNo: actualFlight,
+          flightRouteListStr: route,
+          status: "",
+          pageName: "flightRandConfig",
+        },
       });
     },
     /** 查询原航班顺位规则*/

@@ -893,20 +893,68 @@ export default {
         this.msgError("已删除不可操作");
         return
       }
-      let obj = {
-        id: ' ',
-        handle: 'updated',
-        fltNo: val.fltNo,
-        fltDate: val.fltDate ? val.fltDate : null,
-        route: val.route,
-        routeStatus: 'flightInformationMaintenance' + val.flightKindName,
-        status: ' ',
-        createStatus: 1,
+           /*
+       航班信息维护跳转过来，不管是White Tail还是Purple Tail：
+       Purple Tail
+       {
+          purposeOfFlightNo: "LK002",
+          flightDate: "2023-09-27",
+          flightRouteListStr: "PVG;PEK;PVG-PEK",
+          status: ""
        }
+       White Tail
+       {
+          purposeOfFlightNo: "LK002",
+          flightRouteListStr: "PVG;PEK;PVG-PEK",
+          status: ""
+       }
+       航班配舱设置：
+       非日期级别
+       {
+          flightDate: ""
+          flightRoute: ""
+          purposeOfFlightNo: "A381"
+          status: ""
+       }
+       有日期级别
+       {
+          flightDate: ""
+          flightRoute: ""
+          purposeOfFlightNo: "A381"
+          status: ""
+       }
+       {
+          flightDate: "2023-09-21"
+          flightRoute: ""
+          flightRouteListStr: "",
+          purposeOfFlightNo: "A381"
+          status: ""
+       }
+       航班顺位
+       {
+          flightDate: "2023-07-01"
+          flightRoute: ""
+          purposeOfFlightNo: "LP003"
+          status: ""
+       }
+       {
+          flightRoute: ""
+          flightRouteListStr: "",
+          purposeOfFlightNo: "LP003"
+          status: ""
+       }
+     */
        this.$router.push({
-        name: 'FlightAllocConfigInfo',
-        params: obj
-      })
+        path: "/routeInfo",
+        query: {
+          flightDate: val.fltDate,
+          purposeOfFlightNo: val.fltNo,
+          flightRouteListStr: val.route,
+          status: val.status,
+          flightKindName: val.flightKindName,
+          pageName: "flightInformationMaintenance",
+        },
+      });
     },
     // 航班状态
     flightState(multipleSelection, statusName) {