Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
c0a787f3 1 parent 5b51f554

fix: 优化和增加搜索条件

Inline Side-by-side
Showing 27 changed files with 187 additions and 54 deletions
...@@ -303,7 +303,7 @@ export default { ...@@ -303,7 +303,7 @@ export default {
303 pageSizes: { 303 pageSizes: {
304 type: Array, 304 type: Array,
305 default() { 305 default() {
306 - return [10, 20, 30, 40, 50, 100]; 306 + return [10, 20, 50, 100, 500, 1000];
307 }, 307 },
308 }, 308 },
309 expandRowKeys: { 309 expandRowKeys: {
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
56 :rowSelectDataType="false" 56 :rowSelectDataType="false"
57 :pagination="false" 57 :pagination="false"
58 :page="1" 58 :page="1"
59 - :pageSizes="[20, 30, 50, 100]"
60 :totalCount="0" 59 :totalCount="0"
61 :loading="tableLoading" 60 :loading="tableLoading"
62 :emptyText=" 61 :emptyText="
......
...@@ -23,6 +23,33 @@ ...@@ -23,6 +23,33 @@
23 ></el-input> 23 ></el-input>
24 </Formitem> 24 </Formitem>
25 </el-col> 25 </el-col>
26 + <!-- 选择口岸 -->
27 + <el-col :span="5">
28 + <Formitem
29 + label="选择口岸"
30 + prop="dataSource"
31 + :activeType="activePortType"
32 + >
33 + <el-select
34 + type="text"
35 + id="inputInner--dataSource"
36 + v-model="sreachFormData.dataSource"
37 + clearable
38 + multiple
39 + placeholder=""
40 + @visible-change="portChange"
41 + @remove-tag="removePort"
42 + @clear="clearPort"
43 + >
44 + <el-option
45 + v-for="(item, index) in portList"
46 + :key="index"
47 + :label="item.portName"
48 + :value="item.portCode"
49 + ></el-option>
50 + </el-select>
51 + </Formitem>
52 + </el-col>
26 <!-- 回执状态 --> 53 <!-- 回执状态 -->
27 <el-col :span="5"> 54 <el-col :span="5">
28 <Formitem label="回执状态" prop="receiptStatus"> 55 <Formitem label="回执状态" prop="receiptStatus">
...@@ -134,7 +161,6 @@ ...@@ -134,7 +161,6 @@
134 :order="false" 161 :order="false"
135 :loading="loadings.sreachLoading" 162 :loading="loadings.sreachLoading"
136 :page="page.pageIndex" 163 :page="page.pageIndex"
137 - :pageSizes="[20, 30, 50, 100]"
138 :totalCount="page.total" 164 :totalCount="page.total"
139 @sizeChange="sizeChange" 165 @sizeChange="sizeChange"
140 @currentChange="currentChange" 166 @currentChange="currentChange"
...@@ -271,6 +297,8 @@ import { ...@@ -271,6 +297,8 @@ import {
271 import DialogVue from "./dialog.vue"; 297 import DialogVue from "./dialog.vue";
272 import DataPreview from "../reportingData/data-preview.vue"; 298 import DataPreview from "../reportingData/data-preview.vue";
273 import TimeDialog from "../reportingData/time-dialog.vue"; 299 import TimeDialog from "../reportingData/time-dialog.vue";
300 +import { getPortInfo } from "@/api/system/customer-ai.js";
301 +
274 export default { 302 export default {
275 name: "SupervisePlaceManage", 303 name: "SupervisePlaceManage",
276 components: { 304 components: {
...@@ -280,6 +308,8 @@ export default { ...@@ -280,6 +308,8 @@ export default {
280 }, 308 },
281 data() { 309 data() {
282 return { 310 return {
311 + portList: [],
312 + activePortType: false,
283 // 控制日志弹窗的显示和隐藏 313 // 控制日志弹窗的显示和隐藏
284 allLogDataReceiptStatusPopoverType: false, 314 allLogDataReceiptStatusPopoverType: false,
285 // 存储选中的日志数据 315 // 存储选中的日志数据
...@@ -290,6 +320,7 @@ export default { ...@@ -290,6 +320,7 @@ export default {
290 receiptStatus: null, 320 receiptStatus: null,
291 receiptType: null, 321 receiptType: null,
292 createTime: [], 322 createTime: [],
323 + dataSource: [],
293 }, 324 },
294 page: { 325 page: {
295 pageIndex: 1, 326 pageIndex: 1,
...@@ -390,8 +421,23 @@ export default { ...@@ -390,8 +421,23 @@ export default {
390 this.popoverClose(); 421 this.popoverClose();
391 }, 422 },
392 }, 423 },
393 - 424 + mounted() {
425 + this.searchPortDictData();
426 + },
394 methods: { 427 methods: {
428 + //获取口岸子字典
429 + searchPortDictData() {
430 + getPortInfo()
431 + .then((res) => {
432 + console.log(res);
433 + if (res.code === "200") {
434 + this.portList = res.data;
435 + }
436 + })
437 + .catch((err) => {
438 + console.log(err);
439 + });
440 + },
395 // 申报 441 // 申报
396 postDeclareData() { 442 postDeclareData() {
397 const obj = { 443 const obj = {
...@@ -580,14 +626,46 @@ export default { ...@@ -580,14 +626,46 @@ export default {
580 }, 626 },
581 627
582 clear() { 628 clear() {
583 - this.$refs.sreachForm.resetFields();
584 //重置数据 629 //重置数据
585 this.sreachFormData = { 630 this.sreachFormData = {
586 billNo: "", 631 billNo: "",
587 receiptStatus: null, 632 receiptStatus: null,
588 receiptType: null, 633 receiptType: null,
589 createTime: [], 634 createTime: [],
635 + dataSource: [],
590 }; 636 };
637 + this.clearPort();
638 + this.$refs.sreachForm.resetFields();
639 + },
640 + portChange(type) {
641 + if (type) {
642 + this.activePortType = true;
643 + } else {
644 + if (this.sreachFormData.dataSource.length > 0) {
645 + this.activePortType = true;
646 + } else {
647 + this.activePortType = false;
648 + document
649 + .querySelector("#inputInner--dataSource")
650 + .classList.remove("inputFocus");
651 + }
652 + }
653 + },
654 + removePort(val) {
655 + if (this.sreachFormData.dataSource.length > 0) {
656 + this.activePortType = true;
657 + } else {
658 + this.activePortType = false;
659 + document
660 + .querySelector("#inputInner--dataSource")
661 + .classList.remove("inputFocus");
662 + }
663 + },
664 + clearPort() {
665 + this.activePortType = false;
666 + document
667 + .querySelector("#inputInner--dataSource")
668 + .classList.remove("inputFocus");
591 }, 669 },
592 //查询 670 //查询
593 search(val) { 671 search(val) {
......
...@@ -99,7 +99,6 @@ ...@@ -99,7 +99,6 @@
99 :order="false" 99 :order="false"
100 :loading="loadings.searchLoading" 100 :loading="loadings.searchLoading"
101 :page="page.pageIndex" 101 :page="page.pageIndex"
102 - :pageSizes="[20, 30, 50, 100]"
103 :totalCount="page.total" 102 :totalCount="page.total"
104 @sizeChange="sizeChange" 103 @sizeChange="sizeChange"
105 @currentChange="currentChange" 104 @currentChange="currentChange"
......
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
85 noLabel="序号" 85 noLabel="序号"
86 :loading="loadings.searchLoading" 86 :loading="loadings.searchLoading"
87 :page="page.pageIndex" 87 :page="page.pageIndex"
88 - :pageSizes="[20, 30, 50, 100]"
89 :totalCount="page.total" 88 :totalCount="page.total"
90 @sizeChange="sizeChange" 89 @sizeChange="sizeChange"
91 @currentChange="currentChange" 90 @currentChange="currentChange"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
6 :order="false" 6 :order="false"
7 :border="false" 7 :border="false"
8 :pagination="false" 8 :pagination="false"
9 - :pageSizes="[20, 30, 50, 100]"
10 noLabel="序号" 9 noLabel="序号"
11 rowKey="index" 10 rowKey="index"
12 emptyText="暂无数据" 11 emptyText="暂无数据"
...@@ -94,7 +93,7 @@ export default { ...@@ -94,7 +93,7 @@ export default {
94 str = item.itemChineseName; 93 str = item.itemChineseName;
95 } 94 }
96 }); 95 });
97 - 96 +
98 return str; 97 return str;
99 }, 98 },
100 }, 99 },
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
9 :pagination="false" 9 :pagination="false"
10 :order="false" 10 :order="false"
11 :page="1" 11 :page="1"
12 - :pageSizes="[20, 30, 50, 100]"
13 :totalCount="0" 12 :totalCount="0"
14 :selection="false" 13 :selection="false"
15 :selectFixed="false" 14 :selectFixed="false"
......
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
131 noLabel="序号" 131 noLabel="序号"
132 :loading="loadings.searchLoading" 132 :loading="loadings.searchLoading"
133 :page="page.pageIndex" 133 :page="page.pageIndex"
134 - :pageSizes="[20, 30, 50, 100]"
135 :totalCount="page.total" 134 :totalCount="page.total"
136 @sizeChange="sizeChange" 135 @sizeChange="sizeChange"
137 @currentChange="currentChange" 136 @currentChange="currentChange"
......
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
131 :order="false" 131 :order="false"
132 :loading="loadings.searchLoading" 132 :loading="loadings.searchLoading"
133 :page="page.pageIndex" 133 :page="page.pageIndex"
134 - :pageSizes="[20, 30, 50, 100]"
135 :totalCount="page.total" 134 :totalCount="page.total"
136 @sizeChange="sizeChange" 135 @sizeChange="sizeChange"
137 @currentChange="currentChange" 136 @currentChange="currentChange"
......
...@@ -197,7 +197,6 @@ ...@@ -197,7 +197,6 @@
197 :order="false" 197 :order="false"
198 :loading="loadings.searchLoading" 198 :loading="loadings.searchLoading"
199 :page="page.pageIndex" 199 :page="page.pageIndex"
200 - :pageSizes="[20, 30, 50, 100]"
201 :totalCount="page.total" 200 :totalCount="page.total"
202 @sizeChange="sizeChange" 201 @sizeChange="sizeChange"
203 @currentChange="currentChange" 202 @currentChange="currentChange"
......
...@@ -132,7 +132,6 @@ ...@@ -132,7 +132,6 @@
132 :order="false" 132 :order="false"
133 :loading="loadings.searchLoading" 133 :loading="loadings.searchLoading"
134 :page="page.pageIndex" 134 :page="page.pageIndex"
135 - :pageSizes="[20, 30, 50, 100]"
136 :totalCount="page.total" 135 :totalCount="page.total"
137 @sizeChange="sizeChange" 136 @sizeChange="sizeChange"
138 @currentChange="currentChange" 137 @currentChange="currentChange"
......
...@@ -19,19 +19,19 @@ ...@@ -19,19 +19,19 @@
19 </Formitem> 19 </Formitem>
20 </el-col> 20 </el-col>
21 <!-- 物流企业代码 --> 21 <!-- 物流企业代码 -->
22 -<!-- <el-col :span="5">--> 22 + <!-- <el-col :span="5">-->
23 -<!-- <Formitem label="物流企业代码" prop="logisticsCode">--> 23 + <!-- <Formitem label="物流企业代码" prop="logisticsCode">-->
24 -<!-- <el-input--> 24 + <!-- <el-input-->
25 -<!-- type="text"--> 25 + <!-- type="text"-->
26 -<!-- class="inputShadow"--> 26 + <!-- class="inputShadow"-->
27 -<!-- id="inputInner&#45;&#45;logisticsCode"--> 27 + <!-- id="inputInner&#45;&#45;logisticsCode"-->
28 -<!-- resize="none"--> 28 + <!-- resize="none"-->
29 -<!-- v-model="sreachFormData.logisticsCode"--> 29 + <!-- v-model="sreachFormData.logisticsCode"-->
30 -<!-- clearable--> 30 + <!-- clearable-->
31 -<!-- placeholder=""--> 31 + <!-- placeholder=""-->
32 -<!-- ></el-input>--> 32 + <!-- ></el-input>-->
33 -<!-- </Formitem>--> 33 + <!-- </Formitem>-->
34 -<!-- </el-col>--> 34 + <!-- </el-col>-->
35 <!-- 回执状态 --> 35 <!-- 回执状态 -->
36 <el-col :span="5"> 36 <el-col :span="5">
37 <Formitem label="回执状态" prop="returnStatus"> 37 <Formitem label="回执状态" prop="returnStatus">
...@@ -43,7 +43,11 @@ ...@@ -43,7 +43,11 @@
43 placeholder="" 43 placeholder=""
44 > 44 >
45 <el-option 45 <el-option
46 - v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')" 46 + v-for="(
47 + item, index
48 + ) in $store.getters.dict.RECEIPT_STATUS.filter(
49 + (fItem) => fItem.itemChineseName !== '已提交'
50 + )"
47 :key="index" 51 :key="index"
48 :label="item.itemChineseName" 52 :label="item.itemChineseName"
49 :value="item.itemValue" 53 :value="item.itemValue"
...@@ -113,7 +117,6 @@ ...@@ -113,7 +117,6 @@
113 :order="false" 117 :order="false"
114 :loading="loadings.searchLoading" 118 :loading="loadings.searchLoading"
115 :page="page.pageIndex" 119 :page="page.pageIndex"
116 - :pageSizes="[20, 30, 50, 100]"
117 :totalCount="page.total" 120 :totalCount="page.total"
118 @sizeChange="sizeChange" 121 @sizeChange="sizeChange"
119 @currentChange="currentChange" 122 @currentChange="currentChange"
...@@ -278,7 +281,7 @@ export default { ...@@ -278,7 +281,7 @@ export default {
278 if (val == 0) { 281 if (val == 0) {
279 this.page.pageIndex = 1; 282 this.page.pageIndex = 1;
280 } 283 }
281 - let obj = {...this.sreachFormData}; 284 + let obj = { ...this.sreachFormData };
282 obj.pageIndex = this.page.pageIndex; 285 obj.pageIndex = this.page.pageIndex;
283 obj.pageSize = this.page.pageSize; 286 obj.pageSize = this.page.pageSize;
284 obj.createTimeStart = ""; 287 obj.createTimeStart = "";
...@@ -337,7 +340,7 @@ export default { ...@@ -337,7 +340,7 @@ export default {
337 }) 340 })
338 .finally(() => { 341 .finally(() => {
339 this.$nextTick(() => { 342 this.$nextTick(() => {
340 - this.$store.dispatch('setLoadingState', false) 343 + this.$store.dispatch("setLoadingState", false);
341 this.$refs.returnStatusPopover.tableLoading = false; 344 this.$refs.returnStatusPopover.tableLoading = false;
342 }); 345 });
343 }); 346 });
......
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
101 :order="false" 101 :order="false"
102 :loading="loadings.sreachLoading" 102 :loading="loadings.sreachLoading"
103 :page="page.pageIndex" 103 :page="page.pageIndex"
104 - :pageSizes="[20, 30, 50, 100]"
105 :totalCount="page.total" 104 :totalCount="page.total"
106 @sizeChange="sizeChange" 105 @sizeChange="sizeChange"
107 @currentChange="currentChange" 106 @currentChange="currentChange"
......
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
122 :order="false" 122 :order="false"
123 :loading="loadings.searchLoading" 123 :loading="loadings.searchLoading"
124 :page="page.pageIndex" 124 :page="page.pageIndex"
125 - :pageSizes="[20, 30, 50, 100]"
126 :totalCount="page.total" 125 :totalCount="page.total"
127 @sizeChange="sizeChange" 126 @sizeChange="sizeChange"
128 @currentChange="currentChange" 127 @currentChange="currentChange"
......
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
120 :order="false" 120 :order="false"
121 :loading="loadings.searchLoading" 121 :loading="loadings.searchLoading"
122 :page="page.pageIndex" 122 :page="page.pageIndex"
123 - :pageSizes="[20, 30, 50, 100]"
124 :totalCount="page.total" 123 :totalCount="page.total"
125 @sizeChange="sizeChange" 124 @sizeChange="sizeChange"
126 @currentChange="currentChange" 125 @currentChange="currentChange"
......
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
122 :order="false" 122 :order="false"
123 :loading="loadings.searchLoading" 123 :loading="loadings.searchLoading"
124 :page="page.pageIndex" 124 :page="page.pageIndex"
125 - :pageSizes="[20, 30, 50, 100]"
126 :totalCount="page.total" 125 :totalCount="page.total"
127 @sizeChange="sizeChange" 126 @sizeChange="sizeChange"
128 @currentChange="currentChange" 127 @currentChange="currentChange"
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
56 :order="false" 56 :order="false"
57 :loading="loadings.searchLoading" 57 :loading="loadings.searchLoading"
58 :page="page.pageIndex" 58 :page="page.pageIndex"
59 - :pageSizes="[20, 30, 50, 100]"
60 :totalCount="page.total" 59 :totalCount="page.total"
61 @sizeChange="sizeChange" 60 @sizeChange="sizeChange"
62 @currentChange="currentChange" 61 @currentChange="currentChange"
...@@ -90,7 +89,6 @@ ...@@ -90,7 +89,6 @@
90 <script> 89 <script>
91 import { getRoleList } from "@/api/system/user.js"; 90 import { getRoleList } from "@/api/system/user.js";
92 import DialogVue from "./dialog.vue"; 91 import DialogVue from "./dialog.vue";
93 -import { addMenu, deleteMenu } from "@/api/menu";
94 92
95 export default { 93 export default {
96 name: "SupervisePlaceManage", 94 name: "SupervisePlaceManage",
......
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
101 noLabel="序号" 101 noLabel="序号"
102 :loading="loadings.searchLoading" 102 :loading="loadings.searchLoading"
103 :page="page.pageIndex" 103 :page="page.pageIndex"
104 - :pageSizes="[20, 30, 50, 100]"
105 :totalCount="page.total" 104 :totalCount="page.total"
106 @sizeChange="sizeChange" 105 @sizeChange="sizeChange"
107 @currentChange="currentChange" 106 @currentChange="currentChange"
......
...@@ -107,7 +107,6 @@ ...@@ -107,7 +107,6 @@
107 :order="false" 107 :order="false"
108 :loading="loadings.searchLoading" 108 :loading="loadings.searchLoading"
109 :page="page.pageIndex" 109 :page="page.pageIndex"
110 - :pageSizes="[20, 30, 50, 100]"
111 :totalCount="page.total" 110 :totalCount="page.total"
112 @sizeChange="sizeChange" 111 @sizeChange="sizeChange"
113 @currentChange="currentChange" 112 @currentChange="currentChange"
......
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
90 :pagination="false" 90 :pagination="false"
91 :order="false" 91 :order="false"
92 :page="1" 92 :page="1"
93 - :pageSizes="[20, 30, 50, 100]"
94 :totalCount="0" 93 :totalCount="0"
95 :selection="false" 94 :selection="false"
96 :selectFixed="false" 95 :selectFixed="false"
......
...@@ -89,7 +89,33 @@ ...@@ -89,7 +89,33 @@
89 </el-col> 89 </el-col>
90 </el-row> 90 </el-row>
91 <el-row class="backgroundRow"> 91 <el-row class="backgroundRow">
92 - <!-- 回执状态 --> 92 + <!-- 选择口岸 -->
93 + <el-col :span="5">
94 + <Formitem
95 + label="选择口岸"
96 + prop="dataSource"
97 + :activeType="activePortType"
98 + >
99 + <el-select
100 + type="text"
101 + id="inputInner--dataSource"
102 + v-model="sreachFormData.dataSource"
103 + clearable
104 + multiple
105 + placeholder=""
106 + @visible-change="portChange"
107 + @remove-tag="removePort"
108 + @clear="clearPort"
109 + >
110 + <el-option
111 + v-for="(item, index) in portList"
112 + :key="index"
113 + :label="item.portName"
114 + :value="item.portCode"
115 + ></el-option>
116 + </el-select>
117 + </Formitem>
118 + </el-col>
93 <el-col :span="5"> 119 <el-col :span="5">
94 <Formitem 120 <Formitem
95 label="回执状态" 121 label="回执状态"
...@@ -105,7 +131,7 @@ ...@@ -105,7 +131,7 @@
105 multiple 131 multiple
106 @visible-change="visibleChange" 132 @visible-change="visibleChange"
107 @remove-tag="removeTag" 133 @remove-tag="removeTag"
108 - @clear="clear" 134 + @clear="clearStatus"
109 > 135 >
110 <el-option 136 <el-option
111 v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS" 137 v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
...@@ -276,7 +302,6 @@ ...@@ -276,7 +302,6 @@
276 :order="false" 302 :order="false"
277 :loading="loadings.sreachLoading" 303 :loading="loadings.sreachLoading"
278 :page="page.pageIndex" 304 :page="page.pageIndex"
279 - :pageSizes="[20, 30, 50, 100]"
280 :totalCount="page.total" 305 :totalCount="page.total"
281 @sizeChange="sizeChange" 306 @sizeChange="sizeChange"
282 @currentChange="currentChange" 307 @currentChange="currentChange"
...@@ -494,6 +519,7 @@ import BatchModify from "./batchModify.vue"; ...@@ -494,6 +519,7 @@ import BatchModify from "./batchModify.vue";
494 import TimeDialog from "./time-dialog.vue"; 519 import TimeDialog from "./time-dialog.vue";
495 import DataPreview from "./data-preview.vue"; 520 import DataPreview from "./data-preview.vue";
496 import WeightAdjust from "./weight-adjust.vue"; 521 import WeightAdjust from "./weight-adjust.vue";
522 +import { getPortInfo } from "@/api/system/customer-ai.js";
497 export default { 523 export default {
498 name: "ReportingData", 524 name: "ReportingData",
499 components: { 525 components: {
...@@ -509,6 +535,7 @@ export default { ...@@ -509,6 +535,7 @@ export default {
509 data() { 535 data() {
510 return { 536 return {
511 activeType: false, 537 activeType: false,
538 + activePortType: false,
512 // 控制日志弹窗的显示和隐藏 539 // 控制日志弹窗的显示和隐藏
513 allLogDataReceiptStatusPopoverType: false, 540 allLogDataReceiptStatusPopoverType: false,
514 // 存储选中的日志数据 541 // 存储选中的日志数据
...@@ -520,6 +547,7 @@ export default { ...@@ -520,6 +547,7 @@ export default {
520 receiptStatus: [], 547 receiptStatus: [],
521 receiptType: null, 548 receiptType: null,
522 createTime: [], 549 createTime: [],
550 + dataSource: [],
523 }, 551 },
524 page: { 552 page: {
525 pageIndex: 1, 553 pageIndex: 1,
...@@ -695,6 +723,7 @@ export default { ...@@ -695,6 +723,7 @@ export default {
695 currentLoadingKey: "", 723 currentLoadingKey: "",
696 paramsOjb: {}, 724 paramsOjb: {},
697 weightAdjustVisible: false, 725 weightAdjustVisible: false,
726 + portList: [],
698 }; 727 };
699 }, 728 },
700 created() { 729 created() {
...@@ -711,7 +740,7 @@ export default { ...@@ -711,7 +740,7 @@ export default {
711 } 740 }
712 }, 741 },
713 mounted() { 742 mounted() {
714 - console.log(this.tableMaxheight); 743 + this.searchPortDictData();
715 }, 744 },
716 745
717 watch: { 746 watch: {
...@@ -730,6 +759,49 @@ export default { ...@@ -730,6 +759,49 @@ export default {
730 }); 759 });
731 }, 760 },
732 methods: { 761 methods: {
762 + //获取口岸子字典
763 + searchPortDictData() {
764 + getPortInfo()
765 + .then((res) => {
766 + console.log(res);
767 + if (res.code === "200") {
768 + this.portList = res.data;
769 + }
770 + })
771 + .catch((err) => {
772 + console.log(err);
773 + });
774 + },
775 + portChange(type) {
776 + if (type) {
777 + this.activePortType = true;
778 + } else {
779 + if (this.sreachFormData.dataSource.length > 0) {
780 + this.activePortType = true;
781 + } else {
782 + this.activePortType = false;
783 + document
784 + .querySelector("#inputInner--dataSource")
785 + .classList.remove("inputFocus");
786 + }
787 + }
788 + },
789 + removePort(val) {
790 + if (this.sreachFormData.dataSource.length > 0) {
791 + this.activePortType = true;
792 + } else {
793 + this.activePortType = false;
794 + document
795 + .querySelector("#inputInner--dataSource")
796 + .classList.remove("inputFocus");
797 + }
798 + },
799 + clearPort() {
800 + this.activePortType = false;
801 + document
802 + .querySelector("#inputInner--dataSource")
803 + .classList.remove("inputFocus");
804 + },
733 visibleChange(type) { 805 visibleChange(type) {
734 if (type) { 806 if (type) {
735 this.activeType = true; 807 this.activeType = true;
...@@ -754,7 +826,7 @@ export default { ...@@ -754,7 +826,7 @@ export default {
754 .classList.remove("inputFocus"); 826 .classList.remove("inputFocus");
755 } 827 }
756 }, 828 },
757 - clear() { 829 + clearStatus() {
758 this.activeType = false; 830 this.activeType = false;
759 document 831 document
760 .querySelector("#inputInner--receiptStatus") 832 .querySelector("#inputInner--receiptStatus")
...@@ -819,7 +891,10 @@ export default { ...@@ -819,7 +891,10 @@ export default {
819 receiptStatus: [], 891 receiptStatus: [],
820 receiptType: null, 892 receiptType: null,
821 createTime: [], 893 createTime: [],
894 + dataSource: [],
822 }; 895 };
896 + this.clearPort();
897 + this.clearStatus();
823 }, 898 },
824 //上传申报数据 899 //上传申报数据
825 uploadData() { 900 uploadData() {
......
...@@ -139,10 +139,10 @@ export default { ...@@ -139,10 +139,10 @@ export default {
139 // return; 139 // return;
140 // } 140 // }
141 141
142 - // if (decimalPart.length > 5) { 142 + if (decimalPart.length > 2) {
143 - // callback(new Error("小数部分最多5位")); 143 + callback(new Error("小数部分最多2位"));
144 - // return; 144 + return;
145 - // } 145 + }
146 146
147 callback(); 147 callback();
148 }; 148 };
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
56 :order="false" 56 :order="false"
57 :loading="loadings.searchLoading" 57 :loading="loadings.searchLoading"
58 :page="page.pageIndex" 58 :page="page.pageIndex"
59 - :pageSizes="[20, 30, 50, 100]"
60 :totalCount="page.total" 59 :totalCount="page.total"
61 @sizeChange="sizeChange" 60 @sizeChange="sizeChange"
62 @currentChange="currentChange" 61 @currentChange="currentChange"
......
...@@ -200,7 +200,6 @@ ...@@ -200,7 +200,6 @@
200 :order="false" 200 :order="false"
201 :loading="loadings.searchLoading" 201 :loading="loadings.searchLoading"
202 :page="page.pageIndex" 202 :page="page.pageIndex"
203 - :pageSizes="[20, 30, 50, 100]"
204 :totalCount="page.total" 203 :totalCount="page.total"
205 @sizeChange="sizeChange" 204 @sizeChange="sizeChange"
206 @currentChange="currentChange" 205 @currentChange="currentChange"
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
28 :pagination="true" 28 :pagination="true"
29 :order="false" 29 :order="false"
30 :page="page.pageIndex" 30 :page="page.pageIndex"
31 - :pageSizes="[20, 30, 50, 100]"
32 :totalCount="page.total" 31 :totalCount="page.total"
33 @sizeChange="sizeChange" 32 @sizeChange="sizeChange"
34 @currentChange="currentChange" 33 @currentChange="currentChange"
......
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
101 :order="false" 101 :order="false"
102 :loading="loadings.searchLoading" 102 :loading="loadings.searchLoading"
103 :page="page.pageIndex" 103 :page="page.pageIndex"
104 - :pageSizes="[20, 30, 50, 100]"
105 :totalCount="page.total" 104 :totalCount="page.total"
106 @sizeChange="sizeChange" 105 @sizeChange="sizeChange"
107 @currentChange="currentChange" 106 @currentChange="currentChange"
......
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
113 :order="false" 113 :order="false"
114 :loading="loadings.searchLoading" 114 :loading="loadings.searchLoading"
115 :page="page.pageIndex" 115 :page="page.pageIndex"
116 - :pageSizes="[20, 30, 50, 100]"
117 :totalCount="page.total" 116 :totalCount="page.total"
118 @sizeChange="sizeChange" 117 @sizeChange="sizeChange"
119 @currentChange="currentChange" 118 @currentChange="currentChange"
......