Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
4e29d5cd 1 parent afc32128

代码更新

Inline Side-by-side
Showing 7 changed files with 91 additions and 40 deletions
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
50 <el-pagination 50 <el-pagination
51 :total="totalCount" 51 :total="totalCount"
52 :page-size.sync="limitSize" 52 :page-size.sync="limitSize"
53 + :current-page.sync="pageNum"
53 background 54 background
54 layout="prev, pager, next, jumper, ->, total, slot" 55 layout="prev, pager, next, jumper, ->, total, slot"
55 class="tablePagination" 56 class="tablePagination"
...@@ -201,6 +202,11 @@ export default { ...@@ -201,6 +202,11 @@ export default {
201 created() { 202 created() {
202 this.newHeader = this.headerData; 203 this.newHeader = this.headerData;
203 }, 204 },
205 + watch:{
206 + page(){
207 + this.pageNum = this.page;
208 + }
209 + },
204 mounted() {}, 210 mounted() {},
205 methods: { 211 methods: {
206 nextClick() { 212 nextClick() {
......
...@@ -142,32 +142,35 @@ ...@@ -142,32 +142,35 @@
142 </el-col> 142 </el-col>
143 <el-col :span="6"> 143 <el-col :span="6">
144 <el-form-item label="重量区间"> 144 <el-form-item label="重量区间">
145 - <el-col :span="11" 145 + <el-row>
146 - ><el-input-number 146 + <el-col :span="11"
147 - class="formItem" 147 + ><el-input-number
148 - size="mini" 148 + class="formItem"
149 - v-model="formData.minWeight" 149 + size="mini"
150 - :controls="false" 150 + v-model="formData.minWeight"
151 - :min="0" 151 + :controls="false"
152 - :precision="2" 152 + :min="0"
153 - ></el-input-number 153 + :precision="2"
154 - ></el-col> 154 + ></el-input-number
155 - <el-col class="line" :span="2">-</el-col> 155 + ></el-col>
156 - <el-col :span="11" 156 + <el-col class="line" :span="2">-</el-col>
157 - ><el-input-number 157 + <el-col :span="11"
158 - class="formItem" 158 + ><el-input-number
159 - size="mini" 159 + class="formItem"
160 - v-model="formData.maxWeight" 160 + size="mini"
161 - :controls="false" 161 + v-model="formData.maxWeight"
162 - :min="formData.minWeight" 162 + :controls="false"
163 - :precision="2" 163 + :min="formData.minWeight"
164 - ></el-input-number 164 + :precision="2"
165 - ></el-col> 165 + ></el-input-number
166 + ></el-col>
167 + </el-row>
166 </el-form-item> 168 </el-form-item>
167 </el-col> 169 </el-col>
168 <el-col :span="6"> 170 <el-col :span="6">
169 <el-form-item label="件数区间"> 171 <el-form-item label="件数区间">
170 - <el-col :span="11" 172 + <el-row>
173 + <el-col :span="11"
171 ><el-input-number 174 ><el-input-number
172 class="formItem" 175 class="formItem"
173 size="mini" 176 size="mini"
...@@ -186,6 +189,7 @@ ...@@ -186,6 +189,7 @@
186 :min="formData.minNumber" 189 :min="formData.minNumber"
187 ></el-input-number 190 ></el-input-number
188 ></el-col> 191 ></el-col>
192 + </el-row>
189 </el-form-item> 193 </el-form-item>
190 </el-col> 194 </el-col>
191 <!-- <el-col :span="6"> 195 <!-- <el-col :span="6">
...@@ -270,7 +274,7 @@ ...@@ -270,7 +274,7 @@
270 icon="el-icon-search" 274 icon="el-icon-search"
271 size="mini" 275 size="mini"
272 :loading="loading" 276 :loading="loading"
273 - @click="select" 277 + @click="select(0)"
274 >查询</el-button 278 >查询</el-button
275 > 279 >
276 <el-button 280 <el-button
...@@ -314,6 +318,7 @@ ...@@ -314,6 +318,7 @@
314 :loading="loading" 318 :loading="loading"
315 :limitSize="size" 319 :limitSize="size"
316 :limitStart="formData.limitStart" 320 :limitStart="formData.limitStart"
321 + :page="page"
317 :shiftKey="shiftKey" 322 :shiftKey="shiftKey"
318 height="350" 323 height="350"
319 @tableSelect="tableSelect" 324 @tableSelect="tableSelect"
...@@ -793,9 +798,13 @@ export default { ...@@ -793,9 +798,13 @@ export default {
793 }; 798 };
794 }, 799 },
795 created() { 800 created() {
796 - this.seleData() 801 + this.seleData();
797 this.select(); 802 this.select();
798 }, 803 },
804 + // activated(){
805 + // this.seleData();
806 + // this.select();
807 + // },
799 mounted() { 808 mounted() {
800 window.addEventListener("keydown", (code) => { 809 window.addEventListener("keydown", (code) => {
801 if (code.keyCode === 16 && code.shiftKey) { 810 if (code.keyCode === 16 && code.shiftKey) {
...@@ -852,9 +861,13 @@ export default { ...@@ -852,9 +861,13 @@ export default {
852 .catch(() => {}); 861 .catch(() => {});
853 }, 862 },
854 //查询 863 //查询
855 - select() { 864 + async select(val) {
856 this.loading = true; 865 this.loading = true;
857 this.dataInfo(); 866 this.dataInfo();
867 + if(val === 0){
868 + this.page = 1;
869 + this.formData.page = 1;
870 + }
858 findCargoAllocationData(this.formData) 871 findCargoAllocationData(this.formData)
859 .then((res) => { 872 .then((res) => {
860 this.loading = false; 873 this.loading = false;
...@@ -999,9 +1012,9 @@ export default { ...@@ -999,9 +1012,9 @@ export default {
999 } 1012 }
1000 }); 1013 });
1001 data = data.sort(this.$refs.newTables.compare(val.prop, val.order)); 1014 data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
1002 - if (val.order != "ascending") { 1015 + if (val.order == "descending") {
1003 this.tableData = nullData.concat(data); 1016 this.tableData = nullData.concat(data);
1004 - } else { 1017 + } else{
1005 this.tableData = data.concat(nullData); 1018 this.tableData = data.concat(nullData);
1006 } 1019 }
1007 this.tableData.forEach((item, index = 0) => { 1020 this.tableData.forEach((item, index = 0) => {
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 </el-form> 59 </el-form>
60 <div slot="footer"> 60 <div slot="footer">
61 <el-button @click="dialogBeforeClose">取 消</el-button> 61 <el-button @click="dialogBeforeClose">取 消</el-button>
62 - <el-button type="primary" @click="submit">确 定</el-button> 62 + <el-button type="primary" @click="submit" :loading="loading">确 定</el-button>
63 </div> 63 </div>
64 </el-dialog> 64 </el-dialog>
65 </div> 65 </div>
...@@ -119,6 +119,7 @@ export default { ...@@ -119,6 +119,7 @@ export default {
119 }, 119 },
120 ], 120 ],
121 }, 121 },
122 + loading:false,
122 }; 123 };
123 }, 124 },
124 methods: { 125 methods: {
...@@ -132,6 +133,7 @@ export default { ...@@ -132,6 +133,7 @@ export default {
132 }, 133 },
133 //确定配舱 134 //确定配舱
134 submit() { 135 submit() {
136 + this.loading= true;
135 let arr = []; 137 let arr = [];
136 this.tableData.forEach((item) => { 138 this.tableData.forEach((item) => {
137 arr.push(item.id); 139 arr.push(item.id);
...@@ -146,6 +148,7 @@ export default { ...@@ -146,6 +148,7 @@ export default {
146 type: "success", 148 type: "success",
147 }); 149 });
148 this.cleaerForm(); 150 this.cleaerForm();
151 + this.loading = false;
149 this.$emit("dialogBeforeClose", { close: false, reload: true }); 152 this.$emit("dialogBeforeClose", { close: false, reload: true });
150 } else if (res.code === 202) { 153 } else if (res.code === 202) {
151 MessageBox.confirm(res.msg, "提示", { 154 MessageBox.confirm(res.msg, "提示", {
...@@ -169,6 +172,7 @@ export default { ...@@ -169,6 +172,7 @@ export default {
169 } 172 }
170 }); 173 });
171 this.cleaerForm(); 174 this.cleaerForm();
175 + this.loading = false;
172 this.$emit("dialogBeforeClose", { close: false, reload: true }); 176 this.$emit("dialogBeforeClose", { close: false, reload: true });
173 }) 177 })
174 .catch(() => { 178 .catch(() => {
...@@ -178,19 +182,24 @@ export default { ...@@ -178,19 +182,24 @@ export default {
178 type: "success", 182 type: "success",
179 }); 183 });
180 this.cleaerForm(); 184 this.cleaerForm();
185 + this.loading = false;
181 this.$emit("dialogBeforeClose", { 186 this.$emit("dialogBeforeClose", {
182 close: false, 187 close: false,
183 - reload: false, 188 + reload: true,
184 }); 189 });
185 }); 190 });
186 } else { 191 } else {
192 + this.loading = false;
187 this.$message({ 193 this.$message({
188 message: res.msg, 194 message: res.msg,
189 type: "warning", 195 type: "warning",
190 }); 196 });
191 } 197 }
198 + }).catch(()=>{
199 + this.loading = false;
192 }); 200 });
193 } else { 201 } else {
202 + this.loading = false;
194 this.$message({ 203 this.$message({
195 message: "航班号或航班日期不能为空", 204 message: "航班号或航班日期不能为空",
196 type: "warning", 205 type: "warning",
...@@ -199,7 +208,7 @@ export default { ...@@ -199,7 +208,7 @@ export default {
199 }, 208 },
200 dialogBeforeClose() { 209 dialogBeforeClose() {
201 this.cleaerForm(); 210 this.cleaerForm();
202 - this.$emit("dialogBeforeClose", { close: false, reload: false }); 211 + this.$emit("dialogBeforeClose", { close: false, reload: true });
203 }, 212 },
204 }, 213 },
205 computed: { 214 computed: {
......
...@@ -561,7 +561,9 @@ export default { ...@@ -561,7 +561,9 @@ export default {
561 this.isNeedRequired = info.isNeedRequired; 561 this.isNeedRequired = info.isNeedRequired;
562 } 562 }
563 this.loading = false; 563 this.loading = false;
564 - }); 564 + }).catch(()=>{
565 + this.loading = false;
566 + })
565 } else { 567 } else {
566 //货物信息 568 //货物信息
567 findByFlightId(id).then((response) => { 569 findByFlightId(id).then((response) => {
...@@ -600,7 +602,9 @@ export default { ...@@ -600,7 +602,9 @@ export default {
600 this.isNeedRequired = isNeedRequired; 602 this.isNeedRequired = isNeedRequired;
601 } 603 }
602 this.loading = false; 604 this.loading = false;
603 - }); 605 + }).catch(()=>{
606 + this.loading = false;
607 + })
604 } 608 }
605 } 609 }
606 } else { 610 } else {
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
115 </el-col> 115 </el-col>
116 116
117 <el-col :span="24" style="margin-bottom: 5%;"> 117 <el-col :span="24" style="margin-bottom: 5%;">
118 - <span style="color: #ff4949;margin-left: 10%;">提示:配载航班之同请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br /> 118 + <span style="color: #ff4949;margin-left: 10%;">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
119 <span style="color: #ff4949;margin-left: 10%;">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span> 119 <span style="color: #ff4949;margin-left: 10%;">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span>
120 </el-col> 120 </el-col>
121 <el-col :span="24"> 121 <el-col :span="24">
......
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
70 </el-button> 70 </el-button>
71 </el-col> 71 </el-col>
72 </el-row> --> 72 </el-row> -->
73 - <el-table max-height="550" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList" size="mini" 73 + <el-table height="550" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList" size="mini"
74 @selection-change="handleSelectionChange"> 74 @selection-change="handleSelectionChange">
75 <el-table-column type="selection" width="55" align="center" /> 75 <el-table-column type="selection" width="55" align="center" />
76 <el-table-column label="航班日期" align="center" prop="fltDate" width="120" /> 76 <el-table-column label="航班日期" align="center" prop="fltDate" width="120" />
77 <el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" /> 77 <el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" />
78 - <el-table-column label="航班号" align="center" prop="fltNo" /> 78 + <el-table-column label="航班号" align="center" prop="fltNo" width="150"/>
79 <el-table-column label="航班路线" align="center" prop="route" width="150" /> 79 <el-table-column label="航班路线" align="center" prop="route" width="150" />
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" />
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
268 </div> 268 </div>
269 </el-dialog> 269 </el-dialog>
270 270
271 - <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible"> 271 + <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false" :append-to-body="true">
272 <el-table :data="gridData"> 272 <el-table :data="gridData">
273 <el-table-column property="fltNo" label="航班号" width="150"></el-table-column> 273 <el-table-column property="fltNo" label="航班号" width="150"></el-table-column>
274 <el-table-column property="fltDate" label="航班日期" width="200"></el-table-column> 274 <el-table-column property="fltDate" label="航班日期" width="200"></el-table-column>
...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
564 Weight = this.Weightall(); 564 Weight = this.Weightall();
565 } 565 }
566 //高价可配 566 //高价可配
567 - if (this.form.highPriceWeightPercent > 0) { 567 + if (this.form.highPriceWeightPercent >= 0) {
568 this.$set(this.form, "lowPriceWeightPercent", 100-this.form.highPriceWeightPercent); 568 this.$set(this.form, "lowPriceWeightPercent", 100-this.form.highPriceWeightPercent);
569 this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form 569 this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
570 .highPriceWeightPercent / 100)); 570 .highPriceWeightPercent / 100));
......
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
213 icon="el-icon-search" 213 icon="el-icon-search"
214 size="small" 214 size="small"
215 :loading="tableLoading" 215 :loading="tableLoading"
216 - @click="select" 216 + @click="select(0)"
217 >查询</el-button 217 >查询</el-button
218 > 218 >
219 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" 219 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
...@@ -239,6 +239,7 @@ ...@@ -239,6 +239,7 @@
239 :loading="tableLoading" 239 :loading="tableLoading"
240 :limitSize="limitSize" 240 :limitSize="limitSize"
241 :limitStart="limitStart" 241 :limitStart="limitStart"
242 + :page="page"
242 :shiftKey="shiftKey" 243 :shiftKey="shiftKey"
243 height="550" 244 height="550"
244 @tableSelect="tableSelect" 245 @tableSelect="tableSelect"
...@@ -709,7 +710,7 @@ export default { ...@@ -709,7 +710,7 @@ export default {
709 }; 710 };
710 }, 711 },
711 created() { 712 created() {
712 - //查询条件 713 + // 查询条件
713 findConditionData().then((res) => { 714 findConditionData().then((res) => {
714 if (res.code == 200) { 715 if (res.code == 200) {
715 this.findConditionData = res.data; 716 this.findConditionData = res.data;
...@@ -722,6 +723,19 @@ export default { ...@@ -722,6 +723,19 @@ export default {
722 }); 723 });
723 }, 724 },
724 725
726 + // activated(){
727 + // findConditionData().then((res) => {
728 + // if (res.code == 200) {
729 + // this.findConditionData = res.data;
730 + // } else {
731 + // this.$message({
732 + // message: "查询条件不存在",
733 + // type: "warning",
734 + // });
735 + // }
736 + // });
737 + // },
738 +
725 mounted() { 739 mounted() {
726 window.addEventListener("keydown", (code) => { 740 window.addEventListener("keydown", (code) => {
727 if (code.keyCode === 16 && code.shiftKey) { 741 if (code.keyCode === 16 && code.shiftKey) {
...@@ -740,12 +754,17 @@ export default { ...@@ -740,12 +754,17 @@ export default {
740 this.$refs.cargoForm.resetFields(); 754 this.$refs.cargoForm.resetFields();
741 }, 755 },
742 //查询 756 //查询
743 - select() { 757 + select(val) {
744 this.tableData = []; 758 this.tableData = [];
745 this.allWeight = 0; 759 this.allWeight = 0;
746 this.allQty = 0; 760 this.allQty = 0;
747 this.tableLoading = true; 761 this.tableLoading = true;
748 this.dataInfo(); 762 this.dataInfo();
763 + if(val === 0){
764 + this.formData.limitStart = 1;
765 + this.limitStart = 1;
766 + this.page = 1;
767 + }
749 findCargoData(this.formData).then((res) => { 768 findCargoData(this.formData).then((res) => {
750 if (res.code == 200) { 769 if (res.code == 200) {
751 this.tableData = res.data.list; 770 this.tableData = res.data.list;
......