Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
97dd0004 1 parent 93f6aab1

feat: 新增功能

Inline Side-by-side
Showing 6 changed files with 138 additions and 360 deletions
...@@ -95,7 +95,7 @@ export function getPvgListSearch(data) { ...@@ -95,7 +95,7 @@ export function getPvgListSearch(data) {
95 // GET 95 // GET
96 // /exportArrivalIn/pvg/info/{arrivalInId} 96 // /exportArrivalIn/pvg/info/{arrivalInId}
97 // 查询pvg运抵单详情 97 // 查询pvg运抵单详情
98 -export function getPvgArrivalInInfo(arrivalInId) { 98 +export function getPvgArrivalInInfo({ arrivalInId }) {
99 return request({ 99 return request({
100 url: `/bus-customer/exportArrivalIn/pvg/info/${arrivalInId}`, 100 url: `/bus-customer/exportArrivalIn/pvg/info/${arrivalInId}`,
101 method: "get", 101 method: "get",
...@@ -105,7 +105,7 @@ export function getPvgArrivalInInfo(arrivalInId) { ...@@ -105,7 +105,7 @@ export function getPvgArrivalInInfo(arrivalInId) {
105 // GET 105 // GET
106 // /exportArrivalIn/pvg/receipt/arrivalInId 106 // /exportArrivalIn/pvg/receipt/arrivalInId
107 // 获取运抵单回执 107 // 获取运抵单回执
108 -export function getPvgArrivalInReceipt(arrivalInId) { 108 +export function getPvgArrivalInReceipt({ arrivalInId }) {
109 return request({ 109 return request({
110 url: `/bus-customer/exportArrivalIn/pvg/receipt/${arrivalInId}`, 110 url: `/bus-customer/exportArrivalIn/pvg/receipt/${arrivalInId}`,
111 method: "get", 111 method: "get",
......
...@@ -215,6 +215,14 @@ export const constantRoutes = [ ...@@ -215,6 +215,14 @@ export const constantRoutes = [
215 meta: { title: "PVG订单详情", icon: "" }, 215 meta: { title: "PVG订单详情", icon: "" },
216 }, 216 },
217 { 217 {
218 + path: "/pvg-waybill-detail",
219 + component: (resolve) =>
220 + require(["@/views/pvgWaybill/detail.vue"], resolve),
221 + hidden: true,
222 + name: "PvgWaybillDetail",
223 + meta: { title: "PVG运单详情", icon: "" },
224 + },
225 + {
218 path: "/pvg-list-detail", 226 path: "/pvg-list-detail",
219 component: (resolve) => 227 component: (resolve) =>
220 require(["@/views/pvgList/detail.vue"], resolve), 228 require(["@/views/pvgList/detail.vue"], resolve),
...@@ -223,12 +231,12 @@ export const constantRoutes = [ ...@@ -223,12 +231,12 @@ export const constantRoutes = [
223 meta: { title: "PVG清单详情", icon: "" }, 231 meta: { title: "PVG清单详情", icon: "" },
224 }, 232 },
225 { 233 {
226 - path: "/pvg-waybill-detail", 234 + path: "/pvg-arrival-detail",
227 component: (resolve) => 235 component: (resolve) =>
228 - require(["@/views/pvgWaybill/detail.vue"], resolve), 236 + require(["@/views/pvgArrivalIn/detail.vue"], resolve),
229 hidden: true, 237 hidden: true,
230 - name: "PvgWaybillDetail", 238 + name: "PvgArrivalInDetail",
231 - meta: { title: "PVG运单详情", icon: "" }, 239 + meta: { title: "PVG运抵单详情", icon: "" },
232 }, 240 },
233 ], 241 ],
234 }, 242 },
......
1 <template> 1 <template>
2 <div class="entry" v-loading="loadings.entryLoading"> 2 <div class="entry" v-loading="loadings.entryLoading">
3 <div class="entryTitle"> 3 <div class="entryTitle">
4 - <div>出口订单详情</div> 4 + <div>PVG运抵单详情</div>
5 <div> 5 <div>
6 <el-button class="entrySaveButton" @click="back">返 回</el-button> 6 <el-button class="entrySaveButton" @click="back">返 回</el-button>
7 </div> 7 </div>
...@@ -15,278 +15,204 @@ ...@@ -15,278 +15,204 @@
15 size="small" 15 size="small"
16 > 16 >
17 <el-row :gutter="5"> 17 <el-row :gutter="5">
18 - <!-- 订单编号 --> 18 + <!-- 物流企业代码 -->
19 <el-col :span="3"> 19 <el-col :span="3">
20 - <Formitem label="电商订单/海外仓订仓编号" prop="orderNo"> 20 + <Formitem label="物流企业代码" prop="logisticsCode">
21 <el-input 21 <el-input
22 type="text" 22 type="text"
23 class="inputShadow" 23 class="inputShadow"
24 - id="inputInner--orderNo" 24 + id="inputInner--logisticsCode"
25 resize="none" 25 resize="none"
26 - v-model="formData.orderNo" 26 + v-model="formData.logisticsCode"
27 clearable 27 clearable
28 placeholder="" 28 placeholder=""
29 ></el-input> 29 ></el-input>
30 </Formitem> 30 </Formitem>
31 </el-col> 31 </el-col>
32 - <!-- 物流申报企业平台代码 --> 32 + <!-- 物流企业名称 -->
33 - <el-col :span="3">
34 - <Formitem label="物流申报企业平台代码" prop="logisticsSenderCode">
35 - <el-input
36 - type="text"
37 - class="inputShadow"
38 - id="inputInner--logisticsSenderCode"
39 - resize="none"
40 - v-model="formData.logisticsSenderCode"
41 - clearable
42 - placeholder=""
43 - ></el-input>
44 - </Formitem>
45 - </el-col>
46 - <!-- 申报类型 -->
47 - <el-col :span="3">
48 - <Formitem label="申报类型" prop="appType">
49 - <el-input
50 - type="text"
51 - class="inputShadow"
52 - id="inputInner--appType"
53 - resize="none"
54 - v-model="formData.appType"
55 - clearable
56 - placeholder=""
57 - ></el-input>
58 - </Formitem>
59 - </el-col>
60 - <!-- 电商平台代码 -->
61 - <el-col :span="3">
62 - <Formitem label="电商平台代码" prop="ebpCode">
63 - <el-input
64 - type="text"
65 - class="inputShadow"
66 - id="inputInner--ebpCode"
67 - resize="none"
68 - v-model="formData.ebpCode"
69 - clearable
70 - placeholder=""
71 - ></el-input>
72 - </Formitem>
73 - </el-col>
74 - <!-- 电商平台/海外仓名称 -->
75 <el-col :span="6"> 33 <el-col :span="6">
76 - <Formitem label="电商平台/海外仓名称" prop="ebpName"> 34 + <Formitem label="物流企业名称" prop="logisticsName">
77 <el-input 35 <el-input
78 type="text" 36 type="text"
79 class="inputShadow" 37 class="inputShadow"
80 - id="inputInner--ebpName" 38 + id="inputInner--logisticsName"
81 resize="none" 39 resize="none"
82 - v-model="formData.ebpName" 40 + v-model="formData.logisticsName"
83 clearable 41 clearable
84 placeholder="" 42 placeholder=""
85 ></el-input> 43 ></el-input>
86 </Formitem> 44 </Formitem>
87 </el-col> 45 </el-col>
88 - <!-- 电商企业代码 --> 46 + <!-- 企业唯一编码 -->
89 <el-col :span="3"> 47 <el-col :span="3">
90 - <Formitem label="电商企业代码" prop="ebcCode"> 48 + <Formitem label="企业唯一编码" prop="copNo">
91 - <el-input
92 - type="text"
93 - class="inputShadow"
94 - id="inputInner--ebcCode"
95 - resize="none"
96 - v-model="formData.ebcCode"
97 - clearable
98 - placeholder=""
99 - ></el-input>
100 - </Formitem>
101 - </el-col>
102 - <!-- 电商企业 -->
103 - <el-col :span="6">
104 - <Formitem label="电商企业名称" prop="ebcName">
105 <el-input 49 <el-input
106 type="text" 50 type="text"
107 class="inputShadow" 51 class="inputShadow"
108 - id="inputInner--ebcName" 52 + id="inputInner--copNo"
109 resize="none" 53 resize="none"
110 - v-model="formData.ebcName" 54 + v-model="formData.copNo"
111 clearable 55 clearable
112 placeholder="" 56 placeholder=""
113 ></el-input> 57 ></el-input>
114 </Formitem> 58 </Formitem>
115 </el-col> 59 </el-col>
116 - </el-row> 60 + <!-- 监管场所经营人代码 -->
117 - <el-row :gutter="5">
118 - <!-- 商品金额 -->
119 <el-col :span="3"> 61 <el-col :span="3">
120 - <Formitem label="商品金额" prop="totalPrice"> 62 + <Formitem label="监管场所经营人代码" prop="operatorCode">
121 <el-input 63 <el-input
122 type="text" 64 type="text"
123 class="inputShadow" 65 class="inputShadow"
124 - id="inputInner--totalPrice" 66 + id="inputInner--operatorCode"
125 resize="none" 67 resize="none"
126 - v-model="formData.totalPrice" 68 + v-model="formData.operatorCode"
127 clearable 69 clearable
128 placeholder="" 70 placeholder=""
129 ></el-input> 71 ></el-input>
130 </Formitem> 72 </Formitem>
131 </el-col> 73 </el-col>
132 - <!-- 运杂费 --> 74 + <!-- 监管场所经营人名称 -->
133 - <el-col :span="3"> 75 + <el-col :span="6">
134 - <Formitem label="运杂费" prop="freight"> 76 + <Formitem label="监管场所经营人名称" prop="operatorName">
135 <el-input 77 <el-input
136 type="text" 78 type="text"
137 class="inputShadow" 79 class="inputShadow"
138 - id="inputInner--freight" 80 + id="inputInner--operatorName"
139 resize="none" 81 resize="none"
140 - v-model="formData.freight" 82 + v-model="formData.operatorName"
141 clearable 83 clearable
142 placeholder="" 84 placeholder=""
143 ></el-input> 85 ></el-input>
144 </Formitem> 86 </Formitem>
145 </el-col> 87 </el-col>
146 - <!-- 币制 --> 88 + <!-- 监管场所代码 -->
147 - <el-col :span="3">
148 - <Formitem label="币制" prop="currency">
149 - <el-select
150 - type="text"
151 - id="inputInner--currency"
152 - v-model="formData.currency"
153 - clearable
154 - placeholder=""
155 - >
156 - <el-option
157 - v-for="(item, index) in $store.getters.dict.CURRENCY"
158 - :key="index"
159 - :label="item.itemChineseName"
160 - :value="item.itemValue"
161 - ></el-option>
162 - </el-select>
163 - </Formitem>
164 - </el-col>
165 - <!-- 收货人名称 -->
166 <el-col :span="3"> 89 <el-col :span="3">
167 - <Formitem label="收货人名称" prop="consignee"> 90 + <Formitem label="监管场所代码" prop="loctNo">
168 <el-input 91 <el-input
169 type="text" 92 type="text"
170 class="inputShadow" 93 class="inputShadow"
171 - id="inputInner--consignee" 94 + id="inputInner--loctNo"
172 resize="none" 95 resize="none"
173 - v-model="formData.consignee" 96 + v-model="formData.loctNo"
174 clearable 97 clearable
175 placeholder="" 98 placeholder=""
176 ></el-input> 99 ></el-input>
177 </Formitem> 100 </Formitem>
178 </el-col> 101 </el-col>
179 - <!-- 收货人电话 --> 102 + <!-- 境内运输工具代码 -->
180 <el-col :span="3"> 103 <el-col :span="3">
181 - <Formitem label="收货人电话" prop="consigneeTelephone"> 104 + <Formitem label="境内运输工具代码" prop="domesticTrafNo">
182 <el-input 105 <el-input
183 type="text" 106 type="text"
184 class="inputShadow" 107 class="inputShadow"
185 - id="inputInner--consigneeTelephone" 108 + id="inputInner--domesticTrafNo"
186 resize="none" 109 resize="none"
187 - v-model="formData.consigneeTelephone" 110 + v-model="formData.domesticTrafNo"
188 clearable 111 clearable
189 placeholder="" 112 placeholder=""
190 ></el-input> 113 ></el-input>
191 </Formitem> 114 </Formitem>
192 </el-col> 115 </el-col>
193 - <!-- 收货人地址 --> 116 +
117 + <!-- 操作方式 -->
194 <el-col :span="3"> 118 <el-col :span="3">
195 - <Formitem label="收货人地址" prop="consigneeAddress"> 119 + <Formitem label="操作方式" prop="operationType">
196 <el-input 120 <el-input
197 type="text" 121 type="text"
198 class="inputShadow" 122 class="inputShadow"
199 - id="inputInner--consigneeAddress" 123 + id="inputInner--operationType"
200 resize="none" 124 resize="none"
201 - v-model="formData.consigneeAddress" 125 + v-model="formData.operationType"
202 clearable 126 clearable
203 placeholder="" 127 placeholder=""
204 ></el-input> 128 ></el-input>
205 </Formitem> 129 </Formitem>
206 </el-col> 130 </el-col>
207 - <!-- 收货人所在国 --> 131 + <!-- 大包裹号 -->
208 <el-col :span="3"> 132 <el-col :span="3">
209 - <Formitem label="收货人所在国" prop="consigneeCountry"> 133 + <Formitem label="大包裹号" prop="totalPackageNo">
210 <el-input 134 <el-input
211 type="text" 135 type="text"
212 class="inputShadow" 136 class="inputShadow"
213 - id="inputInner--consigneeCountry" 137 + id="inputInner--totalPackageNo"
214 resize="none" 138 resize="none"
215 - v-model="formData.consigneeCountry" 139 + v-model="formData.totalPackageNo"
216 clearable 140 clearable
217 placeholder="" 141 placeholder=""
218 ></el-input> 142 ></el-input>
219 </Formitem> 143 </Formitem>
220 </el-col> 144 </el-col>
221 - <!-- 发货人名称 --> 145 + <!-- 小包数量 -->
222 <el-col :span="3"> 146 <el-col :span="3">
223 - <Formitem label="发货人名称" prop="shipper"> 147 + <Formitem label="小包数量" prop="packageNum">
224 <el-input 148 <el-input
225 type="text" 149 type="text"
226 class="inputShadow" 150 class="inputShadow"
227 - id="inputInner--shipper" 151 + id="inputInner--packageNum"
228 resize="none" 152 resize="none"
229 - v-model="formData.shipper" 153 + v-model="formData.packageNum"
230 clearable 154 clearable
231 placeholder="" 155 placeholder=""
232 ></el-input> 156 ></el-input>
233 </Formitem> 157 </Formitem>
234 </el-col> 158 </el-col>
235 - <!-- 发货人电话 --> 159 + <!-- 物流运单编号 -->
236 <el-col :span="3"> 160 <el-col :span="3">
237 - <Formitem label="发货人电话" prop="shipperTelephone"> 161 + <Formitem label="物流运单编号" prop="logisticsNo">
238 <el-input 162 <el-input
239 type="text" 163 type="text"
240 class="inputShadow" 164 class="inputShadow"
241 - id="inputInner--shipperTelephone" 165 + id="inputInner--logisticsNo"
242 resize="none" 166 resize="none"
243 - v-model="formData.shipperTelephone" 167 + v-model="formData.logisticsNo"
244 clearable 168 clearable
245 placeholder="" 169 placeholder=""
246 ></el-input> 170 ></el-input>
247 </Formitem> 171 </Formitem>
248 </el-col> 172 </el-col>
249 - <!-- 发货人地址 --> 173 + <!-- 申报地海关 -->
250 <el-col :span="3"> 174 <el-col :span="3">
251 - <Formitem label="发货人地址" prop="shipperAddress"> 175 + <Formitem label="申报地海关" prop="ext01">
252 <el-input 176 <el-input
253 type="text" 177 type="text"
254 class="inputShadow" 178 class="inputShadow"
255 - id="inputInner--shipperAddress" 179 + id="inputInner--ext01"
256 resize="none" 180 resize="none"
257 - v-model="formData.shipperAddress" 181 + v-model="formData.ext01"
258 clearable 182 clearable
259 placeholder="" 183 placeholder=""
260 ></el-input> 184 ></el-input>
261 </Formitem> 185 </Formitem>
262 </el-col> 186 </el-col>
263 - <!-- 发货人所在国 --> 187 + <!-- 总运单号 -->
264 <el-col :span="3"> 188 <el-col :span="3">
265 - <Formitem label="发货人所在国" prop="shipperCountry"> 189 + <Formitem label="总运单号" prop="ext02">
266 <el-input 190 <el-input
267 type="text" 191 type="text"
268 class="inputShadow" 192 class="inputShadow"
269 - id="inputInner--shipperCountry" 193 + id="inputInner--ext02"
270 resize="none" 194 resize="none"
271 - v-model="formData.shipperCountry" 195 + v-model="formData.ext02"
272 clearable 196 clearable
273 placeholder="" 197 placeholder=""
274 ></el-input> 198 ></el-input>
275 </Formitem> 199 </Formitem>
276 </el-col> 200 </el-col>
201 + <!-- 创建时间 -->
277 <el-col :span="3"> 202 <el-col :span="3">
278 - <Formitem label="平台编码" prop="crossOrderId"> 203 + <Formitem label="创建时间" prop="createTime">
279 <el-input 204 <el-input
280 type="text" 205 type="text"
281 class="inputShadow" 206 class="inputShadow"
282 - id="inputInner--crossOrderId" 207 + id="inputInner--createTime"
283 resize="none" 208 resize="none"
284 - v-model="formData.crossOrderId" 209 + v-model="formData.createTime"
285 clearable 210 clearable
286 placeholder="" 211 placeholder=""
287 ></el-input> 212 ></el-input>
288 </Formitem> 213 </Formitem>
289 </el-col> 214 </el-col>
215 +
290 <el-col :span="9"> 216 <el-col :span="9">
291 <Formitem label="备注" prop="note"> 217 <Formitem label="备注" prop="note">
292 <el-input 218 <el-input
...@@ -319,25 +245,20 @@ ...@@ -319,25 +245,20 @@
319 :tableData="logData" 245 :tableData="logData"
320 :headerData="logHeaderData" 246 :headerData="logHeaderData"
321 /> 247 />
322 - <div class="entryTitle" style="margin-top: 10px">商品明细</div> 248 +
323 - <ProductDetailTable
324 - :tableData="detailData"
325 - :bodyHeader="detialHeaderData"
326 - />
327 <div style="margin-bottom: 20px; text-align: center"></div> 249 <div style="margin-bottom: 20px; text-align: center"></div>
328 </div> 250 </div>
329 </template> 251 </template>
330 252
331 <script> 253 <script>
332 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue"; 254 import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
333 -import ProductDetailTable from "../components/ProductDetailTable/index.vue"; 255 +import { getPvgArrivalInInfo } from "@/api/pvg.js";
334 -import { getPvgWaybillInfo } from "@/api/pvg.js";
335 export default { 256 export default {
336 name: "", 257 name: "",
337 - components: { ProductDetailTable, ReceiptInfoTable }, 258 + components: { ReceiptInfoTable },
338 data() { 259 data() {
339 return { 260 return {
340 - id: null, 261 + arrivalInId: null,
341 formData: {}, 262 formData: {},
342 logData: [], 263 logData: [],
343 logHeaderData: [ 264 logHeaderData: [
...@@ -360,120 +281,7 @@ export default { ...@@ -360,120 +281,7 @@ export default {
360 align: "left", 281 align: "left",
361 }, 282 },
362 ], 283 ],
363 - detailData: [], 284 +
364 - detialHeaderData: [
365 - {
366 - name: "序号",
367 - value: "gnum",
368 - width: "",
369 - align: "left",
370 - },
371 - {
372 - name: "商品名称",
373 - value: "itemName",
374 - width: "",
375 - align: "left",
376 - },
377 - {
378 - name: "企业商品货号",
379 - value: "itemNo",
380 - width: "",
381 - align: "left",
382 - },
383 - {
384 - name: "商品编码",
385 - value: "gcode",
386 - width: "",
387 - align: "left",
388 - },
389 - {
390 - name: "规格型号",
391 - value: "itemDescribe",
392 - width: "",
393 - align: "left",
394 - },
395 - {
396 - name: "申报数量",
397 - value: "barCode",
398 - width: "",
399 - align: "left",
400 - },
401 - {
402 - name: "法定数量",
403 - value: "qty1",
404 - width: "",
405 - align: "left",
406 - },
407 - {
408 - name: "法定计量单位",
409 - value: "unit1",
410 - width: "",
411 - align: "left",
412 - slot: true,
413 - },
414 - {
415 - name: "第二数量",
416 - value: "qty2",
417 - width: "",
418 - align: "left",
419 - },
420 - {
421 - name: "第二计量单位",
422 - value: "unit2",
423 - width: "",
424 - align: "left",
425 - slot: true,
426 - },
427 - {
428 - name: "申报计量单位",
429 - value: "unit",
430 - width: "",
431 - align: "left",
432 - },
433 - {
434 - name: "商品品牌",
435 - value: "brand",
436 - width: "",
437 - align: "left",
438 - },
439 - {
440 - name: "企业商品描述",
441 - value: "itemDescribe",
442 - width: "",
443 - align: "left",
444 - },
445 - {
446 - name: "单价",
447 - value: "price",
448 - width: "",
449 - align: "left",
450 - },
451 - {
452 - name: "总价",
453 - value: "totalPrice",
454 - width: "",
455 - align: "left",
456 - },
457 - {
458 - name: "币制",
459 - value: "currency",
460 - width: "",
461 - align: "left",
462 - slot: true,
463 - },
464 - {
465 - name: "条形码",
466 - value: "gmodel",
467 - width: "",
468 - align: "left",
469 - },
470 - {
471 - name: "备注",
472 - value: "note",
473 - width: "",
474 - align: "left",
475 - },
476 - ],
477 loadings: { 285 loadings: {
478 entryLoading: false, 286 entryLoading: false,
479 }, 287 },
...@@ -482,7 +290,7 @@ export default { ...@@ -482,7 +290,7 @@ export default {
482 }, 290 },
483 created() { 291 created() {
484 if (this.$route.params.data) { 292 if (this.$route.params.data) {
485 - this.id = this.$route.params.data.id; 293 + this.arrivalInId = this.$route.params.data.arrivalInId;
486 this.searchData(); 294 this.searchData();
487 } else { 295 } else {
488 this.back(); 296 this.back();
...@@ -491,15 +299,11 @@ export default { ...@@ -491,15 +299,11 @@ export default {
491 methods: { 299 methods: {
492 searchData() { 300 searchData() {
493 this.loadings.entryLoading = true; 301 this.loadings.entryLoading = true;
494 - getPvgWaybillInfo({ id: this.id }) 302 + getPvgArrivalInInfo({ arrivalInId: this.arrivalInId })
495 .then((res) => { 303 .then((res) => {
496 if (res.code === "200") { 304 if (res.code === "200") {
497 - this.formData = res.data.pvgExportOrderVo; 305 + this.formData = res.data.arrivalInfo || {};
498 - this.detailData = res.data.pvgExportOrderProductVo; 306 + this.logData = res.data.receiptList || [];
499 - this.logData = res.data.pvgExportOrderReceiptVo;
500 - this.detailData.forEach((item, idx) => {
501 - item.index = idx;
502 - });
503 } else { 307 } else {
504 this.alertWarningMsg(res.message); 308 this.alertWarningMsg(res.message);
505 } 309 }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 </el-select> 31 </el-select>
32 </Formitem> 32 </Formitem>
33 </el-col> 33 </el-col>
34 - <!-- 运单编号 --> 34 + <!-- 物流运单编号 -->
35 <el-col :span="5"> 35 <el-col :span="5">
36 <Formitem label="物流运单编号" prop="logisticsNo"> 36 <Formitem label="物流运单编号" prop="logisticsNo">
37 <FormTextareaInput 37 <FormTextareaInput
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 /> 41 />
42 </Formitem> 42 </Formitem>
43 </el-col> 43 </el-col>
44 - <!-- 订单编号 --> 44 + <!-- 提运单号 -->
45 <el-col :span="5"> 45 <el-col :span="5">
46 <Formitem label="提运单号" prop="billNo"> 46 <Formitem label="提运单号" prop="billNo">
47 <el-input 47 <el-input
...@@ -55,15 +55,15 @@ ...@@ -55,15 +55,15 @@
55 ></el-input> 55 ></el-input>
56 </Formitem> 56 </Formitem>
57 </el-col> 57 </el-col>
58 - <!-- 电商企业代码 --> 58 + <!-- 平台单号 -->
59 <el-col :span="5"> 59 <el-col :span="5">
60 - <Formitem label="订单编号" prop="orderNo"> 60 + <Formitem label="平台单号" prop="crossOrderId">
61 <el-input 61 <el-input
62 type="text" 62 type="text"
63 class="inputShadow" 63 class="inputShadow"
64 - id="inputInner--orderNo" 64 + id="inputInner--crossOrderId"
65 resize="none" 65 resize="none"
66 - v-model="sreachFormData.orderNo" 66 + v-model="sreachFormData.crossOrderId"
67 clearable 67 clearable
68 placeholder="" 68 placeholder=""
69 ></el-input> 69 ></el-input>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
170 </template> 170 </template>
171 171
172 <script> 172 <script>
173 -import { getPvgWaybillList, getPvgWaybillReceiptInfo } from "@/api/pvg.js"; 173 +import { getPvgArrivalInList, getPvgArrivalInReceipt } from "@/api/pvg.js";
174 174
175 export default { 175 export default {
176 name: "ExportBillQuery", 176 name: "ExportBillQuery",
...@@ -212,30 +212,29 @@ export default { ...@@ -212,30 +212,29 @@ export default {
212 align: "left", 212 align: "left",
213 }, 213 },
214 { 214 {
215 - name: "订单编号", 215 + name: "平台单号",
216 - value: "orderNo", 216 + value: "crossOrderId",
217 width: "", 217 width: "",
218 align: "left", 218 align: "left",
219 }, 219 },
220 { 220 {
221 - name: "大包裹号", 221 + name: "监管场所经营人代码",
222 - value: "totalPackageNo", 222 + value: "operatorCode",
223 width: "", 223 width: "",
224 align: "left", 224 align: "left",
225 }, 225 },
226 { 226 {
227 - name: "主要货物信息", 227 + name: "监管场所经营人名称",
228 - value: "mainGName", 228 + value: "operatorName",
229 width: "", 229 width: "",
230 align: "left", 230 align: "left",
231 }, 231 },
232 { 232 {
233 - name: "报送类型", 233 + name: "监管场所代码",
234 - value: "appType", 234 + value: "loctNo",
235 width: "", 235 width: "",
236 align: "left", 236 align: "left",
237 }, 237 },
238 -
239 { 238 {
240 name: "创建时间", 239 name: "创建时间",
241 value: "createTime", 240 value: "createTime",
...@@ -309,7 +308,7 @@ export default { ...@@ -309,7 +308,7 @@ export default {
309 } else { 308 } else {
310 obj.logisticsNo = []; 309 obj.logisticsNo = [];
311 } 310 }
312 - getPvgWaybillList(obj) 311 + getPvgArrivalInList(obj)
313 .then((res) => { 312 .then((res) => {
314 if (res.code === "200") { 313 if (res.code === "200") {
315 this.tableData = res.data.value; 314 this.tableData = res.data.value;
...@@ -344,14 +343,14 @@ export default { ...@@ -344,14 +343,14 @@ export default {
344 //查询详情 343 //查询详情
345 view(val) { 344 view(val) {
346 this.$router.push({ 345 this.$router.push({
347 - name: "PvgOrderDetail", 346 + name: "PvgArrivalInDetail",
348 params: { data: val }, 347 params: { data: val },
349 }); 348 });
350 }, 349 },
351 popoverChange(val) { 350 popoverChange(val) {
352 console.log(val); 351 console.log(val);
353 this.tableData = val.tableData; 352 this.tableData = val.tableData;
354 - this.receiptApi(val.data.id, val.status) 353 + this.receiptApi(val.data.arrivalInId, val.status)
355 .then((res) => { 354 .then((res) => {
356 val.tableData.forEach((item) => { 355 val.tableData.forEach((item) => {
357 if (item.declareId == val.data.declareId) { 356 if (item.declareId == val.data.declareId) {
...@@ -370,8 +369,8 @@ export default { ...@@ -370,8 +369,8 @@ export default {
370 //查询回执 369 //查询回执
371 receiptApi(id) { 370 receiptApi(id) {
372 return new Promise((resolve, reject) => { 371 return new Promise((resolve, reject) => {
373 - let obj = { id: id }; 372 + let obj = { arrivalInId: id };
374 - getPvgWaybillReceiptInfo(obj) 373 + getPvgArrivalInReceipt(obj)
375 .then((res) => { 374 .then((res) => {
376 if (res.code === "200") { 375 if (res.code === "200") {
377 resolve(res.data); 376 resolve(res.data);
......
...@@ -617,7 +617,7 @@ export default { ...@@ -617,7 +617,7 @@ export default {
617 components: { ProductDetailTable, ReceiptInfoTable }, 617 components: { ProductDetailTable, ReceiptInfoTable },
618 data() { 618 data() {
619 return { 619 return {
620 - id: null, 620 + listId: null,
621 formData: {}, 621 formData: {},
622 logData: [], 622 logData: [],
623 logHeaderData: [ 623 logHeaderData: [
...@@ -650,7 +650,7 @@ export default { ...@@ -650,7 +650,7 @@ export default {
650 }, 650 },
651 { 651 {
652 name: "商品名称", 652 name: "商品名称",
653 - value: "itemName", 653 + value: "gname",
654 width: "", 654 width: "",
655 align: "left", 655 align: "left",
656 }, 656 },
...@@ -663,57 +663,25 @@ export default { ...@@ -663,57 +663,25 @@ export default {
663 }, 663 },
664 { 664 {
665 name: "规格型号", 665 name: "规格型号",
666 - value: "itemDescribe", 666 + value: "gmodel",
667 width: "", 667 width: "",
668 align: "left", 668 align: "left",
669 }, 669 },
670 { 670 {
671 - name: "申报数量", 671 + name: "条形码",
672 value: "barCode", 672 value: "barCode",
673 width: "", 673 width: "",
674 align: "left", 674 align: "left",
675 }, 675 },
676 { 676 {
677 - name: "法定数量", 677 + name: "企业商品货号",
678 - value: "qty1", 678 + value: "itemNo",
679 - width: "",
680 - align: "left",
681 - },
682 - {
683 - name: "法定计量单位",
684 - value: "unit1",
685 - width: "",
686 - align: "left",
687 - slot: true,
688 - },
689 - {
690 - name: "第二数量",
691 - value: "qty2",
692 - width: "",
693 - align: "left",
694 - },
695 - {
696 - name: "第二计量单位",
697 - value: "unit2",
698 - width: "",
699 - align: "left",
700 - slot: true,
701 - },
702 - {
703 - name: "申报计量单位",
704 - value: "unit",
705 width: "", 679 width: "",
706 align: "left", 680 align: "left",
707 }, 681 },
708 { 682 {
709 - name: "商品品牌", 683 + name: "企业商品名称",
710 - value: "brand", 684 + value: "itemName",
711 - width: "",
712 - align: "left",
713 - },
714 - {
715 - name: "企业商品描述",
716 - value: "itemDescribe",
717 width: "", 685 width: "",
718 align: "left", 686 align: "left",
719 }, 687 },
...@@ -737,14 +705,14 @@ export default { ...@@ -737,14 +705,14 @@ export default {
737 slot: true, 705 slot: true,
738 }, 706 },
739 { 707 {
740 - name: "条形码", 708 + name: "目的国（地区）",
741 - value: "gmodel", 709 + value: "country",
742 width: "", 710 width: "",
743 align: "left", 711 align: "left",
744 }, 712 },
745 { 713 {
746 - name: "备注", 714 + name: "申报数量",
747 - value: "note", 715 + value: "qty",
748 width: "", 716 width: "",
749 align: "left", 717 align: "left",
750 }, 718 },
...@@ -757,7 +725,7 @@ export default { ...@@ -757,7 +725,7 @@ export default {
757 }, 725 },
758 created() { 726 created() {
759 if (this.$route.params.data) { 727 if (this.$route.params.data) {
760 - this.id = this.$route.params.data.id; 728 + this.listId = this.$route.params.data.listId;
761 this.searchData(); 729 this.searchData();
762 } else { 730 } else {
763 this.back(); 731 this.back();
...@@ -766,12 +734,12 @@ export default { ...@@ -766,12 +734,12 @@ export default {
766 methods: { 734 methods: {
767 searchData() { 735 searchData() {
768 this.loadings.entryLoading = true; 736 this.loadings.entryLoading = true;
769 - getPvgListInfo({ listId: this.id }) 737 + getPvgListInfo({ listId: this.listId })
770 .then((res) => { 738 .then((res) => {
771 if (res.code === "200") { 739 if (res.code === "200") {
772 - this.formData = res.data.pvgExportOrderVo; 740 + this.formData = res.data.listInfo;
773 - this.detailData = res.data.pvgExportOrderProductVo; 741 + this.detailData = res.data.productList;
774 - this.logData = res.data.pvgExportOrderReceiptVo; 742 + this.logData = res.data.receiptList;
775 this.detailData.forEach((item, idx) => { 743 this.detailData.forEach((item, idx) => {
776 item.index = idx; 744 item.index = idx;
777 }); 745 });
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 size="small" 15 size="small"
16 > 16 >
17 <el-row :gutter="5"> 17 <el-row :gutter="5">
18 - <!-- 订单编号 --> 18 + <!-- 电商订单/海外仓订仓编号 -->
19 <el-col :span="3"> 19 <el-col :span="3">
20 <Formitem label="电商订单/海外仓订仓编号" prop="orderNo"> 20 <Formitem label="电商订单/海外仓订仓编号" prop="orderNo">
21 <el-input 21 <el-input
...@@ -85,50 +85,49 @@ ...@@ -85,50 +85,49 @@
85 ></el-input> 85 ></el-input>
86 </Formitem> 86 </Formitem>
87 </el-col> 87 </el-col>
88 - <!-- 电商企业代码 --> 88 + <!-- 商品金额 -->
89 <el-col :span="3"> 89 <el-col :span="3">
90 - <Formitem label="电商企业代码" prop="ebcCode"> 90 + <Formitem label="商品金额" prop="totalPrice">
91 <el-input 91 <el-input
92 type="text" 92 type="text"
93 class="inputShadow" 93 class="inputShadow"
94 - id="inputInner--ebcCode" 94 + id="inputInner--totalPrice"
95 resize="none" 95 resize="none"
96 - v-model="formData.ebcCode" 96 + v-model="formData.totalPrice"
97 clearable 97 clearable
98 placeholder="" 98 placeholder=""
99 ></el-input> 99 ></el-input>
100 </Formitem> 100 </Formitem>
101 </el-col> 101 </el-col>
102 - <!-- 电商企业 --> 102 + <!-- 电商企业代码 -->
103 - <el-col :span="6"> 103 + <el-col :span="3">
104 - <Formitem label="电商企业名称" prop="ebcName"> 104 + <Formitem label="电商企业代码" prop="ebcCode">
105 <el-input 105 <el-input
106 type="text" 106 type="text"
107 class="inputShadow" 107 class="inputShadow"
108 - id="inputInner--ebcName" 108 + id="inputInner--ebcCode"
109 resize="none" 109 resize="none"
110 - v-model="formData.ebcName" 110 + v-model="formData.ebcCode"
111 clearable 111 clearable
112 placeholder="" 112 placeholder=""
113 ></el-input> 113 ></el-input>
114 </Formitem> 114 </Formitem>
115 </el-col> 115 </el-col>
116 - </el-row> 116 + <!-- 电商企业名称 -->
117 - <el-row :gutter="5"> 117 + <el-col :span="6">
118 - <!-- 商品金额 --> 118 + <Formitem label="电商企业名称" prop="ebcName">
119 - <el-col :span="3">
120 - <Formitem label="商品金额" prop="totalPrice">
121 <el-input 119 <el-input
122 type="text" 120 type="text"
123 class="inputShadow" 121 class="inputShadow"
124 - id="inputInner--totalPrice" 122 + id="inputInner--ebcName"
125 resize="none" 123 resize="none"
126 - v-model="formData.totalPrice" 124 + v-model="formData.ebcName"
127 clearable 125 clearable
128 placeholder="" 126 placeholder=""
129 ></el-input> 127 ></el-input>
130 </Formitem> 128 </Formitem>
131 </el-col> 129 </el-col>
130 +
132 <!-- 运杂费 --> 131 <!-- 运杂费 -->
133 <el-col :span="3"> 132 <el-col :span="3">
134 <Formitem label="运杂费" prop="freight"> 133 <Formitem label="运杂费" prop="freight">
...@@ -219,7 +218,7 @@ ...@@ -219,7 +218,7 @@
219 </Formitem> 218 </Formitem>
220 </el-col> 219 </el-col>
221 <!-- 发货人名称 --> 220 <!-- 发货人名称 -->
222 - <el-col :span="3"> 221 + <el-col :span="6">
223 <Formitem label="发货人名称" prop="shipper"> 222 <Formitem label="发货人名称" prop="shipper">
224 <el-input 223 <el-input
225 type="text" 224 type="text"
...@@ -287,7 +286,7 @@ ...@@ -287,7 +286,7 @@
287 ></el-input> 286 ></el-input>
288 </Formitem> 287 </Formitem>
289 </el-col> 288 </el-col>
290 - <el-col :span="9"> 289 + <el-col :span="6">
291 <Formitem label="备注" prop="note"> 290 <Formitem label="备注" prop="note">
292 <el-input 291 <el-input
293 type="text" 292 type="text"
......