Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
09c0a12e 1 parent cd98ad07

bug修复

Inline Side-by-side
Showing 3 changed files with 22 additions and 8 deletions
...@@ -50,7 +50,6 @@ service.interceptors.request.use(config => { ...@@ -50,7 +50,6 @@ service.interceptors.request.use(config => {
50 50
51 // 响应拦截器 51 // 响应拦截器
52 service.interceptors.response.use(res => { 52 service.interceptors.response.use(res => {
53 - console.log(res.headers['token'])
54 if (res.headers['token']) { 53 if (res.headers['token']) {
55 setToken(decodeURI(res.headers['token'])) 54 setToken(decodeURI(res.headers['token']))
56 } 55 }
......
...@@ -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,7 +73,16 @@ ...@@ -73,7 +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;">
76 <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span> 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>
77 <el-divider></el-divider> 86 <el-divider></el-divider>
78 <el-col :span="24"> 87 <el-col :span="24">
79 <el-form-item label="站点"> 88 <el-form-item label="站点">
...@@ -304,7 +313,14 @@ ...@@ -304,7 +313,14 @@
304 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px" 313 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px"
305 @click="del(idx)">删 除 314 @click="del(idx)">删 除
306 </el-button> 315 </el-button>
316 + <div v-if="routeSatus.indexOf('flightInformationMaintenance') >= 0" style="display: inline-block;">
307 <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span> 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>
308 <el-divider></el-divider> 324 <el-divider></el-divider>
309 <el-col :span="24"> 325 <el-col :span="24">
310 <el-form-item label="站点"> 326 <el-form-item label="站点">
...@@ -603,7 +619,6 @@ export default { ...@@ -603,7 +619,6 @@ export default {
603 this.infoForm.fltDate = null 619 this.infoForm.fltDate = null
604 this.infoForm.route = null 620 this.infoForm.route = null
605 } 621 }
606 -
607 }, 622 },
608 mounted() { 623 mounted() {
609 this.loading = false 624 this.loading = false
...@@ -950,11 +965,12 @@ export default { ...@@ -950,11 +965,12 @@ export default {
950 submit(val) { 965 submit(val) {
951 let routeArr = [] 966 let routeArr = []
952 let data = this.setDataHandle(JSON.parse(JSON.stringify(this.infoForm.list[val]))) 967 let data = this.setDataHandle(JSON.parse(JSON.stringify(this.infoForm.list[val])))
968 + console.log(data)
953 if (new Number(data.minNumOfPieces) > new Number(data.maxNumOfPieces)) { 969 if (new Number(data.minNumOfPieces) > new Number(data.maxNumOfPieces)) {
954 this.msgWarning('件数前区间不能大于后区间') 970 this.msgWarning('件数前区间不能大于后区间')
955 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) { 971 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
956 this.msgWarning('重量前区间不能大于后区间') 972 this.msgWarning('重量前区间不能大于后区间')
957 - } 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 == '')) { 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 == '')) {
958 this.msgWarning('未添加规则信息，请添加后再保存!') 974 this.msgWarning('未添加规则信息，请添加后再保存!')
959 } else { 975 } else {
960 // this.loading = true 976 // this.loading = true
......