Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
5148feda 1 parent 09d4ef2b

参数修改

Inline Side-by-side
Showing 3 changed files with 24 additions and 9 deletions
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
423 // 改变页面条数 423 // 改变页面条数
424 handleSizeChange(val) { 424 handleSizeChange(val) {
425 this.page.size = val; 425 this.page.size = val;
426 - this.search(1); 426 + this.search(0);
427 }, 427 },
428 // 切换页码 428 // 切换页码
429 handleCurrentChange(val) { 429 handleCurrentChange(val) {
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 headData.id == null || 14 headData.id == null ||
15 headData.id == '0' || 15 headData.id == '0' ||
16 ((headData.userUuid == null || headData.userUuid == '') && 16 ((headData.userUuid == null || headData.userUuid == '') &&
17 - (headData.createUserId == null || createUserId == '')) 17 + (headData.createUserId == null || headData.createUserId == ''))
18 " 18 "
19 > 19 >
20 <div class="formRowTitle"> 20 <div class="formRowTitle">
...@@ -587,7 +587,19 @@ export default { ...@@ -587,7 +587,19 @@ export default {
587 }, 587 },
588 headData: { 588 headData: {
589 type: Object, 589 type: Object,
590 - default: null, 590 + default() {
591 + return {
592 + id: null,
593 + userUuid: null,
594 + createUserId: "",
595 + consignmentCode: "",
596 + userInputShipperAccount: "",
597 + userInputOriginCountry: "",
598 + userInputOriginCountryCode: "",
599 + destinationCountry: "China",
600 + destinationCountryCode: "Country_CN",
601 + };
602 + },
591 }, 603 },
592 disabled: { 604 disabled: {
593 type: Boolean, 605 type: Boolean,
......
...@@ -7,12 +7,14 @@ ...@@ -7,12 +7,14 @@
7 <i class="el-icon-circle-check"></i> 7 <i class="el-icon-circle-check"></i>
8 <span>Waybill details</span 8 <span>Waybill details</span
9 ><span 9 ><span
10 - v-if=" 10 + v-show="
11 id != '' && 11 id != '' &&
12 id != null && 12 id != null &&
13 id != '0' && 13 id != '0' &&
14 - (headData.userUuid == null || headData.userUuid == '') && 14 + headData.userUuid != null &&
15 - (headData.createUserId == null || createUserId == '') 15 + headData.userUuid != '' &&
16 + headData.createUserId != null &&
17 + headData.createUserId != ''
16 " 18 "
17 >:{{ headData.consignmentCode }}</span 19 >:{{ headData.consignmentCode }}</span
18 > 20 >
...@@ -26,7 +28,7 @@ ...@@ -26,7 +28,7 @@
26 @searchWaybillData="searchWaybillData" 28 @searchWaybillData="searchWaybillData"
27 /> 29 />
28 <UploadFile 30 <UploadFile
29 - v-if="id != '' && id != null" 31 + v-show="id != '' && id != null"
30 ref="uploadBox" 32 ref="uploadBox"
31 class="headDataBox" 33 class="headDataBox"
32 :headData="headData" 34 :headData="headData"
...@@ -36,14 +38,14 @@ ...@@ -36,14 +38,14 @@
36 /> 38 />
37 <div class="option"> 39 <div class="option">
38 <el-button 40 <el-button
39 - v-if="id != '' && id != null" 41 + v-show="id != '' && id != null"
40 class="entrySaveButton entrySaveButton-background" 42 class="entrySaveButton entrySaveButton-background"
41 @click="submit" 43 @click="submit"
42 > 44 >
43 SUBMIT 45 SUBMIT
44 </el-button> 46 </el-button>
45 <el-button 47 <el-button
46 - v-if=" 48 + v-show="
47 (id == '' || id == null) && 49 (id == '' || id == null) &&
48 headData.consignmentCode != null && 50 headData.consignmentCode != null &&
49 headData.consignmentCode != '' && 51 headData.consignmentCode != '' &&
...@@ -85,6 +87,7 @@ export default { ...@@ -85,6 +87,7 @@ export default {
85 headData: { 87 headData: {
86 id: null, 88 id: null,
87 userUuid: null, 89 userUuid: null,
90 + createUserId: "",
88 consignmentCode: "", 91 consignmentCode: "",
89 userInputShipperAccount: "", 92 userInputShipperAccount: "",
90 userInputOriginCountry: "", 93 userInputOriginCountry: "",
......