Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

aeb4bc03 · 华国豪 · c3fecb66 · c0aae9b2 · aeb4bc03
Commit aeb4bc03 authored Mar 15, 2019 by 华国豪 🙄
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

PassengerList.vue src/components/Ticketing/PassengerList.vue +4 -3

No files found.
--- a/src/components/Ticketing/PassengerList.vue
+++ b/src/components/Ticketing/PassengerList.vue
@@ -66,10 +66,10 @@
  border-top:1px dashed #d1d1d1;
  padding-top:10px;
 }
-.PassengerList .el-input__inner{
+/* .PassengerList .el-input__inner{
  height:23px!important;
  padding:0 5px;
-}
+} */
 </style>

 <template>
@@ -93,7 +93,8 @@
          </table>
        </li>
        <li>
-          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo()" />
+          <input type="button" class="normalBtn" style="display:none;" value="导出报表" @click="getFlightInfo()" />
+          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
        </li>
      </ul>
    </div>