feat: 新增功能

zhanbo.xu
Commit 97dd00047c73d061183094f4decd73e54f2ac058 97dd0004 1 parent 93f6aab1
Showing 6 changed files with 69 additions and 95 deletions
src/api/pvg.js
src/router/index.js
src/views/pvgArrivalIn/detail.vue
src/views/pvgArrivalIn/index.vue
src/views/pvgList/detail.vue
src/views/pvgOrder/detail.vue
--- a/src/api/pvg.js
View file @97dd000
+++ b/src/api/pvg.js
View file @97dd000
@@ -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",
--- a/src/router/index.js
View file @97dd000
+++ b/src/router/index.js
View file @97dd000
@@ -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",
+        name: "PvgArrivalInDetail",
-        meta: { title: "PVG运单详情", icon: "" },
+        meta: { title: "PVG运抵单详情", icon: "" },
       },
     ],
   },
--- a/src/views/pvgArrivalIn/detail.vue
View file @97dd000
+++ b/src/views/pvgArrivalIn/detail.vue
View file @97dd000
--- a/src/views/pvgArrivalIn/index.vue
View file @97dd000
+++ b/src/views/pvgArrivalIn/index.vue
View file @97dd000
@@ -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: "订单编号",
+          name: "平台单号",
-          value: "orderNo",
+          value: "crossOrderId",
           width: "",
           align: "left",
         },
         {
-          name: "大包裹号",
+          name: "监管场所经营人代码",
-          value: "totalPackageNo",
+          value: "operatorCode",
           width: "",
           align: "left",
         },
         {
-          name: "主要货物信息",
+          name: "监管场所经营人名称",
-          value: "mainGName",
+          value: "operatorName",
           width: "",
           align: "left",
         },
         {
-          name: "报送类型",
+          name: "监管场所代码",
-          value: "appType",
+          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 };
+        let obj = { arrivalInId: id };
-        getPvgWaybillReceiptInfo(obj)
+        getPvgArrivalInReceipt(obj)
           .then((res) => {
             if (res.code === "200") {
               resolve(res.data);
--- a/src/views/pvgList/detail.vue
View file @97dd000
+++ b/src/views/pvgList/detail.vue
View file @97dd000
@@ -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: "法定数量",
+          name: "企业商品货号",
-          value: "qty1",
+          value: "itemNo",
-          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: "商品品牌",
+          name: "企业商品名称",
-          value: "brand",
+          value: "itemName",
-          width: "",
-          align: "left",
-        },
-        {
-          name: "企业商品描述",
-          value: "itemDescribe",
           width: "",
           align: "left",
         },
@@ -737,14 +705,14 @@ export default {
           slot: true,
         },
         {
-          name: "条形码",
+          name: "目的国（地区）",
-          value: "gmodel",
+          value: "country",
           width: "",
           align: "left",
         },
         {
-          name: "备注",
+          name: "申报数量",
-          value: "note",
+          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.formData = res.data.listInfo;
-            this.detailData = res.data.pvgExportOrderProductVo;
+            this.detailData = res.data.productList;
-            this.logData = res.data.pvgExportOrderReceiptVo;
+            this.logData = res.data.receiptList;
             this.detailData.forEach((item, idx) => {
               item.index = idx;
             });
--- a/src/views/pvgOrder/detail.vue
View file @97dd000
+++ b/src/views/pvgOrder/detail.vue
View file @97dd000
@@ -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">
+        <el-col :span="3">
-          <Formitem label="电商企业名称" prop="ebcName">
+          <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="6">
-        <!-- 商品金额 -->
+          <Formitem label="电商企业名称" prop="ebcName">
-        <el-col :span="3">
-          <Formitem label="商品金额" prop="totalPrice">
             <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"