Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
e133d490 1 parent 37684659

feat: 根据需求优化

Expand all
Inline Side-by-side
Showing 10 changed files with 457 additions and 102 deletions
...@@ -35,9 +35,9 @@ export function getHsCodeList(data) { ...@@ -35,9 +35,9 @@ export function getHsCodeList(data) {
35 // GET 35 // GET
36 // ​/hsCodeMgr​/hsCodeIncr 36 // ​/hsCodeMgr​/hsCodeIncr
37 // 增量数据同步 37 // 增量数据同步
38 -export function getHsCodeIncr() { 38 +export function getHsCodeIncr({ beginDate }) {
39 return request({ 39 return request({
40 - url: "/bus-customer/hsCodeMgr/hsCodeIncr", 40 + url: `/bus-customer/hsCodeMgr/hsCodeIncr/${beginDate}`,
41 method: "get", 41 method: "get",
42 }); 42 });
43 } 43 }
......
...@@ -283,3 +283,12 @@ export function modifyWeight(data) { ...@@ -283,3 +283,12 @@ export function modifyWeight(data) {
283 data: data, 283 data: data,
284 }); 284 });
285 } 285 }
286 +
287 +// GET /declareData/getTotalDocumentsLevelLog​/{billNo}
288 +export function getTotalDocumentsLevelLog(data) {
289 + return request({
290 + url: "/bus-customer/declareData/getTotalDocumentsLevelLog/" + data.billNo,
291 + method: "get",
292 + data: data,
293 + });
294 +}
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
37 @header-dragend="headerDragend" 37 @header-dragend="headerDragend"
38 @cell-mouse-leave="cellMouseLeave" 38 @cell-mouse-leave="cellMouseLeave"
39 @cell-mouse-enter="cellMouseEnter" 39 @cell-mouse-enter="cellMouseEnter"
40 + @filter-change="filterChange"
40 > 41 >
41 <!-- 多选框 --> 42 <!-- 多选框 -->
42 <el-table-column 43 <el-table-column
...@@ -78,6 +79,9 @@ ...@@ -78,6 +79,9 @@
78 :header-align="item.align" 79 :header-align="item.align"
79 :sort-orders="['descending', 'ascending', null]" 80 :sort-orders="['descending', 'ascending', null]"
80 :key="index" 81 :key="index"
82 + :filters="item.filters"
83 + :filter-method="item.filterMethod"
84 + :column-key="item.columnKey || index.toString()"
81 > 85 >
82 <template slot="header" slot-scope="scope"> 86 <template slot="header" slot-scope="scope">
83 <Tooltip 87 <Tooltip
...@@ -101,7 +105,7 @@ ...@@ -101,7 +105,7 @@
101 :align="item.align ? item.align : 'center'" 105 :align="item.align ? item.align : 'center'"
102 :fixed="item.fixed ? item.fixed : false" 106 :fixed="item.fixed ? item.fixed : false"
103 :sortable="item.sorTable ? true : false" 107 :sortable="item.sorTable ? true : false"
104 - :column-key="index.toString()" 108 + :column-key="item.columnKey || index.toString()"
105 :show-overflow-tooltip=" 109 :show-overflow-tooltip="
106 item.showOverflowTooltip != undefined 110 item.showOverflowTooltip != undefined
107 ? item.showOverflowTooltip 111 ? item.showOverflowTooltip
...@@ -110,6 +114,8 @@ ...@@ -110,6 +114,8 @@
110 :header-align="item.align" 114 :header-align="item.align"
111 :sort-orders="['descending', 'ascending', null]" 115 :sort-orders="['descending', 'ascending', null]"
112 :formatter="formatter" 116 :formatter="formatter"
117 + :filters="item.filters"
118 + :filter-method="item.filterMethod"
113 :key="index" 119 :key="index"
114 > 120 >
115 <template slot="header" slot-scope="scope"> 121 <template slot="header" slot-scope="scope">
...@@ -133,7 +139,7 @@ ...@@ -133,7 +139,7 @@
133 :align="item.align ? item.align : 'center'" 139 :align="item.align ? item.align : 'center'"
134 :fixed="item.fixed ? item.fixed : false" 140 :fixed="item.fixed ? item.fixed : false"
135 :sortable="item.sorTable ? true : false" 141 :sortable="item.sorTable ? true : false"
136 - :column-key="index.toString()" 142 + :column-key="item.columnKey || index.toString()"
137 :show-overflow-tooltip=" 143 :show-overflow-tooltip="
138 item.showOverflowTooltip != undefined 144 item.showOverflowTooltip != undefined
139 ? item.showOverflowTooltip 145 ? item.showOverflowTooltip
...@@ -142,6 +148,8 @@ ...@@ -142,6 +148,8 @@
142 :header-align="item.align" 148 :header-align="item.align"
143 :sort-orders="['descending', 'ascending', null]" 149 :sort-orders="['descending', 'ascending', null]"
144 :formatter="formatter" 150 :formatter="formatter"
151 + :filters="item.filters"
152 + :filter-method="item.filterMethod"
145 :key="index" 153 :key="index"
146 > 154 >
147 <template slot="header" slot-scope="scope"> 155 <template slot="header" slot-scope="scope">
...@@ -541,6 +549,11 @@ export default { ...@@ -541,6 +549,11 @@ export default {
541 this.selectTable = []; 549 this.selectTable = [];
542 this.$emit("sortChange", { prop: prop, order: order }); 550 this.$emit("sortChange", { prop: prop, order: order });
543 }, 551 },
552 + //
553 + filterChange(filters) {
554 + console.log(filters);
555 + this.$emit("filterChange", filters);
556 + },
544 //双击行 557 //双击行
545 dblclick(val) { 558 dblclick(val) {
546 this.$emit("dblclick", val); 559 this.$emit("dblclick", val);
......
This diff is collapsed. Click to expand it.
...@@ -147,6 +147,24 @@ ...@@ -147,6 +147,24 @@
147 离境单申报 147 离境单申报
148 </el-button> 148 </el-button>
149 </div> 149 </div>
150 + <section style="position: fixed; top: 35%; right: 10%">
151 + <TablePopover
152 + ref="allLogDataStatusPopover"
153 + dataKey="allLogDataStatus"
154 + idKey="declareId"
155 + :parentDom="$refs.entryTable"
156 + :receiptDataHead="logDataHead"
157 + :rowData="selectedLogRow"
158 + :tableData="tableData"
159 + @popoverChange="popoverChange"
160 + @popoverClose="popoverClose"
161 + >
162 + <div slot="title">
163 + <span style="font-weight: 700; color: #515a6e">提运单号：</span>
164 + {{ selectedLogRow.billNo }}
165 + </div>
166 + </TablePopover>
167 + </section>
150 <Table 168 <Table
151 class="fedexDetialTable fedexSreachTable" 169 class="fedexDetialTable fedexSreachTable"
152 ref="entryTable" 170 ref="entryTable"
...@@ -263,6 +281,15 @@ ...@@ -263,6 +281,15 @@
263 </div> 281 </div>
264 </TablePopover> 282 </TablePopover>
265 </template> 283 </template>
284 + <template slot="optionColumn">
285 + <el-table-column label="操作" width="80">
286 + <template slot-scope="scope">
287 + <el-button type="text" @click="showTotalLog(scope.row)">
288 + 日志
289 + </el-button>
290 + </template>
291 + </el-table-column>
292 + </template>
266 </Table> 293 </Table>
267 <DialogVue 294 <DialogVue
268 :outerVisible="outerVisible" 295 :outerVisible="outerVisible"
...@@ -290,6 +317,7 @@ import { ...@@ -290,6 +317,7 @@ import {
290 declareDataUpload, 317 declareDataUpload,
291 getLogisticsReceipt, 318 getLogisticsReceipt,
292 getTotalReceipt, 319 getTotalReceipt,
320 + getTotalDocumentsLevelLog,
293 } from "@/api/declareData-api.js"; 321 } from "@/api/declareData-api.js";
294 import DialogVue from "./dialog.vue"; 322 import DialogVue from "./dialog.vue";
295 import DataPreview from "../reportingData/data-preview.vue"; 323 import DataPreview from "../reportingData/data-preview.vue";
...@@ -308,7 +336,7 @@ export default { ...@@ -308,7 +336,7 @@ export default {
308 portList: [], 336 portList: [],
309 activePortType: false, 337 activePortType: false,
310 // 控制日志弹窗的显示和隐藏 338 // 控制日志弹窗的显示和隐藏
311 - allLogDataReceiptStatusPopoverType: false, 339 + allLogDataStatusPopoverType: false,
312 // 存储选中的日志数据 340 // 存储选中的日志数据
313 selectedLogRow: {}, 341 selectedLogRow: {},
314 selected: [], 342 selected: [],
...@@ -325,6 +353,32 @@ export default { ...@@ -325,6 +353,32 @@ export default {
325 total: 0, 353 total: 0,
326 }, 354 },
327 tableData: [], 355 tableData: [],
356 + logDataHead: [
357 + {
358 + name: "回执类型",
359 + value: "receiptType",
360 + width: "",
361 + align: "left",
362 + },
363 + {
364 + name: "回执状态",
365 + value: "receiptStatus",
366 + width: "",
367 + align: "left",
368 + },
369 + {
370 + name: "状态时间",
371 + value: "statusTime",
372 + width: "",
373 + align: "left",
374 + },
375 + {
376 + name: "回执描述",
377 + value: "receiptDescription",
378 + width: "",
379 + align: "left",
380 + },
381 + ],
328 headerData: [ 382 headerData: [
329 { 383 {
330 name: "提运单号", 384 name: "提运单号",
...@@ -422,6 +476,28 @@ export default { ...@@ -422,6 +476,28 @@ export default {
422 this.searchPortDictData(); 476 this.searchPortDictData();
423 }, 477 },
424 methods: { 478 methods: {
479 + //申报日志
480 + showTotalLog(row) {
481 + this.$store.state.viewOption.loadingDatas = true;
482 + this.selectedLogRow = row;
483 + this.$set(row, "logLoading", true);
484 +
485 + this.receiptApi(row.declareId, "allLogDataStatus").then((logData) => {
486 + this.$set(row, "popoverData", logData);
487 +
488 + if (!this.selectedLogRow.popoverData.length) {
489 + this.$store.state.viewOption.loadingDatas = false;
490 + }
491 +
492 + // 手动触发状态更新
493 + this.$nextTick(() => {
494 + // 强制设置弹窗状态为true
495 + row.allLogDataStatusPopoverType = true;
496 + // 强制更新表格
497 + this.tableData = [...this.tableData];
498 + });
499 + });
500 + },
425 //获取口岸子字典 501 //获取口岸子字典
426 searchPortDictData() { 502 searchPortDictData() {
427 getPortInfo() 503 getPortInfo()
...@@ -530,7 +606,7 @@ export default { ...@@ -530,7 +606,7 @@ export default {
530 item.totalReceiptStatusPopoverType = false; 606 item.totalReceiptStatusPopoverType = false;
531 item.popoverData = []; 607 item.popoverData = [];
532 }); 608 });
533 - this.selectedLogRow.allLogDataReceiptStatusPopoverType = false; 609 + this.selectedLogRow.allLogDataStatusPopoverType = false;
534 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY = 610 this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
535 "auto"; 611 "auto";
536 }, 612 },
...@@ -594,6 +670,20 @@ export default { ...@@ -594,6 +670,20 @@ export default {
594 console.log(err); 670 console.log(err);
595 reject(); 671 reject();
596 }); 672 });
673 + } else if (type == "allLogDataStatus") {
674 + let objVal = { billNo: billNo };
675 + getTotalDocumentsLevelLog(objVal)
676 + .then((res) => {
677 + if (res.code === "200") {
678 + resolve(res.data);
679 + } else {
680 + reject();
681 + }
682 + })
683 + .catch((err) => {
684 + console.log(err);
685 + reject();
686 + });
597 } 687 }
598 }); 688 });
599 }, 689 },
...@@ -618,6 +708,7 @@ export default { ...@@ -618,6 +708,7 @@ export default {
618 this.$refs.arrivalInReceiptStatusPopover.tableLoading = false; //运抵单回执 708 this.$refs.arrivalInReceiptStatusPopover.tableLoading = false; //运抵单回执
619 this.$refs.logisticsDepartureReceiptStatusPopover.tableLoading = false; // 离境单回执 709 this.$refs.logisticsDepartureReceiptStatusPopover.tableLoading = false; // 离境单回执
620 this.$refs.totalReceiptStatusPopover.tableLoading = false; 710 this.$refs.totalReceiptStatusPopover.tableLoading = false;
711 + this.$refs.allLogDataStatusPopoverType = false;
621 }); 712 });
622 }); 713 });
623 }, 714 },
...@@ -697,7 +788,7 @@ export default { ...@@ -697,7 +788,7 @@ export default {
697 // item.logLoading = false; 788 // item.logLoading = false;
698 item.popoverData = []; 789 item.popoverData = [];
699 }); 790 });
700 - this.selectedLogRow.allLogDataReceiptStatusPopoverType = false; 791 + this.selectedLogRow.allLogDataStatusPopoverType = false;
701 } else { 792 } else {
702 this.alertWarningMsg(res.message); 793 this.alertWarningMsg(res.message);
703 } 794 }
...@@ -752,8 +843,9 @@ export default { ...@@ -752,8 +843,9 @@ export default {
752 843
753 .optionButton { 844 .optionButton {
754 padding: 10px; 845 padding: 10px;
755 - text-align: left; 846 + text-align: right;
756 - 847 + display: flex;
848 + justify-content: flex-end;
757 .el-button.dropdown-style-button { 849 .el-button.dropdown-style-button {
758 background-color: #ffffff !important; 850 background-color: #ffffff !important;
759 border: 2px solid $fedexBottonColor !important; /* 设置边框颜色 */ 851 border: 2px solid $fedexBottonColor !important; /* 设置边框颜色 */
......
...@@ -216,8 +216,10 @@ ...@@ -216,8 +216,10 @@
216 </el-select> 216 </el-select>
217 </Formitem> 217 </Formitem>
218 </el-col> 218 </el-col>
219 + </el-row>
220 + <el-row :gutter="5" v-if="formData.orderRequester == '2'">
219 <!-- 口岸选择--> 221 <!-- 口岸选择-->
220 - <el-col :span="8" v-if="formData.orderRequester == '2'"> 222 + <el-col :span="8">
221 <Formitem label="申报地区" prop="choosePortCode" type="edit"> 223 <Formitem label="申报地区" prop="choosePortCode" type="edit">
222 <el-select 224 <el-select
223 type="text" 225 type="text"
...@@ -245,6 +247,54 @@ ...@@ -245,6 +247,54 @@
245 > 247 >
246 <div class="dlTitle">青岛</div> 248 <div class="dlTitle">青岛</div>
247 <el-row :gutter="5"> 249 <el-row :gutter="5">
250 + <!-- 订单申报通道 orderDeclareChannel -->
251 + <el-col :span="8" :key="dateKey">
252 + <Formitem
253 + label="订单申报通道"
254 + prop="orderDeclareChannel"
255 + type="edit"
256 + >
257 + <el-select
258 + type="text"
259 + id="inputInner-edit-orderDeclareChannel"
260 + v-model="portConfig.TAO.orderDeclareChannel"
261 + clearable
262 + maxlength="4"
263 + placeholder=""
264 + @change="changeOrderDeclareChannel"
265 + >
266 + <el-option
267 + v-for="(item, index) in $store.getters.dict
268 + .ORDER_DECLARE_CHANNEL"
269 + :key="index"
270 + :label="item.itemChineseName"
271 + :value="item.itemValue"
272 + ></el-option>
273 + </el-select>
274 + </Formitem>
275 + </el-col>
276 + <!-- 加签方式 -->
277 + <el-col :span="8" :key="dateKey">
278 + <Formitem label="加签方式" prop="methodOfSignature" type="edit">
279 + <el-select
280 + type="text"
281 + id="inputInner-edit-methodOfSignature"
282 + v-model="portConfig.TAO.methodOfSignature"
283 + clearable
284 + maxlength="4"
285 + placeholder=""
286 + >
287 + <el-option
288 + v-for="(item, index) in $store.getters.dict
289 + .METHOD_OF_SIGNATURE"
290 + :key="index"
291 + :label="item.itemChineseName"
292 + :value="item.itemValue"
293 + ></el-option>
294 + </el-select>
295 + </Formitem>
296 + </el-col>
297 +
248 <!-- 公服DXPID --> 298 <!-- 公服DXPID -->
249 <el-col 299 <el-col
250 :span="8" 300 :span="8"
...@@ -359,53 +409,6 @@ ...@@ -359,53 +409,6 @@
359 ></el-input> 409 ></el-input>
360 </Formitem> 410 </Formitem>
361 </el-col> 411 </el-col>
362 - <!-- 加签方式 -->
363 - <el-col :span="8" :key="dateKey">
364 - <Formitem label="加签方式" prop="methodOfSignature" type="edit">
365 - <el-select
366 - type="text"
367 - id="inputInner-edit-methodOfSignature"
368 - v-model="portConfig.TAO.methodOfSignature"
369 - clearable
370 - maxlength="4"
371 - placeholder=""
372 - >
373 - <el-option
374 - v-for="(item, index) in $store.getters.dict
375 - .METHOD_OF_SIGNATURE"
376 - :key="index"
377 - :label="item.itemChineseName"
378 - :value="item.itemValue"
379 - ></el-option>
380 - </el-select>
381 - </Formitem>
382 - </el-col>
383 - <!-- 订单申报通道 orderDeclareChannel -->
384 - <el-col :span="8" :key="dateKey">
385 - <Formitem
386 - label="订单申报通道"
387 - prop="orderDeclareChannel"
388 - type="edit"
389 - >
390 - <el-select
391 - type="text"
392 - id="inputInner-edit-orderDeclareChannel"
393 - v-model="portConfig.TAO.orderDeclareChannel"
394 - clearable
395 - maxlength="4"
396 - placeholder=""
397 - @change="changeOrderDeclareChannel"
398 - >
399 - <el-option
400 - v-for="(item, index) in $store.getters.dict
401 - .ORDER_DECLARE_CHANNEL"
402 - :key="index"
403 - :label="item.itemChineseName"
404 - :value="item.itemValue"
405 - ></el-option>
406 - </el-select>
407 - </Formitem>
408 - </el-col>
409 412
410 <el-col 413 <el-col
411 :span="16" 414 :span="16"
...@@ -983,6 +986,13 @@ export default { ...@@ -983,6 +986,13 @@ export default {
983 message: "订单申报方不能为空！", 986 message: "订单申报方不能为空！",
984 }, 987 },
985 ], 988 ],
989 + declareBusinessType: [
990 + {
991 + required: true,
992 + trigger: "change",
993 + message: "申报业务类型不能为空！",
994 + },
995 + ],
986 996
987 // methodOfSignature: [ 997 // methodOfSignature: [
988 // { 998 // {
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 </el-col> 88 </el-col>
89 </el-row> 89 </el-row>
90 <el-row> 90 <el-row>
91 - <!-- 电商企业代码 --> 91 + <!-- 电商企业名称 -->
92 <el-col :span="5"> 92 <el-col :span="5">
93 <Formitem label="电商企业名称" prop="ebcName"> 93 <Formitem label="电商企业名称" prop="ebcName">
94 <el-input 94 <el-input
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
173 @click="customDialogShow = true" 173 @click="customDialogShow = true"
174 > 174 >
175 <svg-icon class="el-icon-user-solid" icon-class="zidingyi"></svg-icon> 175 <svg-icon class="el-icon-user-solid" icon-class="zidingyi"></svg-icon>
176 - 自定义内容 176 + 导出字段
177 </el-button> 177 </el-button>
178 178
179 <el-button 179 <el-button
...@@ -241,6 +241,7 @@ ...@@ -241,6 +241,7 @@
241 <script> 241 <script>
242 import { getAllexportList, getListReceiptData } from "@/api/exportList-api.js"; 242 import { getAllexportList, getListReceiptData } from "@/api/exportList-api.js";
243 import CustomDialog from "./custom-dialog.vue"; 243 import CustomDialog from "./custom-dialog.vue";
244 +import { formatDateNew } from "../../utils";
244 245
245 export default { 246 export default {
246 name: "ExportBillQuery", 247 name: "ExportBillQuery",
...@@ -453,8 +454,9 @@ export default { ...@@ -453,8 +454,9 @@ export default {
453 // // 2. 清单查询 454 // // 2. 清单查询
454 // console.log(res); 455 // console.log(res);
455 // }); 456 // });
457 + const fileName = `${formatDateNew(new Date())}.xlsx`;
456 this.fileDownload 458 this.fileDownload
457 - .downLoadZip("api", "listExport", "清单查询.xlsx", "xlsx", "post", { 459 + .downLoadZip("api", "listExport", fileName, "xlsx", "post", {
458 ...obj, 460 ...obj,
459 }) 461 })
460 .finally(() => { 462 .finally(() => {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 </el-col> 36 </el-col>
37 <!-- 创建时间 --> 37 <!-- 创建时间 -->
38 <el-col :span="5"> 38 <el-col :span="5">
39 - <Formitem label="操作时间" prop="createTime" :activeType="true"> 39 + <Formitem label="更新时间" prop="createTime" :activeType="true">
40 <el-date-picker 40 <el-date-picker
41 class="inputInner--createTime" 41 class="inputInner--createTime"
42 id="inputInner-edit-createTime" 42 id="inputInner-edit-createTime"
...@@ -139,24 +139,25 @@ ...@@ -139,24 +139,25 @@
139 :selected="selected" 139 :selected="selected"
140 @close="dialogClose" 140 @close="dialogClose"
141 /> 141 />
142 + <!-- -->
143 + <TimeDialog :timeVisible="timeVisible" @close="timeClose" />
142 </div> 144 </div>
143 </template> 145 </template>
144 146
145 <script> 147 <script>
146 -import { 148 +import { getHsCodeList, getHsCodeSingleSync } from "@/api/arrivalList-api.js";
147 - getHsCodeList,
148 - getHsCodeIncr,
149 - getHsCodeSingleSync,
150 -} from "@/api/arrivalList-api.js";
151 import DialogVue from "./dialog.vue"; 149 import DialogVue from "./dialog.vue";
150 +import TimeDialog from "./time-dialog.vue";
152 export default { 151 export default {
153 name: "SupervisePlaceManage", 152 name: "SupervisePlaceManage",
154 components: { 153 components: {
155 DialogVue, 154 DialogVue,
155 + TimeDialog,
156 }, 156 },
157 data() { 157 data() {
158 return { 158 return {
159 selected: {}, 159 selected: {},
160 + timeVisible: false,
160 sreachFormData: { 161 sreachFormData: {
161 skuCode: "", 162 skuCode: "",
162 skuname: "", 163 skuname: "",
...@@ -289,32 +290,39 @@ export default { ...@@ -289,32 +290,39 @@ export default {
289 console.log("finally"); 290 console.log("finally");
290 }); 291 });
291 }, 292 },
293 + timeClose() {
294 + console.log("===");
295 + this.loadings.postLoading = false;
296 + this.timeVisible = false;
297 + },
292 addDeclare() { 298 addDeclare() {
293 this.loadings.postLoading = true; 299 this.loadings.postLoading = true;
294 - this.$confirm("是否确认操作增量数据同步?", "提示", { 300 + this.timeVisible = true;
295 - confirmButtonText: "确定", 301 + // loadings.postLoading
296 - cancelButtonText: "取消", 302 + // this.$confirm("是否确认操作增量数据同步?", "提示", {
297 - type: "warning", 303 + // confirmButtonText: "确定",
298 - }) 304 + // cancelButtonText: "取消",
299 - .then(() => { 305 + // type: "warning",
300 - getHsCodeIncr() 306 + // })
301 - .then((res) => { 307 + // .then(() => {
302 - if (res.code === "200") { 308 + // getHsCodeIncr()
303 - this.alertSuccessMsg(res.message); 309 + // .then((res) => {
304 - } else { 310 + // if (res.code === "200") {
305 - this.alertWarningMsg(res.message); 311 + // this.alertSuccessMsg(res.message);
306 - } 312 + // } else {
307 - this.loadings.postLoading = false; 313 + // this.alertWarningMsg(res.message);
308 - }) 314 + // }
309 - .catch((err) => { 315 + // this.loadings.postLoading = false;
310 - console.log(err); 316 + // })
311 - this.loadings.postLoading = false; 317 + // .catch((err) => {
312 - }) 318 + // console.log(err);
313 - .finally(() => { 319 + // this.loadings.postLoading = false;
314 - // console.log("finally"); 320 + // })
315 - }); 321 + // .finally(() => {
316 - }) 322 + // // console.log("finally");
317 - .catch(() => {}); 323 + // });
324 + // })
325 + // .catch(() => {});
318 }, 326 },
319 detail(record) { 327 detail(record) {
320 this.selected = JSON.parse(JSON.stringify(record)); 328 this.selected = JSON.parse(JSON.stringify(record));
......
1 +<template>
2 + <el-dialog
3 + class="entryDialog classCUploadDialog"
4 + title="增量数据同步"
5 + :visible.sync="timeVisibleConfig"
6 + :show-close="false"
7 + width="450px"
8 + :close-on-click-modal="false"
9 + :destroy-on-close="true"
10 + v-loading="loadings.dialogLoading"
11 + @close="close(false)"
12 + >
13 + <div class="modelItem" style="margin-bottom: 10px">
14 + <el-form
15 + class="fedexFormStyle"
16 + ref="formData"
17 + :model="formData"
18 + label-position="top"
19 + size="small"
20 + :rules="rules"
21 + >
22 + <el-row :gutter="5">
23 + <el-col :span="24">
24 + <Formitem label="同步日期" prop="beginDate" type="edit">
25 + <el-date-picker
26 + class="inputInner--beginDate"
27 + id="inputInner-edit-beginDate"
28 + v-model="formData.beginDate"
29 + format="yyyy-MM-dd"
30 + prefix-icon="none"
31 + value-format="yyyy-MM-dd"
32 + />
33 + </Formitem>
34 + </el-col>
35 + </el-row>
36 + </el-form>
37 + </div>
38 +
39 + <div class="dialogOption entrySave">
40 + <el-button
41 + class="entrySaveButton"
42 + :disabled="loadings.submitLoading"
43 + @click="submit"
44 + >确 定</el-button
45 + >
46 + <el-button class="entrySaveButton" @click="close(false)">关 闭</el-button>
47 + </div>
48 + </el-dialog>
49 +</template>
50 +
51 +<script>
52 +import { getHsCodeIncr } from "@/api/arrivalList-api.js";
53 +import { getYesterday } from "@/utils/index.js";
54 +export default {
55 + props: {
56 + timeVisible: {
57 + type: Boolean,
58 + default: false,
59 + },
60 + },
61 +
62 + data() {
63 + return {
64 + formData: {
65 + beginDate: "",
66 + },
67 + timeVisibleConfig: false,
68 + loadings: {
69 + dialogLoading: false,
70 + submitLoading: false,
71 + },
72 + loadingText: "",
73 + logisticsTotal: 0,
74 + rules: {
75 + beginDate: [
76 + {
77 + required: true,
78 + trigger: "change",
79 + message: "同步日期不能为空！",
80 + },
81 + ],
82 + },
83 + };
84 + },
85 + watch: {
86 + timeVisible(val) {
87 + if (val) {
88 + console.log(getYesterday().substring(0, 10));
89 + const time = getYesterday().substring(0, 10);
90 + this.timeVisibleConfig = val;
91 + this.formData = {
92 + beginDate: time,
93 + };
94 + }
95 + },
96 + },
97 + methods: {
98 + //数据保存
99 + submit() {
100 + let obj = {
101 + ...this.formData,
102 + };
103 + this.$refs.formData.validate((valid) => {
104 + if (valid) {
105 + this.addapi(obj);
106 + }
107 + });
108 + },
109 +
110 + //新增 getHsCodeIncr
111 + addapi(val) {
112 + this.loadings.dialogLoading = true;
113 + getHsCodeIncr(val)
114 + .then((res) => {
115 + if (res.code === "200") {
116 + this.msgSuccess(res.message);
117 + this.close(true);
118 + } else {
119 + this.alertWarningMsg(res.message);
120 + this.loadings.dialogLoading = false;
121 + }
122 + })
123 + .catch((err) => {
124 + console.log(err);
125 + this.loadings.dialogLoading = false;
126 + });
127 + },
128 +
129 + close(flag) {
130 + this.formData = {
131 + beginDate: "",
132 + };
133 + this.loadings.dialogLoading = false;
134 + this.timeVisibleConfig = false;
135 + this.$emit("close", flag);
136 + },
137 + },
138 +};
139 +</script>
140 +
141 +<style lang="scss" scoped>
142 +@import "@/assets/styles/variables.scss";
143 +</style>
...@@ -100,6 +100,20 @@ ...@@ -100,6 +100,20 @@
100 </el-col> 100 </el-col>
101 </el-row> 101 </el-row>
102 <el-row class="backgroundRow"> 102 <el-row class="backgroundRow">
103 + <!-- 电商企业名称 -->
104 + <el-col :span="5">
105 + <Formitem label="电商企业名称" prop="ebcName">
106 + <el-input
107 + type="text"
108 + class="inputShadow"
109 + id="inputInner--ebcName"
110 + resize="none"
111 + v-model="sreachFormData.ebcName"
112 + clearable
113 + placeholder=""
114 + ></el-input>
115 + </Formitem>
116 + </el-col>
103 <!-- 创建时间 --> 117 <!-- 创建时间 -->
104 <el-col :span="5"> 118 <el-col :span="5">
105 <Formitem label="创建时间" prop="createTime" :activeType="true"> 119 <Formitem label="创建时间" prop="createTime" :activeType="true">
...@@ -273,7 +287,7 @@ ...@@ -273,7 +287,7 @@
273 </el-button> 287 </el-button>
274 </div> 288 </div>
275 </div> 289 </div>
276 - <section style="position: fixed; top: 350px; left: 500px"> 290 + <section style="position: fixed; top: 35%; right: 10%">
277 <TablePopover 291 <TablePopover
278 ref="allLogDataReceiptStatusPopover" 292 ref="allLogDataReceiptStatusPopover"
279 dataKey="allLogDataReceiptStatus" 293 dataKey="allLogDataReceiptStatus"
...@@ -292,7 +306,7 @@ ...@@ -292,7 +306,7 @@
292 </TablePopover> 306 </TablePopover>
293 </section> 307 </section>
294 <Table 308 <Table
295 - class="fedexDetialTable fedexSreachTable" 309 + class="fedexDetialTable fedexSreachTable fedexTable_new"
296 ref="entryTable" 310 ref="entryTable"
297 :data="tableData" 311 :data="tableData"
298 :headerData="headerData" 312 :headerData="headerData"
...@@ -312,6 +326,8 @@ ...@@ -312,6 +326,8 @@
312 :rowSelectDataType="false" 326 :rowSelectDataType="false"
313 @cellClick="cellClick" 327 @cellClick="cellClick"
314 :selected="selected" 328 :selected="selected"
329 + @filterChange="filterChange"
330 + rowKey="declareId"
315 > 331 >
316 <template v-slot:orderReceiptStatus="scope"> 332 <template v-slot:orderReceiptStatus="scope">
317 <TablePopover 333 <TablePopover
...@@ -326,8 +342,8 @@ ...@@ -326,8 +342,8 @@
326 @popoverClose="popoverClose" 342 @popoverClose="popoverClose"
327 > 343 >
328 <div slot="title"> 344 <div slot="title">
329 - <span style="font-weight: 700; color: #515a6e">订单编号：</span 345 + <span style="font-weight: 700; color: #515a6e">订单编号：</span>
330 - >{{ scope.row.orderno }} 346 + {{ scope.row.orderno }}
331 </div> 347 </div>
332 <div slot="buttonLabel"> 348 <div slot="buttonLabel">
333 {{ scope.row.orderReceiptStatus }} 349 {{ scope.row.orderReceiptStatus }}
...@@ -440,7 +456,7 @@ ...@@ -440,7 +456,7 @@
440 </TablePopover> 456 </TablePopover>
441 </template> 457 </template>
442 <template slot="optionColumn"> 458 <template slot="optionColumn">
443 - <el-table-column align="center" label="操作" width="150"> 459 + <el-table-column label="操作" width="120">
444 <template slot-scope="scope"> 460 <template slot-scope="scope">
445 <el-button type="text" @click="update(scope.row)"> 修改 </el-button> 461 <el-button type="text" @click="update(scope.row)"> 修改 </el-button>
446 <el-button type="text" @click="showTotalLog(scope.row)"> 462 <el-button type="text" @click="showTotalLog(scope.row)">
...@@ -548,6 +564,7 @@ export default { ...@@ -548,6 +564,7 @@ export default {
548 receiptType: null, 564 receiptType: null,
549 createTime: [], 565 createTime: [],
550 dataSource: [], 566 dataSource: [],
567 + ebcName: "",
551 }, 568 },
552 page: { 569 page: {
553 pageIndex: 1, 570 pageIndex: 1,
...@@ -555,6 +572,7 @@ export default { ...@@ -555,6 +572,7 @@ export default {
555 total: 0, 572 total: 0,
556 }, 573 },
557 tableData: [], 574 tableData: [],
575 + orderStatus: [],
558 headerData: [ 576 headerData: [
559 { 577 {
560 name: "提运单号", 578 name: "提运单号",
...@@ -598,6 +616,46 @@ export default { ...@@ -598,6 +616,46 @@ export default {
598 width: "", 616 width: "",
599 align: "left", 617 align: "left",
600 slot: true, 618 slot: true,
619 + columnKey: "orderReceiptStatus",
620 + filters: [
621 + {
622 + text: "已提交",
623 + value: "0",
624 + },
625 + {
626 + text: "xml报文加签失败",
627 + value: "-2",
628 + },
629 + {
630 + text: "xml报文上传失败",
631 + value: "-3",
632 + },
633 + {
634 + text: "电子口岸申报中",
635 + value: "2",
636 + },
637 + {
638 + text: "发送海关成功",
639 + value: "3",
640 + },
641 + {
642 + text: "发送海关失败",
643 + value: "4",
644 + },
645 + {
646 + text: "海关退单",
647 + value: "100",
648 + },
649 + {
650 + text: "海关入库",
651 + value: "120",
652 + },
653 + {
654 + text: "回执异常",
655 + value: "-1",
656 + },
657 + ],
658 + // filterMethod: this.filterMethodFn,
601 }, 659 },
602 // { 660 // {
603 // name: "收款单回执", 661 // name: "收款单回执",
...@@ -636,13 +694,13 @@ export default { ...@@ -636,13 +694,13 @@ export default {
636 // align: "left", 694 // align: "left",
637 // slot: true, 695 // slot: true,
638 // }, 696 // },
639 - { 697 + // {
640 - name: "离境单回执", 698 + // name: "离境单回执",
641 - value: "logisticsReceiptStatus", 699 + // value: "logisticsReceiptStatus",
642 - width: "", 700 + // width: "",
643 - align: "left", 701 + // align: "left",
644 - slot: true, 702 + // slot: true,
645 - }, 703 + // },
646 ], 704 ],
647 receiptDataHead: [ 705 receiptDataHead: [
648 { 706 {
...@@ -759,6 +817,11 @@ export default { ...@@ -759,6 +817,11 @@ export default {
759 }); 817 });
760 }, 818 },
761 methods: { 819 methods: {
820 + filterChange(value) {
821 + this.orderStatus = value.orderReceiptStatus;
822 + console.log(value, this.orderStatus);
823 + this.search(0);
824 + },
762 //获取口岸子字典 825 //获取口岸子字典
763 searchPortDictData() { 826 searchPortDictData() {
764 getPortInfo() 827 getPortInfo()
...@@ -855,6 +918,7 @@ export default { ...@@ -855,6 +918,7 @@ export default {
855 obj.startCreateTime = obj.createTime[0]; 918 obj.startCreateTime = obj.createTime[0];
856 obj.endCreateTime = obj.createTime[1]; 919 obj.endCreateTime = obj.createTime[1];
857 } 920 }
921 + obj.orderStatus = this.orderStatus;
858 searchDeclareData(obj) 922 searchDeclareData(obj)
859 .then((res) => { 923 .then((res) => {
860 if (res.code === "200") { 924 if (res.code === "200") {
...@@ -892,6 +956,7 @@ export default { ...@@ -892,6 +956,7 @@ export default {
892 receiptType: null, 956 receiptType: null,
893 createTime: [], 957 createTime: [],
894 dataSource: [], 958 dataSource: [],
959 + ebcName: "",
895 }; 960 };
896 this.clearPort(); 961 this.clearPort();
897 this.clearStatus(); 962 this.clearStatus();
...@@ -1381,4 +1446,17 @@ export default { ...@@ -1381,4 +1446,17 @@ export default {
1381 margin-right: 30px; 1446 margin-right: 30px;
1382 } 1447 }
1383 } 1448 }
1449 +::v-deep {
1450 + .fedexTable_new {
1451 + .el-table th.el-table__cell > .cell {
1452 + display: flex;
1453 + align-items: center;
1454 + gap: 30px;
1455 + justify-content: space-between;
1456 + &.highlight {
1457 + color: #007ab7;
1458 + }
1459 + }
1460 + }
1461 +}
1384 </style> 1462 </style>
......