lwj

1730532197@qq.com
Commit 82e199ac22e68f885c9af0980caf19a7e7eeb352 82e199ac 1 parent 59b5907c
Showing 2 changed files with 71 additions and 7 deletions
src/api/sourceFlightRules.js
src/views/system/role/index.vue
--- a/src/api/sourceFlightRules.js
View file @82e199a
+++ b/src/api/sourceFlightRules.js
View file @82e199a
@@ -8,3 +8,13 @@ export function findSourceFlightRulesApi(data) {
     data: data
   })
 }
+// 目标航班查询
+export function findSourceFlightAndFlightDateApi(data) {
+  return request({
+    url: '/sourceFlight/findSourceFlightAndFlightDate',
+    method: 'post',
+    data: data
+  })
+}
+
+
--- a/src/views/system/role/index.vue
View file @82e199a
+++ b/src/views/system/role/index.vue
View file @82e199a
@@ -22,7 +22,7 @@
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询实际目的航班</el-button>&#12288;
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际目的航班</el-button>&#12288;
         <span style="color: red;">注：原航班+日期查询该日期的航班实际情况</span>
       </el-form-item>
       <br />
@@ -35,18 +35,18 @@
     </el-form>
-    <el-table v-loading="loading" :data="sourceFlightRulesList">
+    <el-table v-loading="loading" :data="sourceFlightRulesList" >
       <el-table-column label="原航班" align="center" prop="sourceFlightNo"/>
       <el-table-column label="目的航班排序" align="center" prop="flightRank" width="280"/>
-     <el-table-column label="优先级" align="center" prop="priority"  />
+     <!-- <el-table-column label="优先级" align="center" prop="priority"  /> -->
       <el-table-column label="周期" align="center" prop="dayOfWeek"  width="180"/>
       <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column label="开始时间" align="center" prop="startDate"  width="100"/>
       <el-table-column label="结束时间" align="center" prop="endDate" width="100"/>
       <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100"/>
       <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"width="200">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"width="280" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" >修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" >删除</el-button>
@@ -55,14 +55,33 @@
         </template>
       </el-table-column>
     </el-table>
+
     <pagination v-show="total>0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
       :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
+
+    <!-- 查看目的航班对话框 -->
+    <el-dialog title="实际目的航班" :visible.sync="openFlightDate" width="70%">
+    	<el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
+
+    	  <el-table-column label="原航班" align="center" prop="sourceFlightNo"/>
+    	  <el-table-column label="实际目的航班" align="center" prop="actualFlight" width="280"/>
+    	 <el-table-column label="航班日期" align="center" prop="flightDate"  />
+    	  <el-table-column label="操作" align="center" class-name="small-padding fixed-width"width="200">
+    	    <template slot-scope="scope">
+    	      <el-button size="mini" type="text" icon="el-icon-edit" >查看配置维度</el-button>
+    	    </template>
+    	  </el-table-column>
+    	</el-table>
+    	<div slot="footer" class="dialog-footer">
+    		<el-button @click="cancelFlightDate">返  回</el-button>
+    	</div>
+    </el-dialog>
   </div>
 </template>
 <script>
   import {
-  	findSourceFlightRulesApi
+  	findSourceFlightRulesApi,findSourceFlightAndFlightDateApi
   } from "@/api/sourceFlightRules";
   export default {
     name: "SourceFlightRules",
@@ -70,13 +89,19 @@
       return {
         // 遮罩层
         loading: false,
+        // 遮罩层
+        loadingFlightDate: false,
         // 总条数
         total: 0,
         // 原航班规则数据
         sourceFlightRulesList: [],
+        //目的航班数据
+        sourceFlightAndFlightDate:[],
         statusList: [{'id':1,'name':'有效'}, {'id':2,'name':'配置中'},{'id':3,'name':'停用'}],
-        // 是否显示弹出层
+        // 新增修改查看规则弹出层
         open: false,
+        // 是否显示查看目的航班弹出层
+        openFlightDate: false,
         // 查询参数
         queryParams: {
           start: 0, //当前条数【代表第几条数据 +1开始】
@@ -105,13 +130,38 @@
           this.queryParams.start=0;
         }
        findSourceFlightRulesApi(this.queryParams).then(response => {
-
         this.sourceFlightRulesList = response.data.list;
         this.total = response.data.totalCount;
         this.loading = false;
       });
       },
+       /** 查询目的航班*/
+      findSourceFlightAndFlightDate(){
+        //校验原航班号非空
+        if(this.queryParams.sourceFlightNo===null||this.queryParams.sourceFlightNo===undefined||this.queryParams.sourceFlightNo.trim()===''){
+          this.$message.warning("原航班号为空");
+         return
+        }
+        //校验原日期非空
+        if(this.queryParams.flightDate===null||this.queryParams.flightDate===undefined){
+          this.$message.warning("日期为空");
+          return
+        }
+        this.openFlightDate = true;
+        this.loadingFlightDate=true;
+        this.sourceFlightAndFlightDate=[];
+        findSourceFlightAndFlightDateApi(this.queryParams).then(response => {
+          this.sourceFlightAndFlightDate = response.data;
+          this.loadingFlightDate=false;
+        });
+
+
+      },
+      // 目的航班弹出框返回
+      cancelFlightDate() {
+        this.openFlightDate = false;
+      },
       // 状态字典翻译
       statusFormat(row) {
         if(row.status==='1'){
@@ -138,3 +188,7 @@
     }
   };
 </script>
+<style>
+
+
+</style>