Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
f0858ccb 1 parent 15d89d14

字典更新

Inline Side-by-side
Showing 3 changed files with 68 additions and 58 deletions
1 - let ductLabels = { 1 +let ductLabels = {
2 - "cargoRulesStatus":{ 2 + "cargoRulesStatus": {
3 - "1":"手动", 3 + "1": "手动",
4 - "2":"自动" 4 + "2": "自动"
5 }, 5 },
6 "menuType": { 6 "menuType": {
7 "M": "菜单", 7 "M": "菜单",
...@@ -19,7 +19,20 @@ ...@@ -19,7 +19,20 @@
19 "isValid": { 19 "isValid": {
20 "1": "开启", 20 "1": "开启",
21 "2": "关闭", 21 "2": "关闭",
22 + },
23 + "ticketToPiece": {
24 + "1": "是",
25 + "0": "否",
26 + },
27 + "needRequired": {
28 + "1": "是",
29 + "0": "否",
30 + },
31 + "highLowPriceFlg": {
32 + "1": "开启",
33 + "0": "未开启",
22 } 34 }
35 +
23 } 36 }
24 37
25 export default ductLabels; 38 export default ductLabels;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 end-placeholder="结束日期" 19 end-placeholder="结束日期"
20 v-model="fltDate" 20 v-model="fltDate"
21 :value-format="valueFormat" 21 :value-format="valueFormat"
22 + clearable
22 > 23 >
23 </el-date-picker> 24 </el-date-picker>
24 </el-form-item> 25 </el-form-item>
...@@ -72,6 +73,32 @@ ...@@ -72,6 +73,32 @@
72 </el-form-item> 73 </el-form-item>
73 </el-col> 74 </el-col>
74 <el-col :span="6"> 75 <el-col :span="6">
76 + <el-form-item label="ACCSpool">
77 + <el-select
78 + placeholder="不限"
79 + v-model="formData.accsPool"
80 + class="formItem"
81 + clearable
82 + >
83 + <el-option
84 + value="Pre-MDE"
85 + key="Pre-MDE"
86 + >
87 + </el-option>
88 + <el-option
89 + value="OSPR"
90 + key="OSPR"
91 + >
92 + </el-option>
93 + <el-option
94 + value="Manifest"
95 + key="Manifest"
96 + >
97 + </el-option>
98 + </el-select>
99 + </el-form-item>
100 + </el-col>
101 + <el-col :span="6">
75 <el-form-item label="运单号"> 102 <el-form-item label="运单号">
76 <el-input 103 <el-input
77 class="formItem" 104 class="formItem"
...@@ -79,6 +106,7 @@ ...@@ -79,6 +106,7 @@
79 placeholder="请输入运单号（回车分割）" 106 placeholder="请输入运单号（回车分割）"
80 :autosize="true" 107 :autosize="true"
81 v-model="formData.waybillNo" 108 v-model="formData.waybillNo"
109 + clearable
82 ></el-input> 110 ></el-input>
83 </el-form-item> 111 </el-form-item>
84 </el-col> 112 </el-col>
...@@ -126,6 +154,7 @@ ...@@ -126,6 +154,7 @@
126 placeholder="S_;P_;E2" 154 placeholder="S_;P_;E2"
127 v-model="ursa" 155 v-model="ursa"
128 :autosize="true" 156 :autosize="true"
157 + clearable
129 ></el-input> 158 ></el-input>
130 </el-form-item> 159 </el-form-item>
131 </el-col> 160 </el-col>
...@@ -137,6 +166,7 @@ ...@@ -137,6 +166,7 @@
137 placeholder="PVG;PEK" 166 placeholder="PVG;PEK"
138 v-model="siteName" 167 v-model="siteName"
139 :autosize="true" 168 :autosize="true"
169 + clearable
140 ></el-input> 170 ></el-input>
141 </el-form-item> 171 </el-form-item>
142 </el-col> 172 </el-col>
...@@ -192,45 +222,19 @@ ...@@ -192,45 +222,19 @@
192 </el-row> 222 </el-row>
193 </el-form-item> 223 </el-form-item>
194 </el-col> 224 </el-col>
195 - <!-- <el-col :span="6">
196 - <el-form-item label="航班类型">
197 - <el-select
198 - placeholder="不限"
199 - v-model="formData.kindToAllocFlightId"
200 - class="formItem"
201 - clearable
202 - >
203 - <el-option
204 - v-for="item in selectData.fltTypes"
205 - :label="item.chineseName"
206 - v-model="item.id"
207 - :key="item.id"
208 - >
209 - </el-option>
210 - </el-select>
211 - </el-form-item>
212 - </el-col> -->
213 <el-col :span="6"> 225 <el-col :span="6">
214 <el-form-item label="取件日期"> 226 <el-form-item label="取件日期">
215 <el-date-picker 227 <el-date-picker
228 + class="formItem"
216 v-model="formData.pickUpDate" 229 v-model="formData.pickUpDate"
217 type="date" 230 type="date"
218 placeholder="选择日期" 231 placeholder="选择日期"
219 :value-format="valueFormat" 232 :value-format="valueFormat"
233 + clearable
220 > 234 >
221 </el-date-picker> 235 </el-date-picker>
222 </el-form-item> 236 </el-form-item>
223 </el-col> 237 </el-col>
224 - <el-col :span="6">
225 - <el-form-item label="口岸代码">
226 - <el-input
227 - v-model="portName"
228 - placeholder="请输入口岸代码"
229 - class="formItem"
230 - clearable
231 - ></el-input>
232 - </el-form-item>
233 - </el-col>
234 <el-col :span="24"> 238 <el-col :span="24">
235 <el-form-item label="Handling Code"> 239 <el-form-item label="Handling Code">
236 <el-empty 240 <el-empty
...@@ -304,7 +308,7 @@ ...@@ -304,7 +308,7 @@
304 size="mini" 308 size="mini"
305 v-hasPermi="['allocation:cargo:allocation']" 309 v-hasPermi="['allocation:cargo:allocation']"
306 @click="addFit" 310 @click="addFit"
307 - :disabled="tableSelection.length <= 0" 311 + :disabled="tableSelection.length <= 0 || formData.accsPool!='OSPR'"
308 >添加到航班</el-button 312 >添加到航班</el-button
309 > 313 >
310 <div class="tips"> 314 <div class="tips">
...@@ -323,6 +327,7 @@ ...@@ -323,6 +327,7 @@
323 :limitStart="formData.limitStart" 327 :limitStart="formData.limitStart"
324 :page="page" 328 :page="page"
325 :shiftKey="shiftKey" 329 :shiftKey="shiftKey"
330 + :infoShow="false"
326 :height="tableHeight" 331 :height="tableHeight"
327 @tableSelect="tableSelect" 332 @tableSelect="tableSelect"
328 @tableSelectAll="tableSelectAll" 333 @tableSelectAll="tableSelectAll"
...@@ -341,7 +346,6 @@ ...@@ -341,7 +346,6 @@
341 import Dialog from "./info.vue"; 346 import Dialog from "./info.vue";
342 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect"; 347 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
343 import { allDictData } from "@/api/destinationFlight"; 348 import { allDictData } from "@/api/destinationFlight";
344 -// import { findFltConditionDataApi } from "@/api/findAllFltData";
345 import { downLoadXlsx } from "@/utils/zipdownload"; 349 import { downLoadXlsx } from "@/utils/zipdownload";
346 import { upCase } from "@/utils/FedEx"; 350 import { upCase } from "@/utils/FedEx";
347 351
...@@ -372,6 +376,7 @@ export default { ...@@ -372,6 +376,7 @@ export default {
372 handingCodes: null, 376 handingCodes: null,
373 subCategorys: null, 377 subCategorys: null,
374 customsReceiptStatusId: null, 378 customsReceiptStatusId: null,
379 + accsPool:"OSPR"
375 }, //查询数据 380 }, //查询数据
376 tableHeader: [ 381 tableHeader: [
377 { 382 {
...@@ -408,7 +413,7 @@ export default { ...@@ -408,7 +413,7 @@ export default {
408 type: "", 413 type: "",
409 name: "取件日期", 414 name: "取件日期",
410 value: "pickUpDate", 415 value: "pickUpDate",
411 - width: "100", 416 + width: "120",
412 align: "center", 417 align: "center",
413 sorTable: true, 418 sorTable: true,
414 fixed: false, 419 fixed: false,
...@@ -854,9 +859,6 @@ export default { ...@@ -854,9 +859,6 @@ export default {
854 activated(){ 859 activated(){
855 this.select(); 860 this.select();
856 }, 861 },
857 - deactivated(){
858 - this.tableData = []
859 - },
860 mounted() { 862 mounted() {
861 window.addEventListener("keydown", (code) => { 863 window.addEventListener("keydown", (code) => {
862 if (code.keyCode === 16 && code.shiftKey) { 864 if (code.keyCode === 16 && code.shiftKey) {
...@@ -873,19 +875,6 @@ export default { ...@@ -873,19 +875,6 @@ export default {
873 methods: { 875 methods: {
874 //查询条件 876 //查询条件
875 async seleData() { 877 async seleData() {
876 - // findFltConditionDataApi()
877 - // .then((res) => {
878 - // if (res.code === 200) {
879 - // this.selectData.fltTypes = res.data.flightType;
880 - // }else{
881 - // this.$message({
882 - // message: "查询条件不存在",
883 - // type: "warning",
884 - // });
885 - // }
886 - // })
887 - // .catch(() => {});
888 -
889 allDictData() 878 allDictData()
890 .then((res) => { 879 .then((res) => {
891 if (res.code === 200) { 880 if (res.code === 200) {
...@@ -928,9 +917,9 @@ export default { ...@@ -928,9 +917,9 @@ export default {
928 this.tableData = res.data.list; 917 this.tableData = res.data.list;
929 this.totalCount = res.data.total; 918 this.totalCount = res.data.total;
930 if (res.data.list.length > 0) { 919 if (res.data.list.length > 0) {
931 - this.tableData.forEach((item, index = 0) => { 920 + // this.tableData.forEach((item, index = 0) => {
932 - item.index = index; 921 + // item.index = index;
933 - }); 922 + // });
934 } else { 923 } else {
935 this.$message({ 924 this.$message({
936 message: "未查询到数据", 925 message: "未查询到数据",
...@@ -1070,9 +1059,15 @@ export default { ...@@ -1070,9 +1059,15 @@ export default {
1070 } else{ 1059 } else{
1071 this.tableData = data.concat(nullData); 1060 this.tableData = data.concat(nullData);
1072 } 1061 }
1073 - this.tableData.forEach((item, index = 0) => { 1062 + this.tableSelection = []
1074 - item.index = index; 1063 + this.cargoTotal()
1075 - }); 1064 + // this.tableData.forEach((item, index = 0) => {
1065 + // item.index = index;
1066 + // });
1067 + },
1068 + sizeChange(val){
1069 + this.size = val
1070 + this.select(0);
1076 }, 1071 },
1077 //添加到航班 1072 //添加到航班
1078 addFit() { 1073 addFit() {
...@@ -1123,6 +1118,9 @@ export default { ...@@ -1123,6 +1118,9 @@ export default {
1123 }, 1118 },
1124 }, 1119 },
1125 }, 1120 },
1121 + deactivated(){
1122 + this.tableData = []
1123 + },
1126 }; 1124 };
1127 </script> 1125 </script>
1128 1126
......
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
141 <el-col :span="6"> 141 <el-col :span="6">
142 <el-form-item label="取件日期"> 142 <el-form-item label="取件日期">
143 <el-date-picker 143 <el-date-picker
144 - class="formItem"
145 v-model="formData.pickUpDate" 144 v-model="formData.pickUpDate"
146 type="date" 145 type="date"
147 placeholder="选择日期" 146 placeholder="选择日期"
......