预审菜单移动，文本修正，表格字典修正，维护增加航班预审状态

jinhui.wang
Commit 0e75ab24393e5ca82d32e7532ff7c24f82b8f26d 0e75ab24 1 parent 14f5d5da
Showing 7 changed files with 98 additions and 60 deletions
src/assets/languages/dictLabels.js
src/assets/languages/tableHeaders.js
src/assets/styles/FedEx.scss
src/components/Table/index.vue
src/views/systemConfig/preReview/index.vue → src/views/allocationConfig/preReview/index.vue
src/views/basicInformation/flightInformationMaintenance/index.vue
src/views/systemLog/dmLog/index.vue
--- a/src/assets/languages/dictLabels.js
View file @0e75ab2
+++ b/src/assets/languages/dictLabels.js
View file @0e75ab2
@@ -39,7 +39,6 @@ let ductLabels = {
         "needRequired": {
             "1": "是",
             "0": "否",
-            "2": "未设置"
         },
         "highLowPriceFlg": {
             "1": "开启",
@@ -91,6 +90,14 @@ let ductLabels = {
             "0": "未推",
             "1": "推送成功",
             "2": "推送失败"
+        },
+        "status": {
+            "0": "未处理",
+            "1": "已处理",
+            "2": "无需处理",
+            "3": "处理失败",
+            "4": "校验不通过",
+            "9": "处理中"
         }
     },
     "weatherTable": {
@@ -108,7 +115,6 @@ let ductLabels = {
             "1": "增加",
             "-1": "减少"
         }
-
     },
     "preFlight": {//航班预审
         "status": {
--- a/src/assets/languages/tableHeaders.js
View file @0e75ab2
+++ b/src/assets/languages/tableHeaders.js
View file @0e75ab2
@@ -32,8 +32,8 @@ let tableHeaders = {
         {
             columnChineseName: "运单号",
             columnName: "waybillNo",
-            columnWidth: "120",
+            columnWidth: "150",
-            ext1: "sorTable",
+            ext1: "sorTable;slot",
             status: 1
         },
         {
@@ -402,7 +402,7 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "是否需要预审",
+            columnChineseName: "预审状态",
             columnName: "needRequired",
             columnWidth: "130",
             status: 1
@@ -971,7 +971,7 @@ let tableHeaders = {
             columnName: "awbNbr",
             columnWidth: "150",
             status: 1,
-            slot: true
+            ext1: 'slot',
         },
         {
             columnChineseName: "Accs Pool",
@@ -1005,8 +1005,8 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "货物创建时间",
+            columnChineseName: "DM推送IMAC时间",
-            columnName: "cargoCreateTime",
+            columnName: "dmSendTime",
             columnWidth: "150",
             status: 1
         },
@@ -1017,8 +1017,8 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "DM推送时间",
+            columnChineseName: "货物创建时间",
-            columnName: "dmSendTime",
+            columnName: "cargoCreateTime",
             columnWidth: "150",
             status: 1
         },
@@ -1035,27 +1035,35 @@ let tableHeaders = {
             status: 1
         },
         {
-            columnChineseName: "推送状态",
+            columnChineseName: "OSPR推送状态",
             columnName: "cargoPushStatus",
-            columnWidth: "",
+            columnWidth: "130",
             status: 1
         },
         {
-            columnChineseName: "配舱类型",
+            columnChineseName: "首次配舱类型",
             columnName: "cargoAllocationType",
-            columnWidth: "100",
+            columnWidth: "110",
             status: 1
         },
         {
             columnChineseName: "航班顺位规则",
             columnName: "targetFlight",
-            columnWidth: "180",
+            columnWidth: "250",
+            align: 'left',
             status: 1
         },
         {
             columnChineseName: "配舱备注",
             columnName: "remarksDetail",
             columnWidth: "450",
+            align: 'left',
+            status: 1
+        },
+        {
+            columnChineseName: "处理状态级别",
+            columnName: "status",
+            columnWidth: "150",
             status: 1
         },
         {
@@ -1068,6 +1076,7 @@ let tableHeaders = {
             columnChineseName: "处理结果",
             columnName: "statusDetailDesc",
             columnWidth: "350",
+            align: 'left',
             status: 1
         },
         {
--- a/src/assets/styles/FedEx.scss
View file @0e75ab2
+++ b/src/assets/styles/FedEx.scss
View file @0e75ab2
@@ -113,7 +113,7 @@
  	font-size: 15px;
  	color: #6379bb;
  	// border-bottom: 1px solid #ddd;
- 	margin: 8px 10px 25px 10px;
+ 	margin: 8px 10px 15px 10px;
  	padding-top: 15px;
  	padding-bottom: 5px;
--- a/src/components/Table/index.vue
View file @0e75ab2
+++ b/src/components/Table/index.vue
View file @0e75ab2
@@ -15,11 +15,12 @@
       </el-table-column>
       <template v-for="(item, index) in headerData" :key="" v-if="item.status == 1">
         <!-- 自定义插槽 -->
-        <el-table-column v-if="item.slot" :prop="item.columnName" :label="item.columnChineseName"
+        <el-table-column v-if="tableColumnHidden(item.ext1, 'slot')" :prop="item.columnName"
-          :width="item.columnWidth" :align="tableAlign" :fixed="item.fixed ? item.fixed : false"
+          :label="item.columnChineseName" :width="item.columnWidth" :align="item.align ? item.align : 'center'"
-          :show-overflow-tooltip="showOverflowTooltip" :sortable="item.ext1 == 'sorTable' ? true : false"
+          :fixed="item.fixed ? item.fixed : false" :show-overflow-tooltip="showOverflowTooltip"
-          :formatter="formatter" :header-align="headerAlign" :column-key="index.toString()"
+          :sortable="tableColumnHidden(item.ext1, 'sorTable')" :formatter="formatter" :header-align="headerAlign"
-          :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :key="item.columnName">
+          :column-key="index.toString()" :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader"
+          :key="item.columnName">
           <template slot="header" slot-scope="scope">
             <Tooltips :content="scope.column.label" :refName="scope.column.columnName"></Tooltips>
           </template>
@@ -28,10 +29,10 @@
           </template>
         </el-table-column>
         <!-- 隐藏行 -->
-        <el-table-column v-else-if="item.expand" type="expand" :prop="item.columnName" :label="item.columnChineseName"
+        <el-table-column v-else-if="tableColumnHidden(item.ext1) == 'expand'" :prop="item.columnName"
-          :index="item.index" :width="item.columnWidth" :align="tableAlign" :fixed="item.fixed ? item.fixed : false"
+          :label="item.columnChineseName" :index="item.index" :width="item.columnWidth"
-          :sortable="item.ext1 == 'sorTable' ? true : false" :column-key="index.toString()"
+          :align="item.align ? item.align : 'center'" :fixed="item.fixed ? item.fixed : false"
-          :show-overflow-tooltip="showOverflowTooltip" :header-align="headerAlign"
+          :column-key="index.toString()" :show-overflow-tooltip="showOverflowTooltip" :header-align="headerAlign"
           :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :formatter="formatter"
           :key="item.index">
           <template slot="header" slot-scope="scope">
@@ -43,8 +44,8 @@
         </el-table-column>
         <!-- 默认数据 -->
         <el-table-column v-else :prop="item.columnName" :label="item.columnChineseName" :index="item.index"
-          :width="item.columnWidth" :align="tableAlign" :fixed="item.fixed ? item.fixed : false"
+          :width="item.columnWidth" :align="item.align ? item.align : 'center'" :fixed="item.fixed ? item.fixed : false"
-          :sortable="item.ext1 == 'sorTable' ? true : false" :column-key="index.toString()"
+          :sortable="tableColumnHidden(item.ext1, 'sorTable')" :column-key="index.toString()"
           :show-overflow-tooltip="showOverflowTooltip" :header-align="headerAlign"
           :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :formatter="formatter"
           :key="item.id">
@@ -385,11 +386,21 @@ export default {
       }
       if (this.ductName === 'weatherTable') {
         if (column.property == 'flightTime') {
-          return cellValue.split(" ")[0]
+          return cellValue ? cellValue.split(" ")[0] : ''
         }
       }
       return cellValue;
     },
+    //列显示状态
+    tableColumnHidden(val, status) {
+      if (typeof val == 'string') {
+        if (val.indexOf(status) >= 0) {
+          return true
+        } else {
+          return false
+        }
+      }
+    }
   },
 };
 </script>
--- a/src/views/systemConfig/preReview/index.vue → src/views/allocationConfig/preReview/index.vue
View file @0e75ab2
+++ b/src/views/systemConfig/preReview/index.vue → src/views/allocationConfig/preReview/index.vue
View file @0e75ab2
--- a/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @0e75ab2
+++ b/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @0e75ab2
@@ -158,26 +158,29 @@
                 v-model="form.extraWeightPercent"></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
               <el-switch class="wid80" @change="LowHighAvailable" v-model="form.highLowPriceFlg" :active-value="1"
                 :inactive-value="0" active-color="#13ce66">
               </el-switch>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="该航班预审状态：">
+              <el-tag v-if="preAudit" :type="preAudit == '开启' ? 'success' : 'info'" effect="dark">{{ preAudit }}
+              </el-tag>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="是否预审" prop="isNeedRequired">
+            <el-form-item label="今日航班预审状态" prop="isNeedRequired">
-              <!-- <el-switch class="wid80" :disabled="true" v-model="form.isNeedRequired" :active-value="1"
-                :inactive-value="0" active-color="#13ce66">
-              </el-switch> -->
               <el-select class="wid80" v-model="form.isNeedRequired" placeholder="">
                 <el-option label="未设置" :value="2">
                 </el-option>
-                <el-option label="是" :value="1">
+                <el-option label="开启" :value="1">
                 </el-option>
-                <el-option label="否" :value="0">
+                <el-option label="关闭" :value="0">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -259,6 +262,7 @@ import {
   updateStatusBatch,
   updateAutoPushBatch,
 } from "@/api/findAllFltData";
+import { getpreAudit } from '@/api/system/preReview.js'
 export default {
   name: "FlightInformationMaintenance",
@@ -310,17 +314,17 @@ export default {
             trigger: "blur",
           },
         ],
-        // route: [
+        route: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: "航班线路不能为空",
+            message: "航班线路不能为空",
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        //   {
+          {
-        //     pattern: /^(([\~A-Z]{3,4})(\-[A-Z]{3,4})+)(;{1,1}(([\~A-Z]{3,4})(\-[A-Z]{3,4})+)){0,}$/,
+            pattern: /^(([\~A-Z]{3,4})(\-[A-Z]{3,4})+)(;{1,1}(([\~A-Z]{3,4})(\-[A-Z]{3,4})+)){0,}$/,
-        //     message: "请输入正确得航班线路"
+            message: "请输入正确得航班线路"
-        //   }
+          }
-        // ]
+        ]
       },
       //原航班规则数据
       findAllFltDatList: [],
@@ -407,6 +411,8 @@ export default {
       ids: [],
       //目的航班数据
       sourceFlightAndFlightDate: [],
+      //航班预审状态
+      preAudit: null,
       //高价百分比是否打开
       ishighPriceWeightPercent: true,
       //遮罩层
@@ -467,6 +473,7 @@ export default {
         this.form.fltNo != ""
       ) {
         this.form.fltNo = this.form.fltNo.toUpperCase();
+        this.perStatus(this.form.fltNo)
         findFltCommonConf(this.form).then((response) => {
           if (response.code == 200) {
             //额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑
@@ -497,15 +504,6 @@ export default {
               //this.form.highLowPriceFlg = true;
             }
             //是否预审：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否预审’ 为否，不可编辑；
-            // if (
-            //   response.data != null &&
-            //   response.data.isNeedRequired != null &&
-            //   response.data.isNeedRequired != undefined
-            // ) {
-            //   this.form.isNeedRequired = response.data.isNeedRequired;
-            // } else {
-            //   this.form.isNeedRequired = 0;
-            // }
             //高/低价百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘高价百分比’60%，‘低价百分比’40%，不可编辑
             if (
               response.data != null &&
@@ -549,6 +547,18 @@ export default {
         }
       });
     },
+    //获取航班预审状态
+    perStatus(val) {
+      getpreAudit({ fltNo: val, page: 1, size: 20 }).then(res => {
+        if (res.code === 200) {
+          this.preAudit = res.data.list.length == 0 ? '关闭' : res.data.list[0].status == 0 ? '关闭' : res.data.list[0].status == 1 ? '开启' : ''
+        } else {
+          this.msgWarning(res.msg)
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     /** 航班信息维护查询*/
     findAllFltData() {
       this.ids = [];
@@ -580,6 +590,7 @@ export default {
     handleAdd() {
       this.reset();
       this.findFltConditionData();
+      this.preAudit = null;
       this.open = true;
       this.title = "添加航班信息";
       this.form.id = null;
@@ -696,6 +707,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.findFltConditionData();
+      this.perStatus(row.fltNo)
       this.open = true;
       this.title = "修改航班信息";
       //航班号
--- a/src/views/systemLog/dmLog/index.vue
View file @0e75ab2
+++ b/src/views/systemLog/dmLog/index.vue
View file @0e75ab2
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="数据接收时间" prop="createTime">
+          <el-form-item label="数据接收日期" prop="createTime">
             <el-date-picker v-model="selectForm.createTime" class="formItem" type="date" placeholder="选择日期"
               :value-format="valueFormat" clearable>
             </el-date-picker>
@@ -20,7 +20,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="处理状态">
+          <el-form-item label="处理状态级别">
             <el-select v-model="selectForm.status" class="formItem" placeholder="不限" clearable>
               <el-option label="未处理" value="0"></el-option>
               <el-option label="处理成功" value="1"></el-option>
@@ -37,14 +37,14 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="口岸代码">
             <el-select v-model="selectForm.portName" class="formItem" placeholder="不限" clearable>
               <el-option v-for="item in portList" :label="item.englishName" :value="item.englishName" :key="item.id">
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="回推ACCS结果">
             <el-select v-model="selectForm.sendLogSendResult" class="formItem" placeholder="不限" clearable>
@@ -64,7 +64,7 @@
       </div>
     </el-form>
     <Tables ref="dmLogTables" ductName="logDmData" :order="true" :data="data" :headerData="tableHeader"
-      tableAlign="left" :showOverflowTooltip="false" :height="tableHeight" :page="selectForm.page"
+      tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :page="selectForm.page"
       :limitSize="selectForm.size" :pageSizes="[100]" :totalCount="total" :loading="loading"
       @currentChange="currentChange" @sortChange="sortChange">
       <template v-slot:awbNbr="scope">