Merge branch 'et86-black' into test

Elements-SY
Commit 54f3ec2d9d0e6caa17c14a6736931405c4d81dde 54f3ec2d 2 parents 457b8ec8 4d6f9fbe
Showing 4 changed files with 45 additions and 38 deletions
src/views/allocationConfig/cargoAllocation/index.vue
src/views/allocationConfig/flightAllocConfig/index.vue
src/views/allocationConfig/flightAllocConfig/info.vue
src/views/basicInformation/flightInformationMaintenance/index.vue
--- a/src/views/allocationConfig/cargoAllocation/index.vue
View file @54f3ec2
+++ b/src/views/allocationConfig/cargoAllocation/index.vue
View file @54f3ec2
@@ -136,7 +136,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="运单号">
-            <el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号(回车分割)" :maxlength="12000"
+            <el-input class="formItem" type="textarea" :rows="1" placeholder="请输入运单号(回车分割)" :maxlength="12000"
               v-model="formData.waybillNo" clearable></el-input>
           </el-form-item>
         </el-col>
--- a/src/views/allocationConfig/flightAllocConfig/index.vue
View file @54f3ec2
+++ b/src/views/allocationConfig/flightAllocConfig/index.vue
View file @54f3ec2
@@ -34,8 +34,8 @@
               params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' },
             })
             ">添加</el-button>
-          <el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1" inactive-value="2" active-color="#13ce66"
+        <el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1"
-            inactive-color="#909399" @change="switchChange"></el-switch>
+          inactive-value="2" active-color="#13ce66" inactive-color="#909399" @change="switchChange"></el-switch>
       </div>
     </el-form>
     <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true"
@@ -152,7 +152,7 @@ export default {
         fltDate: fltDate != null ? fltDate : ' ',
         route: ' ',
         routeStatus: 'FlightAllocConfig',
-        status: status,
+        status: status == '3' ? '3' : ' ',
         createStatus: 1
       }
       this.$router.push({
--- a/src/views/allocationConfig/flightAllocConfig/info.vue
View file @54f3ec2
+++ b/src/views/allocationConfig/flightAllocConfig/info.vue
View file @54f3ec2
--- a/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @54f3ec2
+++ b/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @54f3ec2
@@ -47,8 +47,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-button class="mt10" type="primary" icon="el-icon-search" size="mini" :loading="loading"
+      <el-button class="mt10" type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="handleQuery">搜索
-        @click="handleQuery">搜索
       </el-button>
       <el-button class="mt10" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       <el-button class="mt10" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
@@ -81,8 +80,8 @@
     <Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
       :order="true" :selection="true" :totalCount="total" :loading="loading" :limitSize="queryParams.limitSize"
       :page="queryParams.pageNum" :shiftKey="shiftKey" :height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]"
-      @tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange"
+      @tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange"
-      @sortChange="sortChange" @sizeChange="sizeChange">
+      @sizeChange="sizeChange">
       <template slot="optionColumn">
         <el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center"
           class-name="small-padding fixed-width" :fixed="tableHeader.length > 10 ? 'right' : false" width="160">
@@ -116,8 +115,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="航班日期" prop="fltDate">
-              <el-date-picker class="wid80" :disabled="formdisabled.fltDate" clearable size="small"
+              <el-date-picker class="wid80" :disabled="formdisabled.fltDate" clearable size="small" v-model="form.fltDate"
-                v-model="form.fltDate" type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
+                type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -143,15 +142,15 @@
                   </el-tooltip>
                 </div>
               </template>
-              <el-select v-if="routeMultiple" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route"
+              <el-select v-if="routeMultiple" ref="routeSelect" class="wid80" v-model="form.route"
-                placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading"
+                :disabled="formdisabled.route" placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange"
-                :multiple='true' :key="routeMultiple">
+                :loading="routeLoading" :multiple='true' :key="routeMultiple">
                 <el-option v-for="item in   routeList" :key="item.id" :label="item.route" :value="item.route">
                 </el-option>
               </el-select>
-              <el-select v-if="routeMultiple == false" ref="routeSelect" class="wid80" v-model="form.route" :disabled="formdisabled.route"
+              <el-select v-if="routeMultiple == false" ref="routeSelect" class="wid80" v-model="form.route"
-                placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange" :loading="routeLoading"
+                :disabled="formdisabled.route" placeholder="请选择航线" no-data-text="未查询到航线" @change="routeChange"
-                :multiple='false' :key="routeMultiple">
+                :loading="routeLoading" :multiple='false' :key="routeMultiple">
                 <el-option v-for="item in   routeList" :key="item.id" :label="item.route" :value="item.route">
                 </el-option>
               </el-select>
@@ -188,8 +187,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="额外增重百分比" prop="extraWeightPercent">
-              <el-input-number class="wid80" @change="LowHighAvailable" :precision="0" placeholder="请输入额外增重百分比"
+              <el-input-number class="wid80" @change="LowHighAvailable" :min="0" :precision="0" placeholder="请输入额外增重百分比"
-                v-model="form.extraWeightPercent"></el-input-number>
+                v-model="form.extraWeightPercent" v-input-filter></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -359,7 +358,7 @@ export default {
         route: [
           {
             required: true,
-            message: "航班路线不能为空呀",
+            message: "航班路线不能为空",
             trigger: "change",
           },
           // {
@@ -617,7 +616,7 @@ export default {
           this.routeLoading = false
           if (res.code === 200) {
             this.routeList = res.data.list
-            if(res.data.list.length == 0){
+            if (res.data.list.length == 0) {
               this.form.route = "";
               this.msgError("该航班没有设置航线");
             }
@@ -628,7 +627,7 @@ export default {
           this.routeLoading = false
           console.log(err)
         })
-      }else{
+      } else {
         this.form.route = "";
         this.routeList = [];
       }
@@ -639,15 +638,12 @@ export default {
         if (item.id == val) {
           if (item.chineseName.indexOf('White') >= 0) {
             this.routeMultiple = false
-            // this.rules.route[0].type = 'string'
             this.form.route = ''
-            // this.rules.route[0].required = true;
           } else if (item.chineseName.indexOf('Purple') >= 0) {
             this.routeMultiple = true
-            // this.rules.route[0].type = 'array'
             this.form.route = []
-            // this.rules.route[0].required = true;
           }
+        this.validateFieldForm()
         }
       })
       // this.$refs.routeSelect.$forceUpdate()
@@ -730,7 +726,7 @@ export default {
       this.formdisabled.typeId = false;
       //原始重量
       this.formdisabled.originalWeight = false;
-          this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.form.clearValidate()
       })
     },
@@ -899,11 +895,11 @@ export default {
       })
     },
     // 航班状态
-    flightState(multipleSelection, statusName){
+    flightState(multipleSelection, statusName) {
-        let flightState = multipleSelection.some(item=>item.statusName == statusName);
+      let flightState = multipleSelection.some(item => item.statusName == statusName);
-        if(flightState){
+      if (flightState) {
         this.msgError(`勾选的航班，航班状态为${statusName}，不可操作该按钮`);
-        }else{
+      } else {
         flightState = false
       }
       return flightState
@@ -915,7 +911,7 @@ export default {
         fIds.push(item.id)
       });
       // 航班状态
-      if(this.flightState(this.ids, "已删除")) return
+      if (this.flightState(this.ids, "已删除")) return
       this.$confirm("是否确认删除所选数据?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -946,6 +942,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
+      this.validateFieldForm()
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let formdata = JSON.parse(JSON.stringify(this.form));
@@ -1023,7 +1020,7 @@ export default {
     //批量开启/关闭航班
     handleFlightStatus(status) {
       // 航班状态
-      if(this.flightState(this.ids, "已删除")) return
+      if (this.flightState(this.ids, "已删除")) return
       let handle = status == "flightStatus80" ? "关闭" : "开启";
       let data = {
         updateIds: [],
@@ -1054,7 +1051,7 @@ export default {
     //自动推送开关
     autoPushBatch(status) {
       // 航班状态
-      if(this.flightState(this.ids, "已删除")) return
+      if (this.flightState(this.ids, "已删除")) return
       let msg = status == "open" ? "开启" : "关闭";
       let data = {
         updateIds: [],
@@ -1093,7 +1090,7 @@ export default {
     //白名单配舱开关
     whiteListSwitchStatus(val) {
       // 航班状态
-      if(this.flightState(this.ids, "已删除")) return
+      if (this.flightState(this.ids, "已删除")) return
       let obj = {
         updateIds: []
       }
@@ -1115,7 +1112,7 @@ export default {
     //黑名单配舱开关
     BlackListSwitchStatus(val) {
       // 航班状态
-      if(this.flightState(this.ids, "已删除")) return
+      if (this.flightState(this.ids, "已删除")) return
       let obj = {
         updateIds: []
       }
@@ -1134,12 +1131,22 @@ export default {
         console.log(err)
       })
     },
+    // 对部分表单字段进行校验的方法
+    validateFieldForm(){
+      this.$refs.form.validateField(['route'], (flag) => {})
+      if(this.form.route.length){
+         this.$nextTick(()=>{
+            this.$refs.form.clearValidate()
+         })
+      }
+    },
     //航线修改
     routeChange(val) {
+       this.validateFieldForm()
       if(val.length){
-        this.rules.route[0].required = false;
+        this.$nextTick(()=>{
-      }else{
+          this.$refs.form.clearValidate()
-        // this.rules.route[0].required = true;
+        })
       }
       this.$forceUpdate()
     },