Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
b5e0748f 1 parent 6e7abc48

基础配置修改，无用代码删除

Expand all
Inline Side-by-side
Showing 15 changed files with 29 additions and 454 deletions
...@@ -81,10 +81,10 @@ export default { ...@@ -81,10 +81,10 @@ export default {
81 // 全局入口页 81 // 全局入口页
82 layout: { 82 layout: {
83 register: "Login", 83 register: "Login",
84 - fedexLogin: "fedex.com user log in", 84 + fedexLogin: "Fedex.com user account login",
85 fedexRegister: "Employee log in", 85 fedexRegister: "Employee log in",
86 onlineDeclare: "線上申報平臺帳號登錄", 86 onlineDeclare: "線上申報平臺帳號登錄",
87 - registerNumber: "註冊線上申報平臺帳號", 87 + registerNumber: "Register a Fedex.com account",
88 userInfo: "用戶信息維護", 88 userInfo: "用戶信息維護",
89 logOut: "log out", 89 logOut: "log out",
90 logOutDia: "Are you sure to log out and exit the system?", 90 logOutDia: "Are you sure to log out and exit the system?",
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
108 selectTem: "選擇使用者", 108 selectTem: "選擇使用者",
109 insterTem: "新增使用者", 109 insterTem: "新增使用者",
110 updateTem: "修改使用者", 110 updateTem: "修改使用者",
111 - number: "提單號碼", 111 + number: "Waybill inquiry",
112 contacts: "聯絡人", 112 contacts: "聯絡人",
113 exporterNum: "貨物輸出統一編號", 113 exporterNum: "貨物輸出統一編號",
114 email: "聯絡人 e-mail", 114 email: "聯絡人 e-mail",
......
...@@ -72,6 +72,11 @@ ...@@ -72,6 +72,11 @@
72 {{ $t("layout.fedexRegister") }} 72 {{ $t("layout.fedexRegister") }}
73 </span> 73 </span>
74 </el-dropdown-item> 74 </el-dropdown-item>
75 + <el-dropdown-item>
76 + <span>
77 + {{ $t("layout.registerNumber") }}
78 + </span>
79 + </el-dropdown-item>
75 </el-dropdown-menu> 80 </el-dropdown-menu>
76 </el-dropdown> 81 </el-dropdown>
77 <!-- <el-select 82 <!-- <el-select
...@@ -156,7 +161,7 @@ export default { ...@@ -156,7 +161,7 @@ export default {
156 type: "warning", 161 type: "warning",
157 }).then(() => { 162 }).then(() => {
158 this.$store.dispatch("LogOut").then(() => { 163 this.$store.dispatch("LogOut").then(() => {
159 - location.href = "/IcTw"; 164 + location.href = "/ImpPer";
160 }); 165 });
161 }); 166 });
162 }, 167 },
......
1 <template> 1 <template>
2 <div class="view-option"> 2 <div class="view-option">
3 <div class="menu-info"> 3 <div class="menu-info">
4 - <span class="info" v-if="activeRoute.name == 'declarationInput'"> 4 + <span
5 - {{ $t("fillIn.number") }}:&nbsp;{{ deliveryNo || "" }} 5 + class="info"
6 + v-if="
7 + activeRoute.name == 'WaybillInquiry' ||
8 + activeRoute.name == 'UploadDetail'
9 + "
10 + >
11 + {{ $t("fillIn.number") }}
12 + <!-- :&nbsp;{{ deliveryNo || "" }} -->
6 </span> 13 </span>
7 <span class="info" v-else> 14 <span class="info" v-else>
8 {{ activeRoute.meta.title }} 15 {{ activeRoute.meta.title }}
...@@ -54,10 +61,10 @@ export default { ...@@ -54,10 +61,10 @@ export default {
54 font-size: 0.88rem; 61 font-size: 0.88rem;
55 border-bottom: 1px solid $fedexBorder; 62 border-bottom: 1px solid $fedexBorder;
56 background-color: #fff; 63 background-color: #fff;
57 - margin-left: 231px; 64 + margin-left: 230px;
58 65
59 .info { 66 .info {
60 - font-weight: 500; 67 + font-weight: 600;
61 } 68 }
62 } 69 }
63 </style> 70 </style>
......
...@@ -60,20 +60,20 @@ service.interceptors.response.use( ...@@ -60,20 +60,20 @@ service.interceptors.response.use(
60 const msg = errorCode[code] || res.data.msg || errorCode["default"]; 60 const msg = errorCode[code] || res.data.msg || errorCode["default"];
61 if (code === 301) { 61 if (code === 301) {
62 MessageBox.confirm( 62 MessageBox.confirm(
63 - "登錄狀態已過期，您可以繼續留在該頁面，或者重新登錄", 63 + "The login status has expired. You can continue to stay on this page or log in again.",
64 - "系統提示", 64 + "System prompt",
65 { 65 {
66 - confirmButtonText: "重新登錄", 66 + confirmButtonText: "Login again",
67 - cancelButtonText: "取消", 67 + cancelButtonText: "Close",
68 type: "warning", 68 type: "warning",
69 } 69 }
70 ).then(() => { 70 ).then(() => {
71 store.dispatch("FedLogOut").then(() => { 71 store.dispatch("FedLogOut").then(() => {
72 - location.href = "/IcTw"; 72 + location.href = "/ImpPer";
73 }); 73 });
74 }); 74 });
75 } else if (code === 500) { 75 } else if (code === 500) {
76 - MessageBox.alert(msg, "註意", { 76 + MessageBox.alert(msg, "Attention", {
77 dangerouslyUseHTMLString: true, 77 dangerouslyUseHTMLString: true,
78 }); 78 });
79 return Promise.reject(new Error(msg)); 79 return Promise.reject(new Error(msg));
...@@ -87,11 +87,11 @@ service.interceptors.response.use( ...@@ -87,11 +87,11 @@ service.interceptors.response.use(
87 console.log("err" + error); 87 console.log("err" + error);
88 let { message } = error; 88 let { message } = error;
89 if (message == "Network Error") { 89 if (message == "Network Error") {
90 - message = "系統異常，請聯繫清關部門"; 90 + message = "System exception, please contact the customs clearance department";
91 } else if (message.includes("timeout")) { 91 } else if (message.includes("timeout")) {
92 - message = "請求超時，請聯繫清關部門"; 92 + message = "Request timeout, please contact the customs clearance department";
93 } else if (message.includes("Request failed with status code")) { 93 } else if (message.includes("Request failed with status code")) {
94 - message = "系統接口" + message.substr(message.length - 3) + "異常，請聯繫清關部門"; 94 + message = "System interface abnormality" + message.substr(message.length - 3) + ",please contact the customs clearance department";
95 } 95 }
96 Message({ 96 Message({
97 message: message, 97 message: message,
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
1 -<template>
2 - <div class="fill-step">
3 - <!-- <div
4 - v-for="(item, index) in steps"
5 - :key="index"
6 - :class="
7 - item.state1 == curStep
8 - ? 'edit-color'
9 - : stepStates.includes(item.state2)
10 - ? setSelectIndex==2 && item.state1==2 ? 'cur-color':'finish-color'
11 - : 'cur-color'
12 - "
13 - >
14 -
15 - <div>
16 - <i
17 - class="el-icon-success"
18 - v-if="stepStates.includes(item.state2) && item.state1 != curStep "
19 - ></i>
20 - <i class="el-icon-success" v-else></i>
21 - <span> {{ item.label }}</span>
22 - </div>
23 - <div v-if="setSelectIndex==2 && item.state1==2"></div>
24 - <el-button
25 - type="text"
26 - v-else-if="stepStates.includes(item.state2) && item.state1 != curStep"
27 - @click="editStepBtn(item)"
28 - :loading="editLoading && curClickStep == item.state1"
29 - >編輯</el-button
30 - >
31 - </div> -->
32 - <div
33 - v-for="(item, index) in steps"
34 - :key="index"
35 - :class="item.state1 == curStep
36 - ? 'edit-color'
37 - : stepStates.includes(item.state2)
38 - ? setSelectIndex == 2 && item.state1 == 2 ? 'cur-color' : 'finish-color'
39 - : 'cur-color'
40 - "
41 - >
42 -
43 - <div>
44 - <i
45 - class="el-icon-success"
46 - v-if="stepStates.includes(item.state2) && item.state1 != curStep"
47 - ></i>
48 - <i class="el-icon-success" v-else></i>
49 - <span> {{ item.label }}</span>
50 - </div>
51 - <div v-if="setSelectIndex == 2 && item.state1 == 2"></div>
52 - <el-button
53 - type="text"
54 - v-else-if="stepEdit.includes(item.state2) && item.state1 != curStep"
55 - @click="editStepBtn(item)"
56 - :loading="editLoading && curClickStep == item.state1"
57 - :disabled="editDisabled"
58 - >編輯</el-button
59 - >
60 - </div>
61 - </div>
62 -</template>
63 -<script>
64 -import { mapGetters } from "vuex";
65 -export default {
66 - props: {
67 - curStep: {
68 - type: Number,
69 - default() {
70 - return 1;
71 - },
72 - },
73 - //控制颜色
74 - stepStates: {
75 - type: Array,
76 - default() {
77 - return [];
78 - },
79 - },
80 - //控制编辑按钮显示
81 - stepEdit: {
82 - type: Array,
83 - default() {
84 - return [];
85 - },
86 - },
87 - editLoading: {
88 - type: Boolean,
89 - default() {
90 - return false;
91 - },
92 - },
93 - editDisabled: {
94 - type: Boolean,
95 - default() {
96 - return false;
97 - },
98 - },
99 - setSelectIndex: {
100 - type: Number,
101 -
102 - },
103 - },
104 - data() {
105 - return {
106 - curClickStep: null,
107 - };
108 - },
109 - created() {},
110 - computed: {
111 - steps() {
112 - return [
113 - {
114 - label: this.$t("fillIn.step1"),
115 - state1: 1,
116 - state2: "finish1",
117 - },
118 - {
119 - label: this.$t("fillIn.step2"),
120 - state1: 2,
121 - state2: "finish2",
122 - },
123 - {
124 - label: this.$t("fillIn.step3"),
125 - state1: 3,
126 - state2: "finish3",
127 - },
128 - ];
129 - },
130 - },
131 - methods: {
132 - editStepBtn(val) {
133 - this.curClickStep = val.state1;
134 - let filtStep = this.stepStates.filter((item) => item != val.state2);
135 - this.$emit("setStepStates", [...new Set(filtStep)]);
136 - this.$emit("editNextStep", {
137 - curStep: val.state1,
138 - leaveStep: this.curStep,
139 - });
140 - },
141 - },
142 -};
143 -</script>
144 -
145 -<style lang="scss" scoped>
146 -.fill-step {
147 - padding: 16px 16px;
148 - line-height: 40px;
149 - // display: flex;
150 - // flex-direction: column
151 - .cur-color {
152 - display: flex;
153 - justify-content: space-between;
154 - color: #919191;
155 - }
156 - .edit-color {
157 - display: flex;
158 - justify-content: space-between;
159 - color: #4d148c;
160 - }
161 - .finish-color {
162 - display: flex;
163 - justify-content: space-between;
164 - font-weight: 500;
165 - font-size: 14px;
166 - color: #008a00;
167 - }
168 -}
169 -</style>
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
1 -<template>
2 - <el-dialog
3 - title="下載附件"
4 - :visible.sync="dialogVisible"
5 - width="50%"
6 - :show-close="true"
7 - class="detail-dialog"
8 - >
9 - <Table
10 - class="fedexDetialTable mt20"
11 - :data="tableData"
12 - :headerData="headerData"
13 - :selection="false"
14 - height="400px"
15 - :order="false"
16 - :border="false"
17 - :pagination="false"
18 - :selectFixed="false"
19 - :pageSizes="[20, 30, 50, 100]"
20 - @selectionChange="handleSelectionChange"
21 - :loading="tableLodaing"
22 - >
23 - <template v-slot:name="scope">
24 - <p> {{ scope.row.name }}{{ scope.row.type }}</p>
25 - </template>
26 - <template v-slot:down="scope">
27 - <el-button
28 - class="plain"
29 - size="mini"
30 - @click.native.stop="downLoadOneFile(scope.row)"
31 - :loading="scope.row.downloadLoading"
32 - >下載</el-button
33 - >
34 - </template>
35 - </Table>
36 - <div class="width-btn-box">
37 - <el-button
38 - class="entrySaveButton entrySaveButton-background"
39 - @click="batchDownloadBtn"
40 - style="margin-right: 30px;width: 110px;"
41 - :loading="allDownload"
42 - :disabled="this.tableData<=0"
43 - >
44 - 下載全部
45 - </el-button>
46 - <el-button class="entrySaveButton" style="width: 110px;" @click="closeDialog">取消</el-button>
47 - </div>
48 - </el-dialog>
49 -</template>
50 -<script>
51 -import { getFindSysByDeclareId } from "@/api/fillForm.js";
52 -import { downLoadZip,downLoadFile } from "@/utils/zipdownload";
53 -export default {
54 - components: {},
55 - props: {},
56 - data() {
57 - return {
58 - tableLodaing:false,
59 - allDownload:false,
60 - dialogVisible: false,
61 - declareId: null,
62 - tableData: [],
63 - headerData: [
64 - {
65 - name: "附件名稱",
66 - value: "name",
67 - width: "",
68 - align: "left",
69 - slot: true,
70 - },
71 - {
72 - name: "操作",
73 - value: "down",
74 - width: "100",
75 - align: "center",
76 - slot: true,
77 - },
78 - ],
79 - selectCheckList: [],
80 - customsFileId: null,
81 - };
82 - },
83 - methods: {
84 - // 打开弹窗
85 - openDialog(row) {
86 - this.dialogVisible = true;
87 - this.declareId = row.id;
88 - this.customsFileId = row.customsFileId;
89 - this.getUploadFileList();
90 - },
91 - // 关闭弹窗
92 - closeDialog() {
93 - this.dialogVisible = false;
94 - },
95 - // 选择下载的附件
96 - handleSelectionChange(val) {
97 - this.selectCheckList = val;
98 - },
99 - // 下载
100 - downLoadOneFile(fileRow) {
101 - fileRow.downloadLoading=true;
102 - downLoadFile(
103 - "/icleartw/cusFile/downLoadFile",
104 - fileRow.id,
105 - fileRow.name+ fileRow.type
106 - ).then(() => {
107 -
108 - this.$message.success("下載成功");
109 - this.exportLoading = false;
110 - })
111 - .catch(() => {
112 - this.exportLoading = false;
113 - }).finally(()=>{
114 - fileRow.downloadLoading = false;
115 - })
116 -
117 - },
118 - // 批量下载
119 - batchDownloadBtn() {
120 - this.allDownload=true;
121 - downLoadZip(
122 - "/icleartw/cusFile/downLoadCusFileAll",
123 - this.customsFileId,
124 - "附件"
125 - )
126 - .then(() => {
127 - this.allDownload = false;
128 - this.exportLoading = false;
129 - })
130 - .catch(() => {
131 - this.exportLoading = false;
132 - });
133 - },
134 - // 获取文件列表
135 - getUploadFileList() {
136 - this.tableData=[];
137 - this.tableLodaing=true;
138 - getFindSysByDeclareId(this.declareId).then((res) => {
139 - if (res.code == 200) {
140 - this.tableData = res.data;
141 - if (this.tableData != null) {
142 - this.tableData = this.tableData.map(item => {
143 - return {
144 - ...item,
145 - downloadLoading: false
146 - };
147 - });
148 - }
149 - }else{
150 - this.$message.error(res.msg);
151 - }
152 - }).catch((res)=>{
153 - this.$message.error(res.msg);
154 - }).finally(()=>{
155 - this.tableLodaing = false;
156 - })
157 - },
158 - },
159 -};
160 -</script>
161 -
162 -<style lang="scss" scoped>
163 -.detail-dialog {
164 - .title-box {
165 - font-size: 16px;
166 - font-weight: 600;
167 - // line-height: 22px;
168 - color: #000000;
169 - display: flex;
170 - justify-content: space-between;
171 - .el-button {
172 - padding: 0;
173 - font-size: 12px;
174 - }
175 - }
176 - .content {
177 - color: #333;
178 - font-size: 12px;
179 - .small-title {
180 - margin: 12px 0 4px 0;
181 - font-size: 14px;
182 - }
183 - .info-box {
184 - width: 100%;
185 - height: 50px;
186 - line-height: 17px;
187 - background: #f2f2f2;
188 - padding: 8px;
189 - margin-bottom: 4px;
190 - }
191 - }
192 - .download {
193 - .el-button {
194 - padding: 0;
195 - font-size: 12px;
196 - }
197 - img {
198 - vertical-align: -4px;
199 - }
200 - }
201 - ::v-deep .el-dialog {
202 - padding: 20px 100px;
203 - }
204 - ::v-deep .el-dialog__header {
205 - text-align: center;
206 - }
207 - .width-btn-box {
208 - width: 100%;
209 - text-align: center;
210 - margin-top: 16px;
211 - .el-button {
212 - width: 100px;
213 - }
214 - }
215 - ::v-deep .el-table__body-wrapper .el-table__body tbody tr {
216 - height: 50px;
217 - }
218 -}
219 -</style>
This diff is collapsed. Click to expand it.
1 -export const tableHeaderKeys = [
2 - {
3 - label: "提單號碼",
4 - prop: "deliveryNo",
5 - width: 150,
6 - align: "left",
7 - sort: false,
8 - },
9 - {
10 - label: "報單類別",
11 - prop: "customsDeclarationType",
12 - width: 150,
13 - align: "left",
14 - sort: false,
15 - },
16 - {
17 - label: "操作狀態/時間",
18 - prop: "operStatusAndTime1",
19 - width: 150,
20 - align: "left",
21 - tem: "operStatusAndTime1",
22 - sort: "custom",
23 - },
24 - {
25 - label: "傳送狀態/時間",
26 - prop: "delStatus",
27 - width: 150,
28 - align: "left",
29 - tem: "delStatus",
30 - sort: "custom",
31 -
32 - },
33 - {
34 - label: "是否適用在目的地進口清關",
35 - prop: "isClear",
36 - width: 150,
37 - align: "left",
38 - tem: "isClear",
39 - sort: false,
40 - },
41 - {
42 - label: "操作",
43 - prop: "opt",
44 - width: 150,
45 - align: "center",
46 - tem: "opt",
47 - sort: false,
48 - },
49 -];