文本框修正，bug修复

jinhui.wang
Commit 4cfe11f41e26e022dba470a4f67bbb93b5cad3e3 4cfe11f4 1 parent d2f19073
Showing 4 changed files with 51 additions and 122 deletions
src/layout/components/Sidebar/index.vue
src/views/allocationConfig/cargoAllocation/index.vue
src/views/allocationConfig/flightAllocConfig/index.vue
src/views/basicInformation/queryCargo/index.vue
--- a/src/layout/components/Sidebar/index.vue
View file @4cfe11f
+++ b/src/layout/components/Sidebar/index.vue
View file @4cfe11f
@@ -9,7 +9,7 @@
     }"
   >
     <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
       :default-active="activeMenu"
       :collapse="isCollapse"
@@ -36,7 +36,7 @@
       />
     </el-menu>
     <div class="version">{{ version }}</div>
-     <!-- </el-scrollbar> -->
+     </el-scrollbar>
   </div>
 </template>
 
--- a/src/views/allocationConfig/cargoAllocation/index.vue
View file @4cfe11f
+++ b/src/views/allocationConfig/cargoAllocation/index.vue
View file @4cfe11f
@@ -77,8 +77,8 @@
               class="formItem"
               type="textarea"
               placeholder="请输入运单号（回车分割）"
-               v-model.trim="formData.waybillNo"
-               rows="1"
+               :autosize="true"
+               v-model="formData.waybillNo"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -125,7 +125,7 @@
               type="textarea"
               placeholder="S_;P_;E2"
               v-model="ursa"
-               rows="1"
+               :autosize="true"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -136,7 +136,7 @@
               type="textarea"
               placeholder="PVG;PEK"
               v-model="siteName"
-               rows="1"
+               :autosize="true"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -373,7 +373,6 @@ export default {
           width: "50",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: true,
         },
         {
@@ -383,7 +382,6 @@ export default {
           width: "50",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -393,7 +391,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -403,7 +400,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -413,7 +409,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -423,7 +418,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -433,7 +427,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -443,7 +436,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -453,7 +445,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -472,7 +463,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -482,7 +472,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -492,7 +481,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -502,7 +490,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -512,7 +499,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -522,7 +508,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -532,7 +517,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -542,7 +526,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -552,7 +535,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -562,7 +544,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -572,7 +553,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -582,7 +562,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -592,7 +571,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -602,7 +580,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -612,7 +589,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -622,7 +598,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -632,7 +607,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -642,7 +616,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -652,7 +625,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -662,7 +634,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -672,7 +643,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -682,7 +652,6 @@ export default {
           width: "170",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -692,7 +661,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -702,7 +670,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -712,7 +679,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -722,7 +688,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -732,7 +697,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -742,7 +706,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -752,7 +715,6 @@ export default {
           width: "300",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -762,7 +724,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed: false,
         },
         {
@@ -772,7 +733,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -782,7 +742,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -792,7 +751,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
         {
@@ -802,7 +760,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed: false,
         },
       ], //表头数据
@@ -836,7 +793,7 @@ export default {
     };
   },
   created() {
-     this.seleData();
+     this.seleData()
     this.select();
   },
   mounted() {
@@ -983,6 +940,9 @@ export default {
       }
       this.formData.page = this.page;
       this.formData.size = this.size;
+       if(this.formData.waybillNo){
+         this.formData.waybillNo = this.formData.waybillNo.trim();
+       }
     },
     //导出表格
     xlsx(val) {
--- a/src/views/allocationConfig/flightAllocConfig/index.vue
View file @4cfe11f
+++ b/src/views/allocationConfig/flightAllocConfig/index.vue
View file @4cfe11f
@@ -34,7 +34,12 @@
       type="primary"
       icon="el-icon-plus"
       size="mini"
-       @click="$router.push({ name: 'FlightAllocConfigInfo', params: { handle: 'add' } })"
+       @click="
+         $router.push({
+           name: 'FlightAllocConfigInfo',
+           params: { handle: 'add' },
+         })
+       "
       >添加</el-button
     >
     <el-table :data="flyList" v-loading="loading" size="small">
@@ -127,12 +132,12 @@ import {
 import { parseTime } from "@/utils/FedEx";
 
 export default {
-   name:"FlightAllocConfig",
+   name: "FlightAllocConfig",
   data() {
     return {
       queryParams: {
         purposeOfFlightNo: "",
-         status:"1",
+         status: "1",
         start: 0,
         limit: 10,
       },
@@ -187,15 +192,16 @@ export default {
           cancelButtonText: "取消",
           showCancelButton: true,
           type: "warning",
-         })
-           .then(function () {
-             return delFlightId(id);
-           })
-           .then(() => {
-             this.getList();
-             this.msgSuccess("删除成功");
-           })
-           .catch(function () {});
+         }).then(() => {
+           delFlightId(id)
+             .then((res) => {
+               this.$message({
+                 message: res.msg,
+                 type: res.code === 200 ? "success" : "warning",
+               });
+             })
+             .catch(() => {});
+         });
       }
     },
     //启用，停用
@@ -205,30 +211,33 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-       })
-         .then(function () {
-           return enableOrDisable(id, status);
-         })
-         .then(() => {
-           this.getList();
-           this.msgSuccess(tip + "成功");
-         })
-         .catch(function () {});
+       }).then(() => {
+         enableOrDisable(id, status)
+           .then((res) => {
+             if (res.code != 200) {
+               this.msgError(res.msg);
+             } else {
+               this.getList();
+               this.msgSuccess(tip + "成功");
+             }
+           })
+           .catch(() => {});
+       });
     },
   },
   created() {
     this.getList();
   },
-   computed:{
+   computed: {
     purposeOfFlightNo: {
       get: function () {
         return this.queryParams.purposeOfFlightNo;
       },
       set: function (val) {
-         this.queryParams.purposeOfFlightNo = val.toUpperCase()
+         this.queryParams.purposeOfFlightNo = val.toUpperCase();
       },
     },
-   }
+   },
 };
 </script>
 
--- a/src/views/basicInformation/queryCargo/index.vue
View file @4cfe11f
+++ b/src/views/basicInformation/queryCargo/index.vue
View file @4cfe11f
@@ -25,7 +25,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="配载航班号">
-             <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" rows="1"></el-input>
+             <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -51,10 +51,10 @@
           <el-form-item label="运单号">
             <el-input
               type="textarea"
-               v-model.trim="formData.waybillNo"
+               v-model="formData.waybillNo"
               class="formItem"
               placeholder="请输入运单号（回车间隔）"
-               rows="1"
+               :autosize="true"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -102,7 +102,7 @@
               v-model="ursa"
               class="formItem"
               placeholder="S_;P_;E2"
-               rows="1"
+               :autosize="true"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -113,7 +113,7 @@
               v-model="siteName"
               class="formItem"
               placeholder="PVG;PEK"
-               rows="1"
+               :autosize="true"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -294,7 +294,6 @@ export default {
           width: "50",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:true,
         },
         {
@@ -304,7 +303,6 @@ export default {
           width: "50",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -314,7 +312,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -324,7 +321,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -334,7 +330,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -344,7 +339,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -354,7 +348,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -364,7 +357,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -374,7 +366,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -393,7 +384,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -403,7 +393,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -413,7 +402,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -423,7 +411,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -433,7 +420,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -443,7 +429,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -453,7 +438,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -463,7 +447,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -473,7 +456,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -483,7 +465,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -493,7 +474,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -503,7 +483,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -513,7 +492,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -523,7 +501,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -533,7 +510,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -543,7 +519,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -553,7 +528,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -563,7 +537,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -573,7 +546,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -583,7 +555,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -593,7 +564,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -603,7 +573,6 @@ export default {
           width: "170",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -613,7 +582,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -623,7 +591,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -633,7 +600,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -643,7 +609,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -653,7 +618,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -663,7 +627,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -673,7 +636,6 @@ export default {
           width: "300",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -683,7 +645,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: false,
-           slot: null,
           fixed:false,
         },
         {
@@ -693,7 +654,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -703,7 +663,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -713,7 +672,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
         {
@@ -723,7 +681,6 @@ export default {
           width: "150",
           align: "center",
           sorTable: true,
-           slot: null,
           fixed:false,
         },
       ], //表头数据
@@ -849,6 +806,9 @@ export default {
         this.formData.cargoPlaneStart = null;
         this.formData.cargoPlaneEnd = null;
       }
+       if(this.formData.waybillNo){
+         this.formData.waybillNo = this.formData.waybillNo.trim();
+       }
     },
     //总和
     cargoTotal(){