Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jiaxing.zhou
9af1d9f1 1 parent 1df1020d

feat(exportSummary): 新增汇总申请单查询功能 

- 添加提运单号、预录入编号、电商企业代码等查询条件
- 新增汇总时间、业务状态等筛选项
- 更新表格展示字段，包括电子口岸预录入编号、提运单号等
-集成新的 API searchExportSummaryList 用于获取汇总申请单数据
Inline Side-by-side
Showing 2 changed files with 176 additions and 75 deletions
import request from '@/utils/request'
/**
* 汇总申请单查询
* @param data.billNo 提运单号
* @param data.preNo 预录入编号
* @param data.agentCode 电商企业代码
* @param data.startTime 汇总开始时间
* @param data.endTime 汇总结束时间
* @param data.sumNo 汇总申请编号
* @param data.declagAgentCode 报关企业代码
* @param data.returnStatus 业务状态
* @param data.msgSeqNo 报文序号
* @param data.pageIndex 当前页码
* @param data.pageSize 分页最大数据量
*/
export function searchExportSummaryList(data){
return request({
url: '/bus-customer/exportSummary/exportSummaryList',
method: 'post',
data: data,
})
}
......@@ -8,56 +8,60 @@
size="small"
>
<el-row class="row-border">
<!-- 订单编号 -->
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="订单编号" prop="orderNo">
<FormTextareaInput
:formData="sreachFormData"
dataKey="orderNo"
@formChange="formChange"
/>
<Formitem label="提运单号" prop="billNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
resize="none"
v-model="sreachFormData.billNo"
clearable
placeholder=""
></el-input>
<!-- <FormTextareaInput-->
<!-- :formData="sreachFormData"-->
<!-- dataKey="billNo"-->
<!-- @formChange="formChange"-->
<!-- />-->
</Formitem>
</el-col>
<!-- 电商企业代码 -->
<!-- 预录入编号 -->
<el-col :span="5">
<Formitem label="电商企业代码" prop="ebccode">
<Formitem label="预录入编号" prop="preNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--ebccode"
id="inputInner--preNo"
resize="none"
v-model="sreachFormData.ebccode"
v-model="sreachFormData.preNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 回执状态 -->
<!-- 电商企业代码 -->
<el-col :span="5">
<Formitem label="回执状态" prop="returnStatus">
<el-select
<Formitem label="电商企业代码" prop="agentCode">
<el-input
type="text"
id="inputInner--returnStatus"
v-model="sreachFormData.returnStatus"
class="inputShadow"
id="inputInner--agentCode"
resize="none"
v-model="sreachFormData.agentCode"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in dictData.returnStatus"
:key="index"
:label="item.name"
:value="item.code"
></el-option>
</el-select>
></el-input>
</Formitem>
</el-col>
<!-- 创建时间 -->
<!-- 汇总时间 -->
<el-col :span="5">
<Formitem label="创建时间" prop="createTime" :activeType="true">
<Formitem label="汇总时间" prop="startTime" :activeType="true">
<el-date-picker
class="inputInner--createTime"
id="inputInner--createTime"
v-model="sreachFormData.createTime"
class="inputInner--startTime"
id="inputInner--startTime"
v-model="sreachFormData.startTime"
type="daterange"
format="yyyy-MM-dd"
prefix-icon="none"
......@@ -67,6 +71,7 @@
/>
</Formitem>
</el-col>
<!-- 查询 -->
<el-col :span="2">
<el-form-item class="textCenter">
<el-button
......@@ -78,6 +83,7 @@
></el-button>
</el-form-item>
</el-col>
<!-- 重置 -->
<el-col :span="2">
<el-form-item class="textCenter">
<el-button
......@@ -90,6 +96,83 @@
</el-button>
</el-form-item>
</el-col>
<!-- 汇总申请编号 -->
<el-col :span="5">
<Formitem label="汇总申请编号" prop="sumNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--sumNo"
resize="none"
v-model="sreachFormData.sumNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 报关企业代码 -->
<el-col :span="5">
<Formitem label="报关企业代码" prop="declagAgentCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--declagAgentCode"
resize="none"
v-model="sreachFormData.declagAgentCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 业务状态 -->
<el-col :span="5">
<Formitem label="业务状态" prop="returnStatus">
<el-select
type="text"
id="inputInner--returnStatus"
v-model="sreachFormData.returnStatus"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in dictData.returnStatus"
:key="index"
:label="item.name"
:value="item.code"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- 入库时间 -->
<!-- <el-col :span="5">-->
<!-- <Formitem label="入库时间" prop="startTime" :activeType="true">-->
<!-- <el-date-picker-->
<!-- class="inputInner&#45;&#45;startTime"-->
<!-- id="inputInner&#45;&#45;startTime"-->
<!-- v-model="sreachFormData.startTime"-->
<!-- type="daterange"-->
<!-- format="yyyy-MM-dd"-->
<!-- prefix-icon="none"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- @change="dateChange"-->
<!-- />-->
<!-- </Formitem>-->
<!-- </el-col>-->
<!-- 报文序号 -->
<el-col :span="5">
<Formitem label="报文序号" prop="msgSeqNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--msgSeqNo"
resize="none"
v-model="sreachFormData.msgSeqNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
</el-form>
<div class="optionButton">
......@@ -156,16 +239,24 @@ import {
getAllExportingBills,
getOrderReceiptData,
} from "@/api/exportQuery.js";
import {
searchExportSummaryList
} from "@/api/exportSummary-api";
export default {
name: "ExportBillQuery",
data() {
return {
sreachFormData: {
orderNo: "",
ebccode: "",
billNo: "",
preNo: "",
agentCode: "",
sumNo: "",
declagAgentCode: "",
msgSeqNo: "",
returnStatus: "",
createTime: [],
receiptStatus: null,
receiptType: null,
},
page: {
pageIndex: 1,
......@@ -175,80 +266,67 @@ export default {
tableData: [],
headerData: [
{
name: "回执状态",
value: "returnStatus",
name: "电子口岸预录入编号",
value: "preNo",
width: "",
align: "left",
slot: true,
},
{
name: "订单编号",
value: "orderNo",
name: "提运单号",
value: "billNo",
width: "",
align: "left",
slot: true,
},
{
name: "订单类型",
value: "orderType",
width: "",
align: "left",
},
{
name: "电商企业代码",
value: "ebccode",
width: "",
align: "left",
},
{
name: "电商企业",
value: "ebcname",
width: "",
align: "left",
},
{
name: "电商平台名称",
value: "ebpname",
name: "汇总申请单编号",
value: "sumNo",
width: "",
align: "left",
slot: true,
},
{
name: "创建时间",
value: "createTime",
name: "申报企业代码",
value: "agentCode",
width: "",
align: "left",
slot: true,
},
{
name: "申报企业",
value: "declaringEnterprise",
name: "申报企业名称",
value: "agentName",
width: "",
align: "left",
slot: true,
},
{
name: "申报类型",
value: "declaringType",
name: "收发货人代码",
value: "ebccode",
width: "",
align: "left",
slot: true,
},
],
receiptDataHead: [
{
name: "回执状态",
value: "receiptStatus",
name: "收发货人名称",
value: "ebcname",
width: "",
align: "left",
slot: true,
},
{
name: "状态时间",
value: "statusTime",
name: "汇总时间",
value: "startTime"+"~"+"endTime",
width: "",
align: "left",
slot: true,
},
{
name: "回执描述",
value: "receiptDescription",
name: "收发货人汇总标志",
value:"summaryFlag",
width: "",
align: "left",
slot: true,
},
],
dictData: {
......@@ -286,13 +364,13 @@ export default {
let obj = this.sreachFormData;
obj.pageIndex = this.page.pageIndex;
obj.pageSize = this.page.pageSize;
obj.createTimeStart = "";
obj.createTimeEnd = "";
obj.startTime = "";
obj.endTime = "";
if (obj.createTime.length > 0) {
obj.createTimeStart = obj.createTime[0];
obj.createTimeEnd = obj.createTime[1];
obj.createTime = obj.createTime[0];
obj.endTime = obj.createTime[1];
}
getAllExportingBills(obj)
searchExportSummaryList(obj)
.then((res) => {
if (res.code === "200") {
this.tableData = res.data.value;
......