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'
VUE_APP_APIVERSION = 'BD6DBD063F5AB7394879E3C08781CD72.A3889C390C14952AD666ABC3BE46BE40'
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
......
......@@ -19,11 +19,11 @@ VUE_APP_APIVERSION = 'BFEDDF560FF988C07141DF6135A9BFCF.A3889C390C14952AD666ABC3B
VUE_CLI_BABEL_TRANSPILE_MODULES = true
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -39,9 +39,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
......
......@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomDev'
VUE_APP_APIVERSION = 'BFEDDF560FF988C07141DF6135A9BFCF.A3889C390C14952AD666ABC3BE46BE40'
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
......
......@@ -17,11 +17,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom'
VUE_APP_APIVERSION = 'D5B582ED9ED4002BF2BCB386A68519CF.A3889C390C14952AD666ABC3BE46BE40'
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'https://iclearexpuat.fedex.com.cn/Emp/#/login'
# VUE_APP_REDIRECT_EMP = 'https://iclearexpuat.fedex.com.cn/Emp/#/login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'https://iclearexpuat.fedex.com.cn/Exp/manager-server/FedEx.pdf'
# VUE_APP_FEDEX_HANDBOOK = 'https://iclearexpuat.fedex.com.cn/Exp/manager-server/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -37,9 +37,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_test = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_demo = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
# VUE_APP_BASE_API_dev = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_test = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_demo = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
......
......@@ -3,9 +3,6 @@ ENV = 'production'
VUE_APP_BASE_ENV = "prod"
# FedEx 在线申报工具/生产环境
VUE_APP_BASE_API = '/prod-api'
VUE_APP_Version = '1.0.0'
#测试环境
......@@ -19,11 +16,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom'
VUE_APP_APIVERSION = 'C8074BB318FB85693233E64ACC64C1ED.A3889C390C14952AD666ABC3BE46BE40'
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'https://declaration.fedex.com.cn/Emp/#/login'
# VUE_APP_REDIRECT_EMP = 'https://declaration.fedex.com.cn/Emp/#/login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'https://declaration.fedex.com.cn/Exp/manager-server/FedEx.pdf'
# VUE_APP_FEDEX_HANDBOOK = 'https://declaration.fedex.com.cn/Exp/manager-server/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -39,9 +36,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'https://declaration.fedex.com.cn/Exp'
VUE_APP_BASE_API_test = 'https://declaration.fedex.com.cn/Exp'
VUE_APP_BASE_API_demo = 'https://declaration.fedex.com.cn/Exp'
VUE_APP_BASE_API_uat = 'https://declaration.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://declaration.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
# VUE_APP_BASE_API_dev = 'https://declaration.fedex.com.cn/Exp'
# VUE_APP_BASE_API_test = 'https://declaration.fedex.com.cn/Exp'
# VUE_APP_BASE_API_demo = 'https://declaration.fedex.com.cn/Exp'
# VUE_APP_BASE_API_uat = 'https://declaration.fedex.com.cn/Exp'
# VUE_APP_BASE_API_pre = 'https://declaration.fedex.com.cn/Exp'
# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
......
......@@ -18,11 +18,11 @@ VUE_APP_BASE_LOGINOUT = '/EcomTest'
VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40'
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -38,9 +38,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
......
......@@ -20,11 +20,11 @@ VUE_APP_BASE_LOGINOUT = '/Ecom'
VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40'
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
# VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
# VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
# VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -40,9 +40,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
# VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
# VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
# VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
# VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
# VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
......
{
"name": "iCearExport",
"name": "FedEx",
"version": "1.0.0",
"description": "FedEx 在线申报工具",
"author": "ICE",
......
......@@ -116,6 +116,7 @@
:data="tableData"
:headerData="headerData"
:height="tableMaxheight + 'px'"
:maxHeight="tableMaxheight + 'px'"
:border="true"
:pagination="true"
:order="false"
......
......@@ -24,7 +24,7 @@
<Formitem label="回执类型" prop="receiptType" type="edit">
<el-select
type="text"
id="inputInner--receiptType"
id="inputInner-edit-receiptType"
v-model="formData.receiptType"
clearable
filterable
......@@ -44,16 +44,17 @@
<Formitem label="订单编号" prop="orderNo" type="edit">
<el-select
type="text"
id="inputInner--orderNo"
id="inputInner-edit-orderNo"
v-model="formData.orderNo"
multiple
:remote="true"
clearable
filterable
reserve-keyword
collapse-tags
:remote-method="remoteMethod"
placeholder=""
@change="receiptXml"
class="order-select-warp-ol"
>
<el-option
v-for="item in orderNoList"
......@@ -65,10 +66,10 @@
</Formitem>
</el-col>
<el-col :span="8">
<Formitem label="回执状态" prop="receiptStatus">
<Formitem label="回执状态" prop="receiptStatus" type="edit">
<el-select
type="text"
id="inputInner--receiptStatus"
id="inputInner-edit-receiptStatus"
v-model="formData.receiptStatus"
clearable
filterable
......@@ -77,7 +78,7 @@
>
<el-option
v-for="item in receiptStatusList"
:key="item.value"
:key="item.itemValue"
:label="item.itemChineseName"
:value="item.itemValue"
></el-option>
......@@ -282,27 +283,13 @@ export default {
<style lang="scss" scoped>
@import "@/assets/styles/variables.scss";
.menuTree {
max-width: 350px;
max-height: 300px;
overflow: auto;
margin: 0 auto;
border: 1px solid #999;
padding: 10px;
}
.textarea-text {
background-color: #f2f2f2;
padding: 10px;
.inputShadow {
border: none;
}
.el-textarea__inner {
border: none !important;
}
.fedexFormStyle {
.order-select-warp-ol {
::v-deep {
.el-textarea textarea {
border: none !important;
background-color: #f2f2f2;
.el-select__input {
width: 40px !important;
padding-top: 0 !important;
}
}
}
}
......
......@@ -207,7 +207,7 @@ export default {
.catch((err) => {
console.error(err);
});
getDictData({ doctCode: "RECEIPT_STATUS" })
getDictData({ doctCode: "MOCK_RECEIPT_STATUS" })
.then((res) => {
if (res.code == "200") {
this.receiptStatusList = res.data;
......
......@@ -58,7 +58,7 @@
<Formitem label="所属口岸" prop="portCode" type="edit">
<el-select
type="text"
id="inputInner--portCode"
id="inputInner-edit-portCode"
v-model="formData.portCode"
clearable
filterable
......@@ -203,6 +203,13 @@ export default {
message: "监管场所负责人不能为空！",
},
],
portCode: [
{
required: true,
trigger: "change",
message: "所属口岸不能为空！",
},
],
},
searchForm: {},
......