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
1 +import request from '@/utils/request'
2 +
3 +/**
4 + * 汇总申请单查询
5 + * @param data.billNo 提运单号
6 + * @param data.preNo 预录入编号
7 + * @param data.agentCode 电商企业代码
8 + * @param data.startTime 汇总开始时间
9 + * @param data.endTime 汇总结束时间
10 + * @param data.sumNo 汇总申请编号
11 + * @param data.declagAgentCode 报关企业代码
12 + * @param data.returnStatus 业务状态
13 + * @param data.msgSeqNo 报文序号
14 + * @param data.pageIndex 当前页码
15 + * @param data.pageSize 分页最大数据量
16 + */
17 +export function searchExportSummaryList(data){
18 + return request({
19 + url: '/bus-customer/exportSummary/exportSummaryList',
20 + method: 'post',
21 + data: data,
22 + })
23 +}
...@@ -8,56 +8,60 @@ ...@@ -8,56 +8,60 @@
8 size="small" 8 size="small"
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 - <!-- 订单编号 --> 11 + <!-- 提运单号 -->
12 <el-col :span="5"> 12 <el-col :span="5">
13 - <Formitem label="订单编号" prop="orderNo"> 13 + <Formitem label="提运单号" prop="billNo">
14 - <FormTextareaInput 14 + <el-input
15 - :formData="sreachFormData" 15 + type="text"
16 - dataKey="orderNo" 16 + class="inputShadow"
17 - @formChange="formChange" 17 + id="inputInner--billNo"
18 - /> 18 + resize="none"
19 + v-model="sreachFormData.billNo"
20 + clearable
21 + placeholder=""
22 + ></el-input>
23 +<!-- <FormTextareaInput-->
24 +<!-- :formData="sreachFormData"-->
25 +<!-- dataKey="billNo"-->
26 +<!-- @formChange="formChange"-->
27 +<!-- />-->
19 </Formitem> 28 </Formitem>
20 </el-col> 29 </el-col>
21 - <!-- 电商企业代码 --> 30 + <!-- 预录入编号 -->
22 <el-col :span="5"> 31 <el-col :span="5">
23 - <Formitem label="电商企业代码" prop="ebccode"> 32 + <Formitem label="预录入编号" prop="preNo">
24 <el-input 33 <el-input
25 type="text" 34 type="text"
26 class="inputShadow" 35 class="inputShadow"
27 - id="inputInner--ebccode" 36 + id="inputInner--preNo"
28 resize="none" 37 resize="none"
29 - v-model="sreachFormData.ebccode" 38 + v-model="sreachFormData.preNo"
30 clearable 39 clearable
31 placeholder="" 40 placeholder=""
32 ></el-input> 41 ></el-input>
33 </Formitem> 42 </Formitem>
34 </el-col> 43 </el-col>
35 - <!-- 回执状态 --> 44 + <!-- 电商企业代码 -->
36 <el-col :span="5"> 45 <el-col :span="5">
37 - <Formitem label="回执状态" prop="returnStatus"> 46 + <Formitem label="电商企业代码" prop="agentCode">
38 - <el-select 47 + <el-input
39 type="text" 48 type="text"
40 - id="inputInner--returnStatus" 49 + class="inputShadow"
41 - v-model="sreachFormData.returnStatus" 50 + id="inputInner--agentCode"
51 + resize="none"
52 + v-model="sreachFormData.agentCode"
42 clearable 53 clearable
43 placeholder="" 54 placeholder=""
44 - > 55 + ></el-input>
45 - <el-option
46 - v-for="(item, index) in dictData.returnStatus"
47 - :key="index"
48 - :label="item.name"
49 - :value="item.code"
50 - ></el-option>
51 - </el-select>
52 </Formitem> 56 </Formitem>
53 </el-col> 57 </el-col>
54 - <!-- 创建时间 --> 58 + <!-- 汇总时间 -->
55 <el-col :span="5"> 59 <el-col :span="5">
56 - <Formitem label="创建时间" prop="createTime" :activeType="true"> 60 + <Formitem label="汇总时间" prop="startTime" :activeType="true">
57 <el-date-picker 61 <el-date-picker
58 - class="inputInner--createTime" 62 + class="inputInner--startTime"
59 - id="inputInner--createTime" 63 + id="inputInner--startTime"
60 - v-model="sreachFormData.createTime" 64 + v-model="sreachFormData.startTime"
61 type="daterange" 65 type="daterange"
62 format="yyyy-MM-dd" 66 format="yyyy-MM-dd"
63 prefix-icon="none" 67 prefix-icon="none"
...@@ -67,6 +71,7 @@ ...@@ -67,6 +71,7 @@
67 /> 71 />
68 </Formitem> 72 </Formitem>
69 </el-col> 73 </el-col>
74 + <!-- 查询 -->
70 <el-col :span="2"> 75 <el-col :span="2">
71 <el-form-item class="textCenter"> 76 <el-form-item class="textCenter">
72 <el-button 77 <el-button
...@@ -78,6 +83,7 @@ ...@@ -78,6 +83,7 @@
78 ></el-button> 83 ></el-button>
79 </el-form-item> 84 </el-form-item>
80 </el-col> 85 </el-col>
86 + <!-- 重置 -->
81 <el-col :span="2"> 87 <el-col :span="2">
82 <el-form-item class="textCenter"> 88 <el-form-item class="textCenter">
83 <el-button 89 <el-button
...@@ -90,6 +96,83 @@ ...@@ -90,6 +96,83 @@
90 </el-button> 96 </el-button>
91 </el-form-item> 97 </el-form-item>
92 </el-col> 98 </el-col>
99 + <!-- 汇总申请编号 -->
100 + <el-col :span="5">
101 + <Formitem label="汇总申请编号" prop="sumNo">
102 + <el-input
103 + type="text"
104 + class="inputShadow"
105 + id="inputInner--sumNo"
106 + resize="none"
107 + v-model="sreachFormData.sumNo"
108 + clearable
109 + placeholder=""
110 + ></el-input>
111 + </Formitem>
112 + </el-col>
113 + <!-- 报关企业代码 -->
114 + <el-col :span="5">
115 + <Formitem label="报关企业代码" prop="declagAgentCode">
116 + <el-input
117 + type="text"
118 + class="inputShadow"
119 + id="inputInner--declagAgentCode"
120 + resize="none"
121 + v-model="sreachFormData.declagAgentCode"
122 + clearable
123 + placeholder=""
124 + ></el-input>
125 + </Formitem>
126 + </el-col>
127 + <!-- 业务状态 -->
128 + <el-col :span="5">
129 + <Formitem label="业务状态" prop="returnStatus">
130 + <el-select
131 + type="text"
132 + id="inputInner--returnStatus"
133 + v-model="sreachFormData.returnStatus"
134 + clearable
135 + placeholder=""
136 + >
137 + <el-option
138 + v-for="(item, index) in dictData.returnStatus"
139 + :key="index"
140 + :label="item.name"
141 + :value="item.code"
142 + ></el-option>
143 + </el-select>
144 + </Formitem>
145 + </el-col>
146 + <!-- 入库时间 -->
147 +<!-- <el-col :span="5">-->
148 +<!-- <Formitem label="入库时间" prop="startTime" :activeType="true">-->
149 +<!-- <el-date-picker-->
150 +<!-- class="inputInner&#45;&#45;startTime"-->
151 +<!-- id="inputInner&#45;&#45;startTime"-->
152 +<!-- v-model="sreachFormData.startTime"-->
153 +<!-- type="daterange"-->
154 +<!-- format="yyyy-MM-dd"-->
155 +<!-- prefix-icon="none"-->
156 +<!-- value-format="yyyy-MM-dd"-->
157 +<!-- range-separator="至"-->
158 +<!-- @change="dateChange"-->
159 +<!-- />-->
160 +<!-- </Formitem>-->
161 +<!-- </el-col>-->
162 + <!-- 报文序号 -->
163 + <el-col :span="5">
164 + <Formitem label="报文序号" prop="msgSeqNo">
165 + <el-input
166 + type="text"
167 + class="inputShadow"
168 + id="inputInner--msgSeqNo"
169 + resize="none"
170 + v-model="sreachFormData.msgSeqNo"
171 + clearable
172 + placeholder=""
173 + ></el-input>
174 + </Formitem>
175 + </el-col>
93 </el-row> 176 </el-row>
94 </el-form> 177 </el-form>
95 <div class="optionButton"> 178 <div class="optionButton">
...@@ -156,16 +239,24 @@ import { ...@@ -156,16 +239,24 @@ import {
156 getAllExportingBills, 239 getAllExportingBills,
157 getOrderReceiptData, 240 getOrderReceiptData,
158 } from "@/api/exportQuery.js"; 241 } from "@/api/exportQuery.js";
159 - 242 +import {
243 + searchExportSummaryList
244 +} from "@/api/exportSummary-api";
160 export default { 245 export default {
161 name: "ExportBillQuery", 246 name: "ExportBillQuery",
162 data() { 247 data() {
163 return { 248 return {
164 sreachFormData: { 249 sreachFormData: {
165 - orderNo: "", 250 + billNo: "",
166 - ebccode: "", 251 + preNo: "",
252 + agentCode: "",
253 + sumNo: "",
254 + declagAgentCode: "",
255 + msgSeqNo: "",
167 returnStatus: "", 256 returnStatus: "",
168 createTime: [], 257 createTime: [],
258 + receiptStatus: null,
259 + receiptType: null,
169 }, 260 },
170 page: { 261 page: {
171 pageIndex: 1, 262 pageIndex: 1,
...@@ -175,80 +266,67 @@ export default { ...@@ -175,80 +266,67 @@ export default {
175 tableData: [], 266 tableData: [],
176 headerData: [ 267 headerData: [
177 { 268 {
178 - name: "回执状态", 269 + name: "电子口岸预录入编号",
179 - value: "returnStatus", 270 + value: "preNo",
180 width: "", 271 width: "",
181 align: "left", 272 align: "left",
182 slot: true, 273 slot: true,
183 }, 274 },
184 { 275 {
185 - name: "订单编号", 276 + name: "提运单号",
186 - value: "orderNo", 277 + value: "billNo",
187 width: "", 278 width: "",
188 align: "left", 279 align: "left",
189 slot: true, 280 slot: true,
190 }, 281 },
191 { 282 {
192 - name: "订单类型", 283 + name: "汇总申请单编号",
193 - value: "orderType", 284 + value: "sumNo",
194 - width: "",
195 - align: "left",
196 - },
197 - {
198 - name: "电商企业代码",
199 - value: "ebccode",
200 - width: "",
201 - align: "left",
202 - },
203 - {
204 - name: "电商企业",
205 - value: "ebcname",
206 - width: "",
207 - align: "left",
208 - },
209 - {
210 - name: "电商平台名称",
211 - value: "ebpname",
212 width: "", 285 width: "",
213 align: "left", 286 align: "left",
287 + slot: true,
214 }, 288 },
215 { 289 {
216 - name: "创建时间", 290 + name: "申报企业代码",
217 - value: "createTime", 291 + value: "agentCode",
218 width: "", 292 width: "",
219 align: "left", 293 align: "left",
294 + slot: true,
220 }, 295 },
221 { 296 {
222 - name: "申报企业", 297 + name: "申报企业名称",
223 - value: "declaringEnterprise", 298 + value: "agentName",
224 width: "", 299 width: "",
225 align: "left", 300 align: "left",
301 + slot: true,
226 }, 302 },
227 { 303 {
228 - name: "申报类型", 304 + name: "收发货人代码",
229 - value: "declaringType", 305 + value: "ebccode",
230 width: "", 306 width: "",
231 align: "left", 307 align: "left",
308 + slot: true,
232 }, 309 },
233 - ],
234 - receiptDataHead: [
235 { 310 {
236 - name: "回执状态", 311 + name: "收发货人名称",
237 - value: "receiptStatus", 312 + value: "ebcname",
238 width: "", 313 width: "",
239 align: "left", 314 align: "left",
315 + slot: true,
240 }, 316 },
241 { 317 {
242 - name: "状态时间", 318 + name: "汇总时间",
243 - value: "statusTime", 319 + value: "startTime"+"~"+"endTime",
244 width: "", 320 width: "",
245 align: "left", 321 align: "left",
322 + slot: true,
246 }, 323 },
247 { 324 {
248 - name: "回执描述", 325 + name: "收发货人汇总标志",
249 - value: "receiptDescription", 326 + value:"summaryFlag",
250 width: "", 327 width: "",
251 align: "left", 328 align: "left",
329 + slot: true,
252 }, 330 },
253 ], 331 ],
254 dictData: { 332 dictData: {
...@@ -286,13 +364,13 @@ export default { ...@@ -286,13 +364,13 @@ export default {
286 let obj = this.sreachFormData; 364 let obj = this.sreachFormData;
287 obj.pageIndex = this.page.pageIndex; 365 obj.pageIndex = this.page.pageIndex;
288 obj.pageSize = this.page.pageSize; 366 obj.pageSize = this.page.pageSize;
289 - obj.createTimeStart = ""; 367 + obj.startTime = "";
290 - obj.createTimeEnd = ""; 368 + obj.endTime = "";
291 if (obj.createTime.length > 0) { 369 if (obj.createTime.length > 0) {
292 - obj.createTimeStart = obj.createTime[0]; 370 + obj.createTime = obj.createTime[0];
293 - obj.createTimeEnd = obj.createTime[1]; 371 + obj.endTime = obj.createTime[1];
294 } 372 }
295 - getAllExportingBills(obj) 373 + searchExportSummaryList(obj)
296 .then((res) => { 374 .then((res) => {
297 if (res.code === "200") { 375 if (res.code === "200") {
298 this.tableData = res.data.value; 376 this.tableData = res.data.value;
......