feat: 开发申报数据管理

zhanbo.xu
Commit 95029386d0f8350a63fd16fb3a6cf1b5c55b97b6 95029386 1 parent 04f17193
Showing 5 changed files with 157 additions and 110 deletions
src/api/declareData-api.js
src/components/TablePopover/index.vue
src/views/arrival-list/index.vue
src/views/reportingData/index.vue
src/views/supervise-place-manage/dialog.vue
--- a/src/api/declareData-api.js
View file @9502938
+++ b/src/api/declareData-api.js
View file @9502938
-import request from '@/utils/request'
+import request from "@/utils/request";
 const baseUrl = process.env.VUE_APP_BASE_API; //接口地址
 //获取自定义设置数据
@@ -14,11 +14,11 @@ const baseUrl = process.env.VUE_APP_BASE_API; //接口地址
  * @param pageSize *
  */
 export function searchDeclareData(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/getDeclareDataList',
+    url: "/bus-customer/declareData/getDeclareDataList",
-        method: 'post',
+    method: "post",
-        data: data,
+    data: data,
-    })
+  });
 }
 //申报数据导入
@@ -26,13 +26,13 @@ export function searchDeclareData(data) {
  * @param multipartFile * 提运单号
  */
 export function uploadDeclareData(data) {
-    let formData = new FormData
+  let formData = new FormData();
-    formData.append("multipartFile", data.multipartFile);
+  formData.append("multipartFile", data.multipartFile);
-    return request({
+  return request({
-        url: '/bus-customer/declareData/import',
+    url: "/bus-customer/declareData/import",
-        method: 'post',
+    method: "post",
-        data: formData,
+    data: formData,
-    })
+  });
 }
 //数据申报
@@ -41,14 +41,14 @@ export function uploadDeclareData(data) {
  * @param type  *
  */
 export function declareDataUpload(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/' + data.type,
+    url: "/bus-customer/declareData/" + data.type,
-        method: 'post',
+    method: "post",
-        data:{
+    data: {
-            cancellationReason: data.cancellationReason,
+      cancellationReason: data.cancellationReason,
-            declareIds: data.declareIds
+      declareIds: data.declareIds,
-        },
+    },
-    })
+  });
 }
 //查询订单回执
@@ -56,11 +56,11 @@ export function declareDataUpload(data) {
  * @param declareId  * id
  */
 export function getOrderReceipt(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/orderReceipt',
+    url: "/bus-customer/declareData/orderReceipt",
-        method: 'get',
+    method: "get",
-        params: data,
+    params: data,
-    })
+  });
 }
 //查看离境回执
@@ -68,24 +68,23 @@ export function getOrderReceipt(data) {
  * @param declareId * id
  */
 export function getLogisticsReceipt(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/logisticsReceipt',
+    url: "/bus-customer/declareData/logisticsReceipt",
-        method: 'get',
+    method: "get",
-        params: data,
+    params: data,
-    })
+  });
 }
-
 //查询清单回执
 /**
  * @param declareId * id
  */
 export function getListReceipt(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/listReceipt',
+    url: "/bus-customer/declareData/listReceipt",
-        method: 'get',
+    method: "get",
-        params: data,
+    params: data,
-    })
+  });
 }
 //查询清单总分单回执
@@ -93,11 +92,11 @@ export function getListReceipt(data) {
  * @param declareId * id
  */
 export function getTotalReceipt(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/totalReceipt',
+    url: "/bus-customer/declareData/totalReceipt",
-        method: 'get',
+    method: "get",
-        params: data,
+    params: data,
-    })
+  });
 }
 /**
  * 查看物流回执
@@ -105,23 +104,34 @@ export function getTotalReceipt(data) {
  * @returns
  */
 export function getWayBillReceipt(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/wayBillReceipt',
+    url: "/bus-customer/declareData/wayBillReceipt",
-        method: 'get',
+    method: "get",
-        params: data,
+    params: data,
-    })
+  });
 }
 /**
  * 查询总申报日志
  * @param data id---->申报id
  */
-export function getDeclarationLog(data){
+export function getDeclarationLog(data) {
   return request({
-    url: '/bus-customer/declareData/getDeclarationLog/' + data,
+    url: "/bus-customer/declareData/getDeclarationLog/" + data,
-    method: 'get',
+    method: "get",
     params: data,
-  })
+  });
+}
+
+// GET
+// /declareData/arrivalInReceipt
+// 运抵单回执
+export function arrivalInReceipt(data) {
+  return request({
+    url: "/bus-customer/declareData/arrivalInReceipt",
+    method: "get",
+    params: data,
+  });
 }
 /**
@@ -130,79 +140,74 @@ export function getDeclarationLog(data){
  * @returns
  */
 export function exportDeclareData(data) {
-
+  return new Promise((resolve, reject) => {
-    return new Promise((resolve, reject) => {
+    var url = baseUrl + "/bus-customer/declareData/exportDeclareData";
-        var url = baseUrl + '/bus-customer/declareData/exportDeclareData';
+    request({
-        request({
+      url: url,
-            url: url,
+      method: "post",
-            method: 'post',
+      responseType: "blob", // 确保响应类型为 blob
-            responseType: 'blob', // 确保响应类型为 blob
+      data: data,
-            data: data,
+    })
-        })
+      .then((res) => {
-        .then((res) => {
+        const aLink = document.createElement("a");
-            const aLink = document.createElement("a");
+        aLink.href = URL.createObjectURL(res);
-            aLink.href = URL.createObjectURL(res);
+        aLink.setAttribute("download", "申报数据.xlsx"); // 设置下载文件名称
-            aLink.setAttribute("download", "申报数据.xlsx"); // 设置下载文件名称
+        document.body.appendChild(aLink);
-            document.body.appendChild(aLink);
+        aLink.click();
-            aLink.click();
+        document.body.removeChild(aLink);
-            document.body.removeChild(aLink);
+        resolve(res);
-            resolve(res);
+      })
-
+      .catch((err) => {
-        })
+        reject(err);
-        .catch((err) => {
-            reject(err);
-        });
       });
+  });
 }
 //获取客户列表
 export function getCustomerList(data) {
-    return request({
+  return request({
-        url: '/bus-customer/customers/getCustomerList',
+    url: "/bus-customer/customers/getCustomerList",
-        method: 'post',
+    method: "post",
-        data:{
+    data: {
-            "pageIndex": 1,
+      pageIndex: 1,
-            "pageSize": 1000,
+      pageSize: 1000,
-        },
+    },
-    })
+  });
 }
 //获取口岸表数据
 export function getPortList(data) {
-    return request({
+  return request({
-        url: '/bus-customer/portInfo/getPortList',
+    url: "/bus-customer/portInfo/getPortList",
-        method: 'post',
+    method: "post",
-        data:{
+    data: {
-            "pageIndex": 1,
+      pageIndex: 1,
-            "pageSize": 1000,
+      pageSize: 1000,
-        },
+    },
-    })
+  });
 }
 //获取申报信息
 export function getDeclareData(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/get/'+data.declareId,
+    url: "/bus-customer/declareData/get/" + data.declareId,
-        method: 'get',
+    method: "get",
-        params: data,
+    params: data,
-    })
+  });
 }
 //更新申报信息
 export function updateDeclareData(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/update',
+    url: "/bus-customer/declareData/update",
-        method: 'post',
+    method: "post",
-        data
+    data,
-    })
+  });
 }
 //申报数据批量修改-航班号，运单号
 export function bathDeclareDate(data) {
-    return request({
+  return request({
-        url: '/bus-customer/declareData/bathDeclareDate',
+    url: "/bus-customer/declareData/bathDeclareDate",
-        method: 'post',
+    method: "post",
-        data
+    data,
-    })
+  });
 }
-
-
-
--- a/src/components/TablePopover/index.vue
View file @9502938
+++ b/src/components/TablePopover/index.vue
View file @9502938
@@ -106,6 +106,7 @@ export default {
     },
     //弹框状态改版
     popoverChange(data, type) {
+      console.log(data, type);
       this.popoverClose();
       let arr = JSON.parse(JSON.stringify(this.tableData));
       arr.forEach((item) => {
--- a/src/views/arrival-list/index.vue
View file @9502938
+++ b/src/views/arrival-list/index.vue
View file @9502938
@@ -202,7 +202,7 @@ export default {
         },
         {
           name: "电商企业代码",
-          value: "copNo",
+          value: "ebccode",
           width: "",
           align: "left",
         },
--- a/src/views/reportingData/index.vue
View file @9502938
+++ b/src/views/reportingData/index.vue
View file @9502938
@@ -336,6 +336,27 @@
           </div>
         </TablePopover>
       </template>
+      <template v-slot:arrivalInReceiptStatus="scope">
+        <TablePopover
+          ref="arrivalInReceiptStatusPopover"
+          dataKey="arrivalInReceiptStatus"
+          idKey="declareId"
+          :parentDom="$refs.entryTable"
+          :receiptDataHead="receiptDataHead"
+          :rowData="scope.row"
+          :tableData="tableData"
+          @popoverChange="popoverChange"
+          @popoverClose="popoverClose"
+        >
+          <div slot="title">
+            <span style="font-weight: 700; color: #515a6e">订单编号：</span
+            >{{ scope.row.orderno }}
+          </div>
+          <div slot="buttonLabel">
+            {{ scope.row.arrivalInReceiptStatus }}
+          </div>
+        </TablePopover>
+      </template>
       <template v-slot:totalSplitOrderStatus="scope">
         <TablePopover
           ref="totalSplitOrderStatusPopover"
@@ -429,6 +450,7 @@ import {
   getTotalReceipt,
   getLogisticsReceipt,
   getDeclarationLog,
+  arrivalInReceipt,
   exportDeclareData,
 } from "@/api/declareData-api.js";
 import { getDictData } from "@/api/system/dict-api.js";
@@ -528,7 +550,7 @@ export default {
         {
           // release-v1.0.9
           name: "运抵单回执",
-          value: "listReceiptStatus",
+          value: "arrivalInReceiptStatus",
           width: "",
           align: "left",
           slot: true,
@@ -677,6 +699,7 @@ export default {
               item.orderReceiptStatusPopoverType = false;
               item.listReceiptStatusPopoverType = false;
               item.wayBillReceiptPopoverType = false;
+              item.arrivalInReceiptStatusPopoverType = false;
               item.totalSplitOrderStatusPopoverType = false;
               item.logisticsReceiptStatusPopoverType = false;
               // item.logLoading = false;
@@ -868,6 +891,9 @@ export default {
     },
     popoverChange(val) {
       this.tableData = val.tableData;
+
+      console.log(val);
+
       this.receiptApi(val.data.declareId, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
@@ -883,6 +909,7 @@ export default {
             this.$refs.orderReceiptStatusPopover.tableLoading = false;
             this.$refs.wayBillReceiptPopover.tableLoading = false;
             this.$refs.listReceiptStatusPopover.tableLoading = false;
+            this.$refs.arrivalInReceiptStatusPopover.tableLoading = false;
             this.$refs.totalSplitOrderStatusPopover.tableLoading = false;
             this.$refs.logisticsReceiptStatusPopover.tableLoading = false;
             this.$refs.allLogDataReceiptStatusPopover.tableLoading = false;
@@ -971,6 +998,19 @@ export default {
               console.log(err);
               reject();
             });
+        } else if (type == "arrivalInReceiptStatus") {
+          arrivalInReceipt(obj)
+            .then((res) => {
+              if (res.code === "200") {
+                resolve(res.data);
+              } else {
+                reject();
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+              reject();
+            });
         }
       });
     },
@@ -981,6 +1021,7 @@ export default {
         item.wayBillReceiptPopoverType = false;
         item.totalSplitOrderStatusPopoverType = false;
         item.logisticsReceiptStatusPopoverType = false;
+        item.arrivalInReceiptStatusPopoverType = false;
         item.popoverData = [];
       });
       this.selectedLogRow.allLogDataReceiptStatusPopoverType = false;
--- a/src/views/supervise-place-manage/dialog.vue
View file @9502938
+++ b/src/views/supervise-place-manage/dialog.vue
View file @9502938
@@ -4,7 +4,7 @@
     :title="title"
     :visible.sync="outerVisible"
     :show-close="false"
-    width="25%"
+    width="40%"
     :close-on-click-modal="false"
     :destroy-on-close="true"
     v-loading="loadings.dialogLoading"