Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
1730532197@qq.com
9a582745 1 parent 5c937389

lwj

Inline Side-by-side
Showing 2 changed files with 102 additions and 146 deletions
...@@ -17,3 +17,21 @@ export function findAllFltDataApi(data) { ...@@ -17,3 +17,21 @@ export function findAllFltDataApi(data) {
17 17
18 }) 18 })
19 } 19 }
20 +//根据id查询item
21 +export function findFltById(data) {
22 + return request({
23 + url: '/FlightPreserveController/findFltById',
24 + method: 'post',
25 + data: data
26 +
27 + })
28 +}
29 +//新增修改
30 +export function saveOrUpdate(data) {
31 + return request({
32 + url: '/FlightPreserveController/saveOrUpdate',
33 + method: 'post',
34 + data: data
35 +
36 + })
37 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
80 <el-table-column label="航班类型" align="center" prop="typeName" width="100" /> 80 <el-table-column label="航班类型" align="center" prop="typeName" width="100" />
81 <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" /> 81 <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" />
82 <el-table-column label="航班状态" align="center" prop="statusName" /> 82 <el-table-column label="航班状态" align="center" prop="statusName" />
83 - <el-table-column label="总重量(KG)" align="center" prop="totalWeight" width="130" /> 83 + <el-table-column label="总重量" align="center" prop="totalWeight" width="130" />
84 - <el-table-column label="原始重量(KG)" align="center" prop="originalWeight" width="130" /> 84 + <el-table-column label="原始重量（T）" align="center" prop="originalWeight" width="130" />
85 <el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" /> 85 <el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" />
86 <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150" 86 <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150"
87 :formatter="ticketToPieceFormat" /> 87 :formatter="ticketToPieceFormat" />
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 <el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" /> 91 <el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" />
92 <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150" 92 <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150"
93 :formatter="highLowPriceFlgFormat" /> 93 :formatter="highLowPriceFlgFormat" />
94 - <el-table-column label="已配重量(KG)" align="center" prop="alloctedWeight" width="150" /> 94 + <el-table-column label="已配重量" align="center" prop="alloctedWeight" width="150" />
95 <el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" /> 95 <el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" />
96 <el-table-column label="航班优先级" align="center" prop="priorityName" width="150" /> 96 <el-table-column label="航班优先级" align="center" prop="priorityName" width="150" />
97 <el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" /> 97 <el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" />
...@@ -131,135 +131,106 @@ ...@@ -131,135 +131,106 @@
131 <el-form ref="form" :model="form" :rules="rules" label-width="125px"> 131 <el-form ref="form" :model="form" :rules="rules" label-width="125px">
132 <el-row> 132 <el-row>
133 <el-col :span="12"> 133 <el-col :span="12">
134 - <el-form-item label="航班号" prop="sourceFlightNo"> 134 + <el-form-item label="航班号" prop="fltNo">
135 - <el-input style="width:93%;" v-model="form.sourceFlightNo" placeholder="请输入航班号" /> 135 + <el-input style="width:93%;" v-model="form.fltNo" placeholder="请输入航班号" />
136 </el-form-item> 136 </el-form-item>
137 </el-col> 137 </el-col>
138 <!-- <el-col :span="1"> &#12288;</el-col> --> 138 <!-- <el-col :span="1"> &#12288;</el-col> -->
139 <el-col :span="12"> 139 <el-col :span="12">
140 - <el-form-item label="航班日期" prop="sourceFlightNo"> 140 + <el-form-item label="航班日期" prop="fltDate">
141 141
142 - <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate" 142 + <el-date-picker clearable size="small" v-model="form.fltDate"
143 - type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间"> 143 + type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
144 </el-date-picker> 144 </el-date-picker>
145 </el-form-item> 145 </el-form-item>
146 </el-col> 146 </el-col>
147 </el-row> 147 </el-row>
148 - <el-row>
149 - <el-col :span="12">
150 - <el-form-item label="航班路线" prop="sourceFlightNo">
151 - <el-input style="width:93%" v-model="form.sourceFlightNo" placeholder="请输入航班路线" />
152 - </el-form-item>
153 - </el-col>
154 148
155 <el-col :span="12"> 149 <el-col :span="12">
156 - <el-form-item label="航班起飞时间" prop="sourceFlightNo"> 150 + <el-form-item label="航班路线" prop="route">
157 - <el-time-picker v-model="form.startDate" placeholder="航班起飞时间"> 151 + <el-input style="width:93%" v-model="form.route" placeholder="请输入航班路线" />
158 - </el-time-picker>
159 </el-form-item> 152 </el-form-item>
160 </el-col> 153 </el-col>
161 - </el-row>
162 -
163 <el-row> 154 <el-row>
164 <el-col :span="12"> 155 <el-col :span="12">
165 - <el-form-item label="航班种类" prop="startDate"> 156 + <el-form-item label="航班种类" prop="kindId">
166 - <el-select v-model="form.value" placeholder="请选择航班种类"> 157 + <el-select v-model="form.kindId" placeholder="请选择航班种类">
167 - <el-option v-for="item in flightKindlist" :key="item.id" :label="item.label" :value="item.id"> 158 + <el-option v-for="item in flightKindlist" :key="item.id" :label="item.chineseName" :value="item.id">
168 </el-option> 159 </el-option>
169 </el-select> 160 </el-select>
170 </el-form-item> 161 </el-form-item>
171 </el-col> 162 </el-col>
172 <el-col :span="12"> 163 <el-col :span="12">
173 <el-form-item label="航班类型" prop="startDate"> 164 <el-form-item label="航班类型" prop="startDate">
174 - <!-- <el-select v-model="form.value1" placeholder="请选择航班类型"> 165 + <el-select v-model="form.typeId" placeholder="请选择航班类型">
175 - <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 166 + <el-option v-for="item in flightTypelist" :key="item.id" :label="item.chineseName" :value="item.id">
176 </el-option> 167 </el-option>
177 - </el-select> --> 168 + </el-select>
178 </el-form-item> 169 </el-form-item>
179 </el-col> 170 </el-col>
180 -
181 -
182 <el-col :span="12"> 171 <el-col :span="12">
183 - <el-form-item label="航班状态" prop="startDate"> 172 + <el-form-item label="航班状态" prop="statusId">
184 - <!-- <el-select v-model="form.value2" placeholder="请选择航班状态"> 173 + <el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
185 - <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 174 + <el-option v-for="item in flightStatuslist" :key="item.id" :label="item.chineseName" :value="item.id">
186 </el-option> 175 </el-option>
187 - </el-select> --> 176 + </el-select>
188 </el-form-item> 177 </el-form-item>
189 </el-col> 178 </el-col>
190 <el-col :span="12"> 179 <el-col :span="12">
191 - <el-form-item label="原始重量(KG)" prop="startDate"> 180 + <el-form-item label="原始重量（T）" prop="originalWeight">
192 - <el-input placeholder="请输入原始重量(KG)" style="width:93%" min="0" 181 + <el-input placeholder="请输入原始重量（T）" style="width:93%" min="0"
193 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 182 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
194 - v-model="form.input"></el-input> 183 + v-model="form.originalWeight"></el-input>
195 </el-form-item> 184 </el-form-item>
196 </el-col> 185 </el-col>
197 186
198 <el-col :span="12"> 187 <el-col :span="12">
199 - <el-form-item label="额外增重百分比" prop="startDate"> 188 + <el-form-item label="额外增重百分比" prop="extraWeightPercent">
200 - <el-input placeholder="请输入额外增重百分比" style="width:93%" min="0" 189 + <el-input :disabled="true" placeholder="请输入额外增重百分比" style="width:93%" min="0"
201 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 190 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
202 - v-model="form.input"></el-input> 191 + v-model="form.extraWeightPercent"></el-input>
203 </el-form-item> 192 </el-form-item>
204 </el-col> 193 </el-col>
205 194
206 <el-col :span="12"> 195 <el-col :span="12">
207 - <el-form-item label="是否限制一票一件" prop="startDate"> 196 + <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
208 - <el-switch v-model="form.value4" active-color="#13ce66"> 197 + <el-switch :disabled="true" v-model="form.highLowPriceFlg" active-color="#13ce66">
209 </el-switch> 198 </el-switch>
210 </el-form-item> 199 </el-form-item>
211 </el-col> 200 </el-col>
212 201
202 + <!-- 是否需要预审，1：预审，0：取消预审 -->
213 <el-col :span="12"> 203 <el-col :span="12">
214 - <el-form-item label="高价百分比" prop="startDate"> 204 + <el-form-item label="是否预审" prop="isNeedRequired">
215 - <el-input placeholder="请输入高价百分比" style="width:93%" min="0" 205 + <el-switch :disabled="true" v-model="form.isNeedRequired" active-color="#13ce66">
216 - oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 206 + </el-switch>
217 - v-model="form.input"></el-input>
218 </el-form-item> 207 </el-form-item>
219 </el-col> 208 </el-col>
220 209
221 <el-col :span="12"> 210 <el-col :span="12">
222 - <el-form-item label="低价百分比" prop="startDate"> 211 + <el-form-item label="高价百分比" prop="highPriceWeightPercent">
223 - <el-input placeholder="请输入低价百分比" style="width:93%" min="0" 212 + <el-input :disabled="true" placeholder="请输入高价百分比" style="width:93%" min="0"
224 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 213 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
225 - v-model="form.input"></el-input> 214 + v-model="form.highPriceWeightPercent"></el-input>
226 </el-form-item> 215 </el-form-item>
227 </el-col> 216 </el-col>
228 217
229 <el-col :span="12"> 218 <el-col :span="12">
230 - <el-form-item label="已配重量（KG）" prop="startDate"> 219 + <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
231 - <el-input placeholder="请输入已配重量（KG）" style="width:93%" min="0" 220 + <el-input :disabled="true" placeholder="请输入低价百分比" style="width:93%" min="0"
232 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 221 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
233 - v-model="form.input"></el-input> 222 + v-model="form.lowPriceWeightPercent"></el-input>
234 - </el-form-item>
235 - </el-col>
236 -
237 - <el-col :span="12">
238 - <el-form-item label="航班优先级" prop="startDate">
239 - <!-- <el-select v-model="form.value5" placeholder="请选择航班优先级">
240 - <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
241 - </el-option>
242 - </el-select> -->
243 </el-form-item> 223 </el-form-item>
244 </el-col> 224 </el-col>
245 225
246 -
247 <el-col :span="12"> 226 <el-col :span="12">
248 - <el-form-item label="总体积 （cm³）" prop="startDate"> 227 + <el-form-item label="已配重量" prop="alloctedWeight">
249 - <el-input placeholder="请输入总体积 （cm³）" style="width:93%" min="0" 228 + <el-input :disabled="true" placeholder="请输入已配重量" style="width:93%" min="0"
250 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" 229 oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
251 - v-model="form.input"></el-input> 230 + v-model="form.alloctedWeight"></el-input>
252 </el-form-item> 231 </el-form-item>
253 </el-col> 232 </el-col>
254 233
255 - <el-col :span="12">
256 - <el-form-item label="已配体积（cm³）" prop="startDate">
257 - <el-input placeholder="请输入已配体积（cm³）" style="width:93%" min="0"
258 - oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
259 - v-model="form.input"></el-input>
260 -
261 - </el-form-item>
262 - </el-col>
263 </el-row> 234 </el-row>
264 235
265 236
...@@ -274,7 +245,9 @@ ...@@ -274,7 +245,9 @@
274 <script> 245 <script>
275 import { 246 import {
276 findFltConditionDataApi, 247 findFltConditionDataApi,
277 - findAllFltDataApi 248 + findAllFltDataApi,
249 + findFltById,
250 + saveOrUpdate
278 251
279 } from "@/api/findAllFltData"; 252 } from "@/api/findAllFltData";
280 export default { 253 export default {
...@@ -293,28 +266,7 @@ ...@@ -293,28 +266,7 @@
293 single: true, 266 single: true,
294 // 非多个禁用 267 // 非多个禁用
295 multiple: true, 268 multiple: true,
296 - // data 中设定 269 +
297 - pickerOptionsStart: {
298 - disabledDate: time => {
299 - let endDateVal = this.form.endDate;
300 - if (endDateVal) {
301 - return time.getTime() > new Date(endDateVal).getTime() || time.getTime() < new Date().getTime() - 24 *
302 - 60 * 60 * 1000;
303 - } else {
304 - return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
305 - }
306 - }
307 - },
308 - pickerOptionsEnd: {
309 - disabledDate: time => {
310 - let beginDateVal = this.form.startDate;
311 - if (beginDateVal) {
312 - return time.getTime() < new Date(beginDateVal).getTime();
313 - } else {
314 - return time.getTime() < new Date().getTime() - 24 * 60 * 60 * 1000;
315 - }
316 - }
317 - },
318 // 遮罩层 270 // 遮罩层
319 loading: false, 271 loading: false,
320 // 遮罩层 272 // 遮罩层
...@@ -355,17 +307,26 @@ ...@@ -355,17 +307,26 @@
355 form: { 307 form: {
356 308
357 }, 309 },
358 -
359 // 表单校验 310 // 表单校验
360 rules: { 311 rules: {
361 - sourceFlightNo: [{ 312 + fltNo: [{
362 required: true, 313 required: true,
363 message: "原航班号不能为空", 314 message: "原航班号不能为空",
364 trigger: "blur" 315 trigger: "blur"
365 }], 316 }],
366 - flightRank: [{ 317 + fltDate: [{
367 required: true, 318 required: true,
368 - message: "配载航班不能为空", 319 + message: "航班日期不能为空",
320 + trigger: "blur"
321 + }],
322 + kindId: [{
323 + required: true,
324 + message: "航班种类不能为空",
325 + trigger: "blur"
326 + }],
327 + originalWeight: [{
328 + required: true,
329 + message: "原始重量（T）不能为空",
369 trigger: "blur" 330 trigger: "blur"
370 }], 331 }],
371 } 332 }
...@@ -418,6 +379,7 @@ ...@@ -418,6 +379,7 @@
418 //航班类型 379 //航班类型
419 this.flightTypelist = response.data.flightType; 380 this.flightTypelist = response.data.flightType;
420 //航班状态 381 //航班状态
382 +
421 this.flightStatuslist = response.data.flightStatus; 383 this.flightStatuslist = response.data.flightStatus;
422 384
423 } else { 385 } else {
...@@ -461,28 +423,35 @@ ...@@ -461,28 +423,35 @@
461 }, 423 },
462 /** 新增按钮操作 */ 424 /** 新增按钮操作 */
463 handleAdd() { 425 handleAdd() {
464 - this.form = {}; 426 + this.reset();
465 this.open = true; 427 this.open = true;
466 this.title = "添加航班信息"; 428 this.title = "添加航班信息";
467 this.form.id = -1; 429 this.form.id = -1;
468 - this.dayOfWeek = []; 430 + this.form.statusId=this.flightStatuslist[0].id;
469 -
470 }, 431 },
471 /** 修改按钮操作 */ 432 /** 修改按钮操作 */
472 handleUpdate(row) { 433 handleUpdate(row) {
473 - 434 + this.reset();
474 - this.form = {};
475 - this.dayOfWeek = [];
476 this.open = true; 435 this.open = true;
477 - this.title = "修改原航班顺位规则"; 436 + this.title = "修改航班信息";
478 - this.form = row; 437 + //根据ID查item
479 - this.dayOfWeek = this.form.dayOfWeek ? this.form.dayOfWeek.split(";") : []; 438 +
480 - //this.form.dayOfWeek = this.form.dayOfWeek ? this.form.dayOfWeek.split(";") : []; 439 + findFltById(row).then(response => {
440 + if (response.code == 200) {
441 + this.form = response.data;
442 + //是否开启高地价
443 + this.form.highLowPriceFlg =this.form.highLowPriceFlg===1?true:false;
444 + //是否预审
445 + this.form.isNeedRequired =this.form.isNeedRequired===1?true:false;
446 + } else {
447 + this.msgError(response.msg);
448 + }
481 449
450 + });
482 }, 451 },
483 /** 删除 启用 停用按钮操作 */ 452 /** 删除 启用 停用按钮操作 */
484 handleDeleteorPlayorpause(row, status, statusText) { 453 handleDeleteorPlayorpause(row, status, statusText) {
485 - debugger 454 +
486 //删除前需要停用 455 //删除前需要停用
487 if (status === 0 && row.status != '3') { 456 if (status === 0 && row.status != '3') {
488 this.$message({ 457 this.$message({
...@@ -518,9 +487,12 @@ ...@@ -518,9 +487,12 @@
518 submitForm: function() { 487 submitForm: function() {
519 this.$refs["form"].validate(valid => { 488 this.$refs["form"].validate(valid => {
520 if (valid) { 489 if (valid) {
521 - this.form.dayOfWeek = this.dayOfWeek.sort(); 490 + //是否开启高地价
491 + this.form.highLowPriceFlg =this.form.highLowPriceFlg?1:0;
492 + //是否预审
493 + this.form.isNeedRequired =this.form.isNeedRequired?1:0;
522 //处理数据 494 //处理数据
523 - sourceFlightRulesSaveApi(this.form).then(response => { 495 + saveOrUpdate(this.form).then(response => {
524 if (response.code === 200) { 496 if (response.code === 200) {
525 this.msgSuccess("保存成功"); 497 this.msgSuccess("保存成功");
526 this.open = false; 498 this.open = false;
...@@ -535,49 +507,15 @@ ...@@ -535,49 +507,15 @@
535 }, 507 },
536 // 表单重置 508 // 表单重置
537 reset() { 509 reset() {
538 - this.form = { 510 + this.form = {};
539 -
540 - dayOfWeek: []
541 -
542 - };
543 this.resetForm("form"); 511 this.resetForm("form");
544 }, 512 },
545 - /** 查询目的航班*/
546 - findSourceFlightAndFlightDate() {
547 - //校验原航班号非空
548 - if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this
549 - .queryParams.sourceFlightNo.trim() === '') {
550 - this.$message.warning("原航班号为空");
551 - return
552 - }
553 - //校验原日期非空
554 - if (this.queryParams.flightDate === null || this.queryParams.flightDate === undefined) {
555 - this.$message.warning("日期为空");
556 - return
557 - }
558 - this.openFlightDate = true;
559 - this.loadingFlightDate = true;
560 - this.sourceFlightAndFlightDate = [];
561 - findSourceFlightAndFlightDateApi(this.queryParams).then(response => {
562 - if (response.code === 200) {
563 - this.sourceFlightAndFlightDate = response.data;
564 - this.loadingFlightDate = false;
565 - } else {
566 - this.msgError(response.msg);
567 - }
568 -
569 - });
570 513
571 514
572 - },
573 - // 目的航班弹出框返回
574 - cancelFlightDate() {
575 - this.openFlightDate = false;
576 - },
577 // 取消按钮 515 // 取消按钮
578 cancel() { 516 cancel() {
579 this.open = false; 517 this.open = false;
580 - // this.reset(); 518 + this.reset();
581 }, 519 },
582 520
583 /** 重置按钮操作 */ 521 /** 重置按钮操作 */
......