接口增加，分页参数修改

jinhui.wang
Commit cb8dfed882e94818f58b3edbce2ed6f4307dfe7a cb8dfed8 1 parent bc724e62
Showing 25 changed files with 421 additions and 398 deletions
src/api/declareData-api.js
src/api/exportList-api.js
src/api/system/cipherMachine-api.js
src/api/system/port-api.js
src/api/system/user.js
src/assets/icons/svg/customCodeConfig.svg
src/components/CustomTable/index.vue
src/components/Table/index.vue
src/views/cipherMachineConfig/index.vue
src/views/customerConfig/index.vue
src/views/exportBillDetail/index.vue
src/views/exportBillQuery/index.vue
src/views/exportListDetail/index.vue
src/views/exportListQuery/index.vue
src/views/exportRevokeBillQuery/index.vue
src/views/exportTransportBillQuery/index.vue
src/views/exportTransportDetail/index.vue
src/views/listBranchDetail/index.vue
src/views/listBranchQuery/index.vue
src/views/logisticsExitDetail/index.vue
--- a/src/api/declareData-api.js
View file @cb8dfed
+++ b/src/api/declareData-api.js
View file @cb8dfed
@@ -9,7 +9,7 @@ import request from '@/utils/request'
  * @param endCreateTime 创建结束时间
  * @param receiptType 回执类型
  * @param receiptStatus 回执状态
-  * @param pageNum *
+  * @param pageIndex *
  * @param pageSize *
  */
 export function searchDeclareData(data) {
--- a/src/api/exportList-api.js 0 → 100644
View file @cb8dfed
+++ b/src/api/exportList-api.js 0 → 100644
View file @cb8dfed
+ import request from '@/utils/request'
+ 
+ //清单总分单查询
+ /**
+  * @param billNo 提运单号
+  * @param createTimeEnd 创建结束时间
+  * @param createTimeStart 创建开始时间
+  * @param returnStatus 回执状态
+  * @param ebpcode 电商平台代码
+  * @param invtNo 清单编号
+  * @param logisticsNo 物流运单编号
+  * @param orderNo 订单编号
+  * @param pageIndex *
+  * @param pageSize *
+  */
+ export function getAllexportList(data) {
+     return request({
+         url: '/bus-customer/exportList/search',
+         method: 'post',
+         data: data,
+     })
+ }
\ No newline at end of file
--- a/src/api/system/cipherMachine-api.js
View file @cb8dfed
+++ b/src/api/system/cipherMachine-api.js
View file @cb8dfed
@@ -5,7 +5,7 @@ import request from '@/utils/request'
  * @param cipherMachineNumber 密码机编号
  * @param endCreationTime 结束创建时间
  * @param startCreationTime 开始创建时间
-  * @param pageNum *
+  * @param pageIndex *
  * @param pageSize *
  */
 export function getCipherMachineList(data) {
--- a/src/api/system/port-api.js
View file @cb8dfed
+++ b/src/api/system/port-api.js
View file @cb8dfed
@@ -4,7 +4,7 @@ import request from '@/utils/request'
 /**
  * @param dxpid DXPID
  * @param portCode 口岸代码
-  * @param pageNum *
+  * @param pageIndex *
  * @param pageSize *
  */
 export function getPortConfigList(data) {
--- a/src/api/system/user.js
View file @cb8dfed
+++ b/src/api/system/user.js
View file @cb8dfed
@@ -11,7 +11,7 @@ export function getInfo() {
 // 获取角色列表
 /**
  * @param roleName 角色名
-  * @param pageNum *
+  * @param pageIndex *
  * @param pageSize *
  */
 export function getRoleList(data) {
@@ -66,7 +66,7 @@ export function updateRoleMenuData(data) {
  * @param userName  用户名称
  * @param port 口岸
  * @param roleIds list
-  * @param pageNum * 
+  * @param pageIndex * 
  * @param pageSize *
  */
 export function getUserData(data) {
--- a/src/assets/icons/svg/customCodeConfig.svg 0 → 100644
View file @cb8dfed
+++ b/src/assets/icons/svg/customCodeConfig.svg 0 → 100644
View file @cb8dfed
+ <svg width="20" height="22" viewBox="0 0 20 22" stroke="currentColor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M1.81814 1.81814H16.3633V10.9089H18.1815V0H0V21.8178H9.99981V19.9996H1.81814V1.81814Z" stroke-width="0" stroke="currentColor"/>
+ <path d="M3.63672 3.63599H14.5456V5.45413H3.63672V3.63599ZM3.63672 7.27227H12.7275V9.09043H3.63672V7.27227ZM3.63672 10.9086H9.09117V12.7267H3.63672V10.9086ZM15.4547 11.7498L10.9093 14.2491V19.249L15.4547 21.7484L20.0001 19.249V14.254L15.4547 11.7498ZM18.1819 18.1739L15.4547 19.6733L12.7275 18.1739V15.3242L15.4547 13.8249L18.1819 15.3242V18.1739Z" stroke-width="0" stroke="currentColor"/>
+ <path d="M14.5457 16.7497C14.5457 16.9295 14.599 17.1052 14.6989 17.2547C14.7988 17.4042 14.9407 17.5207 15.1069 17.5895C15.273 17.6583 15.4558 17.6763 15.6321 17.6413C15.8084 17.6062 15.9704 17.5196 16.0976 17.3925C16.2247 17.2653 16.3113 17.1033 16.3464 16.927C16.3814 16.7507 16.3634 16.5679 16.2946 16.4018C16.2258 16.2357 16.1093 16.0937 15.9598 15.9938C15.8103 15.8939 15.6345 15.8406 15.4547 15.8406C15.2136 15.8406 14.9824 15.9364 14.8119 16.1068C14.6414 16.2773 14.5457 16.5086 14.5457 16.7497V16.7497Z" stroke-width="0" stroke="currentColor"/>
+ </svg>
+ 
--- a/src/components/CustomTable/index.vue
View file @cb8dfed
+++ b/src/components/CustomTable/index.vue
View file @cb8dfed
@@ -144,7 +144,7 @@
         v-if="tableOption.pagination"
         :total="totalCount"
         :page-size.sync="page.pageSize"
-         :current-page.sync="page.pageNum"
+         :current-page.sync="page.pageIndex"
         :page-sizes="page.sizes"
         background
         :layout="page.layout"
@@ -236,7 +236,7 @@ export default {
       type: Object,
       default: () => {
         return {
-           pageNum: 1,
+           pageIndex: 1,
           sizes: [20],
           pageSize: 20,
           layout: "total,prev, pager, next, jumper, ->, sizes",
@@ -411,7 +411,7 @@ export default {
     //连续序号
     indexAdd(index) {
       if (this.tableOption.indexType) {
-         const page = this.page.pageNum; // 当前页码
+         const page = this.page.pageIndex; // 当前页码
         const pagesize = this.page.pageSize; // 每页条数
         return index + 1 + (page - 1) * pagesize;
       } else {
@@ -432,13 +432,13 @@ export default {
     //下一页
     nextClick() {
       this.$emit("currentChange", {
-         page: this.page.pageNum + 1,
+         page: this.page.pageIndex + 1,
       });
     },
     //上一页
     prevClick() {
       this.$emit("currentChange", {
-         page: this.page.pageNum - 1,
+         page: this.page.pageIndex - 1,
       });
     },
     //某页
--- a/src/components/Table/index.vue
View file @cb8dfed
+++ b/src/components/Table/index.vue
View file @cb8dfed
@@ -164,7 +164,7 @@
         v-if="pagination"
         :total="totalCount"
         :page-size.sync="sizes"
-         :current-page.sync="pageNum"
+         :current-page.sync="pageIndex"
         :page-sizes="pageSizes"
         background
         :layout="layout"
@@ -403,7 +403,7 @@ export default {
   data() {
     return {
       selectTable: [],
-       pageNum: 1,
+       pageIndex: 1,
       start: -1,
       sizes: this.limitSize,
       show: false,
@@ -420,7 +420,7 @@ export default {
   },
   watch: {
     page() {
-       this.pageNum = this.page;
+       this.pageIndex = this.page;
     },
     limitSize() {
       this.sizes = this.limitSize;
@@ -474,14 +474,14 @@ export default {
     //下一页
     nextClick() {
       this.$emit("currentChange", {
-         page: this.pageNum + 1,
+         page: this.pageIndex + 1,
         start: this.limitStart + this.limitSize,
       });
     },
     //上一页
     prevClick() {
       this.$emit("currentChange", {
-         page: this.pageNum - 1,
+         page: this.pageIndex - 1,
         start: this.limitStart - this.limitSize,
       });
     },
@@ -497,7 +497,7 @@ export default {
     //连续序号
     indexAdd(index) {
       if (this.indexType) {
-         const page = this.pageNum; // 当前页码
+         const page = this.pageIndex; // 当前页码
         const pagesize = this.limitSize; // 每页条数
         return index + 1 + (page - 1) * pagesize;
       } else {
--- a/src/views/cipherMachineConfig/index.vue
View file @cb8dfed
+++ b/src/views/cipherMachineConfig/index.vue
View file @cb8dfed
@@ -102,7 +102,7 @@
 import { getCipherMachineList } from "@/api/system/cipherMachine-api.js";
 import DialogVue from "./dialog.vue";
 export default {
-   name: "RoleConfig",
+   name: "CipherMachineConfig",
   components: {
     DialogVue,
   },
--- a/src/views/customerConfig/index.vue
View file @cb8dfed
+++ b/src/views/customerConfig/index.vue
View file @cb8dfed
@@ -182,7 +182,7 @@ export default {
     search(val) {},
     //查询
     searchRole(val) {
-       getRoleList({ roleName: "", pageNum: 1, pageSize: 999999 })
+       getRoleList({ roleName: "", pageIndex: 1, pageSize: 999999 })
         .then((res) => {
           if (res.code === "200") {
             this.dict.roleList = res.data.value;
@@ -211,7 +211,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/exportBillDetail/index.vue
View file @cb8dfed
+++ b/src/views/exportBillDetail/index.vue
View file @cb8dfed
@@ -140,7 +140,7 @@
           </Formitem>
         </el-col>
         <!-- <el-col :span="3">
-           <Formitem label="业务状态" prop="returnStatus">
+           <Formitem label="回执状态" prop="returnStatus">
             <el-input
               type="text"
               class="inputShadow"
--- a/src/views/exportBillQuery/index.vue
View file @cb8dfed
+++ b/src/views/exportBillQuery/index.vue
View file @cb8dfed
@@ -155,7 +155,7 @@
 import { getAllExportingBills } from "@/api/exportQuery.js";
 
 export default {
-   name: "index",
+   name: "ExportBillQuery",
   data() {
     return {
       sreachFormData: {
@@ -365,7 +365,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/exportListDetail/index.vue
View file @cb8dfed
+++ b/src/views/exportListDetail/index.vue
View file @cb8dfed
@@ -1211,7 +1211,7 @@
           </Formitem>
         </el-col>
         <el-col :span="4">
-           <Formitem label="业务状态" prop="factoryCode">
+           <Formitem label="回执状态" prop="factoryCode">
             <el-select
               type="text"
               id="inputInner--declaredPort"
--- a/src/views/exportListQuery/index.vue
View file @cb8dfed
+++ b/src/views/exportListQuery/index.vue
View file @cb8dfed
 <template>
-   <div class="export-list-query">
-     <div class="entrySreach" ref="classCPortEntry">
+   <div class="entrySreach">
     <el-form
       class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
       ref="sreachForm"
-         :model="searchForm"
+       :model="sreachFormData"
       label-position="top"
       size="small"
     >
-         <el-row class="row-border">
+       <el-row>
+         <!-- 提运单号 -->
         <el-col :span="5">
-             <Formitem label="提运单号" prop="consignmentCode">
-               <PopoverTextarea
-                 v-model="searchForm.consignmentCode"
-                 :maxlength="5000"
-                 :max-entries="1000"
-               />
+           <Formitem label="提运单号" prop="billNo">
+             <el-input
+               type="text"
+               class="inputShadow"
+               id="inputInner--billNo"
+               resize="none"
+               v-model="sreachFormData.billNo"
+               clearable
+               placeholder=""
+             ></el-input>
+             <!-- <FormTextareaInput
+               :formData="sreachFormData"
+               dataKey="billNo"
+               @formChange="formChange"
+             /> -->
           </Formitem>
         </el-col>
-           <el-col :span="4">
-             <Formitem label="订单编号" prop="factoryCode">
-               <el-select
+         <!-- 订单编号 -->
+         <el-col :span="5">
+           <Formitem label="订单编号" prop="orderNo">
+             <el-input
               type="text"
-                 id="inputInner--declaredPort"
-                 v-model="searchForm.declaredPort"
+               class="inputShadow"
+               id="inputInner--orderNo"
+               resize="none"
+               v-model="sreachFormData.orderNo"
               clearable
               placeholder=""
-                 @change="portChange"
-               >
-                 <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="receiptStatus">
-               <el-select
+         <!-- 物流运单编号 -->
+         <el-col :span="5">
+           <Formitem label="物流运单编号" prop="logisticsNo">
+             <el-input
               type="text"
-                 id="inputInner--declaredPort"
-                 v-model="searchForm.declaredPort"
+               class="inputShadow"
+               id="inputInner--logisticsNo"
+               resize="none"
+               v-model="sreachFormData.logisticsNo"
               clearable
               placeholder=""
-                 @change="portChange"
-               >
-                 <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="createTime"
-               :activeType="true"
-             >
+           <Formitem label="创建时间" prop="createTime" :activeType="true">
             <el-date-picker
-                 class="inputInner--accsDataImportTime"
-                 id="inputInner--accsDataImportTime"
-                 v-model="searchForm.accsDataImportTime"
+               class="inputInner--createTime"
+               id="inputInner--createTime"
+               v-model="sreachFormData.createTime"
               type="daterange"
               format="yyyy-MM-dd"
               prefix-icon="none"
-                 value-format="yyyyMMdd"
+               value-format="yyyy-MM-dd"
               range-separator="至"
-                 start-placeholder=""
-                 clearable
-                 end-placeholder=""
-                 :picker-options="importTimePickerOptions"
-                 @blur="datePickerBlur"
-                 @change="accsDataImportTimeChange"
-               >
-               </el-date-picker>
+               @change="dateChange"
+             />
           </Formitem>
         </el-col>
 
@@ -95,170 +83,90 @@
             ></el-button>
           </el-form-item>
         </el-col>
- 
-           <el-col :span="4">
+         <el-col :span="2">
           <el-form-item class="textCenter">
             <el-button
-                 icon="el-icon-refresh"
+               type="text"
               size="small"
-                 :loading="loadings.searchLoading"
-                 @click="search(0)"
-               >重置
+               icon="el-icon-refresh"
+               @click="clear"
+             >
+               重置
             </el-button>
           </el-form-item>
         </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"
-                   @input="input"
-                 ></el-input>
+           <Formitem label="电商企业代码" prop="ebpcode">
             <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="sreachFormData.ebpcode"
+               clearable
               placeholder=""
-                   @focus="textareaFocus"
-                   @input="input"
             ></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"
-                   @input="input"
-                 ></el-input>
-                 <el-input
-                   slot="reference"
-                   name="consignmentCode"
-                   type="textarea"
-                   :rows="1"
-                   class="inputShadow"
-                   id="inputInner--consignmentCode"
-                   v-model="searchForm.consignmentCode"
-                   resize="none"
-                   placeholder=""
-                   @focus="textareaFocus"
-                   @input="input"
-                 ></el-input>
-               </el-popover>
-             </Formitem>
-           </el-col>
-           <el-col :span="4">
-             <Formitem label="回执状态" prop="receiptStatus">
+           <Formitem label="回执状态" prop="returnStatus">
             <el-select
               type="text"
-                 id="inputInner--declaredPort"
-                 v-model="searchForm.declaredPort"
+               id="inputInner--returnStatus"
+               v-model="sreachFormData.returnStatus"
               clearable
               placeholder=""
-                 @change="portChange"
             >
               <el-option
-                   v-for="(item, index) in dictData.userport"
+                 v-for="(item, index) in dictData.returnStatus"
                 :key="index"
                 :label="item.name"
-                   :value="item.name"
+                 :value="item.code"
               ></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"
-                   @input="input"
-                 ></el-input>
+           <Formitem label="清单编号" prop="invtNo">
             <el-input
-                   slot="reference"
-                   name="consignmentCode"
-                   type="textarea"
-                   :rows="1"
+               type="text"
               class="inputShadow"
-                   id="inputInner--consignmentCode"
-                   v-model="searchForm.consignmentCode"
+               id="inputInner--invtNo"
               resize="none"
+               v-model="sreachFormData.invtNo"
+               clearable
               placeholder=""
-                   @focus="textareaFocus"
-                   @input="input"
             ></el-input>
-               </el-popover>
           </Formitem>
         </el-col>
       </el-row>
     </el-form>
+     <div class="optionButton">
+       <div>
+         <el-button class="entrySaveButton" size="small" @click="downloadData">
+           <svg-icon
+             class="el-icon-user-solid"
+             icon-class="customCodeConfig"
+           ></svg-icon>
+           汇总申请单
+         </el-button>
       </div>
- 
-     <div style="text-align: right; margin: 10px" class="action-buttons">
-       <div class="prime-button">汇总申请单</div>
+       <div>
         <el-button
+           class="entrySaveButton"
           size="small"
-         :loading="loadings.downloadLoading2"
-         @click="downloadBpiData('log')"
+           icon="el-icon-download"
+           @click="downloadData"
         >
-         <svg-icon class="el-icon-user-solid" icon-class="fedexUpBlue"></svg-icon>
           导出
         </el-button>
       </div>
- 
+     </div>
     <Table
       class="fedexDetialTable fedexSreachTable"
       ref="entryTable"
@@ -268,234 +176,327 @@
       :border="true"
       :pagination="true"
       :order="false"
-       :loading="loadings.sreachLoading"
+       :loading="loadings.searchLoading"
       :page="page.pageIndex"
       :pageSizes="[20, 30, 50, 100]"
-       :totalCount="total"
+       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"
-       @rowClick="handleRowClick"
+       @cellClick="cellClick"
       :selection="true"
       :selectFixed="false"
+       :rowSelectDataType="false"
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
-       :rowSelectDataType="false"
       :selected="selected"
     >
-       <template v-slot:waveName="scope">
-         <span>{{ `${scope.row.waveName}(${scope.row.waveExt2})` }}</span>
+       <template v-slot:returnStatus="scope">
+         <TablePopover
+           ref="returnStatusPopover"
+           dataKey="returnStatus"
+           :parentDom="$refs.entryTable"
+           :receiptDataHead="receiptDataHead"
+           :rowData="scope.row"
+           :tableData="tableData"
+           @popoverChange="popoverChange"
+           @popoverClose="popoverClose"
+         >
+           <div slot="title">
+             <span style="font-weight: 700; color: #515a6e">提单运号：</span
+             >{{ scope.row.billNo }}
+           </div>
+           <div slot="buttonLabel">
+             {{ scope.row.returnStatus }}
+           </div>
+         </TablePopover>
+       </template>
+       <template v-slot:billNo="scope">
+         <el-button type="text" @click="view(scope.row)">{{
+           scope.row.billNo
+         }}</el-button>
       </template>
     </Table>
   </div>
 </template>
 
 <script>
- // import {getAllExportingBills, getAllListBills} from "@/api/query/query";
- import PopoverTextarea from "@/components/PopoverTextarea/index.vue";
+ import { getAllexportList } from "@/api/exportList-api.js";
 
 export default {
-   name: "index",
-   components: {PopoverTextarea},
+   name: "ExportBillQuery",
   data() {
     return {
-       searchForm: {
-         declaredPort: "",
-         consStatus: "",
-         consignmentCode: "",
-         accsDataImportTime: [],
-         ownerName: "",
-         consignmentHeadCode: "",
-         isPushCustomsSys: "",
-         waitOperStatus: "",
-         declTime: [],
-       },
-       selected: [],
-       sizeChange(val) {
-         this.page.pageSize = val;
-         this.sreach(1);
-       },
-       //分页
-       currentChange(val) {
-         this.page.pageIndex = val.page;
-         this.search(1);
-       },
-       tableSelect(val) {
-         this.selected = val.selection;
-       },
-       tableSelectAll(val) {
-         this.selected = val;
+       sreachFormData: {
+         billNo: "",
+         ebpcode: "",
+         invtNo: "",
+         logisticsNo: "",
+         orderNo: "",
+         returnStatus: "",
+         createTime: [],
       },
       page: {
         pageIndex: 1,
         pageSize: 20,
-       },
-       tableData: [],
-       tableMaxheight: null,
         total: 0,
-       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"},
-         ],
-       },
-       loadings: {
-         searchLoading: false,
-       },
-       textareaVisible: {
-         formItemconsignmentCode: false,
-         formItemconsignmentHeadCode: false,
       },
+       tableData: [],
       headerData: [
         {
           name: "回执状态",
           value: "returnStatus",
-           width: "150",
+           width: "",
           align: "left",
+           slot: true,
         },
         {
           name: "提运单号",
+           value: "billNo",
+           width: "",
+           align: "left",
+           slot: true,
+         },
+         {
+           name: "订单编号",
           value: "orderNo",
-           width: '150',
-           align: 'left'
+           width: "",
+           align: "left",
         },
         {
-           name: '订单编号',
-           value: 'orderType',
-           width: '150',
-           align: 'left'
+           name: "物流运单号",
+           value: "logisticsNo",
+           width: "",
+           align: "left",
         },
         {
-           name: '物流运单号',
-           value: 'ebccode',
-           width: '200',
-           align: 'left'
+           name: "电商企业代码",
+           value: "ebpcode",
+           width: "",
+           align: "left",
         },
         {
-           name: '电商企业代码',
-           value: 'ebcname',
-           width: '200',
-           align: 'left'
+           name: "电商企业名称",
+           value: "ebpname",
+           width: "",
+           align: "left",
         },
         {
-           name: '电商企业名称',
-           value: 'ebpname',
-           width: '250',
-           align: 'left'
+           name: "申报企业代码",
+           value: "agentCode",
+           width: "",
+           align: "left",
         },
+       ],
+       selected: [],
+       receiptDataHead: [
         {
-           name: '申报企业代码',
-           value: 'declaringEnterprise',
-           width: '200',
-           align: 'left'
-         }
-       ]
-     }
+           name: "回执状态",
+           value: "receiptStatus",
+           width: "",
+           align: "left",
+         },
+         {
+           name: "状态时间",
+           value: "statusTime",
+           width: "",
+           align: "left",
+         },
+         {
+           name: "回执描述",
+           value: "receiptDescription",
+           width: "",
+           align: "left",
+         },
+       ],
+       dictData: {
+         ebccode: [],
+         returnStatus: [],
+       },
+       loadings: {
+         searchLoading: false,
+       },
+       textareaVisible: {
+         formItemconsignmentCode: false,
+         formItemconsignmentHeadCode: false,
+       },
+       tableMaxheight: null,
+     };
   },
   created() {
-     // getAllListBills({
-     //   pageIndex: 1,
-     //   pageSize: 20
-     // }).then((res) => {
-     //   console.log('res', res)
-     //   this.tableData = res.data.value;
-     //   this.total = res.data.totalItems;
-     //   debugger;
-     // })
+     this.search(0);
+   },
+   mounted() {
+     this.tableMaxheight = window.innerHeight - 300;
+   },
+   watch: {
+     $route() {
+       this.popoverClose();
+     },
   },
   methods: {
-     input() {
-       this.$forceUpdate();
+     //查询
+     search(val) {
+       this.loadings.searchLoading = true;
+       if (val == 0) {
+         this.page.pageIndex = 1;
+       }
+       let obj = this.sreachFormData;
+       obj.pageIndex = this.page.pageIndex;
+       obj.pageSize = this.page.pageSize;
+       obj.createTimeStart = "";
+       obj.createTimeEnd = "";
+       if (obj.createTime.length > 0) {
+         obj.createTimeStart = obj.createTime[0];
+         obj.createTimeEnd = obj.createTime[1];
+       }
+       getAllexportList(obj)
+         .then((res) => {
+           if (res.code === "200") {
+             this.tableData = res.data.value;
+             this.page.total = res.data.totalItems;
+             this.tableData.forEach((item, idx) => {
+               item.index = idx;
+               item.returnStatusPopoverType = false;
+               item.popoverData = [];
+             });
+           } else {
+             this.alertWarningMsg(res.message);
+           }
+           this.loadings.searchLoading = false;
+         })
+         .catch((err) => {
+           console.log(err);
+           this.loadings.searchLoading = false;
+         });
     },
-     handleRowClick(row) {
-       const declareId = row.declareId;
+     //重置
+     clear() {
+       this.sreachFormData = {
+         orderNo: "",
+         ebccode: "",
+         returnStatus: "",
+         createTime: [],
+       };
+     },
+     //导出
+     downloadData() {},
+     //查询详情
+     view(val) {
       this.$router.push({
-         path: '/exportListDetail',
-         query: {
-           declareId
-         }
+         name: "ExportBillDetail",
+         params: { data: val },
       });
     },
-     async search(val) {
-       try {
- 
-       } catch (error) {
-         console.error("搜索出错：", error);
-       } finally {
-         // 无论成功还是失败，关闭加载状态
-         this.loadings.sreachLoading = false;
+     popoverChange(val) {
+       console.log(val);
+       this.tableData = val.tableData;
+       this.receiptApi(val.data.declareId, val.status)
+         .then((res) => {
+           val.tableData.forEach((item) => {
+             if (item.declareId == val.data.declareId) {
+               item.popoverData = res;
             }
-     },
-     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.tableData = val.tableData;
+         })
+         .finally(() => {
           this.$nextTick(() => {
-         inputInner.blur();
-         if (
-           inputInner.value != undefined &&
-           inputInner.value != "" &&
-           inputInner.value != null
-         ) {
-           inputInner.classList.add("inputFocus");
-         } else {
-           inputInner.classList.remove("inputFocus");
-         }
+             this.$refs.returnStatusPopover.tableLoading = false;
           });
-       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());
-           }
         });
-       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";
+     //查询回执
+     receiptApi(id, type) {
+       return new Promise((resolve, reject) => {
+         let obj = { declareId: id };
+         resolve();
       });
     },
+     popoverClose(val) {
+       this.tableData.forEach((item) => {
+         item.returnStatusPopoverType = false;
+         item.popoverData = [];
+       });
+       this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
+         "auto";
+     },
+     formChange(val) {
+       this.sreachFormData = val;
+     },
+     tableSelect(val) {
+       this.selected = val.selection;
+     },
+     tableSelectAll(val) {
+       this.selected = val;
+     },
+     //分页
+     currentChange(val) {
+       this.page.pageIndex = val.page;
+       this.search(1);
+     },
+     sizeChange(val) {
+       this.page.pageSize = val;
+       this.search(1);
+     },
+     cellClick() {
+       this.popoverClose();
+     },
+     dateChange(val) {
+       if (val == "" || val == null) {
+         this.$nextTick(() => {
+           this.sreachFormData.createTime = [];
+         });
       }
- }
+     },
+     input() {
+       this.$forceUpdate();
+     },
+   },
+ };
 </script>
 
 <style scoped lang="scss">
 @import "@/assets/styles/variables.scss";
+ .entrySreach {
+   height: 100%;
+   background-color: $menuLightBg;
+ 
+   .entrySreachButton {
+     display: inline-block;
+     font-size: 20px;
+     color: $fedexButton !important;
+   }
 
- .export-list-query {
-   .action-buttons {
+   .optionButton {
+     padding: 10px;
+     text-align: right;
     display: flex;
     justify-content: space-between;
+ 
+     .el-button {
+       color: $fedexButton;
+       border-color: $fedexButton !important;
+ 
+       svg {
+         display: inline-block;
+         margin-right: 5px;
+         fill: $fedexButton;
+       }
+     }
+ 
+     .entrySaveButton:hover,
+     .entrySaveButton:focus {
+       color: $menuLightBg !important;
+       background-color: $fedexButton !important;
     }
-   .prime-button {
-     color: white;
-     background-color: #007AB7;
-     font-size: 12px;
-     display: flex;
-     align-items: center;
-     padding: 0 15px;
   }
 }
 
- .entrySreachButton {
-   display: inline-block;
-   font-size: 20px;
-   color: $fedexButton !important;
+ .texttareaTip {
+   position: absolute;
+   top: 52%;
+   right: 20px;
+   transform: translate(0, -50%);
+   z-index: 10;
 }
 </style>
--- a/src/views/exportRevokeBillQuery/index.vue
View file @cb8dfed
+++ b/src/views/exportRevokeBillQuery/index.vue
View file @cb8dfed
@@ -124,7 +124,7 @@
 import { getAllCancellation } from "@/api/exportRevokeBill-api.js";
 
 export default {
-   name: "ListBranchQuery",
+   name: "ExportRevokeBillQuery",
   data() {
     return {
       sreachFormData: {
@@ -171,7 +171,7 @@ export default {
         },
         {
           name: "创建时间",
-           value: "createTime",
+           value: "createTimeStr",
           width: "",
           align: "left",
         },
@@ -322,7 +322,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/exportTransportBillQuery/index.vue
View file @cb8dfed
+++ b/src/views/exportTransportBillQuery/index.vue
View file @cb8dfed
@@ -168,7 +168,7 @@
 import { getAllExportingTransportBills } from "@/api/exportQuery.js";
 
 export default {
-   name: "index",
+   name: "ExportTransportBillQuery",
   data() {
     return {
       sreachFormData: {
@@ -369,7 +369,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/exportTransportDetail/index.vue
View file @cb8dfed
+++ b/src/views/exportTransportDetail/index.vue
View file @cb8dfed
@@ -161,7 +161,7 @@
           </Formitem>
         </el-col>
         <!-- <el-col :span="3">
-           <Formitem label="业务状态" prop="returnStatus">
+           <Formitem label="回执状态" prop="returnStatus">
             <el-input
               type="text"
               class="inputShadow"
@@ -200,7 +200,7 @@
           </Formitem>
         </el-col>
         <el-col :span="3">
-           <Formitem label="业务状态" prop="appStatus">
+           <Formitem label="回执状态" prop="appStatus">
             <el-input
               type="text"
               class="inputShadow"
--- a/src/views/listBranchDetail/index.vue
View file @cb8dfed
+++ b/src/views/listBranchDetail/index.vue
View file @cb8dfed
@@ -492,7 +492,7 @@
       </el-row>
       <el-row>
         <el-col :span="4">
-           <Formitem label="业务状态" prop="factoryCode">
+           <Formitem label="回执状态" prop="factoryCode">
             <el-select
               type="text"
               id="inputInner--declaredPort"
--- a/src/views/listBranchQuery/index.vue
View file @cb8dfed
+++ b/src/views/listBranchQuery/index.vue
View file @cb8dfed
@@ -349,7 +349,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/logisticsExitDetail/index.vue
View file @cb8dfed
+++ b/src/views/logisticsExitDetail/index.vue
View file @cb8dfed
@@ -68,7 +68,7 @@
           </Formitem>
         </el-col>
         <el-col :span="4">
-           <Formitem label="业务状态" prop="factoryCode">
+           <Formitem label="回执状态" prop="factoryCode">
             <el-select
               type="text"
               id="inputInner--declaredPort"
@@ -397,7 +397,7 @@
       </el-row>
       <el-row>
         <el-col :span="4">
-           <Formitem label="业务状态" prop="factoryCode">
+           <Formitem label="回执状态" prop="factoryCode">
             <el-select
               type="text"
               id="inputInner--declaredPort"
--- a/src/views/logisticsExitQuery/index.vue
View file @cb8dfed
+++ b/src/views/logisticsExitQuery/index.vue
View file @cb8dfed
@@ -27,9 +27,9 @@
             /> -->
           </Formitem>
         </el-col>
-         <!-- 业务状态 -->
+         <!-- 回执状态 -->
         <el-col :span="5">
-           <Formitem label="业务状态" prop="returnStatus">
+           <Formitem label="回执状态" prop="returnStatus">
             <el-select
               type="text"
               id="inputInner--returnStatus"
@@ -168,7 +168,7 @@
 import { getAllLogisticsDepartureList } from "@/api/logisticsExit-api.js";
 
 export default {
-   name: "ListBranchQuery",
+   name: "LogisticsExitQuery",
   data() {
     return {
       sreachFormData: {
@@ -200,7 +200,7 @@ export default {
         },
         {
           name: "运单编号",
-           value: "",
+           value: "logisticsNo",
           width: "",
           align: "left",
         },
@@ -241,12 +241,6 @@ export default {
           align: "left",
         },
         {
-           name: "业务状态",
-           value: "returnStatus",
-           width: "",
-           align: "left",
-         },
-         {
           name: "申报日期",
           value: "appTime",
           width: "",
@@ -387,7 +381,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/portConfig/index.vue
View file @cb8dfed
+++ b/src/views/portConfig/index.vue
View file @cb8dfed
@@ -100,7 +100,7 @@
       :order="false"
       noLabel="序号"
       :loading="loadings.searchLoading"
-       :page="page.pageNum"
+       :page="page.pageIndex"
       :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
@@ -132,7 +132,7 @@ import { getPortConfigList } from "@/api/system/port-api.js";
 import { getPortList } from "@/api/system/user.js";
 import DialogVue from "./dialog.vue";
 export default {
-   name: "RoleConfig",
+   name: "PortConfig",
   components: {
     DialogVue,
   },
@@ -143,7 +143,7 @@ export default {
         dxpid: "",
       },
       page: {
-         pageNum: 1,
+         pageIndex: 1,
         pageSize: 20,
         total: 0,
       },
@@ -211,10 +211,10 @@ export default {
     search(val) {
       this.loadings.searchLoading = true;
       if (val == 0) {
-         this.page.pageNum = 1;
+         this.page.pageIndex = 1;
       }
       let obj = this.sreachFormData;
-       obj.pageNum = this.page.pageNum;
+       obj.pageIndex = this.page.pageIndex;
       obj.pageSize = this.page.pageSize;
       getPortConfigList(obj)
         .then((res) => {
@@ -272,7 +272,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/reportingData/index.vue
View file @cb8dfed
+++ b/src/views/reportingData/index.vue
View file @cb8dfed
@@ -211,7 +211,7 @@
       :pagination="true"
       :order="false"
       :loading="loadings.sreachLoading"
-       :page="page.pageNum"
+       :page="page.pageIndex"
       :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
@@ -343,7 +343,7 @@ export default {
         createTime: [],
       },
       page: {
-         pageNum: 1,
+         pageIndex: 1,
         pageSize: 20,
         total: 0,
       },
@@ -466,10 +466,10 @@ export default {
       this.loadings.sreachLoading = true;
       this.selected = [];
       if (val == 0) {
-         this.page.pageNum = 1;
+         this.page.pageIndex = 1;
       }
       let obj = this.sreachFormData;
-       obj.pageNum = this.page.pageNum;
+       obj.pageIndex = this.page.pageIndex;
       obj.pageSize = this.page.pageSize;
       obj.startCreateTime = "";
       obj.endCreateTime = "";
@@ -668,7 +668,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/roleConfig/index.vue
View file @cb8dfed
+++ b/src/views/roleConfig/index.vue
View file @cb8dfed
@@ -55,7 +55,7 @@
       :pagination="true"
       :order="false"
       :loading="loadings.searchLoading"
-       :page="page.pageNum"
+       :page="page.pageIndex"
       :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
@@ -101,7 +101,7 @@ export default {
         roleName: "",
       },
       page: {
-         pageNum: 1,
+         pageIndex: 1,
         pageSize: 20,
         total: 0,
       },
@@ -135,10 +135,10 @@ export default {
     search(val) {
       this.loadings.searchLoading = true;
       if (val == 0) {
-         this.page.pageNum = 1;
+         this.page.pageIndex = 1;
       }
       let obj = this.sreachFormData;
-       obj.pageNum = this.page.pageNum;
+       obj.pageIndex = this.page.pageIndex;
       obj.pageSize = this.page.pageSize;
       getRoleList(obj)
         .then((res) => {
@@ -182,7 +182,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {
--- a/src/views/userRoleConfig/index.vue
View file @cb8dfed
+++ b/src/views/userRoleConfig/index.vue
View file @cb8dfed
@@ -112,7 +112,7 @@
       :pagination="true"
       :order="false"
       :loading="loadings.searchLoading"
-       :page="page.pageNum"
+       :page="page.pageIndex"
       :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
@@ -162,7 +162,7 @@ export default {
         port: "",
       },
       page: {
-         pageNum: 1,
+         pageIndex: 1,
         pageSize: 20,
         total: 0,
       },
@@ -245,10 +245,10 @@ export default {
     search(val) {
       this.loadings.searchLoading = true;
       if (val == 0) {
-         this.page.pageNum = 1;
+         this.page.pageIndex = 1;
       }
       let obj = this.sreachFormData;
-       obj.pageNum = this.page.pageNum;
+       obj.pageIndex = this.page.pageIndex;
       obj.pageSize = this.page.pageSize;
       getUserData(obj)
         .then((res) => {
@@ -308,7 +308,7 @@ export default {
     },
     //分页
     currentChange(val) {
-       this.page.pageNum = val.page;
+       this.page.pageIndex = val.page;
       this.search(1);
     },
     sizeChange(val) {