代码更新

@@ -9,7 +9,7 @@
     }"
     }"
   >
   >
     <logo v-if="showLogo" :collapse="isCollapse" />
     <logo v-if="showLogo" :collapse="isCollapse" />
-    <!-- <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper"> -->
+    <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
     <el-menu
     <el-menu
       :default-active="activeMenu"
       :default-active="activeMenu"
       :collapse="isCollapse"
       :collapse="isCollapse"
@@ -36,7 +36,7 @@
       />
       />
     </el-menu>
     </el-menu>
     <div class="version">{{ version }}</div>
     <div class="version">{{ version }}</div>
-    <!-- </el-scrollbar> -->
+    </el-scrollbar>
   </div>
   </div>
 </template>
 </template>
 
 

@@ -62,7 +62,7 @@ export const constantRoutes = [
         path: 'index',
         path: 'index',
         component: (resolve) => require(['@/views/index'], resolve),
         component: (resolve) => require(['@/views/index'], resolve),
         name: '首页',
         name: '首页',
-        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+        meta: { title: '首页', icon: 'home', noCache: true, affix: true }
       }
       }
     ]
     ]
   },
   },

@@ -454,6 +454,15 @@ export default {
         },
         },
         {
         {
           type: "",
           type: "",
+          name: "服务代码",
+          value: "serviceCode",
+          width: "150",
+          align: "center",
+          sorTable: false,
+          fixed:false,
+        },
+        {
+          type: "",
           name: "URSA",
           name: "URSA",
           value: "ursa",
           value: "ursa",
           width: "150",
           width: "150",
@@ -823,26 +832,47 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
-    //查询条件
-    new Promise((resolve, reject) => {
-      let obj = {};
-      findFltConditionDataApi()
-        .then((res) => {
-          if (res.code === 200) {
-            obj.flightType = res.data.flightType;
-          } else {
-            reject(res.msg);
+    this.seleData()
+    this.select()
+  },
+  mounted() {
+    window.addEventListener("keydown", (code) => {
+      if (code.keyCode === 16 && code.shiftKey) {
+        this.shiftKey = true;
       }
       }
-        })
-        .catch(() => {});
+    });
+    window.addEventListener("keyup", (code) => {
+      if (code.keyCode === 16) {
+        this.shiftKey = false;
+      }
+    });
+  },
+  methods: {
+    //查询条件
+    async seleData() {
+      // findFltConditionDataApi()
+      //   .then((res) => {
+      //     if (res.code === 200) {
+      //       this.selectData.fltTypes = res.data.flightType;
+      //     }else{
+      //       this.$message({
+      //         message: "查询条件不存在",
+      //         type: "warning",
+      //       });
+      //     }
+      //   })
+      //   .catch(() => {});
 
 
       allDictData()
       allDictData()
         .then((res) => {
         .then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
-            obj.HandlingCode = res.data.handlingCode;
-            obj.SubCategory = res.data.subCategory;
-          } else {
-            reject(res.msg);
+            this.selectData.HandlingCode = res.data.handlingCode;
+            this.selectData.SubCategory = res.data.subCategory;
+          }else{
+            this.$message({
+              message: "查询条件不存在",
+              type: "warning",
+            });
           }
           }
         })
         })
         .catch(() => {});
         .catch(() => {});
@@ -850,36 +880,16 @@ export default {
       findConditionData()
       findConditionData()
         .then((res) => {
         .then((res) => {
           if (res.code == 200) {
           if (res.code == 200) {
-            obj.findConditionData = res.data;
-          } else {
-            reject(res.msg);
-          }
-          resolve(obj)
-        })
-        .catch(() => {});
-      this.select();
-    }).then(res=>{
-      this.selectData = res
-    }).catch((err) => {
+            this.selectData.findConditionData = res.data;
+          }else{
             this.$message({
             this.$message({
               message: "查询条件不存在",
               message: "查询条件不存在",
               type: "warning",
               type: "warning",
             });
             });
-    });
-  },
-  mounted() {
-    window.addEventListener("keydown", (code) => {
-      if (code.keyCode === 16 && code.shiftKey) {
-        this.shiftKey = true;
-      }
-    });
-    window.addEventListener("keyup", (code) => {
-      if (code.keyCode === 16) {
-        this.shiftKey = false;
           }
           }
-    });
+        })
+        .catch(() => {});
     },
     },
-  methods: {
     //查询
     //查询
     select() {
     select() {
       this.loading = true;
       this.loading = true;

@@ -36,8 +36,7 @@
     </el-table>
     </el-table>
   </div>
   </div>
 </template>
 </template>
-</div>
-</template>
+
 <script>
 <script>
   import {
   import {
     downLoadTemplate,
     downLoadTemplate,

@@ -395,6 +395,15 @@ export default {
         },
         },
         {
         {
           type: "",
           type: "",
+          name: "服务代码",
+          value: "serviceCode",
+          width: "150",
+          align: "center",
+          sorTable: false,
+          fixed:false,
+        },
+        {
+          type: "",
           name: "URSA",
           name: "URSA",
           value: "ursa",
           value: "ursa",
           width: "150",
           width: "150",