jiaxing.zhou

feat(exportSummary): 添加汇总申请单详情功能

- 新增 getExportSummaryDetail API 接口
- 更新路由配置,将 summaryDetail 路由名称改为 SummaryDetail
- 修改 summaryDataSearch 组件,使用新的 SummaryDetail 路由名称
- 重构 summaryDetail 组件,适配新的汇总申请单详情数据结构
...@@ -32,3 +32,14 @@ export function getExportSummaryReceiptData(data){ ...@@ -32,3 +32,14 @@ export function getExportSummaryReceiptData(data){
32 method: 'get', 32 method: 'get',
33 }) 33 })
34 } 34 }
35 +
36 +/**
37 + * 获取汇总申请单详情
38 + * @param data.id 汇总申请单id
39 + */
40 +export function getExportSummaryDetail(data){
41 + return request({
42 + url: '/bus-customer/exportSummary/exportSummaryDetail/' + data.id,
43 + method: 'get',
44 + })
45 +}
......
...@@ -209,7 +209,7 @@ export const constantRoutes = [ ...@@ -209,7 +209,7 @@ export const constantRoutes = [
209 { 209 {
210 path: '/summaryDetail', 210 path: '/summaryDetail',
211 component: (resolve) => require(['@/views/summaryDetail/index'], resolve), 211 component: (resolve) => require(['@/views/summaryDetail/index'], resolve),
212 - name: 'summaryDetail', 212 + name: 'SummaryDetail',
213 hidden: true, 213 hidden: true,
214 meta: { title: '汇总申请单详情', icon: '' } 214 meta: { title: '汇总申请单详情', icon: '' }
215 } 215 }
......
...@@ -424,7 +424,7 @@ export default { ...@@ -424,7 +424,7 @@ export default {
424 //查询详情 424 //查询详情
425 view(val) { 425 view(val) {
426 this.$router.push({ 426 this.$router.push({
427 - name: "summaryDetail", 427 + name: "SummaryDetail",
428 params: { data: val }, 428 params: { data: val },
429 }); 429 });
430 }, 430 },
......
...@@ -62,6 +62,19 @@ ...@@ -62,6 +62,19 @@
62 </el-select> 62 </el-select>
63 </Formitem> 63 </Formitem>
64 </el-col> 64 </el-col>
65 + <el-col :span="3">
66 + <Formitem label="业务状态" prop="">
67 + <el-select
68 + type="text"
69 + id="inputInner--appType"
70 +
71 + clearable
72 + placeholder=""
73 + >
74 +
75 + </el-select>
76 + </Formitem>
77 + </el-col>
65 <!-- 汇总申请编号 --> 78 <!-- 汇总申请编号 -->
66 <el-col :span="3"> 79 <el-col :span="3">
67 <Formitem label="汇总申请编号" prop="sumNo"> 80 <Formitem label="汇总申请编号" prop="sumNo">
...@@ -77,7 +90,7 @@ ...@@ -77,7 +90,7 @@
77 </Formitem> 90 </Formitem>
78 </el-col> 91 </el-col>
79 <!-- 报关单位代码 --> 92 <!-- 报关单位代码 -->
80 - <el-col :span="6"> 93 + <el-col :span="3">
81 <Formitem label="报关单位代码" prop="declagAgentCode"> 94 <Formitem label="报关单位代码" prop="declagAgentCode">
82 <el-input 95 <el-input
83 type="text" 96 type="text"
...@@ -91,7 +104,7 @@ ...@@ -91,7 +104,7 @@
91 </Formitem> 104 </Formitem>
92 </el-col> 105 </el-col>
93 <!-- 报关单位名称 --> 106 <!-- 报关单位名称 -->
94 - <el-col :span="3"> 107 + <el-col :span="6">
95 <Formitem label="报关单位名称" prop="declAgentName"> 108 <Formitem label="报关单位名称" prop="declAgentName">
96 <el-input 109 <el-input
97 type="text" 110 type="text"
...@@ -104,8 +117,10 @@ ...@@ -104,8 +117,10 @@
104 ></el-input> 117 ></el-input>
105 </Formitem> 118 </Formitem>
106 </el-col> 119 </el-col>
120 + </el-row>
121 + <el-row :gutter="5">
107 <!-- 报送时间 --> 122 <!-- 报送时间 -->
108 - <el-col :span="6"> 123 + <el-col :span="3">
109 <Formitem label="报送时间" prop="appTime"> 124 <Formitem label="报送时间" prop="appTime">
110 <el-input 125 <el-input
111 type="text" 126 type="text"
...@@ -118,8 +133,6 @@ ...@@ -118,8 +133,6 @@
118 ></el-input> 133 ></el-input>
119 </Formitem> 134 </Formitem>
120 </el-col> 135 </el-col>
121 - </el-row>
122 - <el-row :gutter="5">
123 <!-- 申报企业代码 --> 136 <!-- 申报企业代码 -->
124 <el-col :span="3"> 137 <el-col :span="3">
125 <Formitem label="申报企业代码" prop="agentCode"> 138 <Formitem label="申报企业代码" prop="agentCode">
...@@ -163,7 +176,7 @@ ...@@ -163,7 +176,7 @@
163 </Formitem> 176 </Formitem>
164 </el-col> 177 </el-col>
165 <!-- 收发货人名称 --> 178 <!-- 收发货人名称 -->
166 - <el-col :span="6"> 179 + <el-col :span="3">
167 <Formitem label="收发货人名称" prop="ebcname"> 180 <Formitem label="收发货人名称" prop="ebcname">
168 <el-input 181 <el-input
169 type="text" 182 type="text"
...@@ -177,7 +190,7 @@ ...@@ -177,7 +190,7 @@
177 </Formitem> 190 </Formitem>
178 </el-col> 191 </el-col>
179 <!-- 汇总时间 --> 192 <!-- 汇总时间 -->
180 - <el-col :span="6"> 193 + <el-col :span="3">
181 <Formitem label="汇总时间" prop="startTime"> 194 <Formitem label="汇总时间" prop="startTime">
182 <el-input 195 <el-input
183 type="text" 196 type="text"
...@@ -191,7 +204,7 @@ ...@@ -191,7 +204,7 @@
191 </Formitem> 204 </Formitem>
192 </el-col> 205 </el-col>
193 <!-- 收发货人汇总标志 --> 206 <!-- 收发货人汇总标志 -->
194 - <el-col :span="9"> 207 + <el-col :span="3">
195 <Formitem label="收发货人汇总标志" prop="summaryFlag"> 208 <Formitem label="收发货人汇总标志" prop="summaryFlag">
196 <el-input 209 <el-input
197 type="text" 210 type="text"
...@@ -205,7 +218,7 @@ ...@@ -205,7 +218,7 @@
205 </Formitem> 218 </Formitem>
206 </el-col> 219 </el-col>
207 <!-- 按商品名汇总标志 --> 220 <!-- 按商品名汇总标志 -->
208 - <el-col :span="9"> 221 + <el-col :span="3">
209 <Formitem label="按商品名汇总标志" prop="itemNameFlag"> 222 <Formitem label="按商品名汇总标志" prop="itemNameFlag">
210 <el-input 223 <el-input
211 type="text" 224 type="text"
...@@ -218,8 +231,10 @@ ...@@ -218,8 +231,10 @@
218 ></el-input> 231 ></el-input>
219 </Formitem> 232 </Formitem>
220 </el-col> 233 </el-col>
234 + </el-row>
235 + <el-row :gutter="5">
221 <!-- 监管场所代码 --> 236 <!-- 监管场所代码 -->
222 - <el-col :span="9"> 237 + <el-col :span="3">
223 <Formitem label="监管场所代码" prop="loctNo"> 238 <Formitem label="监管场所代码" prop="loctNo">
224 <el-input 239 <el-input
225 type="text" 240 type="text"
...@@ -233,7 +248,7 @@ ...@@ -233,7 +248,7 @@
233 </Formitem> 248 </Formitem>
234 </el-col> 249 </el-col>
235 <!-- 申报地海关代码 --> 250 <!-- 申报地海关代码 -->
236 - <el-col :span="9"> 251 + <el-col :span="3">
237 <Formitem label="申报地海关代码" prop="customsCode"> 252 <Formitem label="申报地海关代码" prop="customsCode">
238 <el-input 253 <el-input
239 type="text" 254 type="text"
...@@ -247,7 +262,7 @@ ...@@ -247,7 +262,7 @@
247 </Formitem> 262 </Formitem>
248 </el-col> 263 </el-col>
249 <!-- 报文总数 --> 264 <!-- 报文总数 -->
250 - <el-col :span="9"> 265 + <el-col :span="3">
251 <Formitem label="报文总数" prop="msgCount"> 266 <Formitem label="报文总数" prop="msgCount">
252 <el-input 267 <el-input
253 type="text" 268 type="text"
...@@ -261,7 +276,7 @@ ...@@ -261,7 +276,7 @@
261 </Formitem> 276 </Formitem>
262 </el-col> 277 </el-col>
263 <!-- 报文序号 --> 278 <!-- 报文序号 -->
264 - <el-col :span="9"> 279 + <el-col :span="3">
265 <Formitem label="报文序号" prop="msgSeqNo"> 280 <Formitem label="报文序号" prop="msgSeqNo">
266 <el-input 281 <el-input
267 type="text" 282 type="text"
...@@ -275,7 +290,7 @@ ...@@ -275,7 +290,7 @@
275 </Formitem> 290 </Formitem>
276 </el-col> 291 </el-col>
277 <!-- 入库时间 --> 292 <!-- 入库时间 -->
278 - <el-col :span="9"> 293 + <el-col :span="3">
279 <Formitem label="入库时间" prop="createTime"> 294 <Formitem label="入库时间" prop="createTime">
280 <el-input 295 <el-input
281 type="text" 296 type="text"
...@@ -333,7 +348,7 @@ ...@@ -333,7 +348,7 @@
333 <script> 348 <script>
334 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; 349 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
335 import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 350 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
336 -import { getOrderDetailData } from "@/api/exportDetail-api.js"; 351 +import { getExportSummaryDetail } from "@/api/exportSummary-api.js";
337 export default { 352 export default {
338 name: "", 353 name: "",
339 components: { ProductDetailTable, ReceiptInfoTable }, 354 components: { ProductDetailTable, ReceiptInfoTable },
...@@ -371,64 +386,14 @@ export default { ...@@ -371,64 +386,14 @@ export default {
371 align: "left", 386 align: "left",
372 }, 387 },
373 { 388 {
374 - name: "企业商品货号", 389 + name: "清单编号",
375 - value: "itemNo", 390 + value: "invtNo",
376 - width: "",
377 - align: "left",
378 - },
379 - {
380 - name: "商品企业商品名称",
381 - value: "itemName",
382 - width: "",
383 - align: "left",
384 - },
385 - {
386 - name: "企业商品描述",
387 - value: "itemDescribe",
388 - width: "",
389 - align: "left",
390 - },
391 - {
392 - name: "条码",
393 - value: "barCode",
394 - width: "",
395 - align: "left",
396 - },
397 - {
398 - name: "计量单位",
399 - value: "unit",
400 - width: "",
401 - align: "left",
402 - slot: true,
403 - },
404 - {
405 - name: "币制",
406 - value: "currency",
407 - width: "",
408 - align: "left",
409 - slot: true,
410 - },
411 - {
412 - name: "数量",
413 - value: "qty",
414 - width: "",
415 - align: "left",
416 - },
417 - {
418 - name: "单价",
419 - value: "price",
420 - width: "",
421 - align: "left",
422 - },
423 - {
424 - name: "总价",
425 - value: "totalPrice",
426 width: "", 391 width: "",
427 align: "left", 392 align: "left",
428 }, 393 },
429 { 394 {
430 - name: "备注", 395 + name: "录入时间",
431 - value: "note", 396 + value: "createTime",
432 width: "", 397 width: "",
433 align: "left", 398 align: "left",
434 }, 399 },
...@@ -450,12 +415,12 @@ export default { ...@@ -450,12 +415,12 @@ export default {
450 methods: { 415 methods: {
451 searchData() { 416 searchData() {
452 this.loadings.entryLoading = true; 417 this.loadings.entryLoading = true;
453 - getOrderDetailData({ orderId: this.id }) 418 + getExportSummaryDetail({ id: this.id })
454 .then((res) => { 419 .then((res) => {
455 if (res.code === "200") { 420 if (res.code === "200") {
456 - this.formData = res.data.exportOrder; 421 + this.formData = res.data.exportSummaryDetail;
457 - this.detailData = res.data.exportOrderProductList; 422 + this.detailData = res.data.products;
458 - this.logData = res.data.exportOrderReceiptList; 423 + this.logData = res.data.receipts;
459 this.detailData.forEach((item, idx) => { 424 this.detailData.forEach((item, idx) => {
460 item.index = idx; 425 item.index = idx;
461 }); 426 });
......