Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
b38b9867 1 parent 5ff29e39

bug修正

Inline Side-by-side
Showing 5 changed files with 42 additions and 13 deletions
...@@ -581,6 +581,12 @@ let tableHeaders = { ...@@ -581,6 +581,12 @@ let tableHeaders = {
581 status: 1 581 status: 1
582 }, 582 },
583 { 583 {
584 + columnChineseName: "今日是否设置维度规则",
585 + columnName: "ruleId",
586 + columnWidth: "140",
587 + status: 1
588 + },
589 + {
584 columnChineseName: "是否限制一票一件", 590 columnChineseName: "是否限制一票一件",
585 columnName: "ticketToPiece", 591 columnName: "ticketToPiece",
586 columnWidth: "140", 592 columnWidth: "140",
......
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
47 :width="item.columnWidth" :align="item.align ? item.align : 'center'" :fixed="item.fixed ? item.fixed : false" 47 :width="item.columnWidth" :align="item.align ? item.align : 'center'" :fixed="item.fixed ? item.fixed : false"
48 :sortable="tableColumnHidden(item.ext1, 'sorTable')" :column-key="index.toString()" 48 :sortable="tableColumnHidden(item.ext1, 'sorTable')" :column-key="index.toString()"
49 :show-overflow-tooltip="showOverflowTooltip" :header-align="headerAlign" 49 :show-overflow-tooltip="showOverflowTooltip" :header-align="headerAlign"
50 - :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :formatter="formatter" 50 + :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :formatter="formatter" :key="item.id">
51 - :key="item.id">
52 <template slot="header" slot-scope="scope"> 51 <template slot="header" slot-scope="scope">
53 <Tooltips :content="scope.column.label" :refName="scope.column.columnName"></Tooltips> 52 <Tooltips :content="scope.column.label" :refName="scope.column.columnName"></Tooltips>
54 </template> 53 </template>
...@@ -398,6 +397,9 @@ export default { ...@@ -398,6 +397,9 @@ export default {
398 return cellValue ? cellValue.split(" ")[0] : '' 397 return cellValue ? cellValue.split(" ")[0] : ''
399 } 398 }
400 } 399 }
400 + if (column.property == "ruleId") {
401 + return cellValue == null ? '' : '已设置规则'
402 + }
401 return cellValue; 403 return cellValue;
402 }, 404 },
403 //列显示状态 405 //列显示状态
......
...@@ -36,15 +36,14 @@ ...@@ -36,15 +36,14 @@
36 @click=" 36 @click="
37 $router.push({ 37 $router.push({
38 name: 'FlightAllocConfigInfo', 38 name: 'FlightAllocConfigInfo',
39 - params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null }, 39 + params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' },
40 }) 40 })
41 ">添加</el-button> 41 ">添加</el-button>
42 </div> 42 </div>
43 </el-form> 43 </el-form>
44 - <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" 44 + <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true"
45 - :order="true" :totalCount="total" :loading="loading" :limitSize="queryParams.limit" 45 + :totalCount="total" :loading="loading" :limitSize="queryParams.limit" :limitStart="queryParams.start"
46 - :limitStart="queryParams.start" :page="curPage" :pageSizes="[20]" :height="tableHeight" 46 + :page="curPage" :pageSizes="[20]" :height="tableHeight" @currentChange="currentChange">
47 - @currentChange="currentChange">
48 <template v-slot:ruleDate="scope"> 47 <template v-slot:ruleDate="scope">
49 <el-link v-if="scope.row.ruleDate" type="primary" @click="toRouteOrder(scope.row)"> 48 <el-link v-if="scope.row.ruleDate" type="primary" @click="toRouteOrder(scope.row)">
50 {{ 49 {{
......
...@@ -73,6 +73,16 @@ ...@@ -73,6 +73,16 @@
73 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删 73 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删
74 除 74 除
75 </el-button> 75 </el-button>
76 + <div v-if="(routeSatus.indexOf('flightInformationMaintenance') >= 0)"
77 + style="display: inline-block;">
78 + <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
79 + </div>
80 + <div v-else-if="(routeSatus.indexOf('FlightAllocConfig') >= 0)"
81 + style="display: inline-block;">
82 + <span
83 + v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
84 + v-else>普通规则</span>
85 + </div>
76 <el-divider></el-divider> 86 <el-divider></el-divider>
77 <el-col :span="24"> 87 <el-col :span="24">
78 <el-form-item label="站点"> 88 <el-form-item label="站点">
...@@ -300,8 +310,17 @@ ...@@ -300,8 +310,17 @@
300 <el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause" 310 <el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause"
301 @click="changeStatus(idx)"> 311 @click="changeStatus(idx)">
302 启 用</el-button> 312 启 用</el-button>
303 - <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删 除 313 + <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px"
314 + @click="del(idx)">删 除
304 </el-button> 315 </el-button>
316 + <div v-if="routeSatus.indexOf('flightInformationMaintenance') >= 0" style="display: inline-block;">
317 + <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
318 + </div>
319 + <div v-else-if="(routeSatus.indexOf('FlightAllocConfig') >= 0)" style="display: inline-block;">
320 + <span
321 + v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
322 + v-else>普通规则</span>
323 + </div>
305 <el-divider></el-divider> 324 <el-divider></el-divider>
306 <el-col :span="24"> 325 <el-col :span="24">
307 <el-form-item label="站点"> 326 <el-form-item label="站点">
...@@ -951,8 +970,10 @@ export default { ...@@ -951,8 +970,10 @@ export default {
951 this.msgWarning('件数前区间不能大于后区间') 970 this.msgWarning('件数前区间不能大于后区间')
952 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) { 971 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
953 this.msgWarning('重量前区间不能大于后区间') 972 this.msgWarning('重量前区间不能大于后区间')
973 + } else if (data.handlingCode == '' && data.serviceCode == '' && data.subCategory == '' && data.typeOfGoods == '' && data.puporpuxCode == '' && (!data.location || data.location == '') && data.notLocation == '' && (data.includeUrsa == null || data.includeUrsa == '') && (data.notIncludeUrsa == null || data.notIncludeUrsa == '') && (!data.minNumOfPieces || data.minNumOfPieces == '') && (!data.maxNumOfPieces || data.maxNumOfPieces == '') && (!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) {
974 + this.msgWarning('未添加规则信息，请添加后再保存!')
954 } else { 975 } else {
955 - this.loading = true 976 + // this.loading = true
956 this.routeList.forEach((item, idx) => { 977 this.routeList.forEach((item, idx) => {
957 routeArr.push(item.route) 978 routeArr.push(item.route)
958 }) 979 })
......
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
54 <!-- 各航班配舱进度详情 --> 54 <!-- 各航班配舱进度详情 -->
55 <el-divider content-position="left">各航班配舱进度</el-divider> 55 <el-divider content-position="left">各航班配舱进度</el-divider>
56 <Tables ref="indexTable" ductName="indexTable" :order="true" :data="tableData" :headerData="tableHeader" 56 <Tables ref="indexTable" ductName="indexTable" :order="true" :data="tableData" :headerData="tableHeader"
57 - tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :totalCount="total" 57 + tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :totalCount="total" :page="selectData.page"
58 - :page="selectData.page" :limitSize="selectData.size" :pageSizes="[100]" :pagination="false" 58 + :limitSize="selectData.size" :pageSizes="[100]" :pagination="false" @currentChange="currentChange"
59 - @currentChange="currentChange" @rowClick="rowClick"> 59 + @rowClick="rowClick">
60 <template v-slot:percentage="scope"> 60 <template v-slot:percentage="scope">
61 <el-progress stroke-width="100" 61 <el-progress stroke-width="100"
62 :color="(scope.row.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'" 62 :color="(scope.row.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'"
...@@ -132,11 +132,12 @@ export default { ...@@ -132,11 +132,12 @@ export default {
132 getOneDayFlight(this.selectData).then(res => { 132 getOneDayFlight(this.selectData).then(res => {
133 this.loading = false 133 this.loading = false
134 if (res.code === 200) { 134 if (res.code === 200) {
135 - this.getfltBox(JSON.parse(JSON.stringify(res.data.list))) 135 + // this.getfltBox(JSON.parse(JSON.stringify(res.data.list)))
136 this.tableData = res.data.list 136 this.tableData = res.data.list
137 this.percentage = res.data.percentage 137 this.percentage = res.data.percentage
138 this.totalWeight = res.data.totalWeight 138 this.totalWeight = res.data.totalWeight
139 this.allocationWeight = res.data.allocationWeight 139 this.allocationWeight = res.data.allocationWeight
140 + this.fltBox = res.data.FlightWeightPrecent
140 } else { 141 } else {
141 this.msgWarning(res.msg) 142 this.msgWarning(res.msg)
142 } 143 }
......