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-03-06 15:19:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
27eed66a8d4fa9bc1736963c5c48fc747f31e1bc
27eed66a
1 parent
95c15a1a
feat: 优化汇总申报信息编辑功能
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
177 additions
and
115 deletions
src/api/declareData-api.js
src/api/exportSummary-api.js
src/views/portConfig/dialog.vue
src/views/summaryEdit/index.vue
src/api/declareData-api.js
View file @
27eed66
import
request
from
'@/utils/request'
import
request
from
"@/utils/request"
;
const
baseUrl
=
process
.
env
.
VUE_APP_BASE_API
;
//接口地址
//获取自定义设置数据
...
...
@@ -15,10 +15,10 @@ const baseUrl = process.env.VUE_APP_BASE_API; //接口地址
*/
export
function
searchDeclareData
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/getDeclareDataList'
,
method
:
'post'
,
url
:
"/bus-customer/declareData/getDeclareDataList"
,
method
:
"post"
,
data
:
data
,
})
});
}
//申报数据导入
...
...
@@ -26,13 +26,13 @@ export function searchDeclareData(data) {
* @param multipartFile * 提运单号
*/
export
function
uploadDeclareData
(
data
)
{
let
formData
=
new
FormData
let
formData
=
new
FormData
();
formData
.
append
(
"multipartFile"
,
data
.
multipartFile
);
return
request
({
url
:
'/bus-customer/declareData/import'
,
method
:
'post'
,
url
:
"/bus-customer/declareData/import"
,
method
:
"post"
,
data
:
formData
,
})
});
}
//数据申报
...
...
@@ -42,13 +42,13 @@ export function uploadDeclareData(data) {
*/
export
function
declareDataUpload
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/'
+
data
.
type
,
method
:
'post'
,
data
:
{
url
:
"/bus-customer/declareData/"
+
data
.
type
,
method
:
"post"
,
data
:
{
cancellationReason
:
data
.
cancellationReason
,
declareIds
:
data
.
declareIds
declareIds
:
data
.
declareIds
,
},
})
});
}
//查询订单回执
...
...
@@ -57,10 +57,10 @@ export function declareDataUpload(data) {
*/
export
function
getOrderReceipt
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/orderReceipt'
,
method
:
'get'
,
url
:
"/bus-customer/declareData/orderReceipt"
,
method
:
"get"
,
params
:
data
,
})
});
}
//查看离境回执
...
...
@@ -69,23 +69,22 @@ export function getOrderReceipt(data) {
*/
export
function
getLogisticsReceipt
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/logisticsReceipt'
,
method
:
'get'
,
url
:
"/bus-customer/declareData/logisticsReceipt"
,
method
:
"get"
,
params
:
data
,
})
});
}
//查询清单回执
/**
* @param declareId * id
*/
export
function
getListReceipt
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/listReceipt'
,
method
:
'get'
,
url
:
"/bus-customer/declareData/listReceipt"
,
method
:
"get"
,
params
:
data
,
})
});
}
//查询清单总分单回执
...
...
@@ -94,10 +93,10 @@ export function getListReceipt(data) {
*/
export
function
getTotalReceipt
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/totalReceipt'
,
method
:
'get'
,
url
:
"/bus-customer/declareData/totalReceipt"
,
method
:
"get"
,
params
:
data
,
})
});
}
/**
* 查看物流回执
...
...
@@ -106,22 +105,22 @@ export function getTotalReceipt(data) {
*/
export
function
getWayBillReceipt
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/wayBillReceipt'
,
method
:
'get'
,
url
:
"/bus-customer/declareData/wayBillReceipt"
,
method
:
"get"
,
params
:
data
,
})
});
}
/**
* 查询总申报日志
* @param data id---->申报id
*/
export
function
getDeclarationLog
(
data
){
export
function
getDeclarationLog
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/getDeclarationLog/'
+
data
,
method
:
'get'
,
url
:
"/bus-customer/declareData/getDeclarationLog/"
+
data
,
method
:
"get"
,
params
:
data
,
})
})
;
}
/**
...
...
@@ -130,13 +129,12 @@ export function getDeclarationLog(data){
* @returns
*/
export
function
exportDeclareData
(
data
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
var
url
=
baseUrl
+
'/bus-customer/declareData/exportDeclareData'
;
var
url
=
baseUrl
+
"/bus-customer/declareData/exportDeclareData"
;
request
({
url
:
url
,
method
:
'post'
,
responseType
:
'blob'
,
// 确保响应类型为 blob
method
:
"post"
,
responseType
:
"blob"
,
// 确保响应类型为 blob
data
:
data
,
})
.
then
((
res
)
=>
{
...
...
@@ -147,7 +145,6 @@ export function exportDeclareData(data) {
aLink
.
click
();
document
.
body
.
removeChild
(
aLink
);
resolve
(
res
);
})
.
catch
((
err
)
=>
{
reject
(
err
);
...
...
@@ -158,51 +155,60 @@ export function exportDeclareData(data) {
//获取客户列表
export
function
getCustomerList
(
data
)
{
return
request
({
url
:
'/bus-customer/customers/getCustomerList'
,
method
:
'post'
,
data
:
{
"pageIndex"
:
1
,
"pageSize"
:
1000
,
url
:
"/bus-customer/customers/getCustomerList"
,
method
:
"post"
,
data
:
{
pageIndex
:
1
,
pageSize
:
1000
,
},
})
});
}
// /exportSummary/exportSummaryList
export
function
getNewCustomerList
(
data
)
{
return
request
({
url
:
"/bus-customer/exportSummary/get/customers"
,
method
:
"post"
,
data
:
{
pageIndex
:
1
,
pageSize
:
1000
,
...
data
,
},
});
}
//获取口岸表数据
export
function
getPortList
(
data
)
{
return
request
({
url
:
'/bus-customer/portInfo/getPortList'
,
method
:
'post'
,
data
:
{
"pageIndex"
:
1
,
"pageSize"
:
1000
,
url
:
"/bus-customer/portInfo/getPortList"
,
method
:
"post"
,
data
:
{
pageIndex
:
1
,
pageSize
:
1000
,
},
})
});
}
//获取申报信息
export
function
getDeclareData
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/get/'
+
data
.
declareId
,
method
:
'get'
,
url
:
"/bus-customer/declareData/get/"
+
data
.
declareId
,
method
:
"get"
,
params
:
data
,
})
});
}
//更新申报信息
export
function
updateDeclareData
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/update'
,
method
:
'post'
,
data
})
url
:
"/bus-customer/declareData/update"
,
method
:
"post"
,
data
,
});
}
//申报数据批量修改-航班号,运单号
export
function
bathDeclareDate
(
data
)
{
return
request
({
url
:
'/bus-customer/declareData/bathDeclareDate'
,
method
:
'post'
,
data
})
url
:
"/bus-customer/declareData/bathDeclareDate"
,
method
:
"post"
,
data
,
});
}
...
...
src/api/exportSummary-api.js
View file @
27eed66
import
request
from
'@/utils/request'
import
request
from
"@/utils/request"
;
/**
* 汇总申请单查询
...
...
@@ -14,46 +14,56 @@ import request from '@/utils/request'
* @param data.pageIndex 当前页码
* @param data.pageSize 分页最大数据量
*/
export
function
searchExportSummaryList
(
data
){
export
function
searchExportSummaryList
(
data
)
{
return
request
({
url
:
'/bus-customer/exportSummary/exportSummaryList'
,
method
:
'post'
,
url
:
"/bus-customer/exportSummary/exportSummaryList"
,
method
:
"post"
,
data
:
data
,
})
})
;
}
/**
* 查询汇总回执
* @param data.copNo 企业唯一编号
*/
export
function
getExportSummaryReceiptData
(
data
){
export
function
getExportSummaryReceiptData
(
data
)
{
return
request
({
url
:
'/bus-customer/exportSummary/receipt/'
+
data
.
copNo
,
method
:
'get'
,
})
url
:
"/bus-customer/exportSummary/receipt/"
+
data
.
copNo
,
method
:
"get"
,
})
;
}
/**
* 获取汇总申请单详情
* @param data.id 汇总申请单id
*/
export
function
getExportSummaryDetail
(
data
){
export
function
getExportSummaryDetail
(
data
)
{
return
request
({
url
:
'/bus-customer/exportSummary/exportSummaryDetail/'
+
data
.
id
,
method
:
'get'
,
})
url
:
"/bus-customer/exportSummary/exportSummaryDetail/"
+
data
.
id
,
method
:
"get"
,
})
;
}
/**
* 汇总申报
* @param data
* @returns {*}
*/
export
function
declareSummaryApplication
(
data
){
export
function
declareSummaryApplication
(
data
)
{
return
request
({
url
:
"/bus-customer/exportSummary/declare"
,
method
:
"post"
,
data
:
data
,
});
}
// POST
// /exportSummary/get/customers
// 根据条件获取可以汇总申报的企业
export
function
getCustomers
(
data
)
{
return
request
({
url
:
'/bus-customer/exportSummary/declare'
,
method
:
'post'
,
data
:
data
})
url
:
"/bus-customer/exportSummary/get/customers"
,
method
:
"post"
,
data
:
data
,
})
;
}
...
...
src/views/portConfig/dialog.vue
View file @
27eed66
...
...
@@ -127,6 +127,25 @@
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="8">
<Formitem
label="汇总申报地海关代码"
prop="exportPortCode"
type="edit"
>
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-exportPortCode"
resize="none"
v-model="formData.exportPortCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
</el-form>
</div>
<div class="dialogOption entrySave">
...
...
@@ -177,6 +196,7 @@ export default {
declarationUnitCompanyName: "",
dxpid: "",
portCode: "",
exportPortCode: "",
},
rules: {
portCode: [
...
...
@@ -244,6 +264,13 @@ export default {
message: "申报单位 (企业名称)不能为空!",
},
],
exportPortCode: [
{
required: true,
trigger: "blur",
message: "汇总申报地海关代码不能为空!",
},
],
},
loadings: {
dialogLoading: false,
...
...
@@ -348,6 +375,7 @@ export default {
declarationUnitCompanyName: "",
dxpid: "",
portCode: "",
exportPortCode: "",
};
this.$emit("close");
},
...
...
src/views/summaryEdit/index.vue
View file @
27eed66
...
...
@@ -23,6 +23,7 @@
clearable
filterable
placeholder=""
@change="searchUserData"
>
<el-option
v-for="(item, index) in portInfo"
...
...
@@ -54,24 +55,22 @@
</el-row>
<el-row :gutter="5" type="flex" justify="center">
<el-col :span="10">
<Formitem label="电商企业名称" prop="ebpcode">
<el-select
type="text"
id="inputInner--ebpcode"
v-model="formData.ebpcode"
clearable
filterable
placeholder=""
>
<el-option
v-for="(item, index) in ebcDataList"
:key="index"
:label="item.ecomEntName"
:value="item.ecomEntCode"
></el-option>
</el-select>
<Formitem label="创建时间" prop="time" :activeType="true">
<el-date-picker
class="inputInner--time"
id="inputInner--time"
v-model="formData.time"
type="daterange"
format="yyyy-MM-dd"
prefix-icon="none"
value-format="yyyy-MM-dd"
range-separator="至"
@change="dateChange"
style="background-color: #f2f2f2"
/>
</Formitem>
</el-col>
<el-col :span="10">
<Formitem label="申报方式" prop="declareType">
<el-select
...
...
@@ -93,19 +92,23 @@
</el-row>
<el-row :gutter="5" type="flex" justify="center">
<el-col :span="10">
<Formitem label="创建时间" prop="time" :activeType="true">
<el-date-picker
class="inputInner--time"
id="inputInner--time"
v-model="formData.time"
type="daterange"
format="yyyy-MM-dd"
prefix-icon="none"
value-format="yyyy-MM-dd"
range-separator="至"
@change="dateChange"
style="background-color: #f2f2f2"
/>
<Formitem label="电商企业名称" prop="ebpcode">
<el-select
type="text"
id="inputInner--ebpcode"
v-model="formData.ebpcode"
clearable
filterable
placeholder=""
@focus="getCustomerList"
>
<el-option
v-for="(item, index) in ebcDataList"
:key="index"
:label="item.ecomEntName"
:value="item.ecomEntCode"
></el-option>
</el-select>
</Formitem>
</el-col>
<el-col :span="5">
...
...
@@ -156,7 +159,7 @@
<script>
import { getCurrUserPortInfo } from "@/api/system/user.js";
import { getCustomerList } from "@/api/declareData-api.js";
import { get
New
CustomerList } from "@/api/declareData-api.js";
import { getDictData } from "@/api/system/dict-api.js";
import { declareSummaryApplication } from "@/api/exportSummary-api.js";
export default {
...
...
@@ -204,9 +207,15 @@ export default {
this.getCustomerList();
this.getSummaryFlag();
this.getItemNameFlag();
},
mounted() {
this.getDeclareType();
},
methods: {
searchUserData(val) {
this.formData.customsCode = val;
this.formData.ebpcode = "";
},
//获取当前用户的口岸信息
getCurrUserPortInfo() {
getCurrUserPortInfo()
...
...
@@ -221,10 +230,13 @@ export default {
},
//获取客户下拉列表数据
getCustomerList() {
getCustomerList()
let params = {
...this.formData,
};
getNewCustomerList(params)
.then((res) => {
if (res.code == 200) {
this.ebcDataList = res.data
.value
;
this.ebcDataList = res.data;
} else {
this.ebcDataList = [];
}
...
...
@@ -278,6 +290,7 @@ export default {
dateChange(val) {
this.formData.startTime = val[0] + " 00:00:00";
this.formData.endTime = val[1] + " 23:59:59";
this.formData.ebpcode = "";
},
getDeclareType() {
getDictData({
...
...
@@ -285,6 +298,11 @@ export default {
}).then((res) => {
if (res.code == 200) {
this.declareType = res.data;
console.log(res.data);
this.formData.declareType = this.declareType[0].itemValue;
this.$nextTick(() => {
this.$refs.editForm.clearValidate(["declareType"]);
});
} else {
this.declareType = [];
}
...
...
Please
register
or
login
to post a comment