按钮图标增加，顺位查看维度跳转逻辑修改，bug修复

@@ -11,7 +11,8 @@ export function findSourceFlightRulesApi(data) {
 // 目标航班查询
 export function findSourceFlightAndFlightDateApi(data) {
   return request({
-    url: '/sourceFlight/findSourceFlightAndFlightDate',
+    // url: '/sourceFlight/findSourceFlightAndFlightDate',
+    url: '/sourceFlight/findActualAllocateFlightList',
     method: 'post',
     data: data
   })
@@ -19,7 +20,7 @@ export function findSourceFlightAndFlightDateApi(data) {
 
 // 原航班顺位规则保存
 export function sourceFlightRulesSaveApi(data) {
-   data.dayOfWeek = data.dayOfWeek.join(';');
+  data.dayOfWeek = data.dayOfWeek.join(';');
   return request({
     url: '/sourceFlight/sourceFlightRulesSave',
     method: 'post',

@@ -19,7 +19,8 @@ let ductLabels = {
             "7": "预审导出",
             "8": "预审导入",
             "9": "航班不推送修改为待推送",
-            "10": "回推ACCS"
+            "10": "回推ACCS",
+            "11": "航班迁转"
         }
     },
     "menu": {//菜单设置
@@ -62,6 +63,11 @@ let ductLabels = {
             "1": "是",
             "2": "否",
         },
+        // "whiteListSwitch": {
+        //     "1": "开启",
+        //     "0": "关闭",
+        //     null: '关闭'
+        // }
     },
     "flightRand": {//航班顺位设置
         "status": {
@@ -123,7 +129,8 @@ let ductLabels = {
             "1": "pre-MD cutoff",
             "2": "航班迁转手动释放",
             "3": "预审不通过定时任务",
-            "4": "自动配舱"
+            "4": "自动配舱",
+            "5": "航班迁转"
         },
         "weightMark": {
             "1": "增加",
@@ -135,6 +142,27 @@ let ductLabels = {
             "0": "关闭",
             "1": "开启"
         }
+    },
+    "preMdeSelect": {
+        "manualRde": {
+
+        },
+    },
+    'goodsLogStation': {
+        "status": {
+            "0": "未处理",
+            "1": "处理中",
+            "2": "处理成功",
+            "3": "处理失败"
+        }
+    },
+    "archiveDataTables": {
+        "status": {
+            "0": "未处理",
+            "1": "处理成功",
+            "2": "处理失败",
+            "3": "处理中"
+        }
     }
 }
 

@@ -176,17 +176,17 @@
       <div style="margin: 0 0 0 10px">
         <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button>
         <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
-          v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
-          :disabled="tableData.length <= 0">{{
-          downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
+          v-hasPermi="['allocation:cargo:export']" icon="el-icon-download" @click="xlsx(0)"
+          :loading="downLoadingTip.downloading" :disabled="tableData.length <= 0">{{
+              downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
           }}</el-button>
         <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
-          v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
-          :disabled="tableData.length <= 0">{{
-          downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
+          v-hasPermi="['allocation:cargo:export']" icon="el-icon-download" @click="xlsx(1)"
+          :loading="downLoadingTip.downloading" :disabled="tableData.length <= 0">{{
+              downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
           }}</el-button>
-        <el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit"
-          :disabled="tableSelection.length <= 0">添加到航班</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-plus" v-hasPermi="['allocation:cargo:allocation']"
+          @click="addFit" :disabled="tableSelection.length <= 0">添加到航班</el-button>
         <div class="tips">
           <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
           <span>总件数:{{ allQty }}</span>

@@ -774,7 +774,10 @@ export default {
                                 })
                             } else {
                                 //航线为空，提示未找到维度数据
-                                if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
+                                if (this.routeSatus == 'flightInformationMaintenancePurple Tail' || this.routeSatus == 'FlightRandConfig') {
+                                    if (this.routeSatus == 'FlightRandConfig') {
+                                        this.infoForm.fltDate = ''
+                                    }
                                     findDestinationFltRuleByFlightNo({
                                         purposeOfFlightNo: this.infoForm.fltNo,
                                         flightRoute: this.infoForm.route,

@@ -67,7 +67,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit"
-              @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate, scope.row.route)">查看配置维度
+              @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate, ' ', ' ')">查看配置维度
             </el-button>
           </template>
         </el-table-column>

@@ -5,11 +5,12 @@
         <el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel"
           :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
           class="upload-demo" v-hasPermi="['base:caImport:import']">
-          <el-button type="primary">点击上传</el-button>
+          <el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
         </el-upload>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:caImport:download']">下载模板</el-button>
+        <el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
+          v-hasPermi="['base:caImport:download']">下载模板</el-button>
       </el-form-item>
     </el-form>
     <div style="font-size: 12px; font-weight: 700">

@@ -12,11 +12,12 @@
         <el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel"
           :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
           class="upload-demo" v-hasPermi="['base:flightImport:importFlight']">
-          <el-button type="primary">点击上传</el-button>
+          <el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
         </el-upload>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']">下载模板
+        <el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
+          v-hasPermi="['base:flightImport:exportExcel']">下载模板
         </el-button>
       </el-form-item>
     </el-form>

@@ -777,6 +777,7 @@ export default {
           // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
           // 计算高低价可配
           // this.LowHighAvailable();
+          this.ishighPriceWeightPercent = this.form.highLowPriceFlg === 1 ? false : true
         } else {
           this.msgError(response.msg);
         }

@@ -104,11 +104,17 @@ export default {
         },
         //提交
         submit() {
-            let obj = {}
+            let obj = {
+                goodsList: []
+            }
             obj.goodsStation = this.formData.goodsStation
             this.formData.goodsList = this.formData.goodsList.replace(/；/g, ";")
             if (this.formData.goodsList != null && this.formData.goodsList != '') {
-                obj.goodsList = this.formData.goodsList.split(';')
+                this.formData.goodsList.split(';').forEach(item => {
+                    if (item != null && item != '') {
+                        obj.goodsList.push(item)
+                    }
+                })
             }
             this.$refs['addForm'].validate(val => {
                 if (val) {

@@ -9,7 +9,8 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item label="航班" prop="flightList">
-                    <el-input type="textarea" v-model="flightList" rows="4" maxlength="125" placeholder="请输入航班，多个用“;”隔开">
+                    <el-input type="textarea" v-model="flightList" rows="4" maxlength="125"
+                        placeholder="请输入航班，多个用“;”隔开">
                     </el-input>
                 </el-form-item>
             </el-form>
@@ -62,11 +63,17 @@ export default {
     methods: {
         //提交
         submit() {
-            let obj = {}
+            let obj = {
+                flightList: []
+            }
             obj.goodsStation = this.formData.goodsStation
             if (this.formData.flightList != null && this.formData.flightList != '') {
                 this.formData.flightList = this.formData.flightList.toUpperCase()
-                obj.flightList = this.formData.flightList.split(';')
+                this.formData.flightList.split(';').forEach(item => {
+                    if (item != null && item != '') {
+                        obj.flightList.push(item)
+                    }
+                })
             }
             this.$refs['addForm'].validate(val => {
                 if (val) {

@@ -153,16 +153,18 @@
       <div class="pl10 mt20">
         <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询
         </el-button>
-        <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
-          size="small" @click="xlse(0)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
-          downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
+        <el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
+          :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(0)"
+          :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
+              downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
           }}</el-button>
-        <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
-          size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
-          downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
+        <el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
+          :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(1)"
+          :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
+              downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
           }}</el-button>
-        <el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:release']"
-          @click="release">释放舱位</el-button>
+        <el-button type="primary" size="small" icon="el-icon-s-flag" :disabled="selectTable.length == 0"
+          v-hasPermi="['base:cargo:release']" @click="release">释放舱位</el-button>
         <span class="ml20" style="color: #ffba00">全部导出上限80000条数据</span>
         <el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress"
           :status="progress == 100 ? 'success' : 'warning'"></el-progress>
@@ -188,7 +190,7 @@
       <template v-slot:waybillNo="scope">
         <el-link type="primary" @click="logView(scope.row)">
           {{
-          scope.row.waybillNo
+              scope.row.waybillNo
           }}<i class="el-icon-link"></i> </el-link>
       </template>
     </Tables>