Merge remote-tracking branch 'origin/uat'

@@ -80,10 +80,11 @@
 	color:#6379bb;
 	border-bottom:1px solid #ddd;
 	margin:8px 10px 25px 10px;
+	padding-top:15px;
 	padding-bottom:5px;
 	.formItem {
 		width: 100%;
-		max-width: 310px;
+		// max-width: 310px;
 	}
 }
 

@@ -42,5 +42,5 @@ module.exports = {
     /**
    * 版本号
    */
-     version:'version：1.0.0'
+     version:'version：1.0.5'
 }

 <template>
-  <div style="margin: 40px" class="app-container">
+  <div>
     <el-form
       :inline="true"
       :model="queryParams"
-      class="demo-form-inline"
-      size="small"
+      class="form-header"
+      size="medium"
+      label-position="right"
+      label-width="auto"
     >
       <el-form-item label="航班号">
         <el-input
           v-model.trim="purposeOfFlightNo"
           placeholder="航班号"
           @keyup.enter.native="getList"
+          clearable
         ></el-input>
       </el-form-item>
       <el-form-item label="状态">
-        <el-select v-model="queryParams.status" placeholder="状态">
+        <el-select v-model="queryParams.status" placeholder="状态" clearable>
           <el-option label="有效" value="1"></el-option>
           <el-option label="停用" value="3"></el-option>
         </el-select>
@@ -28,21 +31,31 @@
           >查询</el-button
         >
       </el-form-item>
+      <div>
+        <el-button
+          style="margin-bottom: 20px"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="
+            $router.push({
+              name: 'FlightAllocConfigAdd',
+              params: { handle: 'add' },
+            })
+          "
+          >添加</el-button
+        >
+      </div>
     </el-form>
-    <el-button
-      style="margin-bottom: 20px"
-      type="primary"
-      icon="el-icon-plus"
-      size="mini"
-      @click="
-        $router.push({
-          name: 'FlightAllocConfigAdd',
-          params: { handle: 'add' },
-        })
-      "
-      >添加</el-button
+    
+    <el-table 
+      :data="flyList"
+      v-loading="loading"
+      size="small"
+      highlight-current-row
+      border
+      stripe
     >
-    <el-table :data="flyList" v-loading="loading" size="small">
       <el-table-column
         prop="purposeOfFlightNo"
         label="航班号"

 <template>
-  <div class="app-container">
+  <div>
     <el-form :model="queryParams" ref="queryForm" :inline="true">
       <el-form-item label="ACCS原航班">
         <el-input
@@ -43,6 +43,7 @@
           v-model="queryParams.flightDate"
           type="date"
           placeholder="选择日期"
+          clearable
         >
         </el-date-picker>
       </el-form-item>
@@ -77,7 +78,15 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="sourceFlightRulesList">
+    <el-table 
+      v-loading="loading"
+      height="550"
+      size="small"
+      :data="sourceFlightRulesList"
+      highlight-current-row
+      border
+      stripe
+    >
       <el-table-column type="index" label="序号" align="center">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>