Эх сурвалжийг харах

Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

zhongxiaoyu 2 жил өмнө
parent
commit
b0477817c8

+ 22 - 0
src/views/baggageManagement/components/departure/index.vue

@@ -31,6 +31,7 @@
           /> -->
           <el-select
             v-model="formData.currentAirport"
+            size="small"
             @change="airPortChange"
             placeholder="请选择机场"
           >
@@ -114,6 +115,16 @@
               src="../../../../assets/departure/ic_setting.png"
               @click="show"
             >
+
+          </el-form-item>
+          <el-form-item>
+          <el-button
+            class="btn-square setBtn"
+            type="primary"
+            icon="el-icon-s-tools"
+            size="mini"
+            @click="show"
+          />
           </el-form-item>
         </div>
 
@@ -427,6 +438,7 @@ export default {
 <style lang="scss" scoped>
 .departure-form {
   padding-top: 11px;
+  padding-left: 5px;
   ::v-deep .form {
     .el-form-item {
       margin-bottom: 0px;
@@ -445,6 +457,16 @@ export default {
       .el-form-item__error {
         z-index: 10;
       }
+      .el-button {
+          &.btn-square {
+            width: 30px;
+            height: 30px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-top: 5px;
+          }
+        }
     }
     .checkTime {
       margin: 0 16px;

+ 1 - 1
src/views/baggageManagement/mixins/terminal.js

@@ -93,7 +93,7 @@ export default {
       if (columns.length > 0) {
         columns.forEach((column, index) => {
           if (index === 0) {
-            sums[index] = '合计'
+            sums[index] = '航班数:'+this.tableData.length
           } else if (
             // 需要计算的列
             [