Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
210f9fd8 1 parent 3eea193d

feat: 自测更换新table组件

Expand all
Inline Side-by-side
Showing 7 changed files with 207 additions and 153 deletions
...@@ -6,7 +6,7 @@ VUE_APP_BASE_ENV = "dev" ...@@ -6,7 +6,7 @@ VUE_APP_BASE_ENV = "dev"
6 VUE_APP_Version = '1.0.0' 6 VUE_APP_Version = '1.0.0'
7 7
8 # FedEx 在线申报工具/开发环境 8 # FedEx 在线申报工具/开发环境
9 -VUE_APP_BASE_API = 'http://101.132.100.41:7008/EcomExp' 9 +VUE_APP_BASE_API = 'http://101.132.100.41:7001/EcomExp'
10 10
11 VUE_APP_BASE_ROUTE = '/EcomDev' 11 VUE_APP_BASE_ROUTE = '/EcomDev'
12 12
......
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
48 "vue": "2.6.14", 48 "vue": "2.6.14",
49 "vue-i18n": "^8.28.2", 49 "vue-i18n": "^8.28.2",
50 "vue-router": "3.5.2", 50 "vue-router": "3.5.2",
51 - "vuex": "3.6.2" 51 + "vuex": "3.6.2",
52 + "vxe-table": "^3.15.34"
52 }, 53 },
53 "devDependencies": { 54 "devDependencies": {
54 "@vue/cli-plugin-babel": "4.5.13", 55 "@vue/cli-plugin-babel": "4.5.13",
......
...@@ -263,3 +263,7 @@ aside { ...@@ -263,3 +263,7 @@ aside {
263 .el-checkbox__input.is-checked + .el-checkbox__label { 263 .el-checkbox__input.is-checked + .el-checkbox__label {
264 color: #333333 !important; 264 color: #333333 !important;
265 } 265 }
266 +
267 +html {
268 + --vxe-ui-font-primary-color: #007ab7 !important;
269 +}
......
1 -import Vue from 'vue' 1 +import Vue from "vue";
2 - 2 +
3 -import Element from 'element-ui' 3 +import Element from "element-ui";
4 -import './assets/styles/element-variables.scss' 4 +import "./assets/styles/element-variables.scss";
5 - 5 +
6 -import '@/assets/styles/index.scss' // global css 6 +import "@/assets/styles/index.scss"; // global css
7 -import '@/assets/styles/iClearExp.scss' // iClearExp css 7 +import "@/assets/styles/iClearExp.scss"; // iClearExp css
8 -import '@/assets/styles/variables.scss' 8 +import "@/assets/styles/variables.scss";
9 -import '@/assets/styles/fedex.scss' 9 +import "@/assets/styles/fedex.scss";
10 -import App from './App' 10 +import App from "./App";
11 -import store from './store' 11 +import store from "./store";
12 -import router from './router' 12 +import router from "./router";
13 -import i18n from '@/assets/languages' 13 +import i18n from "@/assets/languages";
14 -import permission from './directive/permission' 14 +import permission from "./directive/permission";
15 - 15 +
16 -import './assets/icons' // icon 16 +import "./assets/icons"; // icon
17 -import './permission' // permission control 17 +import "./permission"; // permission control
18 -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree, hscodeElementInfo, elementTostring, numberRound, detailUnitConversion, setDict, sendNotificationHandler, promptMessage, upDateTokenTime, sreachEntryLock, tableFixedTypeChange, getDownLoadFileStatus, approvalPortType, getSystemOption, currencySystemDisableType, imageTaskStatusShowType } from "@/utils/iClearExp"; 18 +import {
19 -import { formatDate, debounce, alertWarningMsg, alertSuccessMsg, alertErrorMsg, alertInfoMsg, toHead, compare, createRandom, ctho, base64ConvertFile } from "@/utils/index"; 19 + parseTime,
20 -import * as fileDownload from '@/utils/zipdownload.js' 20 + resetForm,
21 -import * as filters from '@/utils/filters.js' 21 + addDateRange,
22 -import dictData from '@/utils/dict.js' 22 + selectDictLabel,
23 -import regExp from '@/utils/regExp.js' 23 + selectDictLabels,
24 + download,
25 + handleTree,
26 + hscodeElementInfo,
27 + elementTostring,
28 + numberRound,
29 + detailUnitConversion,
30 + setDict,
31 + sendNotificationHandler,
32 + promptMessage,
33 + upDateTokenTime,
34 + sreachEntryLock,
35 + tableFixedTypeChange,
36 + getDownLoadFileStatus,
37 + approvalPortType,
38 + getSystemOption,
39 + currencySystemDisableType,
40 + imageTaskStatusShowType,
41 +} from "@/utils/iClearExp";
42 +import {
43 + formatDate,
44 + debounce,
45 + alertWarningMsg,
46 + alertSuccessMsg,
47 + alertErrorMsg,
48 + alertInfoMsg,
49 + toHead,
50 + compare,
51 + createRandom,
52 + ctho,
53 + base64ConvertFile,
54 +} from "@/utils/index";
55 +import * as fileDownload from "@/utils/zipdownload.js";
56 +import * as filters from "@/utils/filters.js";
57 +import dictData from "@/utils/dict.js";
58 +import regExp from "@/utils/regExp.js";
24 import Pagination from "@/components/Pagination"; 59 import Pagination from "@/components/Pagination";
25 // 自定义表格工具扩展 60 // 自定义表格工具扩展
26 -import RightToolbar from "@/components/RightToolbar" 61 +import RightToolbar from "@/components/RightToolbar";
27 -import Table from "@/components/Table" 62 +import Table from "@/components/Table";
28 -import Formitem from "@/components/Formitem" 63 +import Formitem from "@/components/Formitem";
29 -import EditStep from "@/components/EditStep" 64 +import EditStep from "@/components/EditStep";
30 -import FedexAlert from "@/components/FedexAlert" 65 +import FedexAlert from "@/components/FedexAlert";
31 -import FedexEdit from "@/components/FedexEdit" 66 +import FedexEdit from "@/components/FedexEdit";
32 -import Tooltip from "@/components/Tooltip" 67 +import Tooltip from "@/components/Tooltip";
33 -import InputNodes from '@/components/InputNodes' 68 +import InputNodes from "@/components/InputNodes";
34 -import AlterDialog from '@/components/AlterDialog' 69 +import AlterDialog from "@/components/AlterDialog";
35 -import CustomTransfer from '@/components/CustomTransfer' 70 +import CustomTransfer from "@/components/CustomTransfer";
36 -import CustomForm from '@/components/CustomForm' 71 +import CustomForm from "@/components/CustomForm";
37 -import CustomTable from '@/components/CustomTable' 72 +import CustomTable from "@/components/CustomTable";
38 -import EditTag from '@/components/EditTag' 73 +import EditTag from "@/components/EditTag";
39 -import TablePopover from '@/components/TablePopover' 74 +import TablePopover from "@/components/TablePopover";
40 -import FormTextareaInput from '@/components/FormTextareaInput' 75 +import FormTextareaInput from "@/components/FormTextareaInput";
76 +
77 +import VxeUITable from "vxe-table";
78 +import "vxe-table/lib/style.css";
79 +
41 (function () { 80 (function () {
42 if (typeof EventTarget !== "undefined") { 81 if (typeof EventTarget !== "undefined") {
43 let func = EventTarget.prototype.addEventListener; 82 let func = EventTarget.prototype.addEventListener;
...@@ -49,89 +88,87 @@ import FormTextareaInput from '@/components/FormTextareaInput' ...@@ -49,89 +88,87 @@ import FormTextareaInput from '@/components/FormTextareaInput'
49 } 88 }
50 this.func(type, fn, capture); 89 this.func(type, fn, capture);
51 }; 90 };
52 - }; 91 + }
53 -}()); 92 +})();
54 93
55 // 全局方法挂载 94 // 全局方法挂载
56 -Vue.prototype.parseTime = parseTime 95 +Vue.prototype.parseTime = parseTime;
57 -Vue.prototype.resetForm = resetForm 96 +Vue.prototype.resetForm = resetForm;
58 -Vue.prototype.addDateRange = addDateRange 97 +Vue.prototype.addDateRange = addDateRange;
59 -Vue.prototype.selectDictLabel = selectDictLabel 98 +Vue.prototype.selectDictLabel = selectDictLabel;
60 -Vue.prototype.selectDictLabels = selectDictLabels 99 +Vue.prototype.selectDictLabels = selectDictLabels;
61 -Vue.prototype.download = download 100 +Vue.prototype.download = download;
62 -Vue.prototype.handleTree = handleTree 101 +Vue.prototype.handleTree = handleTree;
63 -Vue.prototype.hscodeElementInfo = hscodeElementInfo 102 +Vue.prototype.hscodeElementInfo = hscodeElementInfo;
64 -Vue.prototype.elementTostring = elementTostring 103 +Vue.prototype.elementTostring = elementTostring;
65 -Vue.prototype.formatDate = formatDate 104 +Vue.prototype.formatDate = formatDate;
66 -Vue.prototype.debounce = debounce 105 +Vue.prototype.debounce = debounce;
67 -Vue.prototype.regExp = regExp 106 +Vue.prototype.regExp = regExp;
68 -Vue.prototype.numberRound = numberRound 107 +Vue.prototype.numberRound = numberRound;
69 -Vue.prototype.detailUnitConversion = detailUnitConversion 108 +Vue.prototype.detailUnitConversion = detailUnitConversion;
70 -Vue.prototype.fileDownload = fileDownload 109 +Vue.prototype.fileDownload = fileDownload;
71 -Vue.prototype.alertWarningMsg = alertWarningMsg 110 +Vue.prototype.alertWarningMsg = alertWarningMsg;
72 -Vue.prototype.alertSuccessMsg = alertSuccessMsg 111 +Vue.prototype.alertSuccessMsg = alertSuccessMsg;
73 -Vue.prototype.alertErrorMsg = alertErrorMsg 112 +Vue.prototype.alertErrorMsg = alertErrorMsg;
74 -Vue.prototype.alertInfoMsg = alertInfoMsg 113 +Vue.prototype.alertInfoMsg = alertInfoMsg;
75 -Vue.prototype.toHead = toHead 114 +Vue.prototype.toHead = toHead;
76 -Vue.prototype.setDict = setDict 115 +Vue.prototype.setDict = setDict;
77 -Vue.prototype.compare = compare 116 +Vue.prototype.compare = compare;
78 -Vue.prototype.sendNotificationHandler = sendNotificationHandler 117 +Vue.prototype.sendNotificationHandler = sendNotificationHandler;
79 -Vue.prototype.promptMessage = promptMessage 118 +Vue.prototype.promptMessage = promptMessage;
80 -Vue.prototype.createRandom = createRandom 119 +Vue.prototype.createRandom = createRandom;
81 -Vue.prototype.upDateTokenTime = upDateTokenTime 120 +Vue.prototype.upDateTokenTime = upDateTokenTime;
82 -Vue.prototype.sreachEntryLock = sreachEntryLock 121 +Vue.prototype.sreachEntryLock = sreachEntryLock;
83 -Vue.prototype.tableFixedTypeChange = tableFixedTypeChange 122 +Vue.prototype.tableFixedTypeChange = tableFixedTypeChange;
84 -Vue.prototype.ctho = ctho 123 +Vue.prototype.ctho = ctho;
85 -Vue.prototype.getDownLoadFileStatus = getDownLoadFileStatus 124 +Vue.prototype.getDownLoadFileStatus = getDownLoadFileStatus;
86 -Vue.prototype.base64ConvertFile = base64ConvertFile 125 +Vue.prototype.base64ConvertFile = base64ConvertFile;
87 -Vue.prototype.approvalPortType = approvalPortType 126 +Vue.prototype.approvalPortType = approvalPortType;
88 -Vue.prototype.getSystemOption = getSystemOption 127 +Vue.prototype.getSystemOption = getSystemOption;
89 -Vue.prototype.currencySystemDisableType = currencySystemDisableType 128 +Vue.prototype.currencySystemDisableType = currencySystemDisableType;
90 -Vue.prototype.imageTaskStatusShowType = imageTaskStatusShowType 129 +Vue.prototype.imageTaskStatusShowType = imageTaskStatusShowType;
91 -Vue.prototype.dictData = dictData 130 +Vue.prototype.dictData = dictData;
92 131
93 Vue.prototype.msgSuccess = function (msg) { 132 Vue.prototype.msgSuccess = function (msg) {
94 this.$message({ showClose: true, message: msg, type: "success" }); 133 this.$message({ showClose: true, message: msg, type: "success" });
95 -} 134 +};
96 135
97 Vue.prototype.msgError = function (msg) { 136 Vue.prototype.msgError = function (msg) {
98 this.$message({ showClose: true, message: msg, type: "error" }); 137 this.$message({ showClose: true, message: msg, type: "error" });
99 -} 138 +};
100 139
101 Vue.prototype.msgWarning = function (msg) { 140 Vue.prototype.msgWarning = function (msg) {
102 this.$message({ showClose: true, message: msg, type: "warning" }); 141 this.$message({ showClose: true, message: msg, type: "warning" });
103 -} 142 +};
104 143
105 Vue.prototype.msgInfo = function (msg) { 144 Vue.prototype.msgInfo = function (msg) {
106 this.$message.info(msg); 145 this.$message.info(msg);
107 -} 146 +};
108 147
109 // 全局组件挂载 148 // 全局组件挂载
110 -Vue.component('Pagination', Pagination) 149 +Vue.component("Pagination", Pagination);
111 -Vue.component('RightToolbar', RightToolbar) 150 +Vue.component("RightToolbar", RightToolbar);
112 -Vue.component('InputNodes', InputNodes) 151 +Vue.component("InputNodes", InputNodes);
113 -Vue.component('Table', Table) 152 +Vue.component("Table", Table);
114 -Vue.component('Formitem', Formitem) 153 +Vue.component("Formitem", Formitem);
115 -Vue.component('EditStep', EditStep) 154 +Vue.component("EditStep", EditStep);
116 -Vue.component('FedexAlert', FedexAlert) 155 +Vue.component("FedexAlert", FedexAlert);
117 -Vue.component('FedexEdit', FedexEdit) 156 +Vue.component("FedexEdit", FedexEdit);
118 -Vue.component('Tooltip', Tooltip) 157 +Vue.component("Tooltip", Tooltip);
119 -Vue.component('AlterDialog', AlterDialog) 158 +Vue.component("AlterDialog", AlterDialog);
120 -Vue.component('CustomTransfer', CustomTransfer) 159 +Vue.component("CustomTransfer", CustomTransfer);
121 -Vue.component('CustomForm', CustomForm) 160 +Vue.component("CustomForm", CustomForm);
122 -Vue.component('CustomTable', CustomTable) 161 +Vue.component("CustomTable", CustomTable);
123 -Vue.component('EditTag', EditTag) 162 +Vue.component("EditTag", EditTag);
124 -Vue.component('TablePopover', TablePopover) 163 +Vue.component("TablePopover", TablePopover);
125 -Vue.component('FormTextareaInput', FormTextareaInput) 164 +Vue.component("FormTextareaInput", FormTextareaInput);
126 - 165 +
127 -Vue.use(permission) 166 +Vue.use(permission);
128 - 167 +Vue.use(VxeUITable);
129 - 168 +
130 -Object.keys(filters).forEach(key => { 169 +Object.keys(filters).forEach((key) => {
131 - Vue.filter(key, filters[key]) 170 + Vue.filter(key, filters[key]);
132 -}) 171 +});
133 -
134 -
135 172
136 // window.addEventListener('resize', () => { 173 // window.addEventListener('resize', () => {
137 // // 获取当前的缩放级别 174 // // 获取当前的缩放级别
...@@ -154,15 +191,15 @@ Object.keys(filters).forEach(key => { ...@@ -154,15 +191,15 @@ Object.keys(filters).forEach(key => {
154 */ 191 */
155 192
156 Vue.use(Element, { 193 Vue.use(Element, {
157 - size: localStorage.getItem('size') || 'medium' // set element-ui default size 194 + size: localStorage.getItem("size") || "medium", // set element-ui default size
158 -}) 195 +});
159 196
160 -Vue.config.productionTip = false 197 +Vue.config.productionTip = false;
161 198
162 new Vue({ 199 new Vue({
163 - el: '#app', 200 + el: "#app",
164 router, 201 router,
165 store, 202 store,
166 i18n, 203 i18n,
167 - render: h => h(App) 204 + render: (h) => h(App),
168 -}) 205 +});
......
...@@ -532,43 +532,43 @@ export default { ...@@ -532,43 +532,43 @@ export default {
532 export const receiptStatus = () => { 532 export const receiptStatus = () => {
533 return [ 533 return [
534 { 534 {
535 - text: "未提交", 535 + label: "未提交",
536 value: "99999", 536 value: "99999",
537 }, 537 },
538 { 538 {
539 - text: "已提交", 539 + label: "已提交",
540 value: "0", 540 value: "0",
541 }, 541 },
542 { 542 {
543 - text: "xml报文加签失败", 543 + label: "xml报文加签失败",
544 value: "-2", 544 value: "-2",
545 }, 545 },
546 { 546 {
547 - text: "xml报文上传失败", 547 + label: "xml报文上传失败",
548 value: "-3", 548 value: "-3",
549 }, 549 },
550 { 550 {
551 - text: "电子口岸申报中", 551 + label: "电子口岸申报中",
552 value: "2", 552 value: "2",
553 }, 553 },
554 { 554 {
555 - text: "发送海关成功", 555 + label: "发送海关成功",
556 value: "3", 556 value: "3",
557 }, 557 },
558 { 558 {
559 - text: "发送海关失败", 559 + label: "发送海关失败",
560 value: "4", 560 value: "4",
561 }, 561 },
562 { 562 {
563 - text: "海关退单", 563 + label: "海关退单",
564 value: "100", 564 value: "100",
565 }, 565 },
566 { 566 {
567 - text: "海关入库", 567 + label: "海关入库",
568 value: "120", 568 value: "120",
569 }, 569 },
570 { 570 {
571 - text: "回执异常", 571 + label: "回执异常",
572 value: "-1", 572 value: "-1",
573 }, 573 },
574 ]; 574 ];
...@@ -577,55 +577,55 @@ export const receiptStatus = () => { ...@@ -577,55 +577,55 @@ export const receiptStatus = () => {
577 export const listStatus = () => { 577 export const listStatus = () => {
578 return [ 578 return [
579 { 579 {
580 - text: "未提交", 580 + label: "未提交",
581 value: "99999", 581 value: "99999",
582 }, 582 },
583 { 583 {
584 - text: "已提交", 584 + label: "已提交",
585 value: "0", 585 value: "0",
586 }, 586 },
587 { 587 {
588 - text: "xml报文加签失败", 588 + label: "xml报文加签失败",
589 value: "-2", 589 value: "-2",
590 }, 590 },
591 { 591 {
592 - text: "xml报文上传失败", 592 + label: "xml报文上传失败",
593 value: "-3", 593 value: "-3",
594 }, 594 },
595 { 595 {
596 - text: "电子口岸申报中", 596 + label: "电子口岸申报中",
597 value: "2", 597 value: "2",
598 }, 598 },
599 { 599 {
600 - text: "发送海关成功", 600 + label: "发送海关成功",
601 value: "3", 601 value: "3",
602 }, 602 },
603 { 603 {
604 - text: "发送海关失败", 604 + label: "发送海关失败",
605 value: "4", 605 value: "4",
606 }, 606 },
607 { 607 {
608 - text: "海关退单", 608 + label: "海关退单",
609 value: "100", 609 value: "100",
610 }, 610 },
611 { 611 {
612 - text: "海关入库", 612 + label: "海关入库",
613 value: "120", 613 value: "120",
614 }, 614 },
615 { 615 {
616 - text: "海关审结", 616 + label: "海关审结",
617 value: "399", 617 value: "399",
618 }, 618 },
619 { 619 {
620 - text: "放行", 620 + label: "放行",
621 value: "800", 621 value: "800",
622 }, 622 },
623 { 623 {
624 - text: "结关", 624 + label: "结关",
625 value: "899", 625 value: "899",
626 }, 626 },
627 { 627 {
628 - text: "回执异常", 628 + label: "回执异常",
629 value: "-1", 629 value: "-1",
630 }, 630 },
631 ]; 631 ];
...@@ -634,35 +634,35 @@ export const listStatus = () => { ...@@ -634,35 +634,35 @@ export const listStatus = () => {
634 export const totalScoreStatus = () => { 634 export const totalScoreStatus = () => {
635 return [ 635 return [
636 { 636 {
637 - text: "未提交", 637 + label: "未提交",
638 value: "99999", 638 value: "99999",
639 }, 639 },
640 { 640 {
641 - text: "已提交", 641 + label: "已提交",
642 value: "0", 642 value: "0",
643 }, 643 },
644 { 644 {
645 - text: "xml报文加签失败", 645 + label: "xml报文加签失败",
646 value: "-2", 646 value: "-2",
647 }, 647 },
648 { 648 {
649 - text: "xml报文上传失败", 649 + label: "xml报文上传失败",
650 value: "-3", 650 value: "-3",
651 }, 651 },
652 { 652 {
653 - text: "电子口岸申报中", 653 + label: "电子口岸申报中",
654 value: "2", 654 value: "2",
655 }, 655 },
656 { 656 {
657 - text: "发送海关成功", 657 + label: "发送海关成功",
658 value: "3", 658 value: "3",
659 }, 659 },
660 { 660 {
661 - text: "发送海关失败", 661 + label: "发送海关失败",
662 value: "4", 662 value: "4",
663 }, 663 },
664 { 664 {
665 - text: "海关退单", 665 + label: "海关退单",
666 value: "100", 666 value: "100",
667 }, 667 },
668 // { 668 // {
...@@ -670,19 +670,19 @@ export const totalScoreStatus = () => { ...@@ -670,19 +670,19 @@ export const totalScoreStatus = () => {
670 // value: "120", 670 // value: "120",
671 // }, 671 // },
672 { 672 {
673 - text: "海关审结", 673 + label: "海关审结",
674 value: "399", 674 value: "399",
675 }, 675 },
676 { 676 {
677 - text: "放行", 677 + label: "放行",
678 value: "800", 678 value: "800",
679 }, 679 },
680 { 680 {
681 - text: "结关", 681 + label: "结关",
682 value: "899", 682 value: "899",
683 }, 683 },
684 { 684 {
685 - text: "回执异常", 685 + label: "回执异常",
686 value: "-1", 686 value: "-1",
687 }, 687 },
688 ]; 688 ];
......
...@@ -170,11 +170,23 @@ ...@@ -170,11 +170,23 @@
170 </el-col> 170 </el-col>
171 <!-- new 申报业务类型--> 171 <!-- new 申报业务类型-->
172 <el-col :span="8"> 172 <el-col :span="8">
173 - <Formitem 173 + <Formitem prop="declareBusinessType" type="edit">
174 - label="申报业务类型" 174 + <template slot="title">
175 - prop="declareBusinessType" 175 + <span
176 - type="edit" 176 + >申报业务类型
177 - > 177 + <el-tooltip
178 + class="item"
179 + effect="dark"
180 + content="如模板中含此字段，则选用模板数据，此处填写无效"
181 + placement="top"
182 + >
183 + <i
184 + class="el-icon-question"
185 + style="cursor: pointer; font-size: 14px"
186 + ></i>
187 + </el-tooltip>
188 + </span>
189 + </template>
178 <el-select 190 <el-select
179 type="text" 191 type="text"
180 id="inputInner-edit-declareBusinessType" 192 id="inputInner-edit-declareBusinessType"
......
This diff is collapsed. Click to expand it.