Fedex / EcomWeb

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

feat: 自测更换新table组件

Inline Side-by-side
Showing 7 changed files with 602 additions and 463 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"
......
...@@ -305,167 +305,340 @@ ...@@ -305,167 +305,340 @@
305 </div> 305 </div>
306 </TablePopover> 306 </TablePopover>
307 </section> 307 </section>
308 - <Table 308 + <div v-loading="loadings.sreachLoading">
309 - class="fedexDetialTable fedexSreachTable fedexTable_new" 309 + <vxe-table
310 - ref="entryTable" 310 + :max-height="tableMaxheight"
311 - :data="tableData" 311 + :data="tableData"
312 - :headerData="headerData" 312 + :row-config="{ isCurrent: true, isHover: true }"
313 - :maxHeight="tableMaxheight" 313 + :filter-config="{ remote: true }"
314 - :border="true" 314 + @filter-change="filterChangeEvent"
315 - :pagination="true" 315 + @checkbox-change="tableSelect"
316 - :order="false" 316 + @checkbox-all="tableSelectAll"
317 - :loading="loadings.sreachLoading" 317 + >
318 - :page="page.pageIndex" 318 + <vxe-column type="checkbox" width="60"></vxe-column>
319 - :totalCount="page.total" 319 + <vxe-column field="billNo" title="提运单号" :show-overflow="true">
320 - @sizeChange="sizeChange" 320 + <template #default="{ row }">
321 - @currentChange="currentChange" 321 + <el-tooltip
322 - :selection="true" 322 + class="item"
323 - :selectFixed="false" 323 + effect="dark"
324 - @tableSelect="tableSelect" 324 + :content="row.billNo"
325 - @tableSelectAll="tableSelectAll" 325 + placement="top"
326 - :rowSelectDataType="false" 326 + >
327 - @cellClick="cellClick" 327 + <span style="font-size: 12px"> {{ row.billNo }} </span>
328 - :selected="selected" 328 + </el-tooltip>
329 - @filterChange="filterChange" 329 + </template>
330 - rowKey="declareId" 330 + </vxe-column>
331 - > 331 + <vxe-column
332 - <template v-slot:orderReceiptStatus="scope"> 332 + field="logisticsWaybillNumber"
333 - <TablePopover 333 + title="物流运单编号"
334 - ref="orderReceiptStatusPopover" 334 + ></vxe-column>
335 - dataKey="orderReceiptStatus" 335 + <vxe-column field="orderno" title="订单编号" :show-overflow="true">
336 - idKey="declareId" 336 + <template #default="{ row }">
337 - :parentDom="$refs.entryTable" 337 + <el-tooltip
338 - :receiptDataHead="receiptDataHead" 338 + class="item"
339 - :rowData="scope.row" 339 + effect="dark"
340 - :tableData="tableData" 340 + :content="row.orderno"
341 - @popoverChange="popoverChange" 341 + placement="top"
342 - @popoverClose="popoverClose" 342 + >
343 - > 343 + <span style="font-size: 12px"> {{ row.orderno }} </span>
344 - <div slot="title"> 344 + </el-tooltip>
345 - <span style="font-weight: 700; color: #515a6e">订单编号：</span> 345 + </template>
346 - {{ scope.row.orderno }} 346 + </vxe-column>
347 - </div> 347 + <vxe-column field="flightNumber" title="航班号"></vxe-column>
348 - <div slot="buttonLabel"> 348 + <vxe-column
349 - {{ scope.row.orderReceiptStatus }} 349 + field="ecomEntName"
350 - </div> 350 + title="电商企业名称"
351 - </TablePopover> 351 + :show-overflow="true"
352 - </template>
353 - <template v-slot:wayBillReceipt="scope">
354 - <TablePopover
355 - ref="wayBillReceiptPopover"
356 - dataKey="wayBillReceipt"
357 - idKey="declareId"
358 - :parentDom="$refs.entryTable"
359 - :receiptDataHead="receiptDataHead"
360 - :rowData="scope.row"
361 - :tableData="tableData"
362 - @popoverChange="popoverChange"
363 - @popoverClose="popoverClose"
364 > 352 >
365 - <div slot="title"> 353 + <template #default="{ row }">
366 - <span style="font-weight: 700; color: #515a6e">订单编号：</span 354 + <el-tooltip
367 - >{{ scope.row.orderno }} 355 + class="item"
368 - </div> 356 + effect="dark"
369 - <div slot="buttonLabel"> 357 + :content="row.ecomEntName"
370 - {{ scope.row.wayBillReceipt }} 358 + placement="top"
371 - </div> 359 + >
372 - </TablePopover> 360 + <span style="font-size: 12px"> {{ row.ecomEntName }} </span>
373 - </template> 361 + </el-tooltip>
374 - <template v-slot:listReceiptStatus="scope"> 362 + </template>
375 - <TablePopover 363 + </vxe-column>
376 - ref="listReceiptStatusPopover" 364 + <vxe-column field="createTime" title="创建时间"></vxe-column>
377 - dataKey="listReceiptStatus" 365 + <vxe-column
378 - idKey="declareId" 366 + field="orderReceiptStatus"
379 - :parentDom="$refs.entryTable" 367 + title="订单回执"
380 - :receiptDataHead="receiptDataHead" 368 + :filters="receiptStatusFilters"
381 - :rowData="scope.row"
382 - :tableData="tableData"
383 - @popoverChange="popoverChange"
384 - @popoverClose="popoverClose"
385 > 369 >
386 - <div slot="title"> 370 + <template #default="{ row }">
387 - <span style="font-weight: 700; color: #515a6e">订单编号：</span 371 + <el-popover
388 - >{{ scope.row.orderno }} 372 + placement="left"
389 - </div> 373 + popper-class="portLogPopper"
390 - <div slot="buttonLabel"> 374 + :visible-arrow="false"
391 - {{ scope.row.listReceiptStatus }} 375 + title=""
392 - </div> 376 + width="750"
393 - </TablePopover> 377 + trigger="manual"
394 - </template> 378 + v-model="row[`orderReceiptStatus${row.declareId}`]"
395 - <template v-slot:arrivalInReceiptStatus="scope"> 379 + >
396 - <TablePopover 380 + <div style="text-align: right">
397 - ref="arrivalInReceiptStatusPopover" 381 + <i
398 - dataKey="arrivalInReceiptStatus" 382 + @click.stop="
399 - idKey="declareId" 383 + popoverCloseNew(row, row.declareId, 'orderReceiptStatus')
400 - :parentDom="$refs.entryTable" 384 + "
401 - :receiptDataHead="receiptDataHead" 385 + class="el-icon-close"
402 - :rowData="scope.row" 386 + style="cursor: pointer; font-size: 20px; font-weight: 700"
403 - :tableData="tableData" 387 + ></i>
404 - @popoverChange="popoverChange" 388 + </div>
405 - @popoverClose="popoverClose" 389 + <div style="margin-bottom: 5px">
390 + <span style="font-weight: 700; color: #515a6e">订单编号：</span>
391 + {{ row.orderno }}
392 + </div>
393 + <el-table
394 + :data="popoverTableData"
395 + :pagination="false"
396 + :border="true"
397 + tooltip-effect="dark"
398 + max-height="300px"
399 + >
400 + <el-table-column
401 + property="receiptStatus"
402 + label="回执状态"
403 + ></el-table-column>
404 + <el-table-column
405 + property="statusTime"
406 + label="状态时间"
407 + ></el-table-column>
408 + <el-table-column
409 + property="receiptDescription"
410 + label="回执描述"
411 + ></el-table-column>
412 + </el-table>
413 + <el-button
414 + type="text"
415 + slot="reference"
416 + @click="
417 + popoverChange({ data: row, status: 'orderReceiptStatus' })
418 + "
419 + >
420 + {{ row.orderReceiptStatus }}
421 + </el-button>
422 + </el-popover>
423 + </template>
424 + </vxe-column>
425 + <vxe-column
426 + field="wayBillReceipt"
427 + title="运单回执"
428 + :filters="receiptStatusFilters"
406 > 429 >
407 - <div slot="title"> 430 + <template #default="{ row }">
408 - <span style="font-weight: 700; color: #515a6e">订单编号：</span 431 + <el-popover
409 - >{{ scope.row.orderno }} 432 + placement="left"
410 - </div> 433 + popper-class="portLogPopper"
411 - <div slot="buttonLabel"> 434 + :visible-arrow="false"
412 - {{ scope.row.arrivalInReceiptStatus }} 435 + title=""
413 - </div> 436 + width="750"
414 - </TablePopover> 437 + trigger="manual"
415 - </template> 438 + v-model="row[`wayBillReceipt${row.declareId}`]"
416 - <template v-slot:totalSplitOrderStatus="scope"> 439 + >
417 - <TablePopover 440 + <div style="text-align: right">
418 - ref="totalSplitOrderStatusPopover" 441 + <i
419 - dataKey="totalSplitOrderStatus" 442 + @click.stop="
420 - idKey="declareId" 443 + popoverCloseNew(row, row.declareId, 'wayBillReceipt')
421 - :parentDom="$refs.entryTable" 444 + "
422 - :receiptDataHead="receiptDataHead" 445 + class="el-icon-close"
423 - :rowData="scope.row" 446 + style="cursor: pointer; font-size: 20px; font-weight: 700"
424 - :tableData="tableData" 447 + ></i>
425 - @popoverChange="popoverChange" 448 + </div>
426 - @popoverClose="popoverClose" 449 + <div style="margin-bottom: 5px">
450 + <span style="font-weight: 700; color: #515a6e">订单编号：</span>
451 + {{ row.orderno }}
452 + </div>
453 + <el-table
454 + :data="popoverTableData"
455 + :pagination="false"
456 + :border="true"
457 + tooltip-effect="dark"
458 + max-height="300px"
459 + >
460 + <el-table-column
461 + property="receiptStatus"
462 + label="回执状态"
463 + ></el-table-column>
464 + <el-table-column
465 + property="statusTime"
466 + label="状态时间"
467 + ></el-table-column>
468 + <el-table-column
469 + property="receiptDescription"
470 + label="回执描述"
471 + ></el-table-column>
472 + </el-table>
473 + <el-button
474 + type="text"
475 + slot="reference"
476 + @click="popoverChange({ data: row, status: 'wayBillReceipt' })"
477 + >
478 + {{ row.wayBillReceipt }}
479 + </el-button>
480 + </el-popover>
481 + </template>
482 + </vxe-column>
483 + <vxe-column
484 + field="listReceiptStatus"
485 + title="清单回执"
486 + :filters="listStatusFilters"
427 > 487 >
428 - <div slot="title"> 488 + <template #default="{ row }">
429 - <span style="font-weight: 700; color: #515a6e">订单编号：</span 489 + <el-popover
430 - >{{ scope.row.orderno }} 490 + placement="left"
431 - </div> 491 + popper-class="portLogPopper"
432 - <div slot="buttonLabel"> 492 + :visible-arrow="false"
433 - {{ scope.row.totalSplitOrderStatus }} 493 + title=""
434 - </div> 494 + width="750"
435 - </TablePopover> 495 + trigger="manual"
436 - </template> 496 + v-model="row[`listReceiptStatus${row.declareId}`]"
437 - <template v-slot:logisticsReceiptStatus="scope"> 497 + >
438 - <TablePopover 498 + <div style="text-align: right">
439 - ref="logisticsReceiptStatusPopover" 499 + <i
440 - dataKey="logisticsReceiptStatus" 500 + @click.stop="
441 - idKey="declareId" 501 + popoverCloseNew(row, row.declareId, 'listReceiptStatus')
442 - :parentDom="$refs.entryTable" 502 + "
443 - :receiptDataHead="receiptDataHead" 503 + class="el-icon-close"
444 - :rowData="scope.row" 504 + style="cursor: pointer; font-size: 20px; font-weight: 700"
445 - :tableData="tableData" 505 + ></i>
446 - @popoverChange="popoverChange" 506 + </div>
447 - @popoverClose="popoverClose" 507 + <div style="margin-bottom: 5px">
508 + <span style="font-weight: 700; color: #515a6e">订单编号：</span>
509 + {{ row.orderno }}
510 + </div>
511 + <el-table
512 + :data="popoverTableData"
513 + :pagination="false"
514 + :border="true"
515 + tooltip-effect="dark"
516 + max-height="300px"
517 + >
518 + <el-table-column
519 + property="receiptStatus"
520 + label="回执状态"
521 + ></el-table-column>
522 + <el-table-column
523 + property="statusTime"
524 + label="状态时间"
525 + ></el-table-column>
526 + <el-table-column
527 + property="receiptDescription"
528 + label="回执描述"
529 + ></el-table-column>
530 + </el-table>
531 + <el-button
532 + type="text"
533 + slot="reference"
534 + @click="
535 + popoverChange({ data: row, status: 'listReceiptStatus' })
536 + "
537 + >
538 + {{ row.listReceiptStatus }}
539 + </el-button>
540 + </el-popover>
541 + </template>
542 + </vxe-column>
543 + <vxe-column
544 + field="totalSplitOrderStatus"
545 + title="清单总分单回执"
546 + :filters="totalScoreStatusFilters"
448 > 547 >
449 - <div slot="title"> 548 + <template #default="{ row }">
450 - <span style="font-weight: 700; color: #515a6e">订单编号：</span 549 + <el-popover
451 - >{{ scope.row.orderno }} 550 + placement="left"
452 - </div> 551 + popper-class="portLogPopper"
453 - <div slot="buttonLabel"> 552 + :visible-arrow="false"
454 - {{ scope.row.logisticsReceiptStatus }} 553 + title=""
455 - </div> 554 + width="750"
456 - </TablePopover> 555 + trigger="manual"
457 - </template> 556 + v-model="row[`totalSplitOrderStatus${row.declareId}`]"
458 - <template slot="optionColumn"> 557 + >
459 - <el-table-column label="操作" width="120"> 558 + <div style="text-align: right">
460 - <template slot-scope="scope"> 559 + <i
461 - <el-button type="text" @click="update(scope.row)"> 修改 </el-button> 560 + @click.stop="
462 - <el-button type="text" @click="showTotalLog(scope.row)"> 561 + popoverCloseNew(row, row.declareId, 'totalSplitOrderStatus')
463 - 日志 562 + "
464 - </el-button> 563 + class="el-icon-close"
564 + style="cursor: pointer; font-size: 20px; font-weight: 700"
565 + ></i>
566 + </div>
567 + <div style="margin-bottom: 5px">
568 + <span style="font-weight: 700; color: #515a6e">订单编号：</span>
569 + {{ row.orderno }}
570 + </div>
571 + <el-table
572 + :data="popoverTableData"
573 + :pagination="false"
574 + :border="true"
575 + tooltip-effect="dark"
576 + max-height="300px"
577 + >
578 + <el-table-column
579 + property="receiptStatus"
580 + label="回执状态"
581 + ></el-table-column>
582 + <el-table-column
583 + property="statusTime"
584 + label="状态时间"
585 + ></el-table-column>
586 + <el-table-column
587 + property="receiptDescription"
588 + label="回执描述"
589 + ></el-table-column>
590 + </el-table>
591 + <el-button
592 + type="text"
593 + slot="reference"
594 + @click="
595 + popoverChange({ data: row, status: 'totalSplitOrderStatus' })
596 + "
597 + >
598 + {{ row.totalSplitOrderStatus }}
599 + </el-button>
600 + </el-popover>
465 </template> 601 </template>
466 - </el-table-column> 602 + </vxe-column>
467 - </template> 603 + <vxe-column title="操作" fixed="right" width="120">
468 - </Table> 604 + <template #default="{ row }">
605 + <el-button type="text" @click="update(row)"> 修改 </el-button>
606 + <el-button type="text" @click="showTotalLog(row)"> 日志 </el-button>
607 + </template>
608 + </vxe-column>
609 + </vxe-table>
610 + </div>
611 + <div>
612 + <div v-if="selected != null && selected.length != 0" class="selectCount">
613 + {{ $t("system.custom.tableSelect", { a: selected.length }) }}
614 + </div>
615 + <el-pagination
616 + :total="page.total"
617 + :page-size.sync="page.pageSize"
618 + :current-page.sync="page.pageIndex"
619 + :page-sizes="[10, 20, 50, 100, 500, 1000]"
620 + background
621 + layout="total,prev, pager, next, jumper, ->, sizes"
622 + class="tablePagination"
623 + @size-change="sizeChange"
624 + @current-change="currentChange"
625 + >
626 + <el-select
627 + v-model="page.pageSize"
628 + size="mini"
629 + :placeholder="$t('system.custom.pageNUmPlaceholder')"
630 + @change="sizeChange"
631 + >
632 + <el-option
633 + v-for="(item, index) in [10, 20, 50, 100, 500, 1000]"
634 + :label="item + $t('system.custom.pageSize')"
635 + :value="item"
636 + :key="index"
637 + >
638 + </el-option>
639 + </el-select>
640 + </el-pagination>
641 + </div>
469 642
470 <DialogVue 643 <DialogVue
471 :outerVisible="outerVisible" 644 :outerVisible="outerVisible"
...@@ -577,121 +750,11 @@ export default { ...@@ -577,121 +750,11 @@ export default {
577 waybillStatus: [], 750 waybillStatus: [],
578 listStatus: [], 751 listStatus: [],
579 totalScoreStatus: [], 752 totalScoreStatus: [],
580 - headerData: [ 753 + // 订单回执 Filters
581 - { 754 + receiptStatusFilters: receiptStatus(),
582 - name: "提运单号", 755 + listStatusFilters: listStatus(),
583 - value: "billNo", 756 + totalScoreStatusFilters: totalScoreStatus(),
584 - width: "",
585 - align: "left",
586 - },
587 - {
588 - name: "物流运单编号",
589 - value: "logisticsWaybillNumber",
590 - width: "",
591 - align: "left",
592 - },
593 - {
594 - name: "订单编号",
595 - value: "orderno",
596 - width: "",
597 - align: "left",
598 - },
599 - {
600 - name: "航班号",
601 - value: "flightNumber",
602 - width: "",
603 - align: "left",
604 - },
605 - {
606 - name: "电商企业名称",
607 - value: "ecomEntName",
608 - width: "",
609 - align: "left",
610 - },
611 - {
612 - name: "创建时间",
613 - value: "createTime",
614 - width: "",
615 - align: "left",
616 - },
617 - {
618 - name: "订单回执",
619 - value: "orderReceiptStatus",
620 - width: "",
621 - align: "left",
622 - slot: true,
623 - columnKey: "orderReceiptStatus",
624 - filterPlacement: "bottom-right",
625 - filters: [...receiptStatus()],
626 - },
627 -
628 - {
629 - name: "运单回执",
630 - value: "wayBillReceipt",
631 - width: "",
632 - align: "left",
633 - slot: true,
634 - columnKey: "wayBillReceipt",
635 - filterPlacement: "bottom-right",
636 - filters: [...receiptStatus()],
637 - },
638 - {
639 - name: "清单回执",
640 - value: "listReceiptStatus",
641 - width: "",
642 - align: "left",
643 - slot: true,
644 - columnKey: "listReceiptStatus",
645 - filterPlacement: "bottom-right",
646 - filters: [...listStatus()],
647 - },
648 757
649 - {
650 - name: "清单总分单回执",
651 - value: "totalSplitOrderStatus",
652 - width: "",
653 - align: "left",
654 - slot: true,
655 - columnKey: "totalSplitOrderStatus",
656 - filterPlacement: "bottom-right",
657 - filters: [...totalScoreStatus()],
658 - },
659 - // {
660 - // // release-v1.0.9
661 - // name: "运抵单回执",
662 - // value: "arrivalInReceiptStatus",
663 - // width: "",
664 - // align: "left",
665 - // slot: true,
666 - // },
667 - // {
668 - // name: "离境单回执",
669 - // value: "logisticsReceiptStatus",
670 - // width: "",
671 - // align: "left",
672 - // slot: true,
673 - // },
674 - ],
675 - receiptDataHead: [
676 - {
677 - name: "回执状态",
678 - value: "receiptStatus",
679 - width: "",
680 - align: "left",
681 - },
682 - {
683 - name: "状态时间",
684 - value: "statusTime",
685 - width: "",
686 - align: "left",
687 - },
688 - {
689 - name: "回执描述",
690 - value: "receiptDescription",
691 - width: "",
692 - align: "left",
693 - },
694 - ],
695 selected: [], 758 selected: [],
696 logDataHead: [ 759 logDataHead: [
697 { 760 {
...@@ -719,11 +782,7 @@ export default { ...@@ -719,11 +782,7 @@ export default {
719 align: "left", 782 align: "left",
720 }, 783 },
721 ], 784 ],
722 - // dictData: { 785 +
723 - // logisticsNo: [],
724 - // receiptStatus: [],
725 - // receiptType: [],
726 - // },
727 loadings: { 786 loadings: {
728 templateLoading: false, 787 templateLoading: false,
729 sreachLoading: false, 788 sreachLoading: false,
...@@ -752,6 +811,13 @@ export default { ...@@ -752,6 +811,13 @@ export default {
752 paramsOjb: {}, 811 paramsOjb: {},
753 weightAdjustVisible: false, 812 weightAdjustVisible: false,
754 portList: [], 813 portList: [],
814 + popoverTableData: [],
815 + visiblePopover: {
816 + flag: false,
817 + type: "",
818 + declareId: "",
819 + data: {},
820 + },
755 }; 821 };
756 }, 822 },
757 created() { 823 created() {
...@@ -787,12 +853,20 @@ export default { ...@@ -787,12 +853,20 @@ export default {
787 }); 853 });
788 }, 854 },
789 methods: { 855 methods: {
790 - filterChange(value) { 856 + filterChangeEvent(value) {
791 - this.orderStatus = value?.orderReceiptStatus; 857 + console.log(value.values);
792 - this.waybillStatus = value?.wayBillReceipt; 858 + if (value.field === "orderReceiptStatus") {
793 - this.listStatus = value?.listReceiptStatus; 859 + this.orderStatus = value?.values;
794 - this.totalScoreStatus = value?.totalSplitOrderStatus; 860 + }
795 - console.log(value, this.orderStatus); 861 + if (value.field === "wayBillReceipt") {
862 + this.waybillStatus = value?.values;
863 + }
864 + if (value.field === "listReceiptStatus") {
865 + this.listStatus = value?.values;
866 + }
867 + if (value.field === "totalSplitOrderStatus") {
868 + this.totalScoreStatus = value?.values;
869 + }
796 this.search(0); 870 this.search(0);
797 }, 871 },
798 //获取口岸子字典 872 //获取口岸子字典
...@@ -902,11 +976,7 @@ export default { ...@@ -902,11 +976,7 @@ export default {
902 this.page.total = res.data.totalItems; 976 this.page.total = res.data.totalItems;
903 this.tableData.forEach((item, idx) => { 977 this.tableData.forEach((item, idx) => {
904 item.index = idx; 978 item.index = idx;
905 - item.orderReceiptStatusPopoverType = false;
906 - item.listReceiptStatusPopoverType = false;
907 - item.wayBillReceiptPopoverType = false;
908 item.arrivalInReceiptStatusPopoverType = false; 979 item.arrivalInReceiptStatusPopoverType = false;
909 - item.totalSplitOrderStatusPopoverType = false;
910 item.logisticsReceiptStatusPopoverType = false; 980 item.logisticsReceiptStatusPopoverType = false;
911 // item.logLoading = false; 981 // item.logLoading = false;
912 item.popoverData = []; 982 item.popoverData = [];
...@@ -1133,30 +1203,32 @@ export default { ...@@ -1133,30 +1203,32 @@ export default {
1133 this.tableMaxheight = window.innerHeight - 300; 1203 this.tableMaxheight = window.innerHeight - 300;
1134 this.$forceUpdate(); 1204 this.$forceUpdate();
1135 }, 1205 },
1206 + popoverCloseNew(row, declareId, type) {
1207 + row[`${type}${declareId}`] = false;
1208 + this.$forceUpdate();
1209 + },
1136 popoverChange(val) { 1210 popoverChange(val) {
1137 - this.tableData = val.tableData; 1211 + this.popoverTableData = [];
1212 + if (this.visiblePopover.flag) {
1213 + const ojb = this.tableData.find(
1214 + (item) => item.declareId === this.visiblePopover.declareId
1215 + );
1216 + ojb[`${this.visiblePopover.type}${ojb.declareId}`] = false;
1217 + }
1218 + this.visiblePopover.flag = true;
1219 + this.visiblePopover.declareId = val.data.declareId;
1220 + this.visiblePopover.type = val.status;
1221 + this.$nextTick(() => {
1222 + val.data[`${val.status}${val.data.declareId}`] = true;
1223 + });
1138 1224
1139 this.receiptApi(val.data.declareId, val.status) 1225 this.receiptApi(val.data.declareId, val.status)
1140 .then((res) => { 1226 .then((res) => {
1141 - val.tableData.forEach((item) => { 1227 + console.log(res);
1142 - if (item.declareId == val.data.declareId) { 1228 + this.popoverTableData = res;
1143 - item.popoverData = res;
1144 - }
1145 - });
1146 - this.tableData = val.tableData;
1147 }) 1229 })
1148 - .finally(() => { 1230 + .finally(() => {});
1149 - this.$nextTick(() => { 1231 + this.$forceUpdate();
1150 - this.$store.dispatch("setLoadingState", false);
1151 - this.$refs.orderReceiptStatusPopover.tableLoading = false;
1152 - this.$refs.wayBillReceiptPopover.tableLoading = false;
1153 - this.$refs.listReceiptStatusPopover.tableLoading = false;
1154 - this.$refs.arrivalInReceiptStatusPopover.tableLoading = false;
1155 - this.$refs.totalSplitOrderStatusPopover.tableLoading = false;
1156 - this.$refs.logisticsReceiptStatusPopover.tableLoading = false;
1157 - this.$refs.allLogDataReceiptStatusPopover.tableLoading = false;
1158 - });
1159 - });
1160 }, 1232 },
1161 //查询回执 1233 //查询回执
1162 receiptApi(id, type) { 1234 receiptApi(id, type) {
...@@ -1258,10 +1330,6 @@ export default { ...@@ -1258,10 +1330,6 @@ export default {
1258 }, 1330 },
1259 popoverClose(val) { 1331 popoverClose(val) {
1260 this.tableData.forEach((item) => { 1332 this.tableData.forEach((item) => {
1261 - item.orderReceiptStatusPopoverType = false;
1262 - item.listReceiptStatusPopoverType = false;
1263 - item.wayBillReceiptPopoverType = false;
1264 - item.totalSplitOrderStatusPopoverType = false;
1265 item.logisticsReceiptStatusPopoverType = false; 1333 item.logisticsReceiptStatusPopoverType = false;
1266 item.arrivalInReceiptStatusPopoverType = false; 1334 item.arrivalInReceiptStatusPopoverType = false;
1267 item.popoverData = []; 1335 item.popoverData = [];
...@@ -1271,14 +1339,17 @@ export default { ...@@ -1271,14 +1339,17 @@ export default {
1271 "auto"; 1339 "auto";
1272 }, 1340 },
1273 tableSelect(val) { 1341 tableSelect(val) {
1274 - this.selected = val.selection; 1342 + console.log(val.records);
1343 + this.selected = val.records;
1275 }, 1344 },
1276 tableSelectAll(val) { 1345 tableSelectAll(val) {
1277 - this.selected = val; 1346 + console.log(val.records);
1347 + this.selected = val.records;
1278 }, 1348 },
1279 //分页 1349 //分页
1280 currentChange(val) { 1350 currentChange(val) {
1281 - this.page.pageIndex = val.page; 1351 + console.log(val);
1352 + this.page.pageIndex = val;
1282 this.search(1); 1353 this.search(1);
1283 }, 1354 },
1284 sizeChange(val) { 1355 sizeChange(val) {
...@@ -1462,5 +1533,19 @@ export default { ...@@ -1462,5 +1533,19 @@ export default {
1462 font-size: 18px; 1533 font-size: 18px;
1463 } 1534 }
1464 } 1535 }
1536 + .vxe-cell--title {
1537 + font-size: 13px;
1538 + font-family: sans-serif !important;
1539 + }
1540 + .vxe-cell--label {
1541 + font-size: 12px;
1542 + font-family: sans-serif !important;
1543 + }
1544 + .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--icon {
1545 + color: #007ab7 !important;
1546 + }
1547 + .vxe-table--render-default .vxe-body--row.row--hover > .vxe-body--column {
1548 + background-color: #e8f7fd !important;
1549 + }
1465 } 1550 }
1466 </style> 1551 </style>
......