bug修复

jinhui.wang
Commit cd98ad07e38876b56542bed7339735de1cc37182 cd98ad07 1 parent 20835f90
Showing 4 changed files with 22 additions and 8 deletions
src/assets/languages/tableHeaders.js
src/components/Table/index.vue
src/views/allocationConfig/flightAllocConfig/info.vue
src/views/index.vue
--- a/src/assets/languages/tableHeaders.js
View file @cd98ad0
+++ b/src/assets/languages/tableHeaders.js
View file @cd98ad0
@@ -581,6 +581,12 @@ let tableHeaders = {
             status: 1
         },
         {
+            columnChineseName: "今日是否设置维度规则",
+            columnName: "ruleId",
+            columnWidth: "140",
+            status: 1
+        },
+        {
             columnChineseName: "是否限制一票一件",
             columnName: "ticketToPiece",
             columnWidth: "140",
--- a/src/components/Table/index.vue
View file @cd98ad0
+++ b/src/components/Table/index.vue
View file @cd98ad0
@@ -47,8 +47,7 @@
           :width="item.columnWidth" :align="item.align ? item.align : 'center'" :fixed="item.fixed ? item.fixed : false"
           :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"
+          :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :formatter="formatter" :key="item.id">
-          :key="item.id">
           <template slot="header" slot-scope="scope">
             <Tooltips :content="scope.column.label" :refName="scope.column.columnName"></Tooltips>
           </template>
@@ -398,6 +397,9 @@ export default {
           return cellValue ? cellValue.split(" ")[0] : ''
         }
       }
+      if (column.property == "ruleId") {
+        return cellValue == null ? '' : '已设置规则'
+      }
       return cellValue;
     },
     //列显示状态
--- a/src/views/allocationConfig/flightAllocConfig/info.vue
View file @cd98ad0
+++ b/src/views/allocationConfig/flightAllocConfig/info.vue
View file @cd98ad0
@@ -73,6 +73,7 @@
                                 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删
                                     除
                                 </el-button>
+                                <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
                                 <el-divider></el-divider>
                                 <el-col :span="24">
                                     <el-form-item label="站点">
@@ -300,8 +301,10 @@
                         <el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause"
                             @click="changeStatus(idx)">
                             启 用</el-button>
-                        <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删 除
+                        <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px"
+                            @click="del(idx)">删 除
                         </el-button>
+                        <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
                         <el-divider></el-divider>
                         <el-col :span="24">
                             <el-form-item label="站点">
@@ -951,8 +954,10 @@ export default {
                 this.msgWarning('件数前区间不能大于后区间')
             } else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
                 this.msgWarning('重量前区间不能大于后区间')
+            } else if (data.handlingCode == '' && data.serviceCode == '' && data.subCategory == '' && data.typeOfGoods == '' && data.puporpuxCode == '' && (!data.location || data.location == '') && data.notLocation == '' && (data.includeUrsa == null || data.notIncludeUrsa == null) && (!data.minNumOfPieces || data.minNumOfPieces == '') && (!data.maxNumOfPieces || data.maxNumOfPieces == '') && (!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) {
+                this.msgWarning('未添加规则信息，请添加后再保存!')
             } else {
-                this.loading = true
+                // this.loading = true
                 this.routeList.forEach((item, idx) => {
                     routeArr.push(item.route)
                 })
--- a/src/views/index.vue
View file @cd98ad0
+++ b/src/views/index.vue
View file @cd98ad0
@@ -54,9 +54,9 @@
       <!-- 各航班配舱进度详情 -->
       <el-divider content-position="left">各航班配舱进度</el-divider>
       <Tables ref="indexTable" ductName="indexTable" :order="true" :data="tableData" :headerData="tableHeader"
-        tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :totalCount="total"
+        tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :totalCount="total" :page="selectData.page"
-        :page="selectData.page" :limitSize="selectData.size" :pageSizes="[100]" :pagination="false"
+        :limitSize="selectData.size" :pageSizes="[100]" :pagination="false" @currentChange="currentChange"
-        @currentChange="currentChange" @rowClick="rowClick">
+        @rowClick="rowClick">
         <template v-slot:percentage="scope">
           <el-progress stroke-width="100"
             :color="(scope.row.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'"
@@ -132,11 +132,12 @@ export default {
       getOneDayFlight(this.selectData).then(res => {
         this.loading = false
         if (res.code === 200) {
-          this.getfltBox(JSON.parse(JSON.stringify(res.data.list)))
+          // this.getfltBox(JSON.parse(JSON.stringify(res.data.list)))
           this.tableData = res.data.list
           this.percentage = res.data.percentage
           this.totalWeight = res.data.totalWeight
           this.allocationWeight = res.data.allocationWeight
+          this.fltBox = res.data.FlightWeightPrecent
         } else {
           this.msgWarning(res.msg)
         }