Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
44230041 1 parent 394b578f

bug修复

Expand all
Inline Side-by-side
Showing 11 changed files with 139 additions and 122 deletions
1 let ductLabels = { 1 let ductLabels = {
2 "cargoRulesStatus":{ 2 "cargoRulesStatus":{
3 - "1":"自动", 3 + "1":"手动",
4 - "2":"手动" 4 + "2":"自动"
5 } 5 }
6 } 6 }
7 7
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
80 color:#6379bb; 80 color:#6379bb;
81 border-bottom:1px solid #ddd; 81 border-bottom:1px solid #ddd;
82 margin:8px 10px 25px 10px; 82 margin:8px 10px 25px 10px;
83 + padding-top:15px;
83 padding-bottom:5px; 84 padding-bottom:5px;
84 .formItem { 85 .formItem {
85 width: 100%; 86 width: 100%;
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 :fixed="item.fixed" 30 :fixed="item.fixed"
31 :show-overflow-tooltip="showOverflowTooltip" 31 :show-overflow-tooltip="showOverflowTooltip"
32 :sortable="item.sorTable" 32 :sortable="item.sorTable"
33 - header-align="center"
34 :formatter="formatter" 33 :formatter="formatter"
34 + header-align="center"
35 :slotHeader="slotHeader" 35 :slotHeader="slotHeader"
36 :key="index" 36 :key="index"
37 > 37 >
...@@ -188,7 +188,6 @@ export default { ...@@ -188,7 +188,6 @@ export default {
188 this.newHeader = this.headerData; 188 this.newHeader = this.headerData;
189 }, 189 },
190 mounted() { 190 mounted() {
191 -
192 }, 191 },
193 methods: { 192 methods: {
194 nextClick() { 193 nextClick() {
...@@ -218,7 +217,11 @@ export default { ...@@ -218,7 +217,11 @@ export default {
218 this.selectTable.push(this.data[i]); 217 this.selectTable.push(this.data[i]);
219 } 218 }
220 } else if (selection.includes(this.data[row.index])) { 219 } else if (selection.includes(this.data[row.index])) {
221 - for (i = this.start + 1; i <= end; i++) { 220 + if(!selection.includes(this.data[this.start])){
221 + this.$refs.tables.toggleRowSelection(this.data[this.start], true);
222 + this.selectTable.push(this.data[this.start]);
223 + }
224 + for (i = this.start+1; i <= this.start+sum; i++) {
222 this.$refs.tables.toggleRowSelection(this.data[i], true); 225 this.$refs.tables.toggleRowSelection(this.data[i], true);
223 this.selectTable.push(this.data[i]); 226 this.selectTable.push(this.data[i]);
224 } 227 }
...@@ -254,7 +257,9 @@ export default { ...@@ -254,7 +257,9 @@ export default {
254 this.selectTable = [] 257 this.selectTable = []
255 this.$refs.tables.clearSelection() 258 this.$refs.tables.clearSelection()
256 }, 259 },
257 - // itemChange(val) {}, 260 + itemChange(val) {
261 + console.log(val)
262 + },
258 // checkChange(val) { 263 // checkChange(val) {
259 // console.log(val); 264 // console.log(val);
260 // }, 265 // },
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 67
68 <script> 68 <script>
69 import { allocationFlight } from "@/api/cargoSelect"; 69 import { allocationFlight } from "@/api/cargoSelect";
70 -import { MessageBox } from 'element-ui' 70 +import { MessageBox } from "element-ui";
71 export default { 71 export default {
72 props: { 72 props: {
73 dialogVisible: { 73 dialogVisible: {
...@@ -82,10 +82,10 @@ export default { ...@@ -82,10 +82,10 @@ export default {
82 data() { 82 data() {
83 return { 83 return {
84 formData: { 84 formData: {
85 - ids:[], 85 + ids: [],
86 fltNo: undefined, 86 fltNo: undefined,
87 - fltDate:undefined, 87 + fltDate: undefined,
88 - overweight:false 88 + overweight: false,
89 }, 89 },
90 cargoHeader: [ 90 cargoHeader: [
91 { name: "口岸代码", value: "portName" }, 91 { name: "口岸代码", value: "portName" },
...@@ -96,101 +96,101 @@ export default { ...@@ -96,101 +96,101 @@ export default {
96 { name: "URSA", value: "ursa" }, 96 { name: "URSA", value: "ursa" },
97 { name: "实际重量", value: "actualWeight" }, 97 { name: "实际重量", value: "actualWeight" },
98 { name: "件数", value: "qty" }, 98 { name: "件数", value: "qty" },
99 + { name: "ACCS原航班号", value: "fltNoAccs" },
100 + { name: "ACCS原航班日期", value: "fltDateAccs" },
99 { name: "品名描述", value: "nameDescription" }, 101 { name: "品名描述", value: "nameDescription" },
100 { name: "是否自动", value: "cargoRulesStatus" }, 102 { name: "是否自动", value: "cargoRulesStatus" },
101 { name: "创建人", value: "createUserName" }, 103 { name: "创建人", value: "createUserName" },
102 { name: "创建时间", value: "createTime" }, 104 { name: "创建时间", value: "createTime" },
103 ], 105 ],
104 - fltHeader: [ 106 + rules: {
105 - { name: "航班日期", value: "fltDate" }, 107 + fltNo: [
106 - { name: "航班号", value: "fltNo" }, 108 + {
107 - { name: "航班路线", value: "route" },
108 - { name: "航班类型", value: "typeName" },
109 - { name: "总重量", value: "totalWeight" },
110 - { name: "额外增重百分比", value: "extraWeightPercent" },
111 - { name: "已配重量", value: "alloctedWeight" },
112 - { name: "配舱优先级", value: "priorityRuleName" },
113 - { name: "是否开启高地价", value: "highLowPriceFlg" },
114 - { name: "航班起飞时间", value: "takeOffTime" },
115 - { name: "创建人", value: "createUserName" },
116 - { name: "创建时间", value: "createTime" },
117 - ],
118 - rules:{
119 - fltNo: [{
120 required: true, 109 required: true,
121 message: "航班号不能为空", 110 message: "航班号不能为空",
122 - trigger: "blur" 111 + trigger: "blur",
123 - }], 112 + },
124 - fltDate: [{ 113 + ],
114 + fltDate: [
115 + {
125 required: true, 116 required: true,
126 message: "航班日期不能为空", 117 message: "航班日期不能为空",
127 - trigger: "change" 118 + trigger: "change",
128 - }], 119 + },
129 - } 120 + ],
121 + },
130 }; 122 };
131 }, 123 },
132 methods: { 124 methods: {
133 - cleaerForm(){ 125 + cleaerForm() {
134 - this.formData={ 126 + this.formData = {
135 - ids:[], 127 + ids: [],
136 fltNo: undefined, 128 fltNo: undefined,
137 - fltDate:undefined, 129 + fltDate: undefined,
138 - overweight:false 130 + overweight: false,
139 - } 131 + };
140 }, 132 },
141 //确定配舱 133 //确定配舱
142 submit() { 134 submit() {
143 let arr = []; 135 let arr = [];
144 - this.tableData.forEach(item => { 136 + this.tableData.forEach((item) => {
145 - arr.push(item.id) 137 + arr.push(item.id);
146 }); 138 });
147 this.formData.ids = arr; 139 this.formData.ids = arr;
148 - if(this.formData.fltNo && this.formData.fltDate){ 140 + if (this.formData.fltNo && this.formData.fltDate) {
149 - allocationFlight(this.formData).then(res=>{//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg 141 + allocationFlight(this.formData).then((res) => {
150 - if(res.code === 200){ 142 + //code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
143 + if (res.code === 200) {
151 this.$message({ 144 this.$message({
152 message: "货物配舱成功", 145 message: "货物配舱成功",
153 type: "success", 146 type: "success",
154 }); 147 });
155 - }else if(res.code === 202){ 148 + this.cleaerForm();
156 - MessageBox.confirm('航班配重已满，是否继续配舱？', '提示', { 149 + this.$emit("dialogBeforeClose", { close: false, reload: true });
157 - confirmButtonText: '确定', 150 + } else if (res.code === 202) {
158 - cancelButtonText: '取消', 151 + MessageBox.confirm(res.msg, "提示", {
159 - type: 'warning' 152 + confirmButtonText: "确定",
160 - } 153 + cancelButtonText: "取消",
161 - ).then(() => { 154 + type: "warning",
162 - this.formData.overweight = true;//确定继续overweight变为true再次请求接口 155 + })
163 - allocationFlight(this.formData).then(res=>{ 156 + .then(() => {
164 - if(res.code === 200){ 157 + this.formData.overweight = true; //确定继续overweight变为true再次请求接口
158 + allocationFlight(this.formData).then((res) => {
159 + if (res.code === 200) {
165 this.$message({ 160 this.$message({
166 message: "货物配舱成功", 161 message: "货物配舱成功",
167 type: "success", 162 type: "success",
168 }); 163 });
169 - }else{ 164 + } else {
170 this.$message({ 165 this.$message({
171 message: res.msg, 166 message: res.msg,
172 type: "warning", 167 type: "warning",
173 }); 168 });
174 } 169 }
170 + });
171 + this.cleaerForm();
172 + this.$emit("dialogBeforeClose", { close: false, reload: true });
175 }) 173 })
176 - this.cleaerForm() 174 + .catch(() => {
177 - this.$emit("dialogBeforeClose", {close:false,reload:true}); 175 + //取消 取消当前配舱
178 - }).catch(() => {//取消 取消当前配舱
179 this.$message({ 176 this.$message({
180 message: "配舱已取消", 177 message: "配舱已取消",
181 type: "success", 178 type: "success",
182 }); 179 });
183 - this.cleaerForm() 180 + this.cleaerForm();
184 - this.$emit("dialogBeforeClose", {close:false,reload:false}); 181 + this.$emit("dialogBeforeClose", {
182 + close: false,
183 + reload: false,
184 + });
185 }); 185 });
186 - }else{ 186 + } else {
187 this.$message({ 187 this.$message({
188 message: res.msg, 188 message: res.msg,
189 type: "warning", 189 type: "warning",
190 }); 190 });
191 } 191 }
192 - }) 192 + });
193 - }else{ 193 + } else {
194 this.$message({ 194 this.$message({
195 message: "航班号或航班日期不能为空", 195 message: "航班号或航班日期不能为空",
196 type: "warning", 196 type: "warning",
...@@ -198,8 +198,8 @@ export default { ...@@ -198,8 +198,8 @@ export default {
198 } 198 }
199 }, 199 },
200 dialogBeforeClose() { 200 dialogBeforeClose() {
201 - this.cleaerForm() 201 + this.cleaerForm();
202 - this.$emit("dialogBeforeClose", {close:false,reload:false}); 202 + this.$emit("dialogBeforeClose", { close: false, reload: false });
203 }, 203 },
204 }, 204 },
205 computed: { 205 computed: {
......
1 <template> 1 <template>
2 - <div style="margin: 40px" class="app-container"> 2 + <div>
3 <el-form 3 <el-form
4 :inline="true" 4 :inline="true"
5 :model="queryParams" 5 :model="queryParams"
6 - class="demo-form-inline" 6 + class="form-header"
7 - size="small" 7 + size="medium"
8 + label-position="right"
9 + label-width="auto"
8 > 10 >
9 <el-form-item label="航班号"> 11 <el-form-item label="航班号">
10 <el-input 12 <el-input
...@@ -28,7 +30,7 @@ ...@@ -28,7 +30,7 @@
28 >查询</el-button 30 >查询</el-button
29 > 31 >
30 </el-form-item> 32 </el-form-item>
31 - </el-form> 33 + <div>
32 <el-button 34 <el-button
33 style="margin-bottom: 20px" 35 style="margin-bottom: 20px"
34 type="primary" 36 type="primary"
...@@ -37,7 +39,9 @@ ...@@ -37,7 +39,9 @@
37 @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })" 39 @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
38 >添加</el-button 40 >添加</el-button
39 > 41 >
40 - <el-table :data="flyList" v-loading="loading" size="small"> 42 + </div>
43 + </el-form>
44 + <el-table :data="flyList" v-loading="loading" size="small" highlight-current-row border stripe>
41 <el-table-column 45 <el-table-column
42 prop="purposeOfFlightNo" 46 prop="purposeOfFlightNo"
43 label="航班号" 47 label="航班号"
...@@ -208,9 +212,13 @@ export default { ...@@ -208,9 +212,13 @@ export default {
208 .then(function () { 212 .then(function () {
209 return enableOrDisable(id, status); 213 return enableOrDisable(id, status);
210 }) 214 })
211 - .then(() => { 215 + .then((res) => {
216 + if (res.code != 200){
217 + this.msgError(res.msg);
218 + }else {
212 this.getList(); 219 this.getList();
213 this.msgSuccess(tip + "成功"); 220 this.msgSuccess(tip + "成功");
221 + }
214 }) 222 })
215 .catch(function () {}); 223 .catch(function () {});
216 }, 224 },
......
...@@ -62,16 +62,16 @@ ...@@ -62,16 +62,16 @@
62 form.minNumOfPieces == 0 62 form.minNumOfPieces == 0
63 ? (form.minNumOfPieces = undefined) 63 ? (form.minNumOfPieces = undefined)
64 : form.minNumOfPieces 64 : form.minNumOfPieces
65 - " :precision="0" :controls="false" style="width: 100%"></el-input-number> 65 + " :precision="0" :controls="false" style="width: 100%" :min="1"></el-input-number>
66 </el-col> 66 </el-col>
67 <el-col style="text-align: center" :span="1">-</el-col> 67 <el-col style="text-align: center" :span="1">-</el-col>
68 <el-col :span="3"> 68 <el-col :span="3">
69 <!-- <el-input v-model="form.maxNumOfPieces"></el-input> --> 69 <!-- <el-input v-model="form.maxNumOfPieces"></el-input> -->
70 <el-input-number v-model=" 70 <el-input-number v-model="
71 form.maxNumOfPieces == 0 71 form.maxNumOfPieces == 0
72 - ? (form.maxNumOfPieces = undefined) 72 + ? form.maxNumOfPieces=undefined
73 : form.maxNumOfPieces 73 : form.maxNumOfPieces
74 - " :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces + 1"></el-input-number> 74 + " :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces"></el-input-number>
75 </el-col> 75 </el-col>
76 </el-form-item> 76 </el-form-item>
77 77
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 form.minWeight == 0 82 form.minWeight == 0
83 ? (form.minWeight = undefined) 83 ? (form.minWeight = undefined)
84 : form.minWeight 84 : form.minWeight
85 - " :precision="2" :controls="false" style="width: 100%"></el-input-number> 85 + " :precision="2" :controls="false" style="width: 100%" :min="0.01"></el-input-number>
86 </el-col> 86 </el-col>
87 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col> 87 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
88 <el-col style="text-align: center" :span="1">-</el-col> 88 <el-col style="text-align: center" :span="1">-</el-col>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
92 form.maxWeight == 0 92 form.maxWeight == 0
93 ? (form.maxWeight = undefined) 93 ? (form.maxWeight = undefined)
94 : form.maxWeight 94 : form.maxWeight
95 - " :precision="2" :controls="false" style="width: 100%" :min="form.minWeight + 0.01"></el-input-number> 95 + " :precision="2" :controls="false" style="width: 100%" :min="form.minWeight"></el-input-number>
96 </el-col> 96 </el-col>
97 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col> 97 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
98 </el-form-item> 98 </el-form-item>
...@@ -398,10 +398,10 @@ ...@@ -398,10 +398,10 @@
398 info.subCategory.split(";") : 398 info.subCategory.split(";") :
399 []; 399 [];
400 this.form = info; 400 this.form = info;
401 - if (info.location != null || info.location == "") { 401 + if (info.notLocation != null || info.notLocation == "") {
402 - this.isLocation = "1";
403 - } else {
404 this.isLocation = "2"; 402 this.isLocation = "2";
403 + } else {
404 + this.isLocation = "1";
405 } 405 }
406 this.isNeedRequired = info.isNeedRequired; 406 this.isNeedRequired = info.isNeedRequired;
407 } 407 }
...@@ -435,10 +435,10 @@ ...@@ -435,10 +435,10 @@
435 info.subCategory.split(";") : 435 info.subCategory.split(";") :
436 []; 436 [];
437 this.form = info; 437 this.form = info;
438 - if (info.location != null || info.location == "") { 438 + if (info.notLocation != null || info.notLocation == "") {
439 - this.isLocation = "1";
440 - } else {
441 this.isLocation = "2"; 439 this.isLocation = "2";
440 + } else {
441 + this.isLocation = "1";
442 } 442 }
443 let isNeedRequired = response.data.isNeedRequired; 443 let isNeedRequired = response.data.isNeedRequired;
444 this.form.isNeedRequired = isNeedRequired; 444 this.form.isNeedRequired = isNeedRequired;
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 - <el-form :model="queryParams" ref="queryForm" :inline="true"> 3 + <el-form class="form-header" :model="queryParams" ref="queryForm" size="medium" :inline="true" label-position="right" label-width="auto">
4 4
5 <el-form-item label="原航班"> 5 <el-form-item label="原航班">
6 - <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable class="formItem"></el-input> 6 + <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
7 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> --> 7 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
8 </el-form-item> 8 </el-form-item>
9 <el-form-item label="状态" prop="status"> 9 <el-form-item label="状态" prop="status">
10 - <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> 10 + <el-select v-model="queryParams.status" placeholder="请选择" clearable>
11 <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" /> 11 <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
12 </el-select> 12 </el-select>
13 13
...@@ -30,15 +30,13 @@ ...@@ -30,15 +30,13 @@
30 </el-form-item> 30 </el-form-item>
31 <br /> 31 <br />
32 <el-form-item> 32 <el-form-item>
33 - <el-col :span="1.5">
34 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加规则</el-button> 33 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加规则</el-button>
35 - </el-col> 34 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
36 - &#12288; <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
37 </el-form-item> 35 </el-form-item>
38 </el-form> 36 </el-form>
39 37
40 38
41 - <el-table v-loading="loading" :data="sourceFlightRulesList"> 39 + <el-table v-loading="loading" height="550" :data="sourceFlightRulesList" highlight-current-row border stripe>
42 <el-table-column type="index" label="序号" align="center"> 40 <el-table-column type="index" label="序号" align="center">
43 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 41 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
44 </el-table-column> 42 </el-table-column>
...@@ -92,7 +90,7 @@ ...@@ -92,7 +90,7 @@
92 90
93 <!-- 添加或修改对话框 --> 91 <!-- 添加或修改对话框 -->
94 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false"> 92 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
95 - <el-form ref="form" :model="form" :rules="rules" label-width="100px"> 93 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
96 <el-row> 94 <el-row>
97 <el-col :span="10"> 95 <el-col :span="10">
98 <el-form-item label="原航班" prop="sourceFlightNo"> 96 <el-form-item label="原航班" prop="sourceFlightNo">
...@@ -219,7 +217,7 @@ ...@@ -219,7 +217,7 @@
219 rules: { 217 rules: {
220 sourceFlightNo: [{ 218 sourceFlightNo: [{
221 required: true, 219 required: true,
222 - message: "原航班号不能为空", 220 + message: "ACCS原航班号不能为空",
223 trigger: "blur" 221 trigger: "blur"
224 }], 222 }],
225 flightRank: [{ 223 flightRank: [{
...@@ -361,7 +359,7 @@ ...@@ -361,7 +359,7 @@
361 //校验原航班号非空 359 //校验原航班号非空
362 if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this 360 if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this
363 .queryParams.sourceFlightNo.trim() === '') { 361 .queryParams.sourceFlightNo.trim() === '') {
364 - this.$message.warning("原航班号为空"); 362 + this.$message.warning("ACCS原航班号为空");
365 return 363 return
366 } 364 }
367 //校验原日期非空 365 //校验原日期非空
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium"> 3 <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
4 <el-row> 4 <el-row>
5 <el-col :span="6"> 5 <el-col :span="6">
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="90px"> 3 + <el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto" size="medium">
4 <el-row> 4 <el-row>
5 - <el-col :span="8"> 5 + <el-col :span="6">
6 -
7 <el-form-item label="航班日期从" prop="fltDateStart"> 6 <el-form-item label="航班日期从" prop="fltDateStart">
8 - <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期"> 7 + <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
9 </el-date-picker> 8 </el-date-picker>
10 </el-form-item> 9 </el-form-item>
11 </el-col> 10 </el-col>
12 11
13 - <el-col :span="8"> 12 + <el-col :span="6">
14 <el-form-item label="到" prop="fltDateEnd"> 13 <el-form-item label="到" prop="fltDateEnd">
15 - <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期"> 14 + <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
16 </el-date-picker> 15 </el-date-picker>
17 </el-form-item> 16 </el-form-item>
18 </el-col> 17 </el-col>
19 18
20 - <el-col :span="8"> 19 + <el-col :span="6">
21 <el-form-item label="航班号" prop="fltNo"> 20 <el-form-item label="航班号" prop="fltNo">
22 - <el-input v-model="queryParams.fltNo" placeholder="请输入航班号" clearable size="small" /> 21 + <el-input class="formItem" v-model="queryParams.fltNo" placeholder="请输入航班号" clearable />
23 </el-form-item> 22 </el-form-item>
24 </el-col> 23 </el-col>
25 24
26 - </el-row> 25 + <el-col :span="6">
27 - <el-row>
28 - <el-col :span="8">
29 <el-form-item label="航班类型" prop="typeId"> 26 <el-form-item label="航班类型" prop="typeId">
30 - <el-select v-model="queryParams.typeId" placeholder="请选择航班类型" clearable size="small"> 27 + <el-select class="formItem" v-model="queryParams.typeId" placeholder="请选择航班类型" clearable>
31 <el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" /> 28 <el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
32 </el-select> 29 </el-select>
33 </el-form-item> 30 </el-form-item>
34 </el-col> 31 </el-col>
35 32
36 - <el-col :span="8"> 33 + <el-col :span="6">
37 <el-form-item label="航班状态" prop="statusId"> 34 <el-form-item label="航班状态" prop="statusId">
38 - <el-select v-model="queryParams.statusId" placeholder="请选择航班状态" clearable size="small"> 35 + <el-select class="formItem" v-model="queryParams.statusId" placeholder="请选择航班状态" clearable>
39 <el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" /> 36 <el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
40 </el-select> 37 </el-select>
41 </el-form-item> 38 </el-form-item>
42 </el-col> 39 </el-col>
43 40
44 - <el-col :span="8"> 41 + <el-col :span="6">
45 <el-form-item label="航班种类" prop="flightKindId"> 42 <el-form-item label="航班种类" prop="flightKindId">
46 - <el-select v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable size="small"> 43 + <el-select class="formItem" v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable>
47 <el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" /> 44 <el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
48 </el-select> 45 </el-select>
49 </el-form-item> 46 </el-form-item>
...@@ -51,14 +48,11 @@ ...@@ -51,14 +48,11 @@
51 48
52 </el-row> 49 </el-row>
53 50
54 - <br />
55 - <el-form-item>
56 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> 51 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
57 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> 52 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
58 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> 53 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
59 - <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">航班开启</el-button> 54 + <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">自动配舱开启</el-button>
60 - <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">航班关闭</el-button> 55 + <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">自动配舱关闭</el-button>
61 - </el-form-item>
62 </el-form> 56 </el-form>
63 <!-- <el-row :gutter="10" class="mb8"> 57 <!-- <el-row :gutter="10" class="mb8">
64 <el-col :span="1.5"> 58 <el-col :span="1.5">
...@@ -132,7 +126,7 @@ ...@@ -132,7 +126,7 @@
132 126
133 <!-- 添加或修改对话框 --> 127 <!-- 添加或修改对话框 -->
134 <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true"> 128 <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
135 - <el-form ref="form" :model="form" :rules="rules" label-width="130px"> 129 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
136 <el-row> 130 <el-row>
137 <el-col :span="12"> 131 <el-col :span="12">
138 <el-form-item label="航班号" prop="fltNo"> 132 <el-form-item label="航班号" prop="fltNo">
...@@ -547,7 +541,6 @@ ...@@ -547,7 +541,6 @@
547 }, 541 },
548 //计算高地价可配 542 //计算高地价可配
549 LowHighAvailable() { 543 LowHighAvailable() {
550 -
551 //判断是否开启高地价 544 //判断是否开启高地价
552 if (this.form.highLowPriceFlg) { 545 if (this.form.highLowPriceFlg) {
553 this.ishighPriceWeightPercent=false; 546 this.ishighPriceWeightPercent=false;
...@@ -562,21 +555,33 @@ ...@@ -562,21 +555,33 @@
562 this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form 555 this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
563 .highPriceWeightPercent / 100)); 556 .highPriceWeightPercent / 100));
564 // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100) 557 // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
565 - } else { 558 + }else if(this.title == "修改航班信息" && this.form.highPriceWeightPercent > 0){
559 + if(this.form.highAvailableWeight){
560 + this.$set(this.form, 'highAvailableWeight', this.form.highAvailableWeight)
561 + }else{
562 + this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
563 + .highPriceWeightPercent / 100));
564 + }
565 + }else {
566 this.$set(this.form, "highAvailableWeight", 0); 566 this.$set(this.form, "highAvailableWeight", 0);
567 // this.form.HighAvailableWeight = 0; 567 // this.form.HighAvailableWeight = 0;
568 } 568 }
569 //低价可配 569 //低价可配
570 if (this.form.lowPriceWeightPercent > 0) { 570 if (this.form.lowPriceWeightPercent > 0) {
571 -
572 this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form 571 this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
573 .highAvailableWeight); 572 .highAvailableWeight);
574 //this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight; 573 //this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight;
575 - } else { 574 + }else if(this.title == "修改航班信息" && this.form.lowPriceWeightPercent > 0){
575 + if(this.form.lowAvailableWeight){
576 + this.$set(this.form, 'lowAvailableWeight', this.form.lowAvailableWeight)
577 + }else{
578 + this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
579 + .highAvailableWeight);
580 + }
581 + }else {
576 this.$set(this.form, "lowAvailableWeight", 0); 582 this.$set(this.form, "lowAvailableWeight", 0);
577 // this.form.lowAvailableWeight = 0; 583 // this.form.lowAvailableWeight = 0;
578 } 584 }
579 -
580 }else{ 585 }else{
581 this.ishighPriceWeightPercent=true; 586 this.ishighPriceWeightPercent=true;
582 } 587 }
...@@ -587,7 +592,7 @@ ...@@ -587,7 +592,7 @@
587 let Weight = 0; 592 let Weight = 0;
588 if (this.form.extraWeightPercent > 0) { 593 if (this.form.extraWeightPercent > 0) {
589 Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100) 594 Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100)
590 - } else { 595 + }else {
591 Weight = this.form.originalWeight; 596 Weight = this.form.originalWeight;
592 } 597 }
593 return Weight; 598 return Weight;
......