回执功能增加，详情增加

@@ -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,6 +2,7 @@ import request from '@/utils/request'
 
 //订单详情
 /**
+ * @param orderId * 订单id
  */
 export function getOrderDetailData(data) {
   return request({
@@ -11,23 +12,47 @@ export function getOrderDetailData(data) {
   })
 }
 
-//订单详情
 /**
+ * 出口运单详情
+ * @param logisticsId * 运单id
  */
-export function getOrderLogata(data) {
+export function getTransportDetail(data) {
   return request({
-        url: '/bus-customer/exportOrder/receipt/' + data.orderNo,
-        method: 'get',
-        data: data
+    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 getListBranchDetail(data) {
+  return request({
+    url: '/bus-customer/exportTotalScore/info/' + data.totalScoreId,
+    method: 'get'
+  })
+}
+
+/**
+ * 物流离境单详情
+ * @param logisticsDepartureId  * 物流离境单id
  */
-export function getTransportDetail(id) {
+export function getLogisticsExitDetail(data) {
   return request({
-    url: '/bus-customer/exportWaybill/info/' + id,
+    url: '/bus-customer/exportLogisticsDeparture/info/' + data.logisticsDepartureId,
     method: 'get'
   })
 }
\ No newline at end of file

@@ -20,3 +20,15 @@ export function getAllexportList(data) {
         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

@@ -35,3 +35,25 @@ export function getAllExportingTransportBills(data) {
         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

@@ -16,3 +16,14 @@ export function getAllTotalScoreList(data) {
         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

@@ -17,3 +17,14 @@ export function getAllLogisticsDepartureList(data) {
         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";

@@ -23,14 +23,10 @@ router.beforeEach((to, from, next) => {
           store.dispatch('GetInfo').then((res) => {
             // if (res.success) {
             store.dispatch('GenerateRoutes').then(accessRoutes => {
+              store.dispatch("GetDict");
               // 根据roles权限生成可访问的路由表
               router.addRoutes(accessRoutes) // 动态添加可访问路由表
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-                // if (getLoginType()) {
-                //   next({ name: 'Entry', params: JSON.parse(getLoginType()) })
-                // } else {
-                //   next()
-                // }
             })
             // }
           }).catch(err => {
@@ -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) {

 <template>
-  <div class="export-bill-detail">
-    <h5 class="first-header">
-      出口清单详情
-      <div class="returnButton" @click="$router.back()">返回</div>
-    </h5>
+  <div class="entry" v-loading="loadings.entryLoading">
+    <div class="entryTitle">
+      <div>出口清单详情</div>
+      <div>
+        <el-button class="entrySaveButton" @click="back">返 回</el-button>
+      </div>
+    </div>
     <el-form
-      class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
+      class="fedexFormStyle"
       ref="sreachForm"
-      :model="searchForm"
+      :model="formData"
       label-position="top"
       disabled
       size="small"
     >
-      <el-row class="row-border">
-        <el-col :span="5">
-          <Formitem label="提运单号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+      <el-row :gutter="5">
+        <!-- 提运单号 -->
+        <el-col :span="3">
+          <Formitem label="提运单号" prop="billNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--billNo"
               resize="none"
+              v-model="formData.billNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="订单编号" prop="factoryCode">
-            <el-select
+        <!-- 订单编号 -->
+        <el-col :span="3">
+          <Formitem label="订单编号" prop="orderNo">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--orderNo"
+              resize="none"
+              v-model="formData.orderNo"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="电商平台代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 电商平台代码 -->
+        <el-col :span="3">
+          <Formitem label="电商平台代码" prop="ebpcode">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--ebpcode"
               resize="none"
+              v-model="formData.ebpcode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="申报地海关" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 申报地海关 -->
+        <el-col :span="3">
+          <Formitem label="申报地海关" prop="customsCode">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--customsCode"
               resize="none"
+              v-model="formData.customsCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="物流企业代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 物流企业代码 -->
+        <el-col :span="3">
+          <Formitem label="物流企业代码" prop="logisticsCode">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--logisticsCode"
               resize="none"
+              v-model="formData.logisticsCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="5">
-          <Formitem label="物流企业名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 物流企业名称 -->
+        <el-col :span="6">
+          <Formitem label="物流企业名称" prop="logisticsName">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--logisticsName"
               resize="none"
+              v-model="formData.logisticsName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="物流运单编号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 物流运单编号 -->
+        <el-col :span="3">
+          <Formitem label="物流运单编号" prop="logisticsNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--logisticsNo"
               resize="none"
+              v-model="formData.logisticsNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="进出口标记" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+      </el-row>
+      <el-row :gutter="5">
+        <!-- 进出口标记 -->
+        <el-col :span="3">
+          <Formitem label="进出口标记" prop="ieFlag">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--ieFlag"
               resize="none"
+              v-model="formData.ieFlag"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="4">
-          <Formitem label="出口口岸" prop="factoryCode">
-            <el-select
+        <!-- 出口口岸 -->
+        <el-col :span="3">
+          <Formitem label="出口口岸" prop="portCode">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--portCode"
+              resize="none"
+              v-model="formData.portCode"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="出口日期" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 出口日期 -->
+        <el-col :span="3">
+          <Formitem label="出口日期" prop="ieDate">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--ieDate"
               resize="none"
+              v-model="formData.ieDate"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4">
-          <Formitem label="申报业务类型" prop="factoryCode">
+        <!-- 申报业务类型 -->
+        <el-col :span="3">
+          <Formitem label="申报业务类型" prop="statisticsFlag">
             <el-select
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              id="inputInner--statisticsFlag"
+              v-model="formData.statisticsFlag"
               clearable
               placeholder=""
             >
-              <el-option
-                v-for="(item, index) in dictData.userport"
+              <!-- <el-option
+                v-for="(item, index) in dictData.currency"
                 :key="index"
                 :label="item.name"
-                :value="item.name"
-              ></el-option>
+                :value="item.value"
+              ></el-option> -->
             </el-select>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="申报企业代码" prop="factoryCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 申报企业代码 -->
+        <el-col :span="3">
+          <Formitem label="申报企业代码" prop="agentCode">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--agentCode"
               resize="none"
+              v-model="formData.agentCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="申报企业名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 申报企业名称 -->
+        <el-col :span="6">
+          <Formitem label="申报企业名称" prop="agentName">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--agentName"
               resize="none"
+              v-model="formData.agentName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="收发货人代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 收发货人代码 -->
+        <el-col :span="3">
+          <Formitem label="收发货人代码" prop="ebccode">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--ebccode"
               resize="none"
+              v-model="formData.ebccode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="收发货人名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+      </el-row>
+      <el-row :gutter="5">
+        <!-- 收发货人名称 -->
+        <el-col :span="3">
+          <Formitem label="收发货人名称" prop="ebcname">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--ebcname"
               resize="none"
+              v-model="formData.ebcname"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="生产销售企业代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 生产销售企业代码 -->
+        <el-col :span="3">
+          <Formitem label="生产销售企业代码" prop="ownerCode">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--ownerCode"
               resize="none"
+              v-model="formData.ownerCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="生产销售企业名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 生产销售企业名称 -->
+        <el-col :span="3">
+          <Formitem label="生产销售企业名称" prop="ownerName">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--ownerName"
               resize="none"
+              v-model="formData.ownerName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="区内企业代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 区内企业代码 -->
+        <el-col :span="3">
+          <Formitem label="区内企业代码" prop="iacCode">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--iacCode"
               resize="none"
+              v-model="formData.iacCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="区内企业名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 区内企业名称 -->
+        <el-col :span="3">
+          <Formitem label="区内企业名称" prop="iacName">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--iacName"
               resize="none"
+              v-model="formData.iacName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="账册编号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 账册编号 -->
+        <el-col :span="3">
+          <Formitem label="账册编号" prop="emsNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--emsNo"
               resize="none"
+              v-model="formData.emsNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="贸易方式" prop="factoryCode">
+        <!-- 贸易方式 -->
+        <el-col :span="3">
+          <Formitem label="贸易方式" prop="tradeMode">
             <el-select
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              id="inputInner--tradeMode"
+              v-model="formData.tradeMode"
               clearable
               placeholder=""
             >
-              <el-option
-                v-for="(item, index) in dictData.userport"
+              <!-- <el-option
+                v-for="(item, index) in dictData.currency"
                 :key="index"
                 :label="item.name"
-                :value="item.name"
-              ></el-option>
+                :value="item.value"
+              ></el-option> -->
             </el-select>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="运输方式" prop="factoryCode">
+        <!-- 运输方式 -->
+        <el-col :span="3">
+          <Formitem label="运输方式" prop="trafMode">
             <el-select
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              id="inputInner--trafMode"
+              v-model="formData.trafMode"
               clearable
               placeholder=""
             >
-              <el-option
-                v-for="(item, index) in dictData.userport"
+              <!-- <el-option
+                v-for="(item, index) in dictData.currency"
                 :key="index"
                 :label="item.name"
-                :value="item.name"
-              ></el-option>
+                :value="item.value"
+              ></el-option> -->
             </el-select>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="运输工具名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+      </el-row>
+      <el-row :gutter="5">
+        <!-- 运输工具名称 -->
+        <el-col :span="3">
+          <Formitem label="运输工具名称" prop="trafName">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--trafName"
               resize="none"
+              v-model="formData.trafName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="航班航次号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 航班航次号 -->
+        <el-col :span="3">
+          <Formitem label="航班航次号" prop="voyageNo">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--voyageNo"
               resize="none"
+              v-model="formData.voyageNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="总包号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 总包号 -->
+        <el-col :span="3">
+          <Formitem label="总包号" prop="totalPackageNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--totalPackageNo"
               resize="none"
+              v-model="formData.totalPackageNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="监管场所代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 监管场所代码 -->
+        <el-col :span="3">
+          <Formitem label="监管场所代码" prop="loctNo">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--loctNo"
               resize="none"
+              v-model="formData.loctNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="运抵国（地区）" prop="factoryCode">
+        <!-- 运抵国（地区） -->
+        <el-col :span="3">
+          <Formitem label="运抵国（地区）" prop="country">
             <el-select
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              id="inputInner--country"
+              v-model="formData.country"
               clearable
               placeholder=""
             >
-              <el-option
-                v-for="(item, index) in dictData.userport"
+              <!-- <el-option
+                v-for="(item, index) in dictData.currency"
                 :key="index"
                 :label="item.name"
-                :value="item.name"
-              ></el-option>
+                :value="item.value"
+              ></el-option> -->
             </el-select>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="指运港" prop="factoryCode">
+        <!-- 指运港 -->
+        <el-col :span="3">
+          <Formitem label="指运港" prop="pod">
             <el-select
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              id="inputInner--pod"
+              v-model="formData.pod"
               clearable
               placeholder=""
             >
-              <el-option
-                v-for="(item, index) in dictData.userport"
+              <!-- <el-option
+                v-for="(item, index) in dictData.currency"
                 :key="index"
                 :label="item.name"
-                :value="item.name"
-              ></el-option>
+                :value="item.value"
+              ></el-option> -->
             </el-select>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="运费" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 运费 -->
+        <el-col :span="3">
+          <Formitem label="运费" prop="freight">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--freight"
               resize="none"
+              v-model="formData.freight"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="运费币制" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 运费币制 -->
+        <el-col :span="3">
+          <Formitem label="运费币制" prop="fcurrency">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--fcurrency"
               resize="none"
+              v-model="formData.fcurrency"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="运费标志" prop="factoryCode">
-            <el-select
+      </el-row>
+      <el-row :gutter="5">
+        <!-- 运费标志 -->
+        <el-col :span="3">
+          <Formitem label="运费标志" prop="fflag">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--fflag"
+              resize="none"
+              v-model="formData.fflag"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="保费" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 保费 -->
+        <el-col :span="3">
+          <Formitem label="保费" prop="insuredfee">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--insuredfee"
               resize="none"
+              v-model="formData.insuredfee"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="保费币制" prop="factoryCode">
-            <el-select
+        <!-- 保费币制 -->
+        <el-col :span="3">
+          <Formitem label="保费币制" prop="icurrency">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--icurrency"
+              resize="none"
+              v-model="formData.icurrency"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="保费标志" prop="factoryCode">
-            <el-select
+        <!-- 保费标志 -->
+        <el-col :span="3">
+          <Formitem label="保费标志" prop="iflag">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--iflag"
+              resize="none"
+              v-model="formData.iflag"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="件数/包裹件数" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 件数/包裹件数 -->
+        <el-col :span="3">
+          <Formitem label="件数/包裹件数" prop="packNo">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--packNo"
               resize="none"
+              v-model="formData.packNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="毛重(公斤)" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 毛重(公斤) -->
+        <el-col :span="3">
+          <Formitem label="毛重(公斤)" prop="grossWeight">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--grossWeight"
               resize="none"
+              v-model="formData.grossWeight"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="净重(公斤)" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 净重(公斤) -->
+        <el-col :span="3">
+          <Formitem label="净重(公斤)" prop="netWeight">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--netWeight"
               resize="none"
+              v-model="formData.netWeight"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="包装种类代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 包装种类代码 -->
+        <el-col :span="3">
+          <Formitem label="包装种类代码" prop="wrapType">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--wrapType"
               resize="none"
+              v-model="formData.wrapType"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="回执状态" prop="factoryCode">
-            <el-select
+      </el-row>
+      <el-row :gutter="5">
+        <!-- 业务状态 -->
+        <el-col :span="3">
+          <Formitem label="回执状态" prop="returnStatus">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--returnStatus"
+              resize="none"
+              v-model="formData.returnStatus"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="申报类型" prop="factoryCode">
-            <el-select
+        <!-- 申报类型 -->
+        <el-col :span="3">
+          <Formitem label="申报类型" prop="appType">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--appType"
+              resize="none"
+              v-model="formData.appType"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
-          </Formitem>
-        </el-col>
-        <el-col :span="4">
-          <Formitem label="申报时间" prop="declareDate">
-            <el-date-picker
-              v-model="value1"
-              type="date"
-              placeholder="选择日期">
-            </el-date-picker>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="备注" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 申报时间 -->
+        <el-col :span="3">
+          <Formitem label="申报时间" prop="appTime">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
+              type="text"
+              class="inputShadow"
+              id="inputInner--appTime"
               resize="none"
-                maxlength="13000"
+              v-model="formData.appTime"
+              clearable
               placeholder=""
-                @blur="textareaBlur"
             ></el-input>
+          </Formitem>
+        </el-col>
+        <!-- 备注 -->
+        <el-col :span="9">
+          <Formitem label="备注" prop="note">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--note"
               resize="none"
+              v-model="formData.note"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
       </el-row>
     </el-form>
-
-    <h5>回执信息</h5>
-    <ReceiptInfoTable :showActionColumn="true" />
-
-    <h5>商品明细</h5>
-    <ProductDetailTable :columns="columns" :tableData="tableData">
-      <!-- 自定义插槽内容：例如计量单位列 -->
-      <template v-slot:unit="{ row }">
-        <span>{{ row.unit }}</span>
-        <i class="el-icon-top" style="margin-left: 5px;"></i>
-      </template>
-    </ProductDetailTable>
+    <div
+      :class="{ entryTitle: true, titleBorder: logtableType ? false : true }"
+      style="margin-top: 10px"
+    >
+      <div>
+        回执信息
+        <el-button type="text" @click="hiddenLogTable">
+          <svg-icon v-if="logtableType" icon-class="downIcon"></svg-icon>
+          <svg-icon v-else icon-class="upIcon"></svg-icon>
+        </el-button>
+      </div>
+    </div>
+    <ReceiptInfoTable
+      v-if="logtableType"
+      :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 { getListDetail } from "@/api/exportDetail-api.js";
 export default {
-  name: "exportTransportDetail.vue",
-  components: {ProductDetailTable, ReceiptInfoTable},
+  name: "",
+  components: { ProductDetailTable, ReceiptInfoTable },
   data() {
     return {
-      searchForm: {
-        declaredPort: "",
-        consStatus: "",
-        consignmentCode: "",
-        accsDataImportTime: [],
-        ownerName: "",
-        consignmentHeadCode: "",
-        isPushCustomsSys: "",
-        waitOperStatus: "",
-        declTime: [],
+      id: null,
+      formData: {},
+      logData: [],
+      logHeaderData: [
+        {
+          name: "回执状态",
+          value: "returnStatus",
+          width: "200",
+          align: "left",
         },
-      textareaVisible: {
-        formItemconsignmentCode: false,
-        formItemconsignmentHeadCode: false,
+        {
+          name: "状态时间",
+          value: "returnTime",
+          width: "400",
+          align: "left",
         },
-      dictData: {
-        userport: [
-          {name: "Shanghai Port", code: "SH"},
-          {name: "Beijing Port", code: "BJ"},
-          {name: "Guangzhou Port", code: "GZ"},
-          {name: "Shenzhen Port", code: "SZ"},
-          {name: "Tianjin Port", code: "TJ"},
-        ],
+        {
+          name: "回执描述",
+          value: "returnInfo",
+          width: "",
+          align: "left",
         },
-      // 动态列配置
-      columns: [
-        { prop: "index", label: "序号", width: "60" },
-        { prop: "recordNumber", label: "备案编号", width: "120" },
-        { prop: "productName", label: "商品名称", width: "200" },
-        { prop: "productCode", label: "商品编码", width: "150" },
-        { prop: "productModel", label: "商品规格型号", width: "150" },
-        { prop: "unitPrice", label: "单价", width: "80" },
-        { prop: "totalPrice", label: "总价", width: "80" },
-        { prop: "currency", label: "币制", width: "80" },
-        { prop: "legalQuantity", label: "法定数量", width: "100" },
-        { prop: "legalUnit", label: "法定单位", width: "80" },
-        { prop: "secondQuantity", label: "第二数量", width: "100" },
-        { prop: "secondUnit", label: "第二单位", width: "80" },
-        { prop: "originCountry", label: "原产国", width: "120" },
-        { prop: "tradeCountry", label: "贸易国", width: "120" },
-        { prop: "grossWeight", label: "毛重(KG)", width: "100" }
       ],
-      // 表格数据
-      tableData: [
+      detailData: [],
+      detialHeaderData: [
+        {
+          name: "序号",
+          value: "gnum",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "商品名称",
+          value: "itemName",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "商品编码",
+          value: "itemNo",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "商品规格型号",
+          value: "",
+          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: "qty1",
+          width: "",
+          align: "left",
+        },
         {
-          index: 1,
-          productNumber: "6704200000",
-          productName: "真人发发夹",
-          description: "测试内容",
-          code: "485607096",
-          unit: "↑",
-          currency: "美元",
-          quantity: 1,
-          unitPrice: "645.78",
-          totalPrice: "645.78",
-          notes: "山东电子口岸已写，加签后上传",
+          name: "法定单位",
+          value: "unit1",
+          width: "",
+          align: "left",
         },
         {
-          index: 2,
-          productNumber: "6704200000",
-          productName: "真人发发夹",
-          description: "测试内容",
-          code: "2145860720",
-          unit: "↑",
-          currency: "美元",
-          quantity: 2,
-          unitPrice: "645.78",
-          totalPrice: "645.78",
-          notes: "山东电子口岸已写，加签后上传",
+          name: "第二数量",
+          value: "qty2",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "第二单位",
+          value: "unit2",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "毛重(KG)",
+          value: "",
+          width: "",
+          align: "left",
         },
       ],
-    }
+      loadings: {
+        entryLoading: false,
       },
-  methods: {
-    textareaBlur(val) {
-      let inputInner = document.querySelector(
-        "#inputInner--" + val.target.name.split("-")[0]
-      );
-      this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false;
-      inputInner.style.display = "block";
-      this.$nextTick(() => {
-        inputInner.blur();
-        if (
-          inputInner.value != undefined &&
-          inputInner.value != "" &&
-          inputInner.value != null
-        ) {
-          inputInner.classList.add("inputFocus");
+      logtableType: true,
+    };
+  },
+  created() {
+    if (this.$route.params.data) {
+      this.id = this.$route.params.data.id;
+      this.searchData();
     } else {
-          inputInner.classList.remove("inputFocus");
+      this.back();
     }
+  },
+  methods: {
+    searchData() {
+      this.loadings.entryLoading = true;
+      getListDetail({ listId: this.id })
+        .then((res) => {
+          if (res.code === "200") {
+            this.formData = res.data.exportList;
+            this.detailData = res.data.exportListProductList;
+            this.logData = res.data.exportListReceiptList;
+            this.detailData.forEach((item, idx) => {
+              item.index = idx;
             });
-      let arr = [];
-      this.searchForm[val.target.name.split("-")[0]]
-        .replace(/[\n\，\；\;]/g, ",")
-        .replace(/[\t]/g, "")
-        .split(",")
-        .forEach((str, index) => {
-          if (str != null && str != "" && index <= 1000) {
-            arr.push(str.trim());
+          } else {
+            this.alertWarningMsg(res.message);
           }
+          this.loadings.entryLoading = false;
+        })
+        .catch((err) => {
+          console.log(err);
+          this.loadings.entryLoading = false;
         });
-      this.searchForm[val.target.name.split("-")[0]] = arr.join("\n");
-      this.$forceUpdate();
     },
-    //文本域展示状态切换
-    textareaFocus(val) {
-      this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true;
-      this.$nextTick(() => {
-        document
-          .querySelector("#popoverInput" + val.target.name.split("-")[0])
-          .focus();
-        document.querySelector(
-          "#inputInner--" + val.target.name.split("-")[0]
-        ).style.display = "none";
-      });
+    searchLogData() {},
+    hiddenLogTable() {
+      this.logtableType = !this.logtableType;
     },
-  }
-}
+    back() {
+      this.$router.go(-1);
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-.export-bill-detail {
-  background-color: white;
-  padding-left: 20px;
-  //border: 1px solid black;
+.entry {
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+  background-color: #fff;
+  overflow: auto;
+
+  .entryInformation {
+    width: 100%;
     height: 100%;
-  .fedexFormItem {
-    background-color: #f5f5f5;
-    margin-right: 5px;
-    margin-bottom: 5px;
-  }
-  .fedexformSreach {
-    border-bottom: none;
   }
-  .first-header {
-    margin-top: 0;
-    padding-top: 20px;
+
+  .entryTitle {
     display: flex;
     justify-content: space-between;
-    position: relative;
-    .returnButton {
-      font-size: 14px;
-      color: red;
-      position: absolute;
-      right: 0;
-      top: 0px;
-      width: 80px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      background-color: white;
-      border-radius: 5px;
-      margin-right: 20px;
-      margin-top: 20px;
-      cursor: pointer;
-      border: 1px solid red;
+    font-weight: 600;
+    font-weight: 16px;
+    color: #000;
+    margin-bottom: 10px;
   }
+
+  .titleBorder {
+    border-bottom: 1px solid #333;
   }
 }
 </style>

@@ -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) {

@@ -15,12 +15,13 @@
       size="small"
     >
       <el-row :gutter="5">
+        <!-- 运单编号 -->
         <el-col :span="3">
           <Formitem label="运单编号" prop="logisticsNo">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--orderNo"
+              id="inputInner--logisticsNo"
               resize="none"
               v-model="formData.logisticsNo"
               clearable
@@ -28,45 +29,49 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 物流企业代码 -->
         <el-col :span="3">
-          <Formitem label="物流企业名称" prop="logisticsName">
+          <Formitem label="物流企业代码" prop="logisticsCode">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--orderType"
+              id="inputInner--logisticsCode"
               resize="none"
-              v-model="formData.logisticsName"
+              v-model="formData.logisticsCode"
               clearable
               placeholder=""
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 物流企业名称 -->
         <el-col :span="3">
-          <Formitem label="电商企业名称" prop="ebcname">
+          <Formitem label="物流企业名称" prop="logisticsName">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--ebpcode"
+              id="inputInner--logisticsName"
               resize="none"
-              v-model="formData.ebcname"
+              v-model="formData.logisticsName"
               clearable
               placeholder=""
             ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="6">
-          <Formitem label="电商企业代码" prop="ebccode">
+        <!-- 电商企业名称 -->
+        <el-col :span="3">
+          <Formitem label="电商企业名称" prop="ebcname">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--ebpname"
+              id="inputInner--ebcname"
               resize="none"
-              v-model="formData.ebccode"
+              v-model="formData.ebcname"
               clearable
               placeholder=""
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 电商企业代码 -->
         <el-col :span="3">
           <Formitem label="电商企业代码" prop="ebccode">
             <el-input
@@ -80,12 +85,13 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 电商企业电话 -->
         <el-col :span="3">
           <Formitem label="电商企业电话" prop="ebcTelephone">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--ebcname"
+              id="inputInner--ebcTelephone"
               resize="none"
               v-model="formData.ebcTelephone"
               clearable
@@ -93,12 +99,13 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 运费 -->
         <el-col :span="3">
           <Formitem label="运费" prop="freight">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--goodsValue"
+              id="inputInner--freight"
               resize="none"
               v-model="formData.freight"
               clearable
@@ -106,14 +113,13 @@
             ></el-input>
           </Formitem>
         </el-col>
-      </el-row>
-      <el-row :gutter="5">
+        <!-- 保价费 -->
         <el-col :span="3">
           <Formitem label="保价费" prop="insuredfee">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--freight"
+              id="inputInner--insuredfee"
               resize="none"
               v-model="formData.insuredfee"
               clearable
@@ -121,25 +127,34 @@
             ></el-input>
           </Formitem>
         </el-col>
+      </el-row>
+      <el-row :gutter="5">
+        <!-- 币制 -->
         <el-col :span="3">
           <Formitem label="币制" prop="currency">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--currency"
-              resize="none"
               v-model="formData.currency"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in dictData.currency"
+                :key="index"
+                :label="item.name"
+                :value="item.value"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
+        <!-- 毛重 -->
         <el-col :span="3">
           <Formitem label="毛重" prop="grossWeight">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--currency"
+              id="inputInner--grossWeight"
               resize="none"
               v-model="formData.grossWeight"
               clearable
@@ -147,12 +162,13 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 件数 -->
         <el-col :span="3">
           <Formitem label="件数" prop="packNo">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--currency"
+              id="inputInner--packNo"
               resize="none"
               v-model="formData.packNo"
               clearable
@@ -160,25 +176,13 @@
             ></el-input>
           </Formitem>
         </el-col>
-        <!-- <el-col :span="3">
-          <Formitem label="回执状态" prop="returnStatus">
-            <el-input
-              type="text"
-              class="inputShadow"
-              id="inputInner--returnStatus"
-              resize="none"
-              v-model="formData.returnStatus"
-              clearable
-              placeholder=""
-            ></el-input>
-          </Formitem>
-        </el-col> -->
+        <!-- 主要货物信息 -->
         <el-col :span="3">
           <Formitem label="主要货物信息" prop="goodsInfo">
             <el-input
               type="text"
               class="inputShadow"
-              id="inputInner--appType"
+              id="inputInner--goodsInfo"
               resize="none"
               v-model="formData.goodsInfo"
               clearable
@@ -186,33 +190,27 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 回执状态 -->
         <el-col :span="3">
-          <Formitem label="业务时间" prop="appTime">
-            <el-input
-              type="text"
-              class="inputShadow"
-              id="inputInner--appTime"
-              resize="none"
-              v-model="formData.appTime"
-              clearable
-              placeholder=""
-            ></el-input>
-          </Formitem>
-        </el-col>
-        <el-col :span="3">
-          <Formitem label="回执状态" prop="appStatus">
-            <el-input
+          <Formitem label="回执状态" prop="returnStatus">
+            <el-select
               type="text"
-              class="inputShadow"
-              id="inputInner--appTime"
-              resize="none"
-              v-model="formData.appTime"
+              id="inputInner--returnStatus"
+              v-model="formData.returnStatus"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in dictData.returnStatus"
+                :key="index"
+                :label="item.name"
+                :value="item.code"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
-        <el-col :span="12">
+        <!-- 备注 -->
+        <el-col :span="9">
           <Formitem label="备注" prop="note">
             <el-input
               type="text"
@@ -244,22 +242,16 @@
       :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 {getOrderDetailData, getTransportDetail} from "@/api/exportDetail-api.js";
-
+import { getTransportDetail } from "@/api/exportDetail-api.js";
 export default {
-  name: "index.vue",
-  components: {ProductDetailTable, ReceiptInfoTable},
+  name: "",
+  components: { ReceiptInfoTable },
   data() {
     return {
       id: null,
@@ -288,62 +280,70 @@ export default {
       detailData: [],
       detialHeaderData: [
         {
+          name: "序号",
+          value: "gnum",
+          width: "",
+          align: "left",
+        },
+        {
           name: "企业商品货号",
-          value: "",
+          value: "itemNo",
           width: "",
           align: "left",
         },
         {
           name: "商品企业商品名称",
-          value: "",
+          value: "itemName",
           width: "",
           align: "left",
         },
         {
           name: "企业商品描述",
-          value: "",
+          value: "itemDescribe",
           width: "",
           align: "left",
         },
         {
           name: "条码",
-          value: "",
+          value: "barCode",
           width: "",
           align: "left",
         },
         {
           name: "计量单位",
-          value: "",
+          value: "unit",
           width: "",
           align: "left",
+          slot: true,
         },
         {
           name: "币制",
-          value: "",
+          value: "currency",
           width: "",
           align: "left",
+          slot: true,
         },
         {
           name: "数量",
-          value: "",
+          value: "qty",
           width: "",
           align: "left",
         },
         {
           name: "单价",
-          value: "",
+          value: "price",
           width: "",
           align: "left",
         },
         {
           name: "总价",
-          value: "",
+          value: "totalPrice",
           width: "",
           align: "left",
         },
         {
           name: "备注",
-          value: "",
+          value: "note",
           width: "",
           align: "left",
         },
@@ -365,15 +365,11 @@ export default {
   methods: {
     searchData() {
       this.loadings.entryLoading = true;
-      getTransportDetail(this.id)
+      getTransportDetail({ logisticsId: this.id })
         .then((res) => {
           if (res.code === "200") {
             this.formData = res.data.exportWaybill;
-            this.detailData = res.data.exportOrderProductList;
             this.logData = res.data.exportWaybillReceiptList;
-            this.detailData.forEach((item, idx) => {
-              item.index = idx;
-            });
           } else {
             this.alertWarningMsg(res.message);
           }
@@ -384,8 +380,7 @@ export default {
           this.loadings.entryLoading = false;
         });
     },
-    searchLogData() {
-    },
+    searchLogData() {},
     hiddenLogTable() {
       this.logtableType = !this.logtableType;
     },

 <template>
-  <div class="export-bill-detail">
-    <h5 class="first-header">
-      清单总分单详情
-      <div class="returnButton" @click="$router.back()">返回</div>
-    </h5>
+  <div class="entry" v-loading="loadings.entryLoading">
+    <div class="entryTitle">
+      <div>清单总分单详情</div>
+      <div>
+        <el-button class="entrySaveButton" @click="back">返 回</el-button>
+      </div>
+    </div>
     <el-form
-      class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
+      class="fedexFormStyle"
       ref="sreachForm"
-      :model="searchForm"
+      :model="formData"
       label-position="top"
       disabled
       size="small"
     >
-      <el-row class="row-border">
-        <el-col :span="5">
-          <Formitem label="提运单号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+      <el-row :gutter="5">
+        <!-- 提运单号 -->
+        <el-col :span="3">
+          <Formitem label="提运单号" prop="billNo">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--billNo"
               resize="none"
+              v-model="formData.billNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="申报地海关" prop="factoryCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 申报地海关 -->
+        <el-col :span="3">
+          <Formitem label="申报地海关" prop="customsCode">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--customsCode"
               resize="none"
+              v-model="formData.customsCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="电子口岸编号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 电子口岸编号 -->
+        <el-col :span="3">
+          <Formitem label="电子口岸编号" prop="preNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--preNo"
               resize="none"
+              v-model="formData.preNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="监管场所代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 监管场所代码 -->
+        <el-col :span="3">
+          <Formitem label="监管场所代码" prop="loctNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
+              type="text"
+              class="inputShadow"
+              id="inputInner--loctNo"
               resize="none"
-                maxlength="13000"
+              v-model="formData.loctNo"
+              clearable
               placeholder=""
-                @blur="textareaBlur"
             ></el-input>
+          </Formitem>
+        </el-col>
+        <!-- 申报企业代码 -->
+        <el-col :span="3">
+          <Formitem label="申报企业代码" prop="agentCode">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--agentCode"
               resize="none"
+              v-model="formData.agentCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="申报企业代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 申报企业名称 -->
+        <el-col :span="6">
+          <Formitem label="申报企业名称" prop="agentName">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
+              type="text"
+              class="inputShadow"
+              id="inputInner--agentName"
               resize="none"
-                maxlength="13000"
+              v-model="formData.agentName"
+              clearable
               placeholder=""
-                @blur="textareaBlur"
             ></el-input>
+          </Formitem>
+        </el-col>
+        <!-- 运输方式 -->
+        <el-col :span="3">
+          <Formitem label="运输方式" prop="trafMode">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--trafMode"
               resize="none"
+              v-model="formData.trafMode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="5">
-          <Formitem label="申报企业名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+      <el-row :gutter="5">
+        <!-- 运输工具名称 -->
+        <el-col :span="3">
+          <Formitem label="运输工具名称" prop="trafName">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--trafName"
               resize="none"
+              v-model="formData.trafName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="运输方式" prop="factoryCode">
-            <el-select
+        <!-- 航班航次号 -->
+        <el-col :span="3">
+          <Formitem label="航班航次号" prop="voyageNo">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--voyageNo"
+              resize="none"
+              v-model="formData.voyageNo"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="运输工具名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 提运单号 -->
+        <el-col :span="3">
+          <Formitem label="提运单号" prop="billNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--billNo"
               resize="none"
+              v-model="formData.billNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="航班航次号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 境内运输工具编号 -->
+        <el-col :span="3">
+          <Formitem label="境内运输工具编号" prop="domesticTrafNo">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--domesticTrafNo"
               resize="none"
+              v-model="formData.domesticTrafNo"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="境内运输工具编号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 毛重 -->
+        <el-col :span="3">
+          <Formitem label="毛重" prop="grossWeight">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--grossWeight"
               resize="none"
+              v-model="formData.grossWeight"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="毛重" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 物流企业名称 -->
+        <el-col :span="6">
+          <Formitem label="物流企业名称" prop="logisticsName">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--logisticsName"
               resize="none"
+              v-model="formData.logisticsName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="物流企业名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 报文总数 -->
+        <el-col :span="3">
+          <Formitem label="报文总数" prop="msgCount">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--msgCount"
               resize="none"
+              v-model="formData.msgCount"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="4">
-          <Formitem label="报文总数" prop="factoryCode">
-            <el-select
+      </el-row>
+      <el-row :gutter="5">
+        <!-- 报文序号 -->
+        <el-col :span="3">
+          <Formitem label="报文序号" prop="msgSeqNo">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--msgSeqNo"
+              resize="none"
+              v-model="formData.msgSeqNo"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="报文序号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 业务状态 -->
+        <el-col :span="3">
+          <Formitem label="业务状态" prop="returnStatus">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--returnStatus"
               resize="none"
+              v-model="formData.returnStatus"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4">
-          <Formitem label="回执状态" prop="factoryCode">
-            <el-select
+        <!-- 申报类型 -->
+        <el-col :span="3">
+          <Formitem label="申报类型" prop="appTypeStr">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--appTypeStr"
+              resize="none"
+              v-model="formData.appTypeStr"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="申报类型" prop="factoryCode">
-            <el-select
+        <!-- 申报日期 -->
+        <el-col :span="3">
+          <Formitem label="申报日期" prop="appTime">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--appTime"
+              resize="none"
+              v-model="formData.appTime"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
-          </Formitem>
-        </el-col>
-        <el-col :span="4">
-          <Formitem label="申报日期" prop="declareDate">
-            <el-date-picker
-              v-model="value1"
-              type="date"
-              placeholder="选择日期">
-            </el-date-picker>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="备注" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 备注 -->
+        <el-col :span="12">
+          <Formitem label="备注" prop="note">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--note"
               resize="none"
+              v-model="formData.note"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
       </el-row>
     </el-form>
-
-    <h5>回执信息</h5>
-    <ReceiptInfoTable />
-
-    <h5>商品明细</h5>
-    <ProductDetailTable />
+    <div
+      :class="{ entryTitle: true, titleBorder: logtableType ? false : true }"
+      style="margin-top: 10px"
+    >
+      <div>
+        回执信息
+        <el-button type="text" @click="hiddenLogTable">
+          <svg-icon v-if="logtableType" icon-class="downIcon"></svg-icon>
+          <svg-icon v-else icon-class="upIcon"></svg-icon>
+        </el-button>
+      </div>
+    </div>
+    <ReceiptInfoTable
+      v-if="logtableType"
+      :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 { getListBranchDetail } from "@/api/exportDetail-api.js";
 export default {
-  name: "index.vue",
-  components: {ProductDetailTable, ReceiptInfoTable},
+  name: "",
+  components: { ProductDetailTable, ReceiptInfoTable },
   data() {
     return {
-      searchForm: {
-        declaredPort: "",
-        consStatus: "",
-        consignmentCode: "",
-        accsDataImportTime: [],
-        ownerName: "",
-        consignmentHeadCode: "",
-        isPushCustomsSys: "",
-        waitOperStatus: "",
-        declTime: [],
+      id: null,
+      formData: {},
+      logData: [],
+      logHeaderData: [
+        {
+          name: "回执状态",
+          value: "returnStatus",
+          width: "200",
+          align: "left",
+        },
+        {
+          name: "状态时间",
+          value: "returnTime",
+          width: "400",
+          align: "left",
         },
-      textareaVisible: {
-        formItemconsignmentCode: false,
-        formItemconsignmentHeadCode: false,
+        {
+          name: "回执描述",
+          value: "returnInfo",
+          width: "",
+          align: "left",
         },
-      dictData: {
-        userport: [
-          {name: "Shanghai Port", code: "SH"},
-          {name: "Beijing Port", code: "BJ"},
-          {name: "Guangzhou Port", code: "GZ"},
-          {name: "Shenzhen Port", code: "SZ"},
-          {name: "Tianjin Port", code: "TJ"},
       ],
+      detailData: [],
+      detialHeaderData: [
+        {
+          name: "序号",
+          value: "gnum",
+          width: "",
+          align: "left",
         },
-    }
+        {
+          name: "总包号",
+          value: "totalPackageNo",
+          width: "",
+          align: "left",
         },
-  methods: {
-    textareaBlur(val) {
-      let inputInner = document.querySelector(
-        "#inputInner--" + val.target.name.split("-")[0]
-      );
-      this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false;
-      inputInner.style.display = "block";
-      this.$nextTick(() => {
-        inputInner.blur();
-        if (
-          inputInner.value != undefined &&
-          inputInner.value != "" &&
-          inputInner.value != null
-        ) {
-          inputInner.classList.add("inputFocus");
+        {
+          name: "物流运单编号",
+          value: "logisticsNo",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "出口清单编号",
+          value: "invtNo",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "备注",
+          value: "note",
+          width: "",
+          align: "left",
+        },
+      ],
+      loadings: {
+        entryLoading: false,
+      },
+      logtableType: true,
+    };
+  },
+  created() {
+    if (this.$route.params.data) {
+      this.id = this.$route.params.data.id;
+      this.searchData();
     } else {
-          inputInner.classList.remove("inputFocus");
+      this.back();
     }
+  },
+  methods: {
+    searchData() {
+      this.loadings.entryLoading = true;
+      getListBranchDetail({ totalScoreId: this.id })
+        .then((res) => {
+          if (res.code === "200") {
+            this.formData = res.data.exportTotalScore;
+            this.detailData = res.data.exportTotalScoreItemList;
+            this.logData = res.data.exportTotalScoreReceiptList;
+            this.detailData.forEach((item, idx) => {
+              item.index = idx;
             });
-      let arr = [];
-      this.searchForm[val.target.name.split("-")[0]]
-        .replace(/[\n\，\；\;]/g, ",")
-        .replace(/[\t]/g, "")
-        .split(",")
-        .forEach((str, index) => {
-          if (str != null && str != "" && index <= 1000) {
-            arr.push(str.trim());
+          } else {
+            this.alertWarningMsg(res.message);
           }
+          this.loadings.entryLoading = false;
+        })
+        .catch((err) => {
+          console.log(err);
+          this.loadings.entryLoading = false;
         });
-      this.searchForm[val.target.name.split("-")[0]] = arr.join("\n");
-      this.$forceUpdate();
     },
-    //文本域展示状态切换
-    textareaFocus(val) {
-      this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true;
-      this.$nextTick(() => {
-        document
-          .querySelector("#popoverInput" + val.target.name.split("-")[0])
-          .focus();
-        document.querySelector(
-          "#inputInner--" + val.target.name.split("-")[0]
-        ).style.display = "none";
-      });
+    searchLogData() {},
+    hiddenLogTable() {
+      this.logtableType = !this.logtableType;
     },
-  }
-}
+    back() {
+      this.$router.go(-1);
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-.export-bill-detail {
-  background-color: white;
-  padding-left: 20px;
-  //border: 1px solid black;
+.entry {
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+  background-color: #fff;
+  overflow: auto;
+
+  .entryInformation {
+    width: 100%;
     height: 100%;
-  .fedexFormItem {
-    background-color: #f5f5f5;
-    margin-right: 5px;
-    margin-bottom: 5px;
-  }
-  .fedexformSreach {
-    border-bottom: none;
   }
-  .first-header {
-    margin-top: 0;
-    padding-top: 20px;
+
+  .entryTitle {
     display: flex;
     justify-content: space-between;
-    position: relative;
-    .returnButton {
-      font-size: 14px;
-      color: red;
-      position: absolute;
-      right: 0;
-      top: 0px;
-      width: 80px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      background-color: white;
-      border-radius: 5px;
-      margin-right: 20px;
-      margin-top: 20px;
-      cursor: pointer;
-      border: 1px solid red;
+    font-weight: 600;
+    font-weight: 16px;
+    color: #000;
+    margin-bottom: 10px;
   }
+
+  .titleBorder {
+    border-bottom: 1px solid #333;
   }
 }
 </style>

@@ -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) {

 <template>
-  <div class="export-bill-detail">
-    <h5 class="first-header">
-      离境单详情
-      <div class="returnButton" @click="$router.back()">返回</div>
-    </h5>
+  <div class="entry" v-loading="loadings.entryLoading">
+    <div class="entryTitle">
+      <div>离境单详情</div>
+      <div>
+        <el-button class="entrySaveButton" @click="back">返 回</el-button>
+      </div>
+    </div>
     <el-form
-      class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
+      class="fedexFormStyle"
       ref="sreachForm"
-      :model="searchForm"
+      :model="formData"
       label-position="top"
       disabled
       size="small"
     >
-      <el-row class="row-border">
-        <el-col :span="5">
-          <Formitem label="提运单号" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+      <el-row :gutter="5">
+        <!-- 提运单号 -->
+        <el-col :span="3">
+          <Formitem label="提运单号" prop="billNo">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--billNo"
               resize="none"
-                placeholder=""
-                @focus="textareaFocus"
-              ></el-input>
-            </el-popover>
-          </Formitem>
-        </el-col>
-        <el-col :span="4">
-          <Formitem label="报送类型" prop="factoryCode">
-            <el-select
-              type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              v-model="formData.billNo"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="回执状态" prop="factoryCode">
-            <el-select
+        <!-- 报送类型 -->
+        <el-col :span="3">
+          <Formitem label="报送类型" prop="appType">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--appType"
+              resize="none"
+              v-model="formData.appType"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="报送时间" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 业务状态 -->
+        <el-col :span="3">
+          <Formitem label="业务状态" prop="returnStatus">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--returnStatus"
               resize="none"
+              v-model="formData.returnStatus"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="物流企业名称" prop="factoryCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 报送时间 -->
+        <el-col :span="3">
+          <Formitem label="报送时间" prop="appTime">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--appTime"
               resize="none"
+              v-model="formData.appTime"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="物流企业代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 物流企业名称 -->
+        <el-col :span="3">
+          <Formitem label="物流企业名称" prop="logisticsName">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--logisticsName"
               resize="none"
+              v-model="formData.logisticsName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="申报地海关代码" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 物流企业代码 -->
+        <el-col :span="3">
+          <Formitem label="物流企业代码" prop="logisticsCode">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--logisticsCode"
               resize="none"
+              v-model="formData.logisticsCode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="4">
-          <Formitem label="运输方式" prop="factoryCode">
-            <el-select
+        <!-- 申报地海关代码 -->
+        <el-col :span="3">
+          <Formitem label="申报地海关代码" prop="customsCode">
+            <el-input
               type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              class="inputShadow"
+              id="inputInner--customsCode"
+              resize="none"
+              v-model="formData.customsCode"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="运输工具名称" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 运输方式 -->
+        <el-col :span="3">
+          <Formitem label="运输方式" prop="trafMode">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--trafMode"
               resize="none"
+              v-model="formData.trafMode"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="5">
-          <Formitem label="离境时间" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+      <el-row :gutter="5">
+        <!-- 运输工具名称 -->
+        <el-col :span="3">
+          <Formitem label="运输工具名称" prop="trafName">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--trafName"
               resize="none"
+              v-model="formData.trafName"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="申报日期" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 离境时间 -->
+        <el-col :span="3">
+          <Formitem label="离境时间" prop="leaveTime">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--leaveTime"
               resize="none"
+              v-model="formData.leaveTime"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
-
-        <el-col :span="5">
-          <Formitem label="备注" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
-              <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
+        <!-- 申报日期 -->
+        <el-col :span="3">
+          <Formitem label="申报日期" prop="createTimeStr">
             <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--createTimeStr"
               resize="none"
-                placeholder=""
-                @focus="textareaFocus"
-              ></el-input>
-            </el-popover>
-          </Formitem>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="4">
-          <Formitem label="回执状态" prop="factoryCode">
-            <el-select
-              type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
-              clearable
-              placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
-          </Formitem>
-        </el-col>
-        <el-col :span="4">
-          <Formitem label="申报类型" prop="factoryCode">
-            <el-select
-              type="text"
-              id="inputInner--declaredPort"
-              v-model="searchForm.declaredPort"
+              v-model="formData.createTimeStr"
               clearable
               placeholder=""
-            >
-              <el-option
-                v-for="(item, index) in dictData.userport"
-                :key="index"
-                :label="item.name"
-                :value="item.name"
-              ></el-option>
-            </el-select>
-          </Formitem>
-        </el-col>
-        <el-col :span="4">
-          <Formitem label="申报日期" prop="declareDate">
-            <el-date-picker
-              v-model="value1"
-              type="date"
-              placeholder="选择日期">
-            </el-date-picker>
+            ></el-input>
           </Formitem>
         </el-col>
-        <el-col :span="5">
-          <Formitem label="备注" prop="consignmentCode">
-            <el-popover
-              placement="bottom"
-              width="320"
-              trigger="manual"
-              popper-class="popoverconsignmentCode"
-              v-model="textareaVisible.formItemconsignmentCode"
-            >
+        <!-- 备注 -->
+        <el-col :span="9">
+          <Formitem label="备注" prop="note">
             <el-input
-                name="consignmentCode-textarea"
-                type="textarea"
-                :rows="5"
-                id="popoverInputconsignmentCode"
-                class="inputShadow textareaPopover"
-                v-model="searchForm.consignmentCode"
-                resize="none"
-                maxlength="13000"
-                placeholder=""
-                @blur="textareaBlur"
-              ></el-input>
-              <el-input
-                slot="reference"
-                name="consignmentCode"
-                type="textarea"
-                :rows="1"
+              type="text"
               class="inputShadow"
-                id="inputInner--consignmentCode"
-                v-model="searchForm.consignmentCode"
+              id="inputInner--note"
               resize="none"
+              v-model="formData.note"
+              clearable
               placeholder=""
-                @focus="textareaFocus"
             ></el-input>
-            </el-popover>
           </Formitem>
         </el-col>
       </el-row>
     </el-form>
-
-    <h5>回执信息</h5>
-    <ReceiptInfoTable />
-
-    <h5>商品明细</h5>
-    <ProductDetailTable />
+    <div
+      :class="{ entryTitle: true, titleBorder: logtableType ? false : true }"
+      style="margin-top: 10px"
+    >
+      <div>
+        回执信息
+        <el-button type="text" @click="hiddenLogTable">
+          <svg-icon v-if="logtableType" icon-class="downIcon"></svg-icon>
+          <svg-icon v-else icon-class="upIcon"></svg-icon>
+        </el-button>
+      </div>
+    </div>
+    <ReceiptInfoTable
+      v-if="logtableType"
+      :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 { getLogisticsExitDetail } from "@/api/exportDetail-api.js";
 export default {
   name: "index.vue",
-  components: {ProductDetailTable, ReceiptInfoTable},
+  components: { ProductDetailTable, ReceiptInfoTable },
   data() {
     return {
-      searchForm: {
-        declaredPort: "",
-        consStatus: "",
-        consignmentCode: "",
-        accsDataImportTime: [],
-        ownerName: "",
-        consignmentHeadCode: "",
-        isPushCustomsSys: "",
-        waitOperStatus: "",
-        declTime: [],
+      id: null,
+      formData: {},
+      logData: [],
+      logHeaderData: [
+        {
+          name: "回执状态",
+          value: "returnStatus",
+          width: "200",
+          align: "left",
+        },
+        {
+          name: "状态时间",
+          value: "returnTime",
+          width: "400",
+          align: "left",
         },
-      textareaVisible: {
-        formItemconsignmentCode: false,
-        formItemconsignmentHeadCode: false,
+        {
+          name: "回执描述",
+          value: "returnInfo",
+          width: "",
+          align: "left",
         },
-      dictData: {
-        userport: [
-          {name: "Shanghai Port", code: "SH"},
-          {name: "Beijing Port", code: "BJ"},
-          {name: "Guangzhou Port", code: "GZ"},
-          {name: "Shenzhen Port", code: "SZ"},
-          {name: "Tianjin Port", code: "TJ"},
       ],
+      detailData: [],
+      detialHeaderData: [
+        {
+          name: "序号",
+          value: "gnum",
+          width: "",
+          align: "left",
         },
-    }
+        {
+          name: "总包号",
+          value: "totalPackageNo",
+          width: "",
+          align: "left",
         },
-  methods: {
-    textareaBlur(val) {
-      let inputInner = document.querySelector(
-        "#inputInner--" + val.target.name.split("-")[0]
-      );
-      this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false;
-      inputInner.style.display = "block";
-      this.$nextTick(() => {
-        inputInner.blur();
-        if (
-          inputInner.value != undefined &&
-          inputInner.value != "" &&
-          inputInner.value != null
-        ) {
-          inputInner.classList.add("inputFocus");
+        {
+          name: "物流运单编号",
+          value: "logisticsNo",
+          width: "",
+          align: "left",
+        },
+        {
+          name: "备注",
+          value: "note",
+          width: "",
+          align: "left",
+        },
+      ],
+      loadings: {
+        entryLoading: false,
+      },
+      logtableType: true,
+    };
+  },
+  created() {
+    if (this.$route.params.data) {
+      this.id = this.$route.params.data.id;
+      this.searchData();
     } else {
-          inputInner.classList.remove("inputFocus");
+      this.back();
     }
+  },
+  methods: {
+    searchData() {
+      this.loadings.entryLoading = true;
+      getLogisticsExitDetail({ logisticsDepartureId: this.id })
+        .then((res) => {
+          if (res.code === "200") {
+            this.formData = res.data.exportLogisticsDeparture;
+            this.detailData = res.data.exportLogisticsDepartureItemList;
+            this.logData = res.data.exportLogisticsDepartureReceiptList;
+            this.detailData.forEach((item, idx) => {
+              item.index = idx;
             });
-      let arr = [];
-      this.searchForm[val.target.name.split("-")[0]]
-        .replace(/[\n\，\；\;]/g, ",")
-        .replace(/[\t]/g, "")
-        .split(",")
-        .forEach((str, index) => {
-          if (str != null && str != "" && index <= 1000) {
-            arr.push(str.trim());
+          } else {
+            this.alertWarningMsg(res.message);
           }
+          this.loadings.entryLoading = false;
+        })
+        .catch((err) => {
+          console.log(err);
+          this.loadings.entryLoading = false;
         });
-      this.searchForm[val.target.name.split("-")[0]] = arr.join("\n");
-      this.$forceUpdate();
     },
-    //文本域展示状态切换
-    textareaFocus(val) {
-      this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true;
-      this.$nextTick(() => {
-        document
-          .querySelector("#popoverInput" + val.target.name.split("-")[0])
-          .focus();
-        document.querySelector(
-          "#inputInner--" + val.target.name.split("-")[0]
-        ).style.display = "none";
-      });
+    searchLogData() {},
+    hiddenLogTable() {
+      this.logtableType = !this.logtableType;
     },
-  }
-}
+    back() {
+      this.$router.go(-1);
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-.export-bill-detail {
-  background-color: white;
-  padding-left: 20px;
-  //border: 1px solid black;
+.entry {
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+  background-color: #fff;
+  overflow: auto;
+
+  .entryInformation {
+    width: 100%;
     height: 100%;
-  .fedexFormItem {
-    background-color: #f5f5f5;
-    margin-right: 5px;
-    margin-bottom: 5px;
-  }
-  .fedexformSreach {
-    border-bottom: none;
   }
-  .first-header {
-    margin-top: 0;
-    padding-top: 20px;
+
+  .entryTitle {
     display: flex;
     justify-content: space-between;
-    position: relative;
-    .returnButton {
-      font-size: 14px;
-      color: red;
-      position: absolute;
-      right: 0;
-      top: 0px;
-      width: 80px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      background-color: white;
-      border-radius: 5px;
-      margin-right: 20px;
-      margin-top: 20px;
-      cursor: pointer;
-      border: 1px solid red;
+    font-weight: 600;
+    font-weight: 16px;
+    color: #000;
+    margin-bottom: 10px;
   }
+
+  .titleBorder {
+    border-bottom: 1px solid #333;
   }
 }
 </style>

@@ -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 =