Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
9536206e 1 parent 5a8460ea

fix: 修复BUG

Inline Side-by-side
Showing 12 changed files with 87 additions and 95 deletions
...@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomDemo' ...@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomDemo'
17 VUE_APP_APIVERSION = 'BD6DBD063F5AB7394879E3C08781CD72.A3889C390C14952AD666ABC3BE46BE40' 17 VUE_APP_APIVERSION = 'BD6DBD063F5AB7394879E3C08781CD72.A3889C390C14952AD666ABC3BE46BE40'
18 18
19 #iclearEmp系统地址 19 #iclearEmp系统地址
20 -VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login' 20 +# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
21 #Fcl登录地址 21 #Fcl登录地址
22 -VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' 22 +# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
23 #图文版使用指南 23 #图文版使用指南
24 -VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf' 24 +# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
25 #视频版使用指南 25 #视频版使用指南
26 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' 26 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
27 #隐私政策 27 #隐私政策
...@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem ...@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
37 #京ICP 37 #京ICP
38 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' 38 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
39 39
40 -VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
41 -VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
42 -VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
43 -VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
44 -VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
45 -VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
40 +# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
41 +# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
42 +# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
43 +# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
44 +# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
45 +# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -19,11 +19,11 @@ VUE_APP_APIVERSION = 'BFEDDF560FF988C07141DF6135A9BFCF.A3889C390C14952AD666ABC3B ...@@ -19,11 +19,11 @@ VUE_APP_APIVERSION = 'BFEDDF560FF988C07141DF6135A9BFCF.A3889C390C14952AD666ABC3B
19 VUE_CLI_BABEL_TRANSPILE_MODULES = true 19 VUE_CLI_BABEL_TRANSPILE_MODULES = true
20 20
21 #iclearEmp系统地址 21 #iclearEmp系统地址
22 -VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login' 22 +# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
23 #Fcl登录地址 23 #Fcl登录地址
24 -VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' 24 +# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
25 #图文版使用指南 25 #图文版使用指南
26 -VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf' 26 +# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
27 #视频版使用指南 27 #视频版使用指南
28 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' 28 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
29 #隐私政策 29 #隐私政策
...@@ -39,9 +39,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem ...@@ -39,9 +39,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
39 #京ICP 39 #京ICP
40 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' 40 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
41 41
42 -VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
43 -VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
44 -VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
45 -VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
46 -VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
47 -VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
42 +# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
43 +# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
44 +# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
45 +# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
46 +# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
47 +# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomDev' ...@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomDev'
17 VUE_APP_APIVERSION = 'BFEDDF560FF988C07141DF6135A9BFCF.A3889C390C14952AD666ABC3BE46BE40' 17 VUE_APP_APIVERSION = 'BFEDDF560FF988C07141DF6135A9BFCF.A3889C390C14952AD666ABC3BE46BE40'
18 18
19 #iclearEmp系统地址 19 #iclearEmp系统地址
20 -VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login' 20 +# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
21 #Fcl登录地址 21 #Fcl登录地址
22 -VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' 22 +# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
23 #图文版使用指南 23 #图文版使用指南
24 -VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf' 24 +# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
25 #视频版使用指南 25 #视频版使用指南
26 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' 26 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
27 #隐私政策 27 #隐私政策
...@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem ...@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
37 #京ICP 37 #京ICP
38 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' 38 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
39 39
40 -VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
41 -VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
42 -VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
43 -VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
44 -VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
45 -VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
40 +# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
41 +# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
42 +# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
43 +# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
44 +# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
45 +# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom' ...@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom'
17 VUE_APP_APIVERSION = 'D5B582ED9ED4002BF2BCB386A68519CF.A3889C390C14952AD666ABC3BE46BE40' 17 VUE_APP_APIVERSION = 'D5B582ED9ED4002BF2BCB386A68519CF.A3889C390C14952AD666ABC3BE46BE40'
18 18
19 #iclearEmp系统地址 19 #iclearEmp系统地址
20 -VUE_APP_REDIRECT_EMP = 'https://iclearexpuat.fedex.com.cn/Emp/#/login' 20 +# VUE_APP_REDIRECT_EMP = 'https://iclearexpuat.fedex.com.cn/Emp/#/login'
21 #Fcl登录地址 21 #Fcl登录地址
22 -VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' 22 +# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
23 #图文版使用指南 23 #图文版使用指南
24 -VUE_APP_FEDEX_HANDBOOK = 'https://iclearexpuat.fedex.com.cn/Exp/manager-server/FedEx.pdf' 24 +# VUE_APP_FEDEX_HANDBOOK = 'https://iclearexpuat.fedex.com.cn/Exp/manager-server/FedEx.pdf'
25 #视频版使用指南 25 #视频版使用指南
26 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' 26 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
27 #隐私政策 27 #隐私政策
...@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem ...@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
37 #京ICP 37 #京ICP
38 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' 38 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
39 39
40 -VUE_APP_BASE_API_dev = 'https://iclearexpuat.fedex.com.cn/Exp'
41 -VUE_APP_BASE_API_test = 'https://iclearexpuat.fedex.com.cn/Exp'
42 -VUE_APP_BASE_API_demo = 'https://iclearexpuat.fedex.com.cn/Exp'
43 -VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
44 -VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
45 -VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
40 +# VUE_APP_BASE_API_dev = 'https://iclearexpuat.fedex.com.cn/Exp'
41 +# VUE_APP_BASE_API_test = 'https://iclearexpuat.fedex.com.cn/Exp'
42 +# VUE_APP_BASE_API_demo = 'https://iclearexpuat.fedex.com.cn/Exp'
43 +# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
44 +# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
45 +# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -3,9 +3,6 @@ ENV = 'production' ...@@ -3,9 +3,6 @@ ENV = 'production'
3 3
4 VUE_APP_BASE_ENV = "prod" 4 VUE_APP_BASE_ENV = "prod"
5 5
6 -# FedEx 在线申报工具/生产环境
7 -VUE_APP_BASE_API = '/prod-api'
8 -
9 VUE_APP_Version = '1.0.0' 6 VUE_APP_Version = '1.0.0'
10 7
11 #测试环境 8 #测试环境
...@@ -19,11 +16,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom' ...@@ -19,11 +16,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom'
19 VUE_APP_APIVERSION = 'C8074BB318FB85693233E64ACC64C1ED.A3889C390C14952AD666ABC3BE46BE40' 16 VUE_APP_APIVERSION = 'C8074BB318FB85693233E64ACC64C1ED.A3889C390C14952AD666ABC3BE46BE40'
20 17
21 #iclearEmp系统地址 18 #iclearEmp系统地址
22 -VUE_APP_REDIRECT_EMP = 'https://declaration.fedex.com.cn/Emp/#/login' 19 +# VUE_APP_REDIRECT_EMP = 'https://declaration.fedex.com.cn/Emp/#/login'
23 #Fcl登录地址 20 #Fcl登录地址
24 -VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' 21 +# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
25 #图文版使用指南 22 #图文版使用指南
26 -VUE_APP_FEDEX_HANDBOOK = 'https://declaration.fedex.com.cn/Exp/manager-server/FedEx.pdf' 23 +# VUE_APP_FEDEX_HANDBOOK = 'https://declaration.fedex.com.cn/Exp/manager-server/FedEx.pdf'
27 #视频版使用指南 24 #视频版使用指南
28 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' 25 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
29 #隐私政策 26 #隐私政策
...@@ -39,9 +36,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem ...@@ -39,9 +36,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
39 #京ICP 36 #京ICP
40 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' 37 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
41 38
42 -VUE_APP_BASE_API_dev = 'https://declaration.fedex.com.cn/Exp' 39 +# VUE_APP_BASE_API_dev = 'https://declaration.fedex.com.cn/Exp'
43 -VUE_APP_BASE_API_test = 'https://declaration.fedex.com.cn/Exp' 40 +# VUE_APP_BASE_API_test = 'https://declaration.fedex.com.cn/Exp'
44 -VUE_APP_BASE_API_demo = 'https://declaration.fedex.com.cn/Exp' 41 +# VUE_APP_BASE_API_demo = 'https://declaration.fedex.com.cn/Exp'
45 -VUE_APP_BASE_API_uat = 'https://declaration.fedex.com.cn/Exp' 42 +# VUE_APP_BASE_API_uat = 'https://declaration.fedex.com.cn/Exp'
46 -VUE_APP_BASE_API_pre = 'https://declaration.fedex.com.cn/Exp' 43 +# VUE_APP_BASE_API_pre = 'https://declaration.fedex.com.cn/Exp'
47 -VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp' 44 +# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
......
...@@ -18,11 +18,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomTest' ...@@ -18,11 +18,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomTest'
18 VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40' 18 VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40'
19 19
20 #iclearEmp系统地址 20 #iclearEmp系统地址
21 -VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login' 21 +# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
22 #Fcl登录地址 22 #Fcl登录地址
23 -VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' 23 +# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
24 #图文版使用指南 24 #图文版使用指南
25 -VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf' 25 +# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
26 #视频版使用指南 26 #视频版使用指南
27 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' 27 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
28 #隐私政策 28 #隐私政策
...@@ -38,9 +38,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem ...@@ -38,9 +38,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
38 #京ICP 38 #京ICP
39 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' 39 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
40 40
41 -VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
42 -VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
43 -VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
44 -VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
45 -VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
46 -VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
41 +# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
42 +# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
43 +# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
44 +# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
45 +# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
46 +# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -20,11 +20,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom' ...@@ -20,11 +20,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom'
20 VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40' 20 VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40'
21 21
22 #iclearEmp系统地址 22 #iclearEmp系统地址
23 -VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login' 23 +# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
24 #Fcl登录地址 24 #Fcl登录地址
25 -VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward' 25 +# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
26 #图文版使用指南 26 #图文版使用指南
27 -VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf' 27 +# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
28 #视频版使用指南 28 #视频版使用指南
29 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4' 29 VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
30 #隐私政策 30 #隐私政策
...@@ -40,9 +40,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem ...@@ -40,9 +40,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
40 #京ICP 40 #京ICP
41 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery' 41 VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
42 42
43 -VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
44 -VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
45 -VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
46 -VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
47 -VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
48 -VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
43 +# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
44 +# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
45 +# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
46 +# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
47 +# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
48 +# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
...\ No newline at end of file ...\ No newline at end of file
......
1 { 1 {
2 - "name": "iCearExport", 2 + "name": "FedEx",
3 "version": "1.0.0", 3 "version": "1.0.0",
4 "description": "FedEx 在线申报工具", 4 "description": "FedEx 在线申报工具",
5 "author": "ICE", 5 "author": "ICE",
......
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
116 :data="tableData" 116 :data="tableData"
117 :headerData="headerData" 117 :headerData="headerData"
118 :height="tableMaxheight + 'px'" 118 :height="tableMaxheight + 'px'"
119 + :maxHeight="tableMaxheight + 'px'"
119 :border="true" 120 :border="true"
120 :pagination="true" 121 :pagination="true"
121 :order="false" 122 :order="false"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 <Formitem label="回执类型" prop="receiptType" type="edit"> 24 <Formitem label="回执类型" prop="receiptType" type="edit">
25 <el-select 25 <el-select
26 type="text" 26 type="text"
27 - id="inputInner--receiptType" 27 + id="inputInner-edit-receiptType"
28 v-model="formData.receiptType" 28 v-model="formData.receiptType"
29 clearable 29 clearable
30 filterable 30 filterable
...@@ -44,16 +44,17 @@ ...@@ -44,16 +44,17 @@
44 <Formitem label="订单编号" prop="orderNo" type="edit"> 44 <Formitem label="订单编号" prop="orderNo" type="edit">
45 <el-select 45 <el-select
46 type="text" 46 type="text"
47 - id="inputInner--orderNo" 47 + id="inputInner-edit-orderNo"
48 v-model="formData.orderNo" 48 v-model="formData.orderNo"
49 multiple 49 multiple
50 :remote="true" 50 :remote="true"
51 clearable 51 clearable
52 filterable 52 filterable
53 - reserve-keyword 53 + collapse-tags
54 :remote-method="remoteMethod" 54 :remote-method="remoteMethod"
55 placeholder="" 55 placeholder=""
56 @change="receiptXml" 56 @change="receiptXml"
57 + class="order-select-warp-ol"
57 > 58 >
58 <el-option 59 <el-option
59 v-for="item in orderNoList" 60 v-for="item in orderNoList"
...@@ -65,10 +66,10 @@ ...@@ -65,10 +66,10 @@
65 </Formitem> 66 </Formitem>
66 </el-col> 67 </el-col>
67 <el-col :span="8"> 68 <el-col :span="8">
68 - <Formitem label="回执状态" prop="receiptStatus"> 69 + <Formitem label="回执状态" prop="receiptStatus" type="edit">
69 <el-select 70 <el-select
70 type="text" 71 type="text"
71 - id="inputInner--receiptStatus" 72 + id="inputInner-edit-receiptStatus"
72 v-model="formData.receiptStatus" 73 v-model="formData.receiptStatus"
73 clearable 74 clearable
74 filterable 75 filterable
...@@ -77,7 +78,7 @@ ...@@ -77,7 +78,7 @@
77 > 78 >
78 <el-option 79 <el-option
79 v-for="item in receiptStatusList" 80 v-for="item in receiptStatusList"
80 - :key="item.value" 81 + :key="item.itemValue"
81 :label="item.itemChineseName" 82 :label="item.itemChineseName"
82 :value="item.itemValue" 83 :value="item.itemValue"
83 ></el-option> 84 ></el-option>
...@@ -282,27 +283,13 @@ export default { ...@@ -282,27 +283,13 @@ export default {
282 <style lang="scss" scoped> 283 <style lang="scss" scoped>
283 @import "@/assets/styles/variables.scss"; 284 @import "@/assets/styles/variables.scss";
284 285
285 -.menuTree { 286 +.fedexFormStyle {
286 - max-width: 350px; 287 + .order-select-warp-ol {
287 - max-height: 300px;
288 - overflow: auto;
289 - margin: 0 auto;
290 - border: 1px solid #999;
291 - padding: 10px;
292 -}
293 -.textarea-text {
294 - background-color: #f2f2f2;
295 - padding: 10px;
296 - .inputShadow {
297 - border: none;
298 - }
299 - .el-textarea__inner {
300 - border: none !important;
301 - }
302 ::v-deep { 288 ::v-deep {
303 - .el-textarea textarea { 289 + .el-select__input {
304 - border: none !important; 290 + width: 40px !important;
305 - background-color: #f2f2f2; 291 + padding-top: 0 !important;
292 + }
306 } 293 }
307 } 294 }
308 } 295 }
......
...@@ -207,7 +207,7 @@ export default { ...@@ -207,7 +207,7 @@ export default {
207 .catch((err) => { 207 .catch((err) => {
208 console.error(err); 208 console.error(err);
209 }); 209 });
210 - getDictData({ doctCode: "RECEIPT_STATUS" }) 210 + getDictData({ doctCode: "MOCK_RECEIPT_STATUS" })
211 .then((res) => { 211 .then((res) => {
212 if (res.code == "200") { 212 if (res.code == "200") {
213 this.receiptStatusList = res.data; 213 this.receiptStatusList = res.data;
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 <Formitem label="所属口岸" prop="portCode" type="edit"> 58 <Formitem label="所属口岸" prop="portCode" type="edit">
59 <el-select 59 <el-select
60 type="text" 60 type="text"
61 - id="inputInner--portCode" 61 + id="inputInner-edit-portCode"
62 v-model="formData.portCode" 62 v-model="formData.portCode"
63 clearable 63 clearable
64 filterable 64 filterable
...@@ -203,6 +203,13 @@ export default { ...@@ -203,6 +203,13 @@ export default {
203 message: "监管场所负责人不能为空！", 203 message: "监管场所负责人不能为空！",
204 }, 204 },
205 ], 205 ],
206 + portCode: [
207 + {
208 + required: true,
209 + trigger: "change",
210 + message: "所属口岸不能为空！",
211 + },
212 + ],
206 }, 213 },
207 214
208 searchForm: {}, 215 searchForm: {},
......