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) {
// GET
// /exportArrivalIn/pvg/info/{arrivalInId}
// 查询pvg运抵单详情
export function getPvgArrivalInInfo(arrivalInId) {
export function getPvgArrivalInInfo({ arrivalInId }) {
return request({
url: `/bus-customer/exportArrivalIn/pvg/info/${arrivalInId}`,
method: "get",
......@@ -105,7 +105,7 @@ export function getPvgArrivalInInfo(arrivalInId) {
// GET
// /exportArrivalIn/pvg/receipt/arrivalInId
// 获取运抵单回执
export function getPvgArrivalInReceipt(arrivalInId) {
export function getPvgArrivalInReceipt({ arrivalInId }) {
return request({
url: `/bus-customer/exportArrivalIn/pvg/receipt/${arrivalInId}`,
method: "get",
......
......@@ -215,6 +215,14 @@ export const constantRoutes = [
meta: { title: "PVG订单详情", icon: "" },
},
{
path: "/pvg-waybill-detail",
component: (resolve) =>
require(["@/views/pvgWaybill/detail.vue"], resolve),
hidden: true,
name: "PvgWaybillDetail",
meta: { title: "PVG运单详情", icon: "" },
},
{
path: "/pvg-list-detail",
component: (resolve) =>
require(["@/views/pvgList/detail.vue"], resolve),
......@@ -223,12 +231,12 @@ export const constantRoutes = [
meta: { title: "PVG清单详情", icon: "" },
},
{
path: "/pvg-waybill-detail",
path: "/pvg-arrival-detail",
component: (resolve) =>
require(["@/views/pvgWaybill/detail.vue"], resolve),
require(["@/views/pvgArrivalIn/detail.vue"], resolve),
hidden: true,
name: "PvgWaybillDetail",
meta: { title: "PVG运单详情", icon: "" },
name: "PvgArrivalInDetail",
meta: { title: "PVG运抵单详情", icon: "" },
},
],
},
......
<template>
<div class="entry" v-loading="loadings.entryLoading">
<div class="entryTitle">
<div>出口订单详情</div>
<div>PVG运抵单详情</div>
<div>
<el-button class="entrySaveButton" @click="back">返 回</el-button>
</div>
......@@ -15,278 +15,204 @@
size="small"
>
<el-row :gutter="5">
<!-- 订单编号 -->
<!-- 物流企业代码 -->
<el-col :span="3">
<Formitem label="电商订单/海外仓订仓编号" prop="orderNo">
<Formitem label="物流企业代码" prop="logisticsCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--orderNo"
id="inputInner--logisticsCode"
resize="none"
v-model="formData.orderNo"
v-model="formData.logisticsCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 物流申报企业平台代码 -->
<el-col :span="3">
<Formitem label="物流申报企业平台代码" prop="logisticsSenderCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--logisticsSenderCode"
resize="none"
v-model="formData.logisticsSenderCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 申报类型 -->
<el-col :span="3">
<Formitem label="申报类型" prop="appType">
<el-input
type="text"
class="inputShadow"
id="inputInner--appType"
resize="none"
v-model="formData.appType"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 电商平台代码 -->
<el-col :span="3">
<Formitem label="电商平台代码" prop="ebpCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--ebpCode"
resize="none"
v-model="formData.ebpCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 电商平台/海外仓名称 -->
<!-- 物流企业名称 -->
<el-col :span="6">
<Formitem label="电商平台/海外仓名称" prop="ebpName">
<Formitem label="物流企业名称" prop="logisticsName">
<el-input
type="text"
class="inputShadow"
id="inputInner--ebpName"
id="inputInner--logisticsName"
resize="none"
v-model="formData.ebpName"
v-model="formData.logisticsName"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 电商企业代码 -->
<!-- 企业唯一编码 -->
<el-col :span="3">
<Formitem label="电商企业代码" prop="ebcCode">
<Formitem label="企业唯一编码" prop="copNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--ebcCode"
id="inputInner--copNo"
resize="none"
v-model="formData.ebcCode"
v-model="formData.copNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 电商企业 -->
<el-col :span="6">
<Formitem label="电商企业名称" prop="ebcName">
<el-input
type="text"
class="inputShadow"
id="inputInner--ebcName"
resize="none"
v-model="formData.ebcName"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 商品金额 -->
<!-- 监管场所经营人代码 -->
<el-col :span="3">
<Formitem label="商品金额" prop="totalPrice">
<Formitem label="监管场所经营人代码" prop="operatorCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--totalPrice"
id="inputInner--operatorCode"
resize="none"
v-model="formData.totalPrice"
v-model="formData.operatorCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 运杂费 -->
<el-col :span="3">
<Formitem label="运杂费" prop="freight">
<!-- 监管场所经营人名称 -->
<el-col :span="6">
<Formitem label="监管场所经营人名称" prop="operatorName">
<el-input
type="text"
class="inputShadow"
id="inputInner--freight"
id="inputInner--operatorName"
resize="none"
v-model="formData.freight"
v-model="formData.operatorName"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 币制 -->
<el-col :span="3">
<Formitem label="币制" prop="currency">
<el-select
type="text"
id="inputInner--currency"
v-model="formData.currency"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.CURRENCY"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- 收货人名称 -->
<!-- 监管场所代码 -->
<el-col :span="3">
<Formitem label="收货人名称" prop="consignee">
<Formitem label="监管场所代码" prop="loctNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--consignee"
id="inputInner--loctNo"
resize="none"
v-model="formData.consignee"
v-model="formData.loctNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 收货人电话 -->
<!-- 境内运输工具代码 -->
<el-col :span="3">
<Formitem label="收货人电话" prop="consigneeTelephone">
<Formitem label="境内运输工具代码" prop="domesticTrafNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--consigneeTelephone"
id="inputInner--domesticTrafNo"
resize="none"
v-model="formData.consigneeTelephone"
v-model="formData.domesticTrafNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 收货人地址 -->
<!-- 操作方式 -->
<el-col :span="3">
<Formitem label="收货人地址" prop="consigneeAddress">
<Formitem label="操作方式" prop="operationType">
<el-input
type="text"
class="inputShadow"
id="inputInner--consigneeAddress"
id="inputInner--operationType"
resize="none"
v-model="formData.consigneeAddress"
v-model="formData.operationType"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 收货人所在国 -->
<!-- 大包裹号 -->
<el-col :span="3">
<Formitem label="收货人所在国" prop="consigneeCountry">
<Formitem label="大包裹号" prop="totalPackageNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--consigneeCountry"
id="inputInner--totalPackageNo"
resize="none"
v-model="formData.consigneeCountry"
v-model="formData.totalPackageNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 发货人名称 -->
<!-- 小包数量 -->
<el-col :span="3">
<Formitem label="发货人名称" prop="shipper">
<Formitem label="小包数量" prop="packageNum">
<el-input
type="text"
class="inputShadow"
id="inputInner--shipper"
id="inputInner--packageNum"
resize="none"
v-model="formData.shipper"
v-model="formData.packageNum"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 发货人电话 -->
<!-- 物流运单编号 -->
<el-col :span="3">
<Formitem label="发货人电话" prop="shipperTelephone">
<Formitem label="物流运单编号" prop="logisticsNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--shipperTelephone"
id="inputInner--logisticsNo"
resize="none"
v-model="formData.shipperTelephone"
v-model="formData.logisticsNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 发货人地址 -->
<!-- 申报地海关 -->
<el-col :span="3">
<Formitem label="发货人地址" prop="shipperAddress">
<Formitem label="申报地海关" prop="ext01">
<el-input
type="text"
class="inputShadow"
id="inputInner--shipperAddress"
id="inputInner--ext01"
resize="none"
v-model="formData.shipperAddress"
v-model="formData.ext01"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 发货人所在国 -->
<!-- 总运单号 -->
<el-col :span="3">
<Formitem label="发货人所在国" prop="shipperCountry">
<Formitem label="总运单号" prop="ext02">
<el-input
type="text"
class="inputShadow"
id="inputInner--shipperCountry"
id="inputInner--ext02"
resize="none"
v-model="formData.shipperCountry"
v-model="formData.ext02"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 创建时间 -->
<el-col :span="3">
<Formitem label="平台编码" prop="crossOrderId">
<Formitem label="创建时间" prop="createTime">
<el-input
type="text"
class="inputShadow"
id="inputInner--crossOrderId"
id="inputInner--createTime"
resize="none"
v-model="formData.crossOrderId"
v-model="formData.createTime"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<el-col :span="9">
<Formitem label="备注" prop="note">
<el-input
......@@ -319,25 +245,20 @@
:tableData="logData"
:headerData="logHeaderData"
/>
<div class="entryTitle" style="margin-top: 10px">商品明细</div>
<ProductDetailTable
:tableData="detailData"
:bodyHeader="detialHeaderData"
/>
<div style="margin-bottom: 20px; text-align: center"></div>
</div>
</template>
<script>
import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
import ProductDetailTable from "../components/ProductDetailTable/index.vue";
import { getPvgWaybillInfo } from "@/api/pvg.js";
import { getPvgArrivalInInfo } from "@/api/pvg.js";
export default {
name: "",
components: { ProductDetailTable, ReceiptInfoTable },
components: { ReceiptInfoTable },
data() {
return {
id: null,
arrivalInId: null,
formData: {},
logData: [],
logHeaderData: [
......@@ -360,120 +281,7 @@ export default {
align: "left",
},
],
detailData: [],
detialHeaderData: [
{
name: "序号",
value: "gnum",
width: "",
align: "left",
},
{
name: "商品名称",
value: "itemName",
width: "",
align: "left",
},
{
name: "企业商品货号",
value: "itemNo",
width: "",
align: "left",
},
{
name: "商品编码",
value: "gcode",
width: "",
align: "left",
},
{
name: "规格型号",
value: "itemDescribe",
width: "",
align: "left",
},
{
name: "申报数量",
value: "barCode",
width: "",
align: "left",
},
{
name: "法定数量",
value: "qty1",
width: "",
align: "left",
},
{
name: "法定计量单位",
value: "unit1",
width: "",
align: "left",
slot: true,
},
{
name: "第二数量",
value: "qty2",
width: "",
align: "left",
},
{
name: "第二计量单位",
value: "unit2",
width: "",
align: "left",
slot: true,
},
{
name: "申报计量单位",
value: "unit",
width: "",
align: "left",
},
{
name: "商品品牌",
value: "brand",
width: "",
align: "left",
},
{
name: "企业商品描述",
value: "itemDescribe",
width: "",
align: "left",
},
{
name: "单价",
value: "price",
width: "",
align: "left",
},
{
name: "总价",
value: "totalPrice",
width: "",
align: "left",
},
{
name: "币制",
value: "currency",
width: "",
align: "left",
slot: true,
},
{
name: "条形码",
value: "gmodel",
width: "",
align: "left",
},
{
name: "备注",
value: "note",
width: "",
align: "left",
},
],
loadings: {
entryLoading: false,
},
......@@ -482,7 +290,7 @@ export default {
},
created() {
if (this.$route.params.data) {
this.id = this.$route.params.data.id;
this.arrivalInId = this.$route.params.data.arrivalInId;
this.searchData();
} else {
this.back();
......@@ -491,15 +299,11 @@ export default {
methods: {
searchData() {
this.loadings.entryLoading = true;
getPvgWaybillInfo({ id: this.id })
getPvgArrivalInInfo({ arrivalInId: this.arrivalInId })
.then((res) => {
if (res.code === "200") {
this.formData = res.data.pvgExportOrderVo;
this.detailData = res.data.pvgExportOrderProductVo;
this.logData = res.data.pvgExportOrderReceiptVo;
this.detailData.forEach((item, idx) => {
item.index = idx;
});
this.formData = res.data.arrivalInfo || {};
this.logData = res.data.receiptList || [];
} else {
this.alertWarningMsg(res.message);
}
......
......@@ -31,7 +31,7 @@
</el-select>
</Formitem>
</el-col>
<!-- 运单编号 -->
<!-- 物流运单编号 -->
<el-col :span="5">
<Formitem label="物流运单编号" prop="logisticsNo">
<FormTextareaInput
......@@ -41,7 +41,7 @@
/>
</Formitem>
</el-col>
<!-- 订单编号 -->
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
......@@ -55,15 +55,15 @@
></el-input>
</Formitem>
</el-col>
<!-- 电商企业代码 -->
<!-- 平台单号 -->
<el-col :span="5">
<Formitem label="订单编号" prop="orderNo">
<Formitem label="平台单号" prop="crossOrderId">
<el-input
type="text"
class="inputShadow"
id="inputInner--orderNo"
id="inputInner--crossOrderId"
resize="none"
v-model="sreachFormData.orderNo"
v-model="sreachFormData.crossOrderId"
clearable
placeholder=""
></el-input>
......@@ -170,7 +170,7 @@
</template>
<script>
import { getPvgWaybillList, getPvgWaybillReceiptInfo } from "@/api/pvg.js";
import { getPvgArrivalInList, getPvgArrivalInReceipt } from "@/api/pvg.js";
export default {
name: "ExportBillQuery",
......@@ -212,30 +212,29 @@ export default {
align: "left",
},
{
name: "订单编号",
value: "orderNo",
name: "平台单号",
value: "crossOrderId",
width: "",
align: "left",
},
{
name: "大包裹号",
value: "totalPackageNo",
name: "监管场所经营人代码",
value: "operatorCode",
width: "",
align: "left",
},
{
name: "主要货物信息",
value: "mainGName",
name: "监管场所经营人名称",
value: "operatorName",
width: "",
align: "left",
},
{
name: "报送类型",
value: "appType",
name: "监管场所代码",
value: "loctNo",
width: "",
align: "left",
},
{
name: "创建时间",
value: "createTime",
......@@ -309,7 +308,7 @@ export default {
} else {
obj.logisticsNo = [];
}
getPvgWaybillList(obj)
getPvgArrivalInList(obj)
.then((res) => {
if (res.code === "200") {
this.tableData = res.data.value;
......@@ -344,14 +343,14 @@ export default {
//查询详情
view(val) {
this.$router.push({
name: "PvgOrderDetail",
name: "PvgArrivalInDetail",
params: { data: val },
});
},
popoverChange(val) {
console.log(val);
this.tableData = val.tableData;
this.receiptApi(val.data.id, val.status)
this.receiptApi(val.data.arrivalInId, val.status)
.then((res) => {
val.tableData.forEach((item) => {
if (item.declareId == val.data.declareId) {
......@@ -370,8 +369,8 @@ export default {
//查询回执
receiptApi(id) {
return new Promise((resolve, reject) => {
let obj = { id: id };
getPvgWaybillReceiptInfo(obj)
let obj = { arrivalInId: id };
getPvgArrivalInReceipt(obj)
.then((res) => {
if (res.code === "200") {
resolve(res.data);
......
......@@ -617,7 +617,7 @@ export default {
components: { ProductDetailTable, ReceiptInfoTable },
data() {
return {
id: null,
listId: null,
formData: {},
logData: [],
logHeaderData: [
......@@ -650,7 +650,7 @@ export default {
},
{
name: "商品名称",
value: "itemName",
value: "gname",
width: "",
align: "left",
},
......@@ -663,57 +663,25 @@ export default {
},
{
name: "规格型号",
value: "itemDescribe",
value: "gmodel",
width: "",
align: "left",
},
{
name: "申报数量",
name: "条形码",
value: "barCode",
width: "",
align: "left",
},
{
name: "法定数量",
value: "qty1",
width: "",
align: "left",
},
{
name: "法定计量单位",
value: "unit1",
width: "",
align: "left",
slot: true,
},
{
name: "第二数量",
value: "qty2",
width: "",
align: "left",
},
{
name: "第二计量单位",
value: "unit2",
width: "",
align: "left",
slot: true,
},
{
name: "申报计量单位",
value: "unit",
name: "企业商品货号",
value: "itemNo",
width: "",
align: "left",
},
{
name: "商品品牌",
value: "brand",
width: "",
align: "left",
},
{
name: "企业商品描述",
value: "itemDescribe",
name: "企业商品名称",
value: "itemName",
width: "",
align: "left",
},
......@@ -737,14 +705,14 @@ export default {
slot: true,
},
{
name: "条形码",
value: "gmodel",
name: "目的国（地区）",
value: "country",
width: "",
align: "left",
},
{
name: "备注",
value: "note",
name: "申报数量",
value: "qty",
width: "",
align: "left",
},
......@@ -757,7 +725,7 @@ export default {
},
created() {
if (this.$route.params.data) {
this.id = this.$route.params.data.id;
this.listId = this.$route.params.data.listId;
this.searchData();
} else {
this.back();
......@@ -766,12 +734,12 @@ export default {
methods: {
searchData() {
this.loadings.entryLoading = true;
getPvgListInfo({ listId: this.id })
getPvgListInfo({ listId: this.listId })
.then((res) => {
if (res.code === "200") {
this.formData = res.data.pvgExportOrderVo;
this.detailData = res.data.pvgExportOrderProductVo;
this.logData = res.data.pvgExportOrderReceiptVo;
this.formData = res.data.listInfo;
this.detailData = res.data.productList;
this.logData = res.data.receiptList;
this.detailData.forEach((item, idx) => {
item.index = idx;
});
......
......@@ -15,7 +15,7 @@
size="small"
>
<el-row :gutter="5">
<!-- 订单编号 -->
<!-- 电商订单/海外仓订仓编号 -->
<el-col :span="3">
<Formitem label="电商订单/海外仓订仓编号" prop="orderNo">
<el-input
......@@ -85,50 +85,49 @@
></el-input>
</Formitem>
</el-col>
<!-- 电商企业代码 -->
<!-- 商品金额 -->
<el-col :span="3">
<Formitem label="电商企业代码" prop="ebcCode">
<Formitem label="商品金额" prop="totalPrice">
<el-input
type="text"
class="inputShadow"
id="inputInner--ebcCode"
id="inputInner--totalPrice"
resize="none"
v-model="formData.ebcCode"
v-model="formData.totalPrice"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 电商企业 -->
<el-col :span="6">
<Formitem label="电商企业名称" prop="ebcName">
<!-- 电商企业代码 -->
<el-col :span="3">
<Formitem label="电商企业代码" prop="ebcCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--ebcName"
id="inputInner--ebcCode"
resize="none"
v-model="formData.ebcName"
v-model="formData.ebcCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 商品金额 -->
<el-col :span="3">
<Formitem label="商品金额" prop="totalPrice">
<!-- 电商企业名称 -->
<el-col :span="6">
<Formitem label="电商企业名称" prop="ebcName">
<el-input
type="text"
class="inputShadow"
id="inputInner--totalPrice"
id="inputInner--ebcName"
resize="none"
v-model="formData.totalPrice"
v-model="formData.ebcName"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 运杂费 -->
<el-col :span="3">
<Formitem label="运杂费" prop="freight">
......@@ -219,7 +218,7 @@
</Formitem>
</el-col>
<!-- 发货人名称 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="发货人名称" prop="shipper">
<el-input
type="text"
......@@ -287,7 +286,7 @@
></el-input>
</Formitem>
</el-col>
<el-col :span="9">
<el-col :span="6">
<Formitem label="备注" prop="note">
<el-input
type="text"
......