Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
EcomWeb
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
zhanbo.xu
2025-04-01 15:40:55 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
06a93630304b962955f3a9ea8c43d3c4232afa75
06a93630
2 parents
9dd3e040
243f0c3e
Merge branch 'release-v1.0.9.1' into release-v1.0.9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
18 deletions
src/views/customerConfig/dialog.vue
src/views/reportingData/index.vue
src/views/customerConfig/dialog.vue
View file @
06a9363
...
...
@@ -72,7 +72,7 @@
<!-- 1.0.9 -->
<!-- 电商平台代码:、电商平台名称:、收发货人代码:、收发货人名称:、生产销售企业代码:、生产销售企业名称: -->
<!-- 证书到期时间: -->
<el-row :gutter="5">
<el-row :gutter="5"
v-if="0"
>
<el-col :span="8">
<Formitem label="电商平台代码" prop="ebpcode" type="edit">
<el-input
...
...
@@ -117,7 +117,7 @@
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<el-row :gutter="5"
v-if="0"
>
<el-col :span="8">
<Formitem
label="收发货人名称"
...
...
@@ -223,7 +223,10 @@
<div class="dlTitle">青岛</div>
<el-row :gutter="5">
<!-- 公服DXPID -->
<el-col :span="8">
<el-col
:span="8"
v-if="portConfig.TAO.orderDeclareChannel != 'SHANDONG_SINGLE'"
>
<Formitem label="公服DXPID" prop="qingdaoUserDxpid" type="edit">
<el-input
type="text"
...
...
@@ -237,7 +240,10 @@
</Formitem>
</el-col>
<!-- User ID -->
<el-col :span="8">
<el-col
:span="8"
v-if="portConfig.TAO.orderDeclareChannel != 'SHANDONG_SINGLE'"
>
<Formitem label="User ID" prop="qingdaoUserId" type="edit">
<el-input
type="text"
...
...
@@ -251,7 +257,10 @@
</Formitem>
</el-col>
<!-- Key -->
<el-col :span="8">
<el-col
:span="8"
v-if="portConfig.TAO.orderDeclareChannel != 'SHANDONG_SINGLE'"
>
<Formitem label="Key" prop="qingdaoKey" type="edit">
<el-input
type="text"
...
...
@@ -265,7 +274,12 @@
</Formitem>
</el-col>
<!-- </div>-->
<el-col :span="8">
<el-col
:span="8"
v-if="
portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
"
>
<Formitem
label="山电DXPID"
prop="qingdaoDanyiUserDxpid"
...
...
@@ -282,7 +296,12 @@
></el-input>
</Formitem>
</el-col>
<el-col :span="8">
<el-col
:span="8"
v-if="
portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
"
>
<Formitem label="山电用户名" prop="qingdaoUserName" type="edit">
<el-input
type="text"
...
...
@@ -295,7 +314,12 @@
></el-input>
</Formitem>
</el-col>
<el-col :span="8">
<el-col
:span="8"
v-if="
portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
"
>
<Formitem
label="山电用户密码"
prop="qingdaoUserPassword"
...
...
@@ -359,7 +383,13 @@
</Formitem>
</el-col>
<el-col :span="16" style="padding-right: 5px">
<el-col
:span="16"
style="padding-right: 5px"
v-if="
portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
"
>
<div class="uploadItem">
<div class="uploadbox">
<el-button
...
...
src/views/reportingData/index.vue
View file @
06a9363
...
...
@@ -458,7 +458,6 @@ import {
arrivalInReceipt,
exportDeclareData,
} from "@/api/declareData-api.js";
import { getDictData } from "@/api/system/dict-api.js";
import DialogVue from "./dialog.vue";
import RevokeDialog from "./revokeDialog.vue";
import TemplateDownloadDialog from "./templateDownloadDialog.vue";
...
...
@@ -562,14 +561,14 @@ export default {
align: "left",
slot: true,
},
{
// release-v1.0.9
name: "运抵单回执",
value: "arrivalInReceiptStatus",
width: "",
align: "left",
slot: true,
},
//
{
//
// release-v1.0.9
//
name: "运抵单回执",
//
value: "arrivalInReceiptStatus",
//
width: "",
//
align: "left",
//
slot: true,
//
},
{
name: "离境单回执",
value: "logisticsReceiptStatus",
...
...
Please
register
or
login
to post a comment