Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
bc724e62 1 parent cafd24b5

删除无用文件，撤销单、离境单、总分单页面增加

Expand all
Inline Side-by-side
Showing 23 changed files with 1525 additions and 197 deletions
...@@ -47,3 +47,53 @@ export function declareDataUpload(data) { ...@@ -47,3 +47,53 @@ export function declareDataUpload(data) {
47 }) 47 })
48 } 48 }
49 49
50 +//查询订单回执
51 +/**
52 + * @param declareId * id
53 + */
54 +export function getOrderReceipt(data) {
55 + return request({
56 + url: '/bus-customer/declareData/orderReceipt',
57 + method: 'get',
58 + params: data,
59 + })
60 +}
61 +
62 +//查询物流单回执
63 +/**
64 + * @param declareId * id
65 + */
66 +export function getLogisticsReceipt(data) {
67 + return request({
68 + url: '/bus-customer/declareData/logisticsReceipt',
69 + method: 'get',
70 + params: data,
71 + })
72 +}
73 +
74 +
75 +//查询清单回执
76 +/**
77 + * @param declareId * id
78 + */
79 +export function getListReceipt(data) {
80 + return request({
81 + url: '/bus-customer/declareData/logisticsReceipt',
82 + method: 'get',
83 + params: data,
84 + })
85 +}
86 +
87 +//查询清单总分单回执
88 +/**
89 + * @param declareId * id
90 + */
91 +export function getTotalReceipt(data) {
92 + return request({
93 + url: '/bus-customer/declareData/totalReceipt',
94 + method: 'get',
95 + params: data,
96 + })
97 +}
98 +
99 +
......
...@@ -7,7 +7,7 @@ import request from '@/utils/request' ...@@ -7,7 +7,7 @@ import request from '@/utils/request'
7 * @param returnStatus 回执状态 7 * @param returnStatus 回执状态
8 * @param createTimeStart 创建开始时间 8 * @param createTimeStart 创建开始时间
9 * @param createTimeEnd 创建结束时间 9 * @param createTimeEnd 创建结束时间
10 - * @param pageNum * 10 + * @param pageIndex *
11 * @param pageSize * 11 * @param pageSize *
12 */ 12 */
13 export function getAllExportingBills(data) { 13 export function getAllExportingBills(data) {
...@@ -25,7 +25,7 @@ export function getAllExportingBills(data) { ...@@ -25,7 +25,7 @@ export function getAllExportingBills(data) {
25 * @param returnStatus 回执状态 25 * @param returnStatus 回执状态
26 * @param createTimeStart 创建开始时间 26 * @param createTimeStart 创建开始时间
27 * @param createTimeEnd 创建结束时间 27 * @param createTimeEnd 创建结束时间
28 - * @param pageNum * 28 + * @param pageIndex *
29 * @param pageSize * 29 * @param pageSize *
30 */ 30 */
31 export function getAllExportingTransportBills(data) { 31 export function getAllExportingTransportBills(data) {
......
1 +import request from '@/utils/request'
2 +
3 +//清单总分单查询
4 +/**
5 + * @param billNo 提运单号
6 + * @param createTimeEnd 创建结束时间
7 + * @param createTimeStart 创建开始时间
8 + * @param returnStatus 回执状态
9 + * @param pageIndex *
10 + * @param pageSize *
11 + */
12 +export function getAllCancellation(data) {
13 + return request({
14 + url: '/bus-customer/exportCancellation/search',
15 + method: 'post',
16 + data: data,
17 + })
18 +}
...\ No newline at end of file ...\ No newline at end of file
1 +import request from '@/utils/request'
2 +
3 +//清单总分单查询
4 +/**
5 + * @param billNo 提运单号
6 + * @param createTimeEnd 创建结束时间
7 + * @param createTimeStart 创建开始时间
8 + * @param returnStatus 回执状态
9 + * @param pageIndex *
10 + * @param pageSize *
11 + */
12 +export function getAllTotalScoreList(data) {
13 + return request({
14 + url: '/bus-customer/exportTotalScore/search',
15 + method: 'post',
16 + data: data,
17 + })
18 +}
...\ No newline at end of file ...\ No newline at end of file
1 +import request from '@/utils/request'
2 +
3 +//物流离境单查询
4 +/**
5 + * @param billNo 提运单号
6 + * @param createTimeEnd 创建结束时间
7 + * @param createTimeStart 创建开始时间
8 + * @param 运单号
9 + * @param returnStatus 回执状态
10 + * @param pageIndex *
11 + * @param pageSize *
12 + */
13 +export function getAllLogisticsDepartureList(data) {
14 + return request({
15 + url: '/bus-customer/exportLogisticsDeparture/search',
16 + method: 'post',
17 + data: data,
18 + })
19 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -7,10 +7,47 @@ import request from '@/utils/request' ...@@ -7,10 +7,47 @@ import request from '@/utils/request'
7 * @param pageNum * 7 * @param pageNum *
8 * @param pageSize * 8 * @param pageSize *
9 */ 9 */
10 -export function getPortList(data) { 10 +export function getPortConfigList(data) {
11 return request({ 11 return request({
12 url: '/bus-customer/portInfo/getPortList', 12 url: '/bus-customer/portInfo/getPortList',
13 method: 'post', 13 method: 'post',
14 data: data 14 data: data
15 }) 15 })
16 +}
17 +
18 +// 获取用户详细信息
19 +/**
20 + * @param declarationPortCode * 申报地海关代码
21 + * @param declarationUnit10 * 申报单位 (10位海关代码)
22 + * @param declarationUnit10Inspection * 申报单位 (10位检验检疫编码)
23 + * @param declarationUnit18 * 申报单位 (18位社会信用代码)
24 + * @param declarationUnitCompanyName * 申报单位 (企业名称)
25 + * @param portCode * 口岸代码
26 + * @param dxpid DXPID
27 + */
28 +export function addPortData(data) {
29 + return request({
30 + url: '/bus-customer/portInfo/addPort',
31 + method: 'post',
32 + data: data
33 + })
34 +}
35 +
36 +// 获取用户详细信息
37 +/**
38 + * @param id * id
39 + * @param declarationPortCode * 申报地海关代码
40 + * @param declarationUnit10 * 申报单位 (10位海关代码)
41 + * @param declarationUnit10Inspection * 申报单位 (10位检验检疫编码)
42 + * @param declarationUnit18 * 申报单位 (18位社会信用代码)
43 + * @param declarationUnitCompanyName * 申报单位 (企业名称)
44 + * @param portCode * 口岸代码
45 + * @param dxpid DXPID
46 + */
47 +export function updatePortData(data) {
48 + return request({
49 + url: '/bus-customer/portInfo/updatePort',
50 + method: 'put',
51 + data: data
52 + })
16 } 53 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <el-popover 2 <el-popover
3 - :popper-class="`popper${dataKey}${rowData.declareId} portLogPopper`" 3 + :popper-class="`popper${dataKey}${rowData[idKey]} portLogPopper`"
4 placement="left" 4 placement="left"
5 :visible-arrow="false" 5 :visible-arrow="false"
6 title="" 6 title=""
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
15 @click.stop="popoverClose" 15 @click.stop="popoverClose"
16 ></i> 16 ></i>
17 </div> 17 </div>
18 - <div v-loading="rowData.popoverLoading"> 18 + <div v-loading="tableLoading">
19 <slot name="title"></slot> 19 <slot name="title"></slot>
20 <Table 20 <Table
21 class="fedexDetialTable mt20" 21 class="fedexDetialTable mt20"
22 - :data="rowData[`${dataKey}PopoverData`]" 22 + :data="rowData.popoverData"
23 :headerData="receiptDataHead" 23 :headerData="receiptDataHead"
24 :selection="false" 24 :selection="false"
25 :selectFixed="false" 25 :selectFixed="false"
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
30 :page="1" 30 :page="1"
31 :pageSizes="[20, 30, 50, 100]" 31 :pageSizes="[20, 30, 50, 100]"
32 :totalCount="0" 32 :totalCount="0"
33 + :loading="tableLoading"
33 :emptyText="$t('portEntry.emptyText')" 34 :emptyText="$t('portEntry.emptyText')"
34 height="350px" 35 height="350px"
35 maxHeight="500px" 36 maxHeight="500px"
...@@ -54,6 +55,10 @@ export default { ...@@ -54,6 +55,10 @@ export default {
54 type: String, 55 type: String,
55 default: "", 56 default: "",
56 }, 57 },
58 + idKey: {
59 + type: String,
60 + default: "id",
61 + },
57 rowData: { 62 rowData: {
58 tpye: Object, 63 tpye: Object,
59 default: null, 64 default: null,
...@@ -76,7 +81,9 @@ export default { ...@@ -76,7 +81,9 @@ export default {
76 }, 81 },
77 }, 82 },
78 data() { 83 data() {
79 - return {}; 84 + return {
85 + tableLoading: false,
86 + };
80 }, 87 },
81 methods: { 88 methods: {
82 //弹框关闭 89 //弹框关闭
...@@ -89,8 +96,8 @@ export default { ...@@ -89,8 +96,8 @@ export default {
89 this.popoverClose(); 96 this.popoverClose();
90 let arr = JSON.parse(JSON.stringify(this.tableData)); 97 let arr = JSON.parse(JSON.stringify(this.tableData));
91 arr.forEach((item) => { 98 arr.forEach((item) => {
92 - item[`${type}PopoverData`] = []; 99 + item.popoverData = [];
93 - if (data.declareId != item.declareId) { 100 + if (data[idKey] != item[idKey]) {
94 // item[`${type}PopoverLoading`] = false; 101 // item[`${type}PopoverLoading`] = false;
95 item[`${type}PopoverType`] = false; 102 item[`${type}PopoverType`] = false;
96 } else { 103 } else {
...@@ -124,13 +131,13 @@ export default { ...@@ -124,13 +131,13 @@ export default {
124 }); 131 });
125 let interval = setInterval(() => { 132 let interval = setInterval(() => {
126 if ( 133 if (
127 - document.getElementsByClassName(`popper${type}${data.declareId}`) 134 + document.getElementsByClassName(`popper${type}${data[idKey]}`)
128 .length == 1 135 .length == 1
129 ) { 136 ) {
130 clearInterval(interval); 137 clearInterval(interval);
131 } 138 }
132 document 139 document
133 - .getElementsByClassName(`popper${type}${data.declareId}`) 140 + .getElementsByClassName(`popper${type}${data[idKey]}`)
134 .forEach((dom, index) => { 141 .forEach((dom, index) => {
135 if (index > 0) { 142 if (index > 0) {
136 dom.style.display = "none"; 143 dom.style.display = "none";
......
...@@ -99,6 +99,7 @@ export const constantRoutes = [ ...@@ -99,6 +99,7 @@ export const constantRoutes = [
99 path: '/exportBillQuery', 99 path: '/exportBillQuery',
100 component: (resolve) => require(['@/views/exportBillQuery/index'], resolve), 100 component: (resolve) => require(['@/views/exportBillQuery/index'], resolve),
101 hidden: false, 101 hidden: false,
102 + name: 'ExportBillQuery',
102 meta: { title: '出口订单查询', icon: '' }, 103 meta: { title: '出口订单查询', icon: '' },
103 }, 104 },
104 { 105 {
...@@ -119,51 +120,54 @@ export const constantRoutes = [ ...@@ -119,51 +120,54 @@ export const constantRoutes = [
119 path: '/exportListDetail', 120 path: '/exportListDetail',
120 component: (resolve) => require(['@/views/exportListDetail/index'], resolve), 121 component: (resolve) => require(['@/views/exportListDetail/index'], resolve),
121 hidden: true, 122 hidden: true,
123 + name: 'ExportListDetail',
122 meta: { title: '出口清单详情', icon: '' }, 124 meta: { title: '出口清单详情', icon: '' },
123 }, 125 },
124 { 126 {
125 path: '/exportTransportBillQuery', 127 path: '/exportTransportBillQuery',
126 component: (resolve) => require(['@/views/exportTransportBillQuery/index'], resolve), 128 component: (resolve) => require(['@/views/exportTransportBillQuery/index'], resolve),
127 hidden: false, 129 hidden: false,
130 + name: 'ExportTransportBillQuery',
128 meta: { title: '出口运单查询', icon: '' }, 131 meta: { title: '出口运单查询', icon: '' },
129 }, 132 },
130 { 133 {
131 path: '/exportListQuery', 134 path: '/exportListQuery',
132 component: (resolve) => require(['@/views/exportListQuery/index'], resolve), 135 component: (resolve) => require(['@/views/exportListQuery/index'], resolve),
133 name: '首页', 136 name: '首页',
137 + name: 'ExportListQuery',
134 meta: { title: '出口清单查询', icon: '' } 138 meta: { title: '出口清单查询', icon: '' }
135 }, 139 },
136 { 140 {
137 path: '/listBranchQuery', 141 path: '/listBranchQuery',
138 component: (resolve) => require(['@/views/listBranchQuery/index'], resolve), 142 component: (resolve) => require(['@/views/listBranchQuery/index'], resolve),
139 - name: '首页', 143 + name: 'ListBranchQuery',
140 hidden: false, 144 hidden: false,
141 meta: { title: '清单总分单查询', icon: '' } 145 meta: { title: '清单总分单查询', icon: '' }
142 }, 146 },
143 { 147 {
144 path: '/listBranchDetail', 148 path: '/listBranchDetail',
145 component: (resolve) => require(['@/views/listBranchDetail/index'], resolve), 149 component: (resolve) => require(['@/views/listBranchDetail/index'], resolve),
146 - name: '首页', 150 + name: 'ListBranchDetail',
147 hidden: true, 151 hidden: true,
148 meta: { title: '清单总分单详情', icon: '' } 152 meta: { title: '清单总分单详情', icon: '' }
149 }, 153 },
150 { 154 {
151 path: '/logisticsExitDetail', 155 path: '/logisticsExitDetail',
152 component: (resolve) => require(['@/views/logisticsExitDetail/index'], resolve), 156 component: (resolve) => require(['@/views/logisticsExitDetail/index'], resolve),
153 - name: '首页', 157 + name: 'LogisticsExitDetail',
154 hidden: true, 158 hidden: true,
155 meta: { title: '物流离境单详情', icon: '' } 159 meta: { title: '物流离境单详情', icon: '' }
156 }, 160 },
157 { 161 {
158 path: '/logisticsExitQuery', 162 path: '/logisticsExitQuery',
159 component: (resolve) => require(['@/views/logisticsExitQuery/index'], resolve), 163 component: (resolve) => require(['@/views/logisticsExitQuery/index'], resolve),
160 - name: '首页', 164 + name: 'LogisticsExitQuery',
161 meta: { title: '物流离境单查询', icon: '' } 165 meta: { title: '物流离境单查询', icon: '' }
162 }, 166 },
163 { 167 {
164 - path: 'index', 168 + path: 'exportRevokeBillQuery',
165 - component: (resolve) => require(['@/views/index'], resolve), 169 + component: (resolve) => require(['@/views/exportRevokeBillQuery/index'], resolve),
166 - name: '首页', 170 + name: 'ExportRevokeBillQuery',
167 meta: { title: '出口撤销单查询', icon: '' } 171 meta: { title: '出口撤销单查询', icon: '' }
168 } 172 }
169 ] 173 ]
...@@ -178,12 +182,14 @@ export const constantRoutes = [ ...@@ -178,12 +182,14 @@ export const constantRoutes = [
178 path: '/summary', 182 path: '/summary',
179 component: (resolve) => require(['@/views/reportingData/index'], resolve), 183 component: (resolve) => require(['@/views/reportingData/index'], resolve),
180 hidden: false, 184 hidden: false,
185 + name: 'Summary',
181 meta: { title: '汇总申报', icon: '' } 186 meta: { title: '汇总申报', icon: '' }
182 }, 187 },
183 { 188 {
184 path: '/summaryDataSearch', 189 path: '/summaryDataSearch',
185 component: (resolve) => require(['@/views/reportingData/index'], resolve), 190 component: (resolve) => require(['@/views/reportingData/index'], resolve),
186 hidden: false, 191 hidden: false,
192 + name: 'SummaryDataSearch',
187 meta: { title: '汇总申请单查询', icon: '' } 193 meta: { title: '汇总申请单查询', icon: '' }
188 } 194 }
189 ] 195 ]
......
...@@ -118,7 +118,6 @@ export default { ...@@ -118,7 +118,6 @@ export default {
118 cipherMachineNumber: "", 118 cipherMachineNumber: "",
119 ipAddress: "", 119 ipAddress: "",
120 }, 120 },
121 - customData: [],
122 rules: { 121 rules: {
123 ipAddress: [ 122 ipAddress: [
124 { 123 {
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
71 :order="true" 71 :order="true"
72 noLabel="序号" 72 noLabel="序号"
73 :loading="loadings.searchLoading" 73 :loading="loadings.searchLoading"
74 - :page="page.pageNum" 74 + :page="page.pageIndex"
75 :pageSizes="[20, 30, 50, 100]" 75 :pageSizes="[20, 30, 50, 100]"
76 :totalCount="page.total" 76 :totalCount="page.total"
77 @sizeChange="sizeChange" 77 @sizeChange="sizeChange"
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
113 creationTime: [], 113 creationTime: [],
114 }, 114 },
115 page: { 115 page: {
116 - pageNum: 1, 116 + pageIndex: 1,
117 pageSize: 20, 117 pageSize: 20,
118 total: 0, 118 total: 0,
119 }, 119 },
...@@ -183,10 +183,10 @@ export default { ...@@ -183,10 +183,10 @@ export default {
183 search(val) { 183 search(val) {
184 this.loadings.searchLoading = true; 184 this.loadings.searchLoading = true;
185 if (val == 0) { 185 if (val == 0) {
186 - this.page.pageNum = 1; 186 + this.page.pageIndex = 1;
187 } 187 }
188 let obj = this.sreachFormData; 188 let obj = this.sreachFormData;
189 - obj.pageNum = this.page.pageNum; 189 + obj.pageIndex = this.page.pageIndex;
190 obj.pageSize = this.page.pageSize; 190 obj.pageSize = this.page.pageSize;
191 obj.endCreationTime = ""; 191 obj.endCreationTime = "";
192 obj.startCreationTime = ""; 192 obj.startCreationTime = "";
...@@ -230,7 +230,7 @@ export default { ...@@ -230,7 +230,7 @@ export default {
230 }, 230 },
231 //分页 231 //分页
232 currentChange(val) { 232 currentChange(val) {
233 - this.page.pageNum = val.page; 233 + this.page.pageIndex = val.page;
234 this.search(1); 234 this.search(1);
235 }, 235 },
236 sizeChange(val) { 236 sizeChange(val) {
......
...@@ -117,12 +117,14 @@ ...@@ -117,12 +117,14 @@
117 :totalCount="page.total" 117 :totalCount="page.total"
118 @sizeChange="sizeChange" 118 @sizeChange="sizeChange"
119 @currentChange="currentChange" 119 @currentChange="currentChange"
120 + @cellClick="cellClick"
120 :selection="false" 121 :selection="false"
121 :selectFixed="false" 122 :selectFixed="false"
122 :rowSelectDataType="false" 123 :rowSelectDataType="false"
123 > 124 >
124 <template v-slot:returnStatus="scope"> 125 <template v-slot:returnStatus="scope">
125 <TablePopover 126 <TablePopover
127 + ref="returnStatusPopover"
126 dataKey="returnStatus" 128 dataKey="returnStatus"
127 :parentDom="$refs.entryTable" 129 :parentDom="$refs.entryTable"
128 :receiptDataHead="receiptDataHead" 130 :receiptDataHead="receiptDataHead"
...@@ -229,19 +231,19 @@ export default { ...@@ -229,19 +231,19 @@ export default {
229 receiptDataHead: [ 231 receiptDataHead: [
230 { 232 {
231 name: "回执状态", 233 name: "回执状态",
232 - value: "", 234 + value: "receiptStatus",
233 width: "", 235 width: "",
234 align: "left", 236 align: "left",
235 }, 237 },
236 { 238 {
237 name: "状态时间", 239 name: "状态时间",
238 - value: "", 240 + value: "statusTime",
239 width: "", 241 width: "",
240 align: "left", 242 align: "left",
241 }, 243 },
242 { 244 {
243 name: "回执描述", 245 name: "回执描述",
244 - value: "", 246 + value: "receiptDescription",
245 width: "", 247 width: "",
246 align: "left", 248 align: "left",
247 }, 249 },
...@@ -266,6 +268,11 @@ export default { ...@@ -266,6 +268,11 @@ export default {
266 mounted() { 268 mounted() {
267 this.tableMaxheight = window.innerHeight - 300; 269 this.tableMaxheight = window.innerHeight - 300;
268 }, 270 },
271 + watch: {
272 + $route() {
273 + this.popoverClose();
274 + },
275 + },
269 methods: { 276 methods: {
270 //查询 277 //查询
271 search(val) { 278 search(val) {
...@@ -289,9 +296,8 @@ export default { ...@@ -289,9 +296,8 @@ export default {
289 this.page.total = res.data.totalItems; 296 this.page.total = res.data.totalItems;
290 this.tableData.forEach((item, idx) => { 297 this.tableData.forEach((item, idx) => {
291 item.index = idx; 298 item.index = idx;
292 - item.popoverLoading = false;
293 item.returnStatusPopoverType = false; 299 item.returnStatusPopoverType = false;
294 - item.returnStatusPopoverData = []; 300 + item.popoverData = [];
295 }); 301 });
296 } else { 302 } else {
297 this.alertWarningMsg(res.message); 303 this.alertWarningMsg(res.message);
...@@ -322,14 +328,34 @@ export default { ...@@ -322,14 +328,34 @@ export default {
322 }); 328 });
323 }, 329 },
324 popoverChange(val) { 330 popoverChange(val) {
331 + console.log(val);
325 this.tableData = val.tableData; 332 this.tableData = val.tableData;
326 - console.log(this.tableData); 333 + this.receiptApi(val.data.declareId, val.status)
334 + .then((res) => {
335 + val.tableData.forEach((item) => {
336 + if (item.declareId == val.data.declareId) {
337 + item.popoverData = res;
338 + }
339 + });
340 + this.tableData = val.tableData;
341 + })
342 + .finally(() => {
343 + this.$nextTick(() => {
344 + this.$refs.returnStatusPopover.tableLoading = false;
345 + });
346 + });
347 + },
348 + //查询回执
349 + receiptApi(id, type) {
350 + return new Promise((resolve, reject) => {
351 + let obj = { declareId: id };
352 + resolve();
353 + });
327 }, 354 },
328 popoverClose(val) { 355 popoverClose(val) {
329 this.tableData.forEach((item) => { 356 this.tableData.forEach((item) => {
330 - item.popoverLoading = false;
331 item.returnStatusPopoverType = false; 357 item.returnStatusPopoverType = false;
332 - item.returnStatusPopoverData = []; 358 + item.popoverData = [];
333 }); 359 });
334 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY = 360 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
335 "auto"; 361 "auto";
...@@ -346,6 +372,9 @@ export default { ...@@ -346,6 +372,9 @@ export default {
346 this.page.pageSize = val; 372 this.page.pageSize = val;
347 this.search(1); 373 this.search(1);
348 }, 374 },
375 + cellClick() {
376 + this.popoverClose();
377 + },
349 dateChange(val) { 378 dateChange(val) {
350 if (val == "" || val == null) { 379 if (val == "" || val == null) {
351 this.$nextTick(() => { 380 this.$nextTick(() => {
......
1 +<template>
2 + <div class="entrySreach">
3 + <el-form
4 + class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
5 + ref="sreachForm"
6 + :model="sreachFormData"
7 + label-position="top"
8 + size="small"
9 + >
10 + <el-row class="row-border">
11 + <!-- 提运单号 -->
12 + <el-col :span="5">
13 + <Formitem label="提运单号" prop="billNo">
14 + <el-input
15 + type="text"
16 + class="inputShadow"
17 + id="inputInner--billNo"
18 + resize="none"
19 + v-model="sreachFormData.billNo"
20 + clearable
21 + placeholder=""
22 + ></el-input>
23 + <!-- <FormTextareaInput
24 + :formData="sreachFormData"
25 + dataKey="billNo"
26 + @formChange="formChange"
27 + /> -->
28 + </Formitem>
29 + </el-col>
30 + <!-- 回执状态 -->
31 + <el-col :span="5">
32 + <Formitem label="回执状态" prop="returnStatus">
33 + <el-select
34 + type="text"
35 + id="inputInner--returnStatus"
36 + v-model="sreachFormData.returnStatus"
37 + clearable
38 + placeholder=""
39 + >
40 + <el-option
41 + v-for="(item, index) in dictData.returnStatus"
42 + :key="index"
43 + :label="item.name"
44 + :value="item.code"
45 + ></el-option>
46 + </el-select>
47 + </Formitem>
48 + </el-col>
49 + <!-- 创建时间 -->
50 + <el-col :span="5">
51 + <Formitem label="创建时间" prop="createTime" :activeType="true">
52 + <el-date-picker
53 + class="inputInner--createTime"
54 + id="inputInner--createTime"
55 + v-model="sreachFormData.createTime"
56 + type="daterange"
57 + format="yyyy-MM-dd"
58 + prefix-icon="none"
59 + value-format="yyyy-MM-dd"
60 + range-separator="至"
61 + @change="dateChange"
62 + />
63 + </Formitem>
64 + </el-col>
65 + <el-col :span="2">
66 + <el-form-item class="textCenter">
67 + <el-button
68 + class="entrySreachButton"
69 + type="text"
70 + icon="el-icon-search"
71 + :loading="loadings.searchLoading"
72 + @click="search(0)"
73 + ></el-button>
74 + </el-form-item>
75 + </el-col>
76 + <el-col :span="2">
77 + <el-form-item class="textCenter">
78 + <el-button
79 + type="text"
80 + size="small"
81 + icon="el-icon-refresh"
82 + @click="clear"
83 + >
84 + 重置
85 + </el-button>
86 + </el-form-item>
87 + </el-col>
88 + </el-row>
89 + </el-form>
90 + <div class="optionButton">
91 + <el-button
92 + class="entrySaveButton"
93 + size="small"
94 + icon="el-icon-download"
95 + @click="downloadData"
96 + >
97 + 导出
98 + </el-button>
99 + </div>
100 + <Table
101 + class="fedexDetialTable fedexSreachTable"
102 + ref="entryTable"
103 + :data="tableData"
104 + :headerData="headerData"
105 + :maxHeight="tableMaxheight"
106 + :border="true"
107 + :pagination="true"
108 + :order="false"
109 + :loading="loadings.searchLoading"
110 + :page="page.pageIndex"
111 + :pageSizes="[20, 30, 50, 100]"
112 + :totalCount="page.total"
113 + @sizeChange="sizeChange"
114 + @currentChange="currentChange"
115 + :selection="false"
116 + :selectFixed="false"
117 + :rowSelectDataType="false"
118 + >
119 + </Table>
120 + </div>
121 +</template>
122 +
123 +<script>
124 +import { getAllCancellation } from "@/api/exportRevokeBill-api.js";
125 +
126 +export default {
127 + name: "ListBranchQuery",
128 + data() {
129 + return {
130 + sreachFormData: {
131 + billNo: "",
132 + returnStatus: "",
133 + createTime: [],
134 + },
135 + page: {
136 + pageIndex: 1,
137 + pageSize: 20,
138 + total: 0,
139 + },
140 + tableData: [],
141 + headerData: [
142 + {
143 + name: "回执状态",
144 + value: "returnStatus",
145 + width: "",
146 + align: "left",
147 + },
148 + {
149 + name: "提运单号",
150 + value: "billNo",
151 + width: "",
152 + align: "left",
153 + },
154 + {
155 + name: "清单编号",
156 + value: "invtNo",
157 + width: "",
158 + align: "left",
159 + },
160 + {
161 + name: "发货人名称",
162 + value: "ebcname",
163 + width: "",
164 + align: "left",
165 + },
166 + {
167 + name: "撤单原因",
168 + value: "reason",
169 + width: "",
170 + align: "left",
171 + },
172 + {
173 + name: "创建时间",
174 + value: "createTime",
175 + width: "",
176 + align: "left",
177 + },
178 + {
179 + name: "申报企业",
180 + value: "agentName",
181 + width: "",
182 + align: "left",
183 + },
184 + {
185 + name: "申报类型",
186 + value: "appType",
187 + width: "",
188 + align: "left",
189 + },
190 + ],
191 + receiptDataHead: [
192 + {
193 + name: "回执状态",
194 + value: "receiptStatus",
195 + width: "",
196 + align: "left",
197 + },
198 + {
199 + name: "状态时间",
200 + value: "statusTime",
201 + width: "",
202 + align: "left",
203 + },
204 + {
205 + name: "回执描述",
206 + value: "receiptDescription",
207 + width: "",
208 + align: "left",
209 + },
210 + ],
211 + // dictData: {
212 + // ebccode: [],
213 + // returnStatus: [],
214 + // },
215 + loadings: {
216 + searchLoading: false,
217 + },
218 + textareaVisible: {
219 + formItemconsignmentCode: false,
220 + formItemconsignmentHeadCode: false,
221 + },
222 + tableMaxheight: null,
223 + };
224 + },
225 + created() {
226 + this.search(0);
227 + },
228 + mounted() {
229 + this.tableMaxheight = window.innerHeight - 300;
230 + },
231 + methods: {
232 + //查询详情
233 + view(val) {
234 + this.$router.push({
235 + name: "ExportTransportDetail",
236 + params: { data: val },
237 + });
238 + },
239 + //查询
240 + search(val) {
241 + this.loadings.searchLoading = true;
242 + if (val == 0) {
243 + this.page.pageIndex = 1;
244 + }
245 + let obj = this.sreachFormData;
246 + obj.pageIndex = this.page.pageIndex;
247 + obj.pageSize = this.page.pageSize;
248 + obj.createTimeStart = "";
249 + obj.createTimeEnd = "";
250 + if (obj.createTime.length > 0) {
251 + obj.createTimeStart = obj.createTime[0];
252 + obj.createTimeEnd = obj.createTime[1];
253 + }
254 + // if (obj.billNo != null && obj.billNo != "") {
255 + // obj.billNo = obj.billNo.split("\n");
256 + // } else {
257 + // obj.billNo = [];
258 + // }
259 + getAllCancellation(obj)
260 + .then((res) => {
261 + if (res.code === "200") {
262 + this.tableData = res.data.value;
263 + this.page.total = res.data.totalItems;
264 + this.tableData.forEach((item, idx) => {
265 + item.index = idx;
266 + item.returnStatusPopoverType = false;
267 + item.popoverData = [];
268 + });
269 + } else {
270 + this.alertWarningMsg(res.message);
271 + }
272 + this.loadings.searchLoading = false;
273 + })
274 + .catch((err) => {
275 + console.log(err);
276 + this.loadings.searchLoading = false;
277 + });
278 + },
279 + //重置
280 + clear() {
281 + this.sreachFormData = {
282 + orderNo: "",
283 + ebccode: "",
284 + returnStatus: "",
285 + createTime: [],
286 + };
287 + },
288 + //导出
289 + downloadData() {},
290 + popoverChange(val) {
291 + console.log(val);
292 + this.tableData = val.tableData;
293 + this.receiptApi(val.data.declareId, val.status)
294 + .then((res) => {
295 + val.tableData.forEach((item) => {
296 + if (item.declareId == val.data.declareId) {
297 + item.popoverData = res;
298 + }
299 + });
300 + this.tableData = val.tableData;
301 + })
302 + .finally(() => {
303 + this.$nextTick(() => {
304 + this.$refs.returnStatusPopover.tableLoading = false;
305 + });
306 + });
307 + },
308 + //查询回执
309 + receiptApi(id, type) {
310 + return new Promise((resolve, reject) => {
311 + let obj = { declareId: id };
312 + resolve();
313 + });
314 + },
315 + popoverClose(val) {
316 + this.tableData.forEach((item) => {
317 + item.returnStatusPopoverType = false;
318 + item.popoverData = [];
319 + });
320 + this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
321 + "auto";
322 + },
323 + //分页
324 + currentChange(val) {
325 + this.page.pageNum = val.page;
326 + this.search(1);
327 + },
328 + sizeChange(val) {
329 + this.page.pageSize = val;
330 + this.search(1);
331 + },
332 + dateChange(val) {
333 + if (val == "" || val == null) {
334 + this.$nextTick(() => {
335 + this.sreachFormData.createTime = [];
336 + });
337 + }
338 + },
339 + formChange(val) {
340 + this.sreachFormData = val;
341 + },
342 + input() {
343 + this.$forceUpdate();
344 + },
345 + },
346 +};
347 +</script>
348 +
349 +<style scoped lang="scss">
350 +@import "@/assets/styles/variables.scss";
351 +.entrySreach {
352 + height: 100%;
353 + background-color: $menuLightBg;
354 +
355 + .entrySreachButton {
356 + display: inline-block;
357 + font-size: 20px;
358 + color: $fedexButton !important;
359 + }
360 +
361 + .optionButton {
362 + padding: 10px;
363 + text-align: right;
364 +
365 + .el-button {
366 + color: $fedexButton;
367 + border-color: $fedexButton !important;
368 +
369 + svg {
370 + display: inline-block;
371 + margin-right: 5px;
372 + fill: $fedexButton;
373 + }
374 + }
375 +
376 + .entrySaveButton:hover,
377 + .entrySaveButton:focus {
378 + color: $menuLightBg !important;
379 + background-color: $fedexButton !important;
380 + }
381 + }
382 +}
383 +
384 +.texttareaTip {
385 + position: absolute;
386 + top: 52%;
387 + right: 20px;
388 + transform: translate(0, -50%);
389 + z-index: 10;
390 +}
391 +</style>
...@@ -11,61 +11,26 @@ ...@@ -11,61 +11,26 @@
11 <!-- 运单编号 --> 11 <!-- 运单编号 -->
12 <el-col :span="5"> 12 <el-col :span="5">
13 <Formitem label="运单编号" prop="logisticsNo"> 13 <Formitem label="运单编号" prop="logisticsNo">
14 - <el-popover 14 + <FormTextareaInput
15 - placement="bottom" 15 + :formData="sreachFormData"
16 - width="320" 16 + dataKey="logisticsNo"
17 - trigger="manual" 17 + @formChange="formChange"
18 - popper-class="popoverlogisticsNo"
19 - v-model="textareaVisible.formItemlogisticsNo"
20 - >
21 - <el-input
22 - name="logisticsNo-textarea"
23 - type="textarea"
24 - :rows="5"
25 - id="popoverInputlogisticsNo"
26 - class="inputShadow textareaPopover"
27 - v-model="sreachFormData.logisticsNo"
28 - resize="none"
29 - maxlength="13000"
30 - placeholder=""
31 - @blur="textareaBlur"
32 - @input="input"
33 - ></el-input>
34 - <el-input
35 - slot="reference"
36 - name="logisticsNo"
37 - type="textarea"
38 - :rows="1"
39 - class="inputShadow"
40 - id="inputInner--logisticsNo"
41 - v-model="sreachFormData.logisticsNo"
42 - resize="none"
43 - placeholder=""
44 - @focus="textareaFocus"
45 - @input="input"
46 - ></el-input>
47 - </el-popover>
48 - <el-badge
49 - v-if="
50 - !textareaVisible.formItemlogisticsNo &&
51 - textareaLength({
52 - key: 'logisticsNo',
53 - value: sreachFormData.logisticsNo,
54 - }) > 1
55 - "
56 - type="info"
57 - :value="`+${textareaLength({
58 - key: 'logisticsNo',
59 - value: sreachFormData.logisticsNo,
60 - })}`"
61 - class="item texttareaTip"
62 /> 18 />
63 </Formitem> 19 </Formitem>
64 </el-col> 20 </el-col>
65 <!-- 物流企业代码 --> 21 <!-- 物流企业代码 -->
66 <el-col :span="5"> 22 <el-col :span="5">
67 <Formitem label="物流企业代码" prop="logisticsCode"> 23 <Formitem label="物流企业代码" prop="logisticsCode">
68 - <el-select 24 + <el-input
25 + type="text"
26 + class="inputShadow"
27 + id="inputInner--logisticsCode"
28 + resize="none"
29 + v-model="sreachFormData.logisticsCode"
30 + clearable
31 + placeholder=""
32 + ></el-input>
33 + <!-- <el-select
69 type="text" 34 type="text"
70 id="inputInner--logisticsCode" 35 id="inputInner--logisticsCode"
71 v-model="sreachFormData.logisticsCode" 36 v-model="sreachFormData.logisticsCode"
...@@ -78,7 +43,7 @@ ...@@ -78,7 +43,7 @@
78 :label="item.name" 43 :label="item.name"
79 :value="item.code" 44 :value="item.code"
80 ></el-option> 45 ></el-option>
81 - </el-select> 46 + </el-select> -->
82 </Formitem> 47 </Formitem>
83 </el-col> 48 </el-col>
84 <!-- 回执状态 --> 49 <!-- 回执状态 -->
...@@ -171,7 +136,24 @@ ...@@ -171,7 +136,24 @@
171 :rowSelectDataType="false" 136 :rowSelectDataType="false"
172 > 137 >
173 <template v-slot:returnStatus="scope"> 138 <template v-slot:returnStatus="scope">
174 - <span>{{ scope.row.returnStatus }}</span> 139 + <TablePopover
140 + ref="returnStatusPopover"
141 + dataKey="returnStatus"
142 + :parentDom="$refs.entryTable"
143 + :receiptDataHead="receiptDataHead"
144 + :rowData="scope.row"
145 + :tableData="tableData"
146 + @popoverChange="popoverChange"
147 + @popoverClose="popoverClose"
148 + >
149 + <div slot="title">
150 + <span style="font-weight: 700; color: #515a6e">运单编号：</span
151 + >{{ scope.row.logisticsNo }}
152 + </div>
153 + <div slot="buttonLabel">
154 + {{ scope.row.returnStatus }}
155 + </div>
156 + </TablePopover>
175 </template> 157 </template>
176 <template v-slot:logisticsNo="scope"> 158 <template v-slot:logisticsNo="scope">
177 <el-button type="text" @click="view(scope.row)">{{ 159 <el-button type="text" @click="view(scope.row)">{{
...@@ -253,10 +235,30 @@ export default { ...@@ -253,10 +235,30 @@ export default {
253 align: "left", 235 align: "left",
254 }, 236 },
255 ], 237 ],
256 - dictData: { 238 + receiptDataHead: [
257 - ebccode: [], 239 + {
258 - returnStatus: [], 240 + name: "回执状态",
259 - }, 241 + value: "receiptStatus",
242 + width: "",
243 + align: "left",
244 + },
245 + {
246 + name: "状态时间",
247 + value: "statusTime",
248 + width: "",
249 + align: "left",
250 + },
251 + {
252 + name: "回执描述",
253 + value: "receiptDescription",
254 + width: "",
255 + align: "left",
256 + },
257 + ],
258 + // dictData: {
259 + // ebccode: [],
260 + // returnStatus: [],
261 + // },
260 loadings: { 262 loadings: {
261 searchLoading: false, 263 searchLoading: false,
262 }, 264 },
...@@ -308,9 +310,8 @@ export default { ...@@ -308,9 +310,8 @@ export default {
308 this.page.total = res.data.totalItems; 310 this.page.total = res.data.totalItems;
309 this.tableData.forEach((item, idx) => { 311 this.tableData.forEach((item, idx) => {
310 item.index = idx; 312 item.index = idx;
311 - item.popoverLoading = false;
312 item.returnStatusPopoverType = false; 313 item.returnStatusPopoverType = false;
313 - item.returnStatusPopoverData = false; 314 + item.popoverData = [];
314 }); 315 });
315 } else { 316 } else {
316 this.alertWarningMsg(res.message); 317 this.alertWarningMsg(res.message);
...@@ -333,66 +334,38 @@ export default { ...@@ -333,66 +334,38 @@ export default {
333 }, 334 },
334 //导出 335 //导出
335 downloadData() {}, 336 downloadData() {},
336 - //文本域展示状态切换 337 + popoverChange(val) {
337 - textareaFocus(val) { 338 + console.log(val);
338 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true; 339 + this.tableData = val.tableData;
339 - this.$nextTick(() => { 340 + this.receiptApi(val.data.declareId, val.status)
340 - document 341 + .then((res) => {
341 - .querySelector("#popoverInput" + val.target.name.split("-")[0]) 342 + val.tableData.forEach((item) => {
342 - .focus(); 343 + if (item.declareId == val.data.declareId) {
343 - document.querySelector( 344 + item.popoverData = res;
344 - "#inputInner--" + val.target.name.split("-")[0] 345 + }
345 - ).style.display = "none"; 346 + });
346 - }); 347 + this.tableData = val.tableData;
348 + })
349 + .finally(() => {
350 + this.$nextTick(() => {
351 + this.$refs.returnStatusPopover.tableLoading = false;
352 + });
353 + });
347 }, 354 },
348 - textareaBlur(val) { 355 + //查询回执
349 - let inputInner = document.querySelector( 356 + receiptApi(id, type) {
350 - "#inputInner--" + val.target.name.split("-")[0] 357 + return new Promise((resolve, reject) => {
351 - ); 358 + let obj = { declareId: id };
352 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false; 359 + resolve();
353 - inputInner.style.display = "block";
354 - this.$nextTick(() => {
355 - inputInner.blur();
356 - if (
357 - inputInner.value != undefined &&
358 - inputInner.value != "" &&
359 - inputInner.value != null
360 - ) {
361 - inputInner.classList.add("inputFocus");
362 - } else {
363 - inputInner.classList.remove("inputFocus");
364 - }
365 }); 360 });
366 - let arr = [];
367 - this.sreachFormData[val.target.name.split("-")[0]]
368 - .replace(/[\n\，\；\;]/g, ",")
369 - .replace(/[\t]/g, "")
370 - .split(",")
371 - .forEach((str, index) => {
372 - if (str != null && str != "" && index <= 1000) {
373 - arr.push(str.trim());
374 - }
375 - });
376 - this.sreachFormData[val.target.name.split("-")[0]] = arr.join("\n");
377 - this.$forceUpdate();
378 }, 361 },
379 - //文本域输入内容数量处理 362 + popoverClose(val) {
380 - textareaLength(val) { 363 + this.tableData.forEach((item) => {
381 - if (val.value != "" && val.value != null) { 364 + item.returnStatusPopoverType = false;
382 - let arr = []; 365 + item.popoverData = [];
383 - val.value 366 + });
384 - .trim() 367 + this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
385 - .replace(/[\n\，\；\;]/g, ",") 368 + "auto";
386 - .split(",")
387 - .forEach((item) => {
388 - if (item != "" && item != null) {
389 - arr.push(item);
390 - }
391 - });
392 - return arr.length;
393 - } else {
394 - return 0;
395 - }
396 }, 369 },
397 //分页 370 //分页
398 currentChange(val) { 371 currentChange(val) {
...@@ -410,6 +383,9 @@ export default { ...@@ -410,6 +383,9 @@ export default {
410 }); 383 });
411 } 384 }
412 }, 385 },
386 + formChange(val) {
387 + this.sreachFormData = val;
388 + },
413 input() { 389 input() {
414 this.$forceUpdate(); 390 this.$forceUpdate();
415 }, 391 },
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
1 +<template>
2 + <el-dialog
3 + class="entryDialog classCUploadDialog"
4 + :title="title"
5 + :visible.sync="outerVisible"
6 + :show-close="false"
7 + width="40%"
8 + :close-on-click-modal="false"
9 + v-loading="loadings.dialogLoading"
10 + @close="close"
11 + >
12 + <div class="modelItem">
13 + <el-form
14 + class="fedexFormStyle"
15 + ref="formData"
16 + :model="formData"
17 + :rules="type == 'roleChange' ? {} : rules"
18 + label-position="top"
19 + :disabled="type == 'roleChange'"
20 + size="small"
21 + >
22 + <el-row :gutter="5">
23 + <!-- 口岸代码 -->
24 + <el-col :span="8">
25 + <Formitem label="口岸代码" prop="portCode" type="edit">
26 + <el-input
27 + type="text"
28 + class="inputShadow"
29 + id="inputInner-edit-portCode"
30 + resize="none"
31 + v-model="formData.portCode"
32 + clearable
33 + placeholder=""
34 + ></el-input>
35 + </Formitem>
36 + </el-col>
37 + <!-- 申报地海关代码（4位海关编号) -->
38 + <el-col :span="8">
39 + <Formitem
40 + label="申报地海关代码（4位海关编号)"
41 + prop="declarationPortCode"
42 + type="edit"
43 + >
44 + <el-input
45 + type="text"
46 + class="inputShadow"
47 + id="inputInner-edit-declarationPortCode"
48 + resize="none"
49 + v-model="formData.declarationPortCode"
50 + clearable
51 + maxlength="4"
52 + placeholder=""
53 + ></el-input>
54 + </Formitem>
55 + </el-col>
56 + <!-- 申报单位（18位社会信用代码) -->
57 + <el-col :span="8">
58 + <Formitem
59 + label="申报单位（18位社会信用代码）"
60 + prop="declarationUnit18"
61 + type="edit"
62 + >
63 + <el-input
64 + type="text"
65 + class="inputShadow"
66 + id="inputInner-edit-declarationUnit18"
67 + resize="none"
68 + v-model="formData.declarationUnit18"
69 + clearable
70 + maxlength="18"
71 + placeholder=""
72 + ></el-input>
73 + </Formitem>
74 + </el-col>
75 + </el-row>
76 + <el-row :gutter="5">
77 + <!-- 申报单位（10位海关代码) -->
78 + <el-col :span="8">
79 + <Formitem
80 + label="申报单位（10位海关代码)"
81 + prop="declarationUnit10"
82 + type="edit"
83 + >
84 + <el-input
85 + type="text"
86 + class="inputShadow"
87 + id="inputInner-edit-declarationUnit10"
88 + resize="none"
89 + v-model="formData.declarationUnit10"
90 + clearable
91 + maxlength="10"
92 + placeholder=""
93 + ></el-input>
94 + </Formitem>
95 + </el-col>
96 + <!-- 申报单位 (企业名称) -->
97 + <el-col :span="8">
98 + <Formitem
99 + label="申报单位 (企业名称)"
100 + prop="declarationUnitCompanyName"
101 + type="edit"
102 + >
103 + <el-input
104 + type="text"
105 + class="inputShadow"
106 + id="inputInner-edit-declarationUnitCompanyName"
107 + resize="none"
108 + v-model="formData.declarationUnitCompanyName"
109 + clearable
110 + placeholder=""
111 + ></el-input>
112 + </Formitem>
113 + </el-col>
114 + <!-- DXPID -->
115 + <el-col :span="8">
116 + <Formitem label="DXPID" prop="dxpid" type="edit">
117 + <el-input
118 + type="text"
119 + class="inputShadow"
120 + id="inputInner-edit-dxpid"
121 + resize="none"
122 + v-model="formData.dxpid"
123 + clearable
124 + placeholder=""
125 + ></el-input>
126 + </Formitem>
127 + </el-col>
128 + </el-row>
129 + </el-form>
130 + </div>
131 + <div class="dialogOption entrySave">
132 + <el-button
133 + class="entrySaveButton"
134 + :disabled="loadings.submitLoading"
135 + @click="submit"
136 + >确 定</el-button
137 + >
138 + <el-button
139 + class="entrySaveButton"
140 + :disabled="loadings.uploadLoading"
141 + @click="close"
142 + >关 闭</el-button
143 + >
144 + </div>
145 + </el-dialog>
146 +</template>
147 +
148 +<script>
149 +import { addPortData, updatePortData } from "@/api/system/port-api.js";
150 +export default {
151 + props: {
152 + outerVisible: {
153 + type: Boolean,
154 + default: false,
155 + },
156 + title: {
157 + type: String,
158 + default: "新增口岸",
159 + },
160 + type: {
161 + type: String,
162 + default: "",
163 + },
164 + active: {
165 + type: Object,
166 + default: null,
167 + },
168 + },
169 + data() {
170 + return {
171 + formData: {
172 + declarationPortCode: "",
173 + declarationUnit10: "",
174 + declarationUnit10Inspection: "",
175 + declarationUnit18: "",
176 + declarationUnitCompanyName: "",
177 + dxpid: "",
178 + portCode: "",
179 + },
180 + rules: {
181 + portCode: [
182 + {
183 + required: true,
184 + trigger: "blur",
185 + message: "口岸代码不能为空！",
186 + },
187 + ],
188 + declarationPortCode: [
189 + {
190 + required: true,
191 + trigger: "blur",
192 + message: "申报地海关代码不能为空！",
193 + },
194 + {
195 + validator: (rule, value, callback) => {
196 + if (value.length != 4) {
197 + callback("申报地海关代码必须为4位！");
198 + } else {
199 + callback();
200 + }
201 + },
202 + trigger: "blur",
203 + },
204 + ],
205 + declarationUnit18: [
206 + {
207 + required: true,
208 + trigger: "blur",
209 + message: "申报单位（18位社会信用代码)不能为空！",
210 + },
211 + {
212 + validator: (rule, value, callback) => {
213 + if (value.length != 18) {
214 + callback("18位社会信用代码必须为18位！");
215 + } else {
216 + callback();
217 + }
218 + },
219 + trigger: "blur",
220 + },
221 + ],
222 + declarationUnit10: [
223 + {
224 + required: true,
225 + trigger: "blur",
226 + message: "申报单位（10位海关代码)不能为空！",
227 + },
228 + {
229 + validator: (rule, value, callback) => {
230 + if (value.length != 10) {
231 + callback("10位海关代码必须为10位！");
232 + } else {
233 + callback();
234 + }
235 + },
236 + trigger: "blur",
237 + },
238 + ],
239 + declarationUnitCompanyName: [
240 + {
241 + required: true,
242 + trigger: "blur",
243 + message: "申报单位 (企业名称)不能为空！",
244 + },
245 + ],
246 + },
247 + loadings: {
248 + dialogLoading: false,
249 + uploadLoading: false,
250 + submitLoading: false,
251 + },
252 + loadingText: "",
253 + };
254 + },
255 + watch: {
256 + outerVisible(val) {
257 + if (val) {
258 + this.loadings.dialogLoading = false;
259 + if (this.type == "update") {
260 + this.formData = this.active;
261 + }
262 + }
263 + },
264 + },
265 + methods: {
266 + //查询用户信息详情
267 + searchUserData(id) {
268 + this.loadings.dialogLoading = true;
269 + getUserDetailData({ id: id })
270 + .then((res) => {
271 + if (res.code === "200") {
272 + this.formData = res.data;
273 + } else {
274 + this.alertWarningMsg(res.message);
275 + }
276 + this.loadings.dialogLoading = false;
277 + })
278 + .catch((err) => {
279 + console.log(err);
280 + this.loadings.dialogLoading = false;
281 + });
282 + },
283 + //数据保存
284 + submit() {
285 + this.loadings.dialogLoading = true;
286 + let obj = {};
287 + if (this.type == "add") {
288 + this.$refs.formData.validate((valid) => {
289 + if (valid) {
290 + obj = this.formData;
291 + this.addApi(obj);
292 + } else {
293 + this.loadings.dialogLoading = false;
294 + }
295 + });
296 + } else if (this.type == "update") {
297 + this.$refs.formData.validate((valid) => {
298 + if (valid) {
299 + obj = this.formData;
300 + this.updateapi(obj);
301 + } else {
302 + this.loadings.dialogLoading = false;
303 + }
304 + });
305 + }
306 + },
307 + //新增
308 + addApi(val) {
309 + addPortData(val)
310 + .then((res) => {
311 + if (res.code === "200") {
312 + this.msgSuccess(res.message);
313 + this.close();
314 + } else {
315 + this.alertWarningMsg(res.message);
316 + this.loadings.dialogLoading = false;
317 + }
318 + })
319 + .catch((err) => {
320 + console.log(err);
321 + this.loadings.dialogLoading = false;
322 + });
323 + },
324 + //修改
325 + updateapi(val) {
326 + updatePortData(val)
327 + .then((res) => {
328 + if (res.code === "200") {
329 + this.msgSuccess(res.message);
330 + this.close();
331 + } else {
332 + this.alertWarningMsg(res.message);
333 + this.loadings.dialogLoading = false;
334 + }
335 + })
336 + .catch((err) => {
337 + console.log(err);
338 + this.loadings.dialogLoading = false;
339 + });
340 + },
341 + close() {
342 + this.formData = {
343 + declarationPortCode: "",
344 + declarationUnit10: "",
345 + declarationUnit10Inspection: "",
346 + declarationUnit18: "",
347 + declarationUnitCompanyName: "",
348 + dxpid: "",
349 + portCode: "",
350 + };
351 + this.$emit("close");
352 + },
353 + },
354 +};
355 +</script>
356 +
357 +<style lang="scss" scoped>
358 +@import "@/assets/styles/variables.scss";
359 +</style>
1 +<template>
2 + <div class="entrySreach">
3 + <el-form
4 + class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
5 + ref="sreachForm"
6 + :model="sreachFormData"
7 + label-position="top"
8 + size="small"
9 + >
10 + <el-row class="row-border">
11 + <!-- 口岸代码 -->
12 + <el-col :span="5">
13 + <Formitem label="口岸代码" prop="portCode">
14 + <el-select
15 + type="text"
16 + id="inputInner--portCode"
17 + v-model="sreachFormData.portCode"
18 + clearable
19 + placeholder=""
20 + >
21 + <el-option
22 + v-for="(item, index) in dict.port"
23 + :key="index"
24 + :label="item"
25 + :value="item"
26 + ></el-option>
27 + </el-select>
28 + </Formitem>
29 + </el-col>
30 + <!-- DXPID -->
31 + <el-col :span="5">
32 + <Formitem label="DXPID" prop="dxpid">
33 + <el-input
34 + type="text"
35 + class="inputShadow"
36 + id="inputInner--dxpid"
37 + resize="none"
38 + v-model="sreachFormData.dxpid"
39 + clearable
40 + placeholder=""
41 + ></el-input>
42 + </Formitem>
43 + </el-col>
44 + <el-col :span="2">
45 + <el-form-item class="textCenter">
46 + <el-button
47 + class="entrySreachButton"
48 + type="text"
49 + icon="el-icon-search"
50 + :loading="loadings.searchLoading"
51 + @click="search(0)"
52 + ></el-button>
53 + </el-form-item>
54 + </el-col>
55 + <el-col :span="2">
56 + <!-- 清空查询条件-->
57 + <el-form-item class="textLeft textCenter">
58 + <el-button
59 + type="text"
60 + size="small"
61 + icon="el-icon-refresh"
62 + @click="clear"
63 + >
64 + 重置
65 + </el-button>
66 + </el-form-item>
67 + </el-col>
68 + </el-row>
69 + </el-form>
70 + <div class="optionButton">
71 + <div>
72 + <el-button
73 + class="entrySaveButton"
74 + icon="el-icon-plus"
75 + size="small"
76 + @click="addcipherMachine"
77 + >
78 + 新 增
79 + </el-button>
80 + </div>
81 + <div>
82 + <el-button
83 + class="entrySaveButton"
84 + size="small"
85 + icon="el-icon-download"
86 + @click="downloadData"
87 + >
88 + 导出
89 + </el-button>
90 + </div>
91 + </div>
92 + <Table
93 + class="fedexDetialTable fedexSreachTable"
94 + ref="entryTable"
95 + :data="tableData"
96 + :headerData="headerData"
97 + :maxHeight="tableMaxheight"
98 + :border="true"
99 + :pagination="true"
100 + :order="false"
101 + noLabel="序号"
102 + :loading="loadings.searchLoading"
103 + :page="page.pageNum"
104 + :pageSizes="[20, 30, 50, 100]"
105 + :totalCount="page.total"
106 + @sizeChange="sizeChange"
107 + @currentChange="currentChange"
108 + :selection="false"
109 + :selectFixed="false"
110 + :rowSelectDataType="false"
111 + >
112 + <template slot="optionColumn">
113 + <el-table-column align="left" label="操作" width="100">
114 + <template slot-scope="scope">
115 + <el-button type="text" @click="update(scope.row)"> 修改 </el-button>
116 + </template>
117 + </el-table-column>
118 + </template>
119 + </Table>
120 + <DialogVue
121 + :outerVisible="outerVisible"
122 + :title="dialogTitle"
123 + :type="editType"
124 + :active="activeData"
125 + @close="dialogClose"
126 + />
127 + </div>
128 +</template>
129 +
130 +<script>
131 +import { getPortConfigList } from "@/api/system/port-api.js";
132 +import { getPortList } from "@/api/system/user.js";
133 +import DialogVue from "./dialog.vue";
134 +export default {
135 + name: "RoleConfig",
136 + components: {
137 + DialogVue,
138 + },
139 + data() {
140 + return {
141 + sreachFormData: {
142 + portCode: "",
143 + dxpid: "",
144 + },
145 + page: {
146 + pageNum: 1,
147 + pageSize: 20,
148 + total: 0,
149 + },
150 + activeData: null,
151 + tableData: [],
152 + headerData: [
153 + {
154 + name: "口岸代码",
155 + value: "portCode",
156 + width: "",
157 + align: "left",
158 + },
159 + {
160 + name: "DXPID",
161 + value: "dxpid",
162 + width: "",
163 + align: "left",
164 + },
165 + {
166 + name: "申报地海关代码",
167 + value: "declarationPortCode",
168 + width: "",
169 + align: "left",
170 + },
171 + {
172 + name: "申报单位 (18位社会信用代码)",
173 + value: "declarationUnit18",
174 + width: "",
175 + align: "left",
176 + },
177 + {
178 + name: "申报单位 (10位海关代码)",
179 + value: "declarationUnit10",
180 + width: "",
181 + align: "left",
182 + },
183 + {
184 + name: "申报单位 (企业名称）",
185 + value: "declarationUnitCompanyName",
186 + width: "",
187 + align: "left",
188 + },
189 + ],
190 + dict: {
191 + port: [],
192 + },
193 + loadings: {
194 + searchLoading: false,
195 + },
196 + tableMaxheight: null,
197 + outerVisible: false,
198 + dialogTitle: "",
199 + editType: "",
200 + };
201 + },
202 + created() {
203 + this.searchPortDictData();
204 + this.search(0);
205 + },
206 + mounted() {
207 + this.tableMaxheight = window.innerHeight - 300;
208 + },
209 + methods: {
210 + //查询
211 + search(val) {
212 + this.loadings.searchLoading = true;
213 + if (val == 0) {
214 + this.page.pageNum = 1;
215 + }
216 + let obj = this.sreachFormData;
217 + obj.pageNum = this.page.pageNum;
218 + obj.pageSize = this.page.pageSize;
219 + getPortConfigList(obj)
220 + .then((res) => {
221 + if (res.code === "200") {
222 + this.tableData = res.data.value;
223 + this.page.total = res.data.totalItems;
224 + this.tableData.forEach((item, idx) => {
225 + item.index = idx;
226 + });
227 + } else {
228 + this.alertWarningMsg(res.message);
229 + }
230 + this.loadings.searchLoading = false;
231 + })
232 + .catch((err) => {
233 + console.log(err);
234 + this.loadings.searchLoading = false;
235 + });
236 + },
237 + //获取口岸子字典
238 + searchPortDictData() {
239 + getPortList()
240 + .then((res) => {
241 + if (res.code === "200") {
242 + this.dict.port = res.data;
243 + }
244 + })
245 + .catch((err) => {
246 + console.log(err);
247 + });
248 + },
249 + clear() {
250 + this.sreachFormData = {
251 + portCode: "",
252 + dxpid: "",
253 + };
254 + },
255 + //导出
256 + downloadData() {},
257 + addcipherMachine() {
258 + this.dialogTitle = "新增口岸";
259 + this.editType = "add";
260 + this.outerVisible = true;
261 + },
262 + update(val) {
263 + this.dialogTitle = "修改口岸";
264 + this.editType = "update";
265 + this.outerVisible = true;
266 + this.activeData = val;
267 + },
268 + dialogClose() {
269 + this.outerVisible = false;
270 + this.activeData = null;
271 + this.search(1);
272 + },
273 + //分页
274 + currentChange(val) {
275 + this.page.pageNum = val.page;
276 + this.search(1);
277 + },
278 + sizeChange(val) {
279 + this.page.pageSize = val;
280 + this.search(1);
281 + },
282 + input() {
283 + this.$forceUpdate();
284 + },
285 + dateChange(val) {
286 + if (val == "" || val == null) {
287 + this.$nextTick(() => {
288 + this.sreachFormData.creationTime = [];
289 + });
290 + }
291 + },
292 + },
293 +};
294 +</script>
295 +
296 +<style scoped lang="scss">
297 +@import "@/assets/styles/variables.scss";
298 +.entrySreach {
299 + height: 100%;
300 + background-color: $menuLightBg;
301 +
302 + .entrySreachButton {
303 + display: inline-block;
304 + font-size: 20px;
305 + color: $fedexButton !important;
306 + }
307 +
308 + .optionButton {
309 + padding: 10px;
310 + text-align: left;
311 + display: flex;
312 + justify-content: space-between;
313 +
314 + .el-button {
315 + color: $fedexButton;
316 + border-color: $fedexButton !important;
317 +
318 + svg {
319 + display: inline-block;
320 + margin-right: 5px;
321 + fill: $fedexButton;
322 + }
323 + }
324 +
325 + .entrySaveButton:hover,
326 + .entrySaveButton:focus {
327 + color: $menuLightBg !important;
328 + background-color: $fedexButton !important;
329 + }
330 + }
331 +}
332 +
333 +.texttareaTip {
334 + position: absolute;
335 + top: 52%;
336 + right: 20px;
337 + transform: translate(0, -50%);
338 + z-index: 10;
339 +}
340 +</style>
......
...@@ -226,7 +226,9 @@ ...@@ -226,7 +226,9 @@
226 > 226 >
227 <template v-slot:orderReceiptStatus="scope"> 227 <template v-slot:orderReceiptStatus="scope">
228 <TablePopover 228 <TablePopover
229 + ref="orderReceiptStatusPopover"
229 dataKey="orderReceiptStatus" 230 dataKey="orderReceiptStatus"
231 + idKey="declareId"
230 :parentDom="$refs.entryTable" 232 :parentDom="$refs.entryTable"
231 :receiptDataHead="receiptDataHead" 233 :receiptDataHead="receiptDataHead"
232 :rowData="scope.row" 234 :rowData="scope.row"
...@@ -245,7 +247,9 @@ ...@@ -245,7 +247,9 @@
245 </template> 247 </template>
246 <template v-slot:logisticsReceiptStatus="scope"> 248 <template v-slot:logisticsReceiptStatus="scope">
247 <TablePopover 249 <TablePopover
250 + ref="logisticsReceiptStatusPopover"
248 dataKey="logisticsReceiptStatus" 251 dataKey="logisticsReceiptStatus"
252 + idKey="declareId"
249 :parentDom="$refs.entryTable" 253 :parentDom="$refs.entryTable"
250 :receiptDataHead="receiptDataHead" 254 :receiptDataHead="receiptDataHead"
251 :rowData="scope.row" 255 :rowData="scope.row"
...@@ -264,7 +268,9 @@ ...@@ -264,7 +268,9 @@
264 </template> 268 </template>
265 <template v-slot:listReceiptStatus="scope"> 269 <template v-slot:listReceiptStatus="scope">
266 <TablePopover 270 <TablePopover
271 + ref="listReceiptStatusPopover"
267 dataKey="listReceiptStatus" 272 dataKey="listReceiptStatus"
273 + idKey="declareId"
268 :parentDom="$refs.entryTable" 274 :parentDom="$refs.entryTable"
269 :receiptDataHead="receiptDataHead" 275 :receiptDataHead="receiptDataHead"
270 :rowData="scope.row" 276 :rowData="scope.row"
...@@ -281,6 +287,27 @@ ...@@ -281,6 +287,27 @@
281 </div> 287 </div>
282 </TablePopover> 288 </TablePopover>
283 </template> 289 </template>
290 + <template v-slot:totalSplitOrderStatus="scope">
291 + <TablePopover
292 + ref="totalSplitOrderStatusPopover"
293 + dataKey="totalSplitOrderStatus"
294 + idKey="declareId"
295 + :parentDom="$refs.entryTable"
296 + :receiptDataHead="receiptDataHead"
297 + :rowData="scope.row"
298 + :tableData="tableData"
299 + @popoverChange="popoverChange"
300 + @popoverClose="popoverClose"
301 + >
302 + <div slot="title">
303 + <span style="font-weight: 700; color: #515a6e">订单编号：</span
304 + >{{ scope.row.orderno }}
305 + </div>
306 + <div slot="buttonLabel">
307 + {{ scope.row.totalSplitOrderStatus }}
308 + </div>
309 + </TablePopover>
310 + </template>
284 </Table> 311 </Table>
285 <DialogVue 312 <DialogVue
286 :outerVisible="outerVisible" 313 :outerVisible="outerVisible"
...@@ -291,7 +318,14 @@ ...@@ -291,7 +318,14 @@
291 </template> 318 </template>
292 319
293 <script> 320 <script>
294 -import { searchDeclareData, declareDataUpload } from "@/api/declareData-api.js"; 321 +import {
322 + searchDeclareData,
323 + declareDataUpload,
324 + getOrderReceipt,
325 + getLogisticsReceipt,
326 + getListReceipt,
327 + getTotalReceipt,
328 +} from "@/api/declareData-api.js";
295 import DialogVue from "./dialog.vue"; 329 import DialogVue from "./dialog.vue";
296 export default { 330 export default {
297 name: "ReportingData", 331 name: "ReportingData",
...@@ -346,13 +380,13 @@ export default { ...@@ -346,13 +380,13 @@ export default {
346 align: "left", 380 align: "left",
347 slot: true, 381 slot: true,
348 }, 382 },
349 - { 383 + // {
350 - name: "收款单回执", 384 + // name: "收款单回执",
351 - value: "", 385 + // value: "",
352 - width: "", 386 + // width: "",
353 - align: "left", 387 + // align: "left",
354 - slot: true, 388 + // slot: true,
355 - }, 389 + // },
356 { 390 {
357 name: "物流单回执", 391 name: "物流单回执",
358 value: "logisticsReceiptStatus", 392 value: "logisticsReceiptStatus",
...@@ -369,7 +403,7 @@ export default { ...@@ -369,7 +403,7 @@ export default {
369 }, 403 },
370 { 404 {
371 name: "清单总分单回执", 405 name: "清单总分单回执",
372 - value: "", 406 + value: "totalSplitOrderStatus",
373 width: "", 407 width: "",
374 align: "left", 408 align: "left",
375 slot: true, 409 slot: true,
...@@ -378,19 +412,19 @@ export default { ...@@ -378,19 +412,19 @@ export default {
378 receiptDataHead: [ 412 receiptDataHead: [
379 { 413 {
380 name: "回执状态", 414 name: "回执状态",
381 - value: "", 415 + value: "receiptStatus",
382 width: "", 416 width: "",
383 align: "left", 417 align: "left",
384 }, 418 },
385 { 419 {
386 name: "状态时间", 420 name: "状态时间",
387 - value: "", 421 + value: "statusTime",
388 width: "", 422 width: "",
389 align: "left", 423 align: "left",
390 }, 424 },
391 { 425 {
392 name: "回执描述", 426 name: "回执描述",
393 - value: "", 427 + value: "receiptDescription",
394 width: "", 428 width: "",
395 align: "left", 429 align: "left",
396 }, 430 },
...@@ -421,6 +455,11 @@ export default { ...@@ -421,6 +455,11 @@ export default {
421 mounted() { 455 mounted() {
422 this.tableMaxheight = window.innerHeight - 300; 456 this.tableMaxheight = window.innerHeight - 300;
423 }, 457 },
458 + watch: {
459 + $route(val, oldval) {
460 + this.popoverClose();
461 + },
462 + },
424 methods: { 463 methods: {
425 //查询申报数据 464 //查询申报数据
426 search(val) { 465 search(val) {
...@@ -445,13 +484,10 @@ export default { ...@@ -445,13 +484,10 @@ export default {
445 this.page.total = res.data.totalItems; 484 this.page.total = res.data.totalItems;
446 this.tableData.forEach((item, idx) => { 485 this.tableData.forEach((item, idx) => {
447 item.index = idx; 486 item.index = idx;
448 - item.popoverLoading = false;
449 item.orderReceiptStatusPopoverType = false; 487 item.orderReceiptStatusPopoverType = false;
450 item.listReceiptStatusPopoverType = false; 488 item.listReceiptStatusPopoverType = false;
451 item.logisticsReceiptStatusPopoverType = false; 489 item.logisticsReceiptStatusPopoverType = false;
452 - item.orderReceiptStatusPopoverData = []; 490 + item.popoverData = [];
453 - item.listReceiptStatusPopoverData = [];
454 - item.logisticsReceiptStatusPopoverData = [];
455 }); 491 });
456 } else { 492 } else {
457 this.alertWarningMsg(res.message); 493 this.alertWarningMsg(res.message);
...@@ -463,36 +499,6 @@ export default { ...@@ -463,36 +499,6 @@ export default {
463 this.loadings.sreachLoading = false; 499 this.loadings.sreachLoading = false;
464 }); 500 });
465 }, 501 },
466 - //查询清关回执
467 - searchLog(data) {
468 - let arr = JSON.parse(JSON.stringify(data.tableData));
469 - if (data.type) {
470 - this.$refs.classCPortEntry.style.overflowY = "hidden";
471 - this.tableData = arr;
472 - if (data.status == "customs") {
473 - arr[data.data.idx][`${data.status}PopoverLoading`] = true;
474 - getClassCPortLog({ chmId: Number(data.data.consignmentId) })
475 - .then((res) => {
476 - if (res.code === "200") {
477 - arr[data.data.idx][`${data.status}PopoverData`] =
478 - this.logDataInfo(res.data.records);
479 - } else {
480 - this.alertWarningMsg(res.message);
481 - }
482 - arr[data.data.idx][`${data.status}PopoverLoading`] = false;
483 - this.tableData = arr;
484 - })
485 - .catch((err) => {
486 - console.log(err);
487 - arr[data.data.idx][`${data.status}PopoverLoading`] = false;
488 - this.tableData = arr;
489 - });
490 - }
491 - } else {
492 - this.$refs.classCPortEntry.style.overflowY = "auto";
493 - this.tableData = arr;
494 - }
495 - },
496 //重置数据 502 //重置数据
497 clear() { 503 clear() {
498 this.sreachFormData = { 504 this.sreachFormData = {
...@@ -565,18 +571,91 @@ export default { ...@@ -565,18 +571,91 @@ export default {
565 this.outerVisible = false; 571 this.outerVisible = false;
566 }, 572 },
567 popoverChange(val) { 573 popoverChange(val) {
574 + console.log(val);
568 this.tableData = val.tableData; 575 this.tableData = val.tableData;
569 - console.log(this.tableData); 576 + this.receiptApi(val.data.declareId, val.status)
577 + .then((res) => {
578 + val.tableData.forEach((item) => {
579 + if (item.declareId == val.data.declareId) {
580 + item.popoverData = res;
581 + }
582 + });
583 + this.tableData = val.tableData;
584 + })
585 + .finally(() => {
586 + this.$nextTick(() => {
587 + this.$refs.orderReceiptStatusPopover.tableLoading = false;
588 + this.$refs.logisticsReceiptStatusPopover.tableLoading = false;
589 + this.$refs.listReceiptStatusPopover.tableLoading = false;
590 + this.$refs.totalSplitOrderStatusPopover.tableLoading = false;
591 + });
592 + });
593 + },
594 + //查询回执
595 + receiptApi(id, type) {
596 + return new Promise((resolve, reject) => {
597 + let obj = { declareId: id };
598 + if (type == "orderReceiptStatus") {
599 + getOrderReceipt(obj)
600 + .then((res) => {
601 + if (res.code === "200") {
602 + resolve(res.data);
603 + } else {
604 + reject();
605 + }
606 + })
607 + .catch((err) => {
608 + console.log(err);
609 + reject();
610 + });
611 + } else if (type == "logisticsReceiptStatus") {
612 + getLogisticsReceipt(obj)
613 + .then((res) => {
614 + if (res.code === "200") {
615 + resolve(res.data);
616 + } else {
617 + reject();
618 + }
619 + })
620 + .catch((err) => {
621 + console.log(err);
622 + reject();
623 + });
624 + } else if (type == "listReceiptStatus") {
625 + getListReceipt(obj)
626 + .then((res) => {
627 + if (res.code === "200") {
628 + resolve(res.data);
629 + } else {
630 + reject();
631 + }
632 + })
633 + .catch((err) => {
634 + console.log(err);
635 + reject();
636 + });
637 + } else if (type == "totalSplitOrderStatus") {
638 + getTotalReceipt(obj)
639 + .then((res) => {
640 + if (res.code === "200") {
641 + resolve(res.data);
642 + } else {
643 + reject();
644 + }
645 + })
646 + .catch((err) => {
647 + console.log(err);
648 + reject();
649 + });
650 + }
651 + });
570 }, 652 },
571 popoverClose(val) { 653 popoverClose(val) {
572 this.tableData.forEach((item) => { 654 this.tableData.forEach((item) => {
573 - item.popoverLoading = false;
574 item.orderReceiptStatusPopoverType = false; 655 item.orderReceiptStatusPopoverType = false;
575 item.listReceiptStatusPopoverType = false; 656 item.listReceiptStatusPopoverType = false;
576 item.logisticsReceiptStatusPopoverType = false; 657 item.logisticsReceiptStatusPopoverType = false;
577 - item.orderReceiptStatusPopoverData = []; 658 + item.popoverData = [];
578 - item.listReceiptStatusPopoverData = [];
579 - item.logisticsReceiptStatusPopoverData = [];
580 }); 659 });
581 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY = 660 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
582 "auto"; 661 "auto";
......