回执功能增加，详情增加

@@ -65,7 +65,7 @@ export function getOrderReceipt(data) {
  */
 export function getLogisticsReceipt(data) {
     return request({
-        url: '/bus-customer/declareData/logisticsReceipt',
+        url: '/bus-customer/declareData/wayBillReceipt',
         method: 'get',
         params: data,
     })
@@ -78,7 +78,7 @@ export function getLogisticsReceipt(data) {
  */
 export function getListReceipt(data) {
     return request({
-        url: '/bus-customer/declareData/logisticsReceipt',
+        url: '/bus-customer/declareData/listReceipt',
         method: 'get',
         params: data,
     })

@@ -2,32 +2,57 @@ import request from '@/utils/request'
 
 //订单详情
 /**
+ * @param orderId * 订单id
  */
 export function getOrderDetailData(data) {
-    return request({
-        url: '/bus-customer/exportOrder/info/' + data.orderId,
-        method: 'get',
-        data: data
-    })
+  return request({
+    url: '/bus-customer/exportOrder/info/' + data.orderId,
+    method: 'get',
+    data: data
+  })
 }
 
-//订单详情
 /**
+ * 出口运单详情
+ * @param logisticsId * 运单id
  */
-export function getOrderLogata(data) {
-    return request({
-        url: '/bus-customer/exportOrder/receipt/' + data.orderNo,
-        method: 'get',
-        data: data
-    })
+export function getTransportDetail(data) {
+  return request({
+    url: '/bus-customer/exportWaybill/info/' + data.logisticsId,
+    method: 'get'
+  })
 }
 
 /**
- * 出口运单详情
+ * 出口清单详情
+ * @param listId  * 清单id
+ */
+export function getListDetail(data) {
+  return request({
+    url: '/bus-customer/exportList/info/' + data.listId,
+    method: 'get'
+  })
+}
+
+
+/**
+ * 清单总分单详情
+ * @param totalScoreId  * 总分单id
  */
-export function getTransportDetail(id) {
+export function getListBranchDetail(data) {
   return request({
-    url: '/bus-customer/exportWaybill/info/' + id,
+    url: '/bus-customer/exportTotalScore/info/' + data.totalScoreId,
     method: 'get'
   })
 }
+
+/**
+ * 物流离境单详情
+ * @param logisticsDepartureId  * 物流离境单id
+ */
+export function getLogisticsExitDetail(data) {
+  return request({
+    url: '/bus-customer/exportLogisticsDeparture/info/' + data.logisticsDepartureId,
+    method: 'get'
+  })
+}
\ No newline at end of file

@@ -19,4 +19,16 @@ export function getAllexportList(data) {
         method: 'post',
         data: data,
     })
+}
+
+
+//清单回执
+/**
+ * @param copNo  * 运单id
+ */
+export function getListReceiptData(data) {
+    return request({
+        url: '/bus-customer/exportList/receipt/' + data.copNo,
+        method: 'get',
+    })
 }
\ No newline at end of file

@@ -34,4 +34,26 @@ export function getAllExportingTransportBills(data) {
         method: 'post',
         data: data,
     })
+}
+
+//订单回执
+/**
+ * @param orderId  * 订单id
+ */
+export function getOrderReceiptData(data) {
+    return request({
+        url: '/bus-customer/exportOrder/receipt/' + data.orderId,
+        method: 'get',
+    })
+}
+
+//运单回执
+/**
+ * @param logisticsId  * 运单id
+ */
+export function getWaybillReceiptData(data) {
+    return request({
+        url: '/bus-customer/exportWaybill/receipt/' + data.logisticsId,
+        method: 'get',
+    })
 }
\ No newline at end of file

@@ -15,4 +15,15 @@ export function getAllTotalScoreList(data) {
         method: 'post',
         data: data,
     })
+}
+
+//清单总分单回执
+/**
+ * @param copNo  * 清单总分单号
+ */
+export function getTotalScoreReceiptData(data) {
+    return request({
+        url: '/bus-customer/exportTotalScore/receipt/' + data.copNo,
+        method: 'get',
+    })
 }
\ No newline at end of file

@@ -16,4 +16,15 @@ export function getAllLogisticsDepartureList(data) {
         method: 'post',
         data: data,
     })
+}
+
+//物流离境单回执
+/**
+ * @param copNo  * 清单总分单号
+ */
+export function getLogisticsDepartureReceiptData(data) {
+    return request({
+        url: '/bus-customer/exportLogisticsDeparture/receipt/' + data.copNo,
+        method: 'get',
+    })
 }
\ No newline at end of file

+import request from '@/utils/request'
+
+//获取物流企业代码
+/**
+ * @param
+ */
+export function getLogisticsCodeList(data) {
+    return request({
+        url: '/bus-customer/exportWaybill/getLogisticsCodeList',
+        method: 'get',
+        params: data
+    })
+}
\ No newline at end of file

@@ -97,7 +97,7 @@ export default {
       let arr = JSON.parse(JSON.stringify(this.tableData));
       arr.forEach((item) => {
         item.popoverData = [];
-        if (data[idKey] != item[idKey]) {
+        if (data[this.idKey] != item[this.idKey]) {
           // item[`${type}PopoverLoading`] = false;
           item[`${type}PopoverType`] = false;
         } else {
@@ -131,13 +131,13 @@ export default {
         });
         let interval = setInterval(() => {
           if (
-            document.getElementsByClassName(`popper${type}${data[idKey]}`)
+            document.getElementsByClassName(`popper${type}${data[this.idKey]}`)
               .length == 1
           ) {
             clearInterval(interval);
           }
           document
-            .getElementsByClassName(`popper${type}${data[idKey]}`)
+            .getElementsByClassName(`popper${type}${data[this.idKey]}`)
             .forEach((dom, index) => {
               if (index > 0) {
                 dom.style.display = "none";

@@ -22,16 +22,12 @@ router.beforeEach((to, from, next) => {
           // 判断当前用户是否已拉取完user_info信息
           store.dispatch('GetInfo').then((res) => {
             // if (res.success) {
-              store.dispatch('GenerateRoutes').then(accessRoutes => {
-                // 根据roles权限生成可访问的路由表
-                router.addRoutes(accessRoutes) // 动态添加可访问路由表
-                next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-                // if (getLoginType()) {
-                //   next({ name: 'Entry', params: JSON.parse(getLoginType()) })
-                // } else {
-                //   next()
-                // }
-              })
+            store.dispatch('GenerateRoutes').then(accessRoutes => {
+              store.dispatch("GetDict");
+              // 根据roles权限生成可访问的路由表
+              router.addRoutes(accessRoutes) // 动态添加可访问路由表
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            })
             // }
           }).catch(err => {
             if (err != undefined) {
@@ -39,11 +35,6 @@ router.beforeEach((to, from, next) => {
             }
           })
         } else {
-          // if (store.getters.entryEdit.submitType && to.path != '/finish') {
-          //   alertWarningMsg('单据提交进行中，请等待提交完成后再进行操作！', '警告！').then(() => {
-          //     next(false)
-          //   })
-          // }
           next()
         }
       }

-import { login, logout, getLinkURL } from '@/api/login'
-import { getInfo, initOwnerNameChange, getUserPortData, checkRdeUser } from '@/api/system/user.js'
-import { getToken, setToken, removeToken, getUserId, setUserId, removeUserId, removeTime } from '@/utils/auth'
+import { login, logout } from '@/api/login'
+import { getLogisticsCodeList } from '@/api/system/dict-api.js'
+import { getToken, setToken, removeToken, removeUserId, removeTime } from '@/utils/auth'
 import { alertWarningMsg } from '@/utils/index.js'
-import { encrypt } from '@/utils/jsencrypt'
-import { unEntryLock } from "@/api/entry-api.js";
 
 const user = {
   state: {
@@ -127,6 +125,20 @@ const user = {
       })
     },
 
+    //获取字典数据
+    async GetDict({ commit, state }) {
+      let obj = state.dict
+      new Promise((resolve, reject) => {
+        getLogisticsCode().then(res => {
+          obj.LogisticsCode = res
+        }).finally(() => {
+          resolve()
+        })
+      }).then(() => {
+        commit('SET_DICT', obj)
+      })
+    },
+
     //退出系统
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {
@@ -161,6 +173,21 @@ const user = {
   }
 }
 
+function getLogisticsCode() {
+  return new Promise((resolve, reject) => {
+    getLogisticsCodeList().then(res => {
+      if (res.code === '200') {
+        resolve(res.data)
+      } else {
+        reject()
+      }
+    }).catch(err => {
+      console.log(err);
+      reject()
+    })
+  })
+}
+
 
 export default user
 

@@ -3,7 +3,7 @@
     class="fedexDetialTable fedexTableBlack tableHeightAuto bodyTable"
     :data="tableData"
     :headerData="bodyHeader"
-    :order="true"
+    :order="false"
     :border="false"
     :pagination="false"
     :pageSizes="[20, 30, 50, 100]"

@@ -229,7 +229,7 @@ import ReceiptInfoTable from "../components/ReceiptInfoTable/index.vue";
 import ProductDetailTable from "../components/ProductDetailTable/index.vue";
 import { getOrderDetailData } from "@/api/exportDetail-api.js";
 export default {
-  name: "index.vue",
+  name: "",
   components: { ProductDetailTable, ReceiptInfoTable },
   data() {
     return {
@@ -259,6 +259,12 @@ export default {
       detailData: [],
       detialHeaderData: [
         {
+          name: "序号",
+          value: "gnum",
+          width: "",
+          align: "left",
+        },
+        {
           name: "企业商品货号",
           value: "itemNo",
           width: "",

@@ -152,7 +152,10 @@
 </template>
 
 <script>
-import { getAllExportingBills } from "@/api/exportQuery.js";
+import {
+  getAllExportingBills,
+  getOrderReceiptData,
+} from "@/api/exportQuery.js";
 
 export default {
   name: "ExportBillQuery",
@@ -346,10 +349,21 @@ export default {
         });
     },
     //查询回执
-    receiptApi(id, type) {
+    receiptApi(id) {
       return new Promise((resolve, reject) => {
-        let obj = { declareId: id };
-        resolve();
+        let obj = { orderId: id };
+        getOrderReceiptData(obj)
+          .then((res) => {
+            if (res.code === "200") {
+              resolve(res.data);
+            } else {
+              reject();
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            reject();
+          });
       });
     },
     popoverClose(val) {

@@ -148,13 +148,13 @@
     </el-form>
     <div class="optionButton">
       <div>
-        <el-button class="entrySaveButton" size="small" @click="downloadData">
+        <!-- <el-button class="entrySaveButton" size="small" @click="downloadData">
           <svg-icon
             class="el-icon-user-solid"
             icon-class="customCodeConfig"
           ></svg-icon>
           汇总申请单
-        </el-button>
+        </el-button> -->
       </div>
       <div>
         <el-button
@@ -183,7 +183,7 @@
       @sizeChange="sizeChange"
       @currentChange="currentChange"
       @cellClick="cellClick"
-      :selection="true"
+      :selection="false"
       :selectFixed="false"
       :rowSelectDataType="false"
       @tableSelect="tableSelect"
@@ -220,7 +220,7 @@
 </template>
 
 <script>
-import { getAllexportList } from "@/api/exportList-api.js";
+import { getAllexportList, getListReceiptData } from "@/api/exportList-api.js";
 
 export default {
   name: "ExportBillQuery",
@@ -383,14 +383,14 @@ export default {
     //查询详情
     view(val) {
       this.$router.push({
-        name: "ExportBillDetail",
+        name: "ExportListDetail",
         params: { data: val },
       });
     },
     popoverChange(val) {
       console.log(val);
       this.tableData = val.tableData;
-      this.receiptApi(val.data.declareId, val.status)
+      this.receiptApi(val.data.copNo, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {
@@ -406,10 +406,21 @@ export default {
         });
     },
     //查询回执
-    receiptApi(id, type) {
+    receiptApi(id) {
       return new Promise((resolve, reject) => {
-        let obj = { declareId: id };
-        resolve();
+        let obj = { copNo: id };
+        getListReceiptData(obj)
+          .then((res) => {
+            if (res.code === "200") {
+              resolve(res.data);
+            } else {
+              reject();
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            reject();
+          });
       });
     },
     popoverClose(val) {

@@ -21,16 +21,7 @@
         <!-- 物流企业代码 -->
         <el-col :span="5">
           <Formitem label="物流企业代码" prop="logisticsCode">
-            <el-input
-              type="text"
-              class="inputShadow"
-              id="inputInner--logisticsCode"
-              resize="none"
-              v-model="sreachFormData.logisticsCode"
-              clearable
-              placeholder=""
-            ></el-input>
-            <!-- <el-select
+            <el-select
               type="text"
               id="inputInner--logisticsCode"
               v-model="sreachFormData.logisticsCode"
@@ -38,12 +29,12 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.logisticsCode"
+                v-for="(item, index) in $store.getters.dict.logisticsCode"
                 :key="index"
                 :label="item.name"
                 :value="item.code"
               ></el-option>
-            </el-select> -->
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 回执状态 -->
@@ -165,7 +156,10 @@
 </template>
 
 <script>
-import { getAllExportingTransportBills } from "@/api/exportQuery.js";
+import {
+  getAllExportingTransportBills,
+  getWaybillReceiptData,
+} from "@/api/exportQuery.js";
 
 export default {
   name: "ExportTransportBillQuery",
@@ -353,10 +347,21 @@ export default {
         });
     },
     //查询回执
-    receiptApi(id, type) {
+    receiptApi(id) {
       return new Promise((resolve, reject) => {
-        let obj = { declareId: id };
-        resolve();
+        let obj = { logisticsId: id };
+        getWaybillReceiptData(obj)
+          .then((res) => {
+            if (res.code === "200") {
+              resolve(res.data);
+            } else {
+              reject();
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            reject();
+          });
       });
     },
     popoverClose(val) {

@@ -146,7 +146,10 @@
 </template>
 
 <script>
-import { getAllTotalScoreList } from "@/api/listBranch-api.js";
+import {
+  getAllTotalScoreList,
+  getTotalScoreReceiptData,
+} from "@/api/listBranch-api.js";
 
 export default {
   name: "ListBranchQuery",
@@ -259,7 +262,7 @@ export default {
     //查询详情
     view(val) {
       this.$router.push({
-        name: "ExportTransportDetail",
+        name: "ListBranchDetail",
         params: { data: val },
       });
     },
@@ -317,7 +320,7 @@ export default {
     popoverChange(val) {
       console.log(val);
       this.tableData = val.tableData;
-      this.receiptApi(val.data.declareId, val.status)
+      this.receiptApi(val.data.copNo, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {
@@ -333,10 +336,21 @@ export default {
         });
     },
     //查询回执
-    receiptApi(id, type) {
+    receiptApi(id) {
       return new Promise((resolve, reject) => {
-        let obj = { declareId: id };
-        resolve();
+        let obj = { copNo: id };
+        getTotalScoreReceiptData(obj)
+          .then((res) => {
+            if (res.code === "200") {
+              resolve(res.data);
+            } else {
+              reject();
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            reject();
+          });
       });
     },
     popoverClose(val) {

@@ -165,7 +165,10 @@
 </template>
 
 <script>
-import { getAllLogisticsDepartureList } from "@/api/logisticsExit-api.js";
+import {
+  getAllLogisticsDepartureList,
+  getLogisticsDepartureReceiptData,
+} from "@/api/logisticsExit-api.js";
 
 export default {
   name: "LogisticsExitQuery",
@@ -291,7 +294,7 @@ export default {
     //查询详情
     view(val) {
       this.$router.push({
-        name: "ExportTransportDetail",
+        name: "LogisticsExitDetail",
         params: { data: val },
       });
     },
@@ -349,7 +352,7 @@ export default {
     popoverChange(val) {
       console.log(val);
       this.tableData = val.tableData;
-      this.receiptApi(val.data.declareId, val.status)
+      this.receiptApi(val.data.copNo, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {
@@ -365,10 +368,21 @@ export default {
         });
     },
     //查询回执
-    receiptApi(id, type) {
+    receiptApi(id) {
       return new Promise((resolve, reject) => {
-        let obj = { declareId: id };
-        resolve();
+        let obj = { copNo: id };
+        getLogisticsDepartureReceiptData(obj)
+          .then((res) => {
+            if (res.code === "200") {
+              resolve(res.data);
+            } else {
+              reject();
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            reject();
+          });
       });
     },
     popoverClose(val) {

@@ -41,6 +41,7 @@ export default {
       //     })
       //   );
       // }
+      this.$store.dispatch("GetDict");
       location.replace(process.env.VUE_APP_BASE_ROUTE);
     } else {
       this.$router.push({ path: "/login" });

@@ -334,6 +334,7 @@ export default {
 }
 
 .errorMessage {
+  width: 100%;
   color: $fedexError;
 }
 </style>

@@ -487,6 +487,7 @@ export default {
               item.orderReceiptStatusPopoverType = false;
               item.listReceiptStatusPopoverType = false;
               item.logisticsReceiptStatusPopoverType = false;
+              item.totalSplitOrderStatusPopoverType = false;
               item.popoverData = [];
             });
           } else {
@@ -655,6 +656,7 @@ export default {
         item.orderReceiptStatusPopoverType = false;
         item.listReceiptStatusPopoverType = false;
         item.logisticsReceiptStatusPopoverType = false;
+        item.totalSplitOrderStatusPopoverType = false;
         item.popoverData = [];
       });
       this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =