Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
cb8dfed8 1 parent bc724e62

接口增加，分页参数修改

Inline Side-by-side
Showing 25 changed files with 421 additions and 398 deletions
...@@ -9,7 +9,7 @@ import request from '@/utils/request' ...@@ -9,7 +9,7 @@ import request from '@/utils/request'
9 * @param endCreateTime 创建结束时间 9 * @param endCreateTime 创建结束时间
10 * @param receiptType 回执类型 10 * @param receiptType 回执类型
11 * @param receiptStatus 回执状态 11 * @param receiptStatus 回执状态
12 - * @param pageNum * 12 + * @param pageIndex *
13 * @param pageSize * 13 * @param pageSize *
14 */ 14 */
15 export function searchDeclareData(data) { 15 export function searchDeclareData(data) {
......
1 +import request from '@/utils/request'
2 +
3 +//清单总分单查询
4 +/**
5 + * @param billNo 提运单号
6 + * @param createTimeEnd 创建结束时间
7 + * @param createTimeStart 创建开始时间
8 + * @param returnStatus 回执状态
9 + * @param ebpcode 电商平台代码
10 + * @param invtNo 清单编号
11 + * @param logisticsNo 物流运单编号
12 + * @param orderNo 订单编号
13 + * @param pageIndex *
14 + * @param pageSize *
15 + */
16 +export function getAllexportList(data) {
17 + return request({
18 + url: '/bus-customer/exportList/search',
19 + method: 'post',
20 + data: data,
21 + })
22 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -5,7 +5,7 @@ import request from '@/utils/request' ...@@ -5,7 +5,7 @@ import request from '@/utils/request'
5 * @param cipherMachineNumber 密码机编号 5 * @param cipherMachineNumber 密码机编号
6 * @param endCreationTime 结束创建时间 6 * @param endCreationTime 结束创建时间
7 * @param startCreationTime 开始创建时间 7 * @param startCreationTime 开始创建时间
8 - * @param pageNum * 8 + * @param pageIndex *
9 * @param pageSize * 9 * @param pageSize *
10 */ 10 */
11 export function getCipherMachineList(data) { 11 export function getCipherMachineList(data) {
......
...@@ -4,7 +4,7 @@ import request from '@/utils/request' ...@@ -4,7 +4,7 @@ import request from '@/utils/request'
4 /** 4 /**
5 * @param dxpid DXPID 5 * @param dxpid DXPID
6 * @param portCode 口岸代码 6 * @param portCode 口岸代码
7 - * @param pageNum * 7 + * @param pageIndex *
8 * @param pageSize * 8 * @param pageSize *
9 */ 9 */
10 export function getPortConfigList(data) { 10 export function getPortConfigList(data) {
......
...@@ -11,7 +11,7 @@ export function getInfo() { ...@@ -11,7 +11,7 @@ export function getInfo() {
11 // 获取角色列表 11 // 获取角色列表
12 /** 12 /**
13 * @param roleName 角色名 13 * @param roleName 角色名
14 - * @param pageNum * 14 + * @param pageIndex *
15 * @param pageSize * 15 * @param pageSize *
16 */ 16 */
17 export function getRoleList(data) { 17 export function getRoleList(data) {
...@@ -66,7 +66,7 @@ export function updateRoleMenuData(data) { ...@@ -66,7 +66,7 @@ export function updateRoleMenuData(data) {
66 * @param userName 用户名称 66 * @param userName 用户名称
67 * @param port 口岸 67 * @param port 口岸
68 * @param roleIds list 68 * @param roleIds list
69 - * @param pageNum * 69 + * @param pageIndex *
70 * @param pageSize * 70 * @param pageSize *
71 */ 71 */
72 export function getUserData(data) { 72 export function getUserData(data) {
......
1 +<svg width="20" height="22" viewBox="0 0 20 22" stroke="currentColor" xmlns="http://www.w3.org/2000/svg">
2 +<path d="M1.81814 1.81814H16.3633V10.9089H18.1815V0H0V21.8178H9.99981V19.9996H1.81814V1.81814Z" stroke-width="0" stroke="currentColor"/>
3 +<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"/>
4 +<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"/>
5 +</svg>
6 +
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 v-if="tableOption.pagination" 144 v-if="tableOption.pagination"
145 :total="totalCount" 145 :total="totalCount"
146 :page-size.sync="page.pageSize" 146 :page-size.sync="page.pageSize"
147 - :current-page.sync="page.pageNum" 147 + :current-page.sync="page.pageIndex"
148 :page-sizes="page.sizes" 148 :page-sizes="page.sizes"
149 background 149 background
150 :layout="page.layout" 150 :layout="page.layout"
...@@ -236,7 +236,7 @@ export default { ...@@ -236,7 +236,7 @@ export default {
236 type: Object, 236 type: Object,
237 default: () => { 237 default: () => {
238 return { 238 return {
239 - pageNum: 1, 239 + pageIndex: 1,
240 sizes: [20], 240 sizes: [20],
241 pageSize: 20, 241 pageSize: 20,
242 layout: "total,prev, pager, next, jumper, ->, sizes", 242 layout: "total,prev, pager, next, jumper, ->, sizes",
...@@ -411,7 +411,7 @@ export default { ...@@ -411,7 +411,7 @@ export default {
411 //连续序号 411 //连续序号
412 indexAdd(index) { 412 indexAdd(index) {
413 if (this.tableOption.indexType) { 413 if (this.tableOption.indexType) {
414 - const page = this.page.pageNum; // 当前页码 414 + const page = this.page.pageIndex; // 当前页码
415 const pagesize = this.page.pageSize; // 每页条数 415 const pagesize = this.page.pageSize; // 每页条数
416 return index + 1 + (page - 1) * pagesize; 416 return index + 1 + (page - 1) * pagesize;
417 } else { 417 } else {
...@@ -432,13 +432,13 @@ export default { ...@@ -432,13 +432,13 @@ export default {
432 //下一页 432 //下一页
433 nextClick() { 433 nextClick() {
434 this.$emit("currentChange", { 434 this.$emit("currentChange", {
435 - page: this.page.pageNum + 1, 435 + page: this.page.pageIndex + 1,
436 }); 436 });
437 }, 437 },
438 //上一页 438 //上一页
439 prevClick() { 439 prevClick() {
440 this.$emit("currentChange", { 440 this.$emit("currentChange", {
441 - page: this.page.pageNum - 1, 441 + page: this.page.pageIndex - 1,
442 }); 442 });
443 }, 443 },
444 //某页 444 //某页
......
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 v-if="pagination" 164 v-if="pagination"
165 :total="totalCount" 165 :total="totalCount"
166 :page-size.sync="sizes" 166 :page-size.sync="sizes"
167 - :current-page.sync="pageNum" 167 + :current-page.sync="pageIndex"
168 :page-sizes="pageSizes" 168 :page-sizes="pageSizes"
169 background 169 background
170 :layout="layout" 170 :layout="layout"
...@@ -403,7 +403,7 @@ export default { ...@@ -403,7 +403,7 @@ export default {
403 data() { 403 data() {
404 return { 404 return {
405 selectTable: [], 405 selectTable: [],
406 - pageNum: 1, 406 + pageIndex: 1,
407 start: -1, 407 start: -1,
408 sizes: this.limitSize, 408 sizes: this.limitSize,
409 show: false, 409 show: false,
...@@ -420,7 +420,7 @@ export default { ...@@ -420,7 +420,7 @@ export default {
420 }, 420 },
421 watch: { 421 watch: {
422 page() { 422 page() {
423 - this.pageNum = this.page; 423 + this.pageIndex = this.page;
424 }, 424 },
425 limitSize() { 425 limitSize() {
426 this.sizes = this.limitSize; 426 this.sizes = this.limitSize;
...@@ -474,14 +474,14 @@ export default { ...@@ -474,14 +474,14 @@ export default {
474 //下一页 474 //下一页
475 nextClick() { 475 nextClick() {
476 this.$emit("currentChange", { 476 this.$emit("currentChange", {
477 - page: this.pageNum + 1, 477 + page: this.pageIndex + 1,
478 start: this.limitStart + this.limitSize, 478 start: this.limitStart + this.limitSize,
479 }); 479 });
480 }, 480 },
481 //上一页 481 //上一页
482 prevClick() { 482 prevClick() {
483 this.$emit("currentChange", { 483 this.$emit("currentChange", {
484 - page: this.pageNum - 1, 484 + page: this.pageIndex - 1,
485 start: this.limitStart - this.limitSize, 485 start: this.limitStart - this.limitSize,
486 }); 486 });
487 }, 487 },
...@@ -497,7 +497,7 @@ export default { ...@@ -497,7 +497,7 @@ export default {
497 //连续序号 497 //连续序号
498 indexAdd(index) { 498 indexAdd(index) {
499 if (this.indexType) { 499 if (this.indexType) {
500 - const page = this.pageNum; // 当前页码 500 + const page = this.pageIndex; // 当前页码
501 const pagesize = this.limitSize; // 每页条数 501 const pagesize = this.limitSize; // 每页条数
502 return index + 1 + (page - 1) * pagesize; 502 return index + 1 + (page - 1) * pagesize;
503 } else { 503 } else {
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 import { getCipherMachineList } from "@/api/system/cipherMachine-api.js"; 102 import { getCipherMachineList } from "@/api/system/cipherMachine-api.js";
103 import DialogVue from "./dialog.vue"; 103 import DialogVue from "./dialog.vue";
104 export default { 104 export default {
105 - name: "RoleConfig", 105 + name: "CipherMachineConfig",
106 components: { 106 components: {
107 DialogVue, 107 DialogVue,
108 }, 108 },
......
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
182 search(val) {}, 182 search(val) {},
183 //查询 183 //查询
184 searchRole(val) { 184 searchRole(val) {
185 - getRoleList({ roleName: "", pageNum: 1, pageSize: 999999 }) 185 + getRoleList({ roleName: "", pageIndex: 1, pageSize: 999999 })
186 .then((res) => { 186 .then((res) => {
187 if (res.code === "200") { 187 if (res.code === "200") {
188 this.dict.roleList = res.data.value; 188 this.dict.roleList = res.data.value;
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
211 }, 211 },
212 //分页 212 //分页
213 currentChange(val) { 213 currentChange(val) {
214 - this.page.pageNum = val.page; 214 + this.page.pageIndex = val.page;
215 this.search(1); 215 this.search(1);
216 }, 216 },
217 sizeChange(val) { 217 sizeChange(val) {
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
140 </Formitem> 140 </Formitem>
141 </el-col> 141 </el-col>
142 <!-- <el-col :span="3"> 142 <!-- <el-col :span="3">
143 - <Formitem label="业务状态" prop="returnStatus"> 143 + <Formitem label="回执状态" prop="returnStatus">
144 <el-input 144 <el-input
145 type="text" 145 type="text"
146 class="inputShadow" 146 class="inputShadow"
......
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
155 import { getAllExportingBills } from "@/api/exportQuery.js"; 155 import { getAllExportingBills } from "@/api/exportQuery.js";
156 156
157 export default { 157 export default {
158 - name: "index", 158 + name: "ExportBillQuery",
159 data() { 159 data() {
160 return { 160 return {
161 sreachFormData: { 161 sreachFormData: {
...@@ -365,7 +365,7 @@ export default { ...@@ -365,7 +365,7 @@ export default {
365 }, 365 },
366 //分页 366 //分页
367 currentChange(val) { 367 currentChange(val) {
368 - this.page.pageNum = val.page; 368 + this.page.pageIndex = val.page;
369 this.search(1); 369 this.search(1);
370 }, 370 },
371 sizeChange(val) { 371 sizeChange(val) {
......
...@@ -1211,7 +1211,7 @@ ...@@ -1211,7 +1211,7 @@
1211 </Formitem> 1211 </Formitem>
1212 </el-col> 1212 </el-col>
1213 <el-col :span="4"> 1213 <el-col :span="4">
1214 - <Formitem label="业务状态" prop="factoryCode"> 1214 + <Formitem label="回执状态" prop="factoryCode">
1215 <el-select 1215 <el-select
1216 type="text" 1216 type="text"
1217 id="inputInner--declaredPort" 1217 id="inputInner--declaredPort"
......
1 <template> 1 <template>
2 - <div class="export-list-query"> 2 + <div class="entrySreach">
3 - <div class="entrySreach" ref="classCPortEntry">
4 <el-form 3 <el-form
5 class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder" 4 class="fedexFormStyle fedexformSreach fedexformSreachBottomBorder"
6 ref="sreachForm" 5 ref="sreachForm"
7 - :model="searchForm" 6 + :model="sreachFormData"
8 label-position="top" 7 label-position="top"
9 size="small" 8 size="small"
10 > 9 >
11 - <el-row class="row-border"> 10 + <el-row>
11 + <!-- 提运单号 -->
12 <el-col :span="5"> 12 <el-col :span="5">
13 - <Formitem label="提运单号" prop="consignmentCode"> 13 + <Formitem label="提运单号" prop="billNo">
14 - <PopoverTextarea 14 + <el-input
15 - v-model="searchForm.consignmentCode" 15 + type="text"
16 - :maxlength="5000" 16 + class="inputShadow"
17 - :max-entries="1000" 17 + id="inputInner--billNo"
18 - /> 18 + resize="none"
19 + v-model="sreachFormData.billNo"
20 + clearable
21 + placeholder=""
22 + ></el-input>
23 + <!-- <FormTextareaInput
24 + :formData="sreachFormData"
25 + dataKey="billNo"
26 + @formChange="formChange"
27 + /> -->
19 </Formitem> 28 </Formitem>
20 </el-col> 29 </el-col>
21 - <el-col :span="4"> 30 + <!-- 订单编号 -->
22 - <Formitem label="订单编号" prop="factoryCode"> 31 + <el-col :span="5">
23 - <el-select 32 + <Formitem label="订单编号" prop="orderNo">
33 + <el-input
24 type="text" 34 type="text"
25 - id="inputInner--declaredPort" 35 + class="inputShadow"
26 - v-model="searchForm.declaredPort" 36 + id="inputInner--orderNo"
37 + resize="none"
38 + v-model="sreachFormData.orderNo"
27 clearable 39 clearable
28 placeholder="" 40 placeholder=""
29 - @change="portChange" 41 + ></el-input>
30 - >
31 - <el-option
32 - v-for="(item, index) in dictData.userport"
33 - :key="index"
34 - :label="item.name"
35 - :value="item.name"
36 - ></el-option>
37 - </el-select>
38 </Formitem> 42 </Formitem>
39 </el-col> 43 </el-col>
40 - 44 + <!-- 物流运单编号 -->
41 - <el-col :span="4"> 45 + <el-col :span="5">
42 - <Formitem label="物流运单编号" prop="receiptStatus"> 46 + <Formitem label="物流运单编号" prop="logisticsNo">
43 - <el-select 47 + <el-input
44 type="text" 48 type="text"
45 - id="inputInner--declaredPort" 49 + class="inputShadow"
46 - v-model="searchForm.declaredPort" 50 + id="inputInner--logisticsNo"
51 + resize="none"
52 + v-model="sreachFormData.logisticsNo"
47 clearable 53 clearable
48 placeholder="" 54 placeholder=""
49 - @change="portChange" 55 + ></el-input>
50 - >
51 - <el-option
52 - v-for="(item, index) in dictData.userport"
53 - :key="index"
54 - :label="item.name"
55 - :value="item.name"
56 - ></el-option>
57 - </el-select>
58 </Formitem> 56 </Formitem>
59 </el-col> 57 </el-col>
60 - 58 + <!-- 创建时间 -->
61 <el-col :span="5"> 59 <el-col :span="5">
62 - <Formitem 60 + <Formitem label="创建时间" prop="createTime" :activeType="true">
63 - label="创建日期"
64 - prop="createTime"
65 - :activeType="true"
66 - >
67 <el-date-picker 61 <el-date-picker
68 - class="inputInner--accsDataImportTime" 62 + class="inputInner--createTime"
69 - id="inputInner--accsDataImportTime" 63 + id="inputInner--createTime"
70 - v-model="searchForm.accsDataImportTime" 64 + v-model="sreachFormData.createTime"
71 type="daterange" 65 type="daterange"
72 format="yyyy-MM-dd" 66 format="yyyy-MM-dd"
73 prefix-icon="none" 67 prefix-icon="none"
74 - value-format="yyyyMMdd" 68 + value-format="yyyy-MM-dd"
75 range-separator="至" 69 range-separator="至"
76 - start-placeholder="" 70 + @change="dateChange"
77 - clearable 71 + />
78 - end-placeholder=""
79 - :picker-options="importTimePickerOptions"
80 - @blur="datePickerBlur"
81 - @change="accsDataImportTimeChange"
82 - >
83 - </el-date-picker>
84 </Formitem> 72 </Formitem>
85 </el-col> 73 </el-col>
86 74
...@@ -95,170 +83,90 @@ ...@@ -95,170 +83,90 @@
95 ></el-button> 83 ></el-button>
96 </el-form-item> 84 </el-form-item>
97 </el-col> 85 </el-col>
98 - 86 + <el-col :span="2">
99 - <el-col :span="4">
100 <el-form-item class="textCenter"> 87 <el-form-item class="textCenter">
101 <el-button 88 <el-button
102 - icon="el-icon-refresh" 89 + type="text"
103 size="small" 90 size="small"
104 - :loading="loadings.searchLoading" 91 + icon="el-icon-refresh"
105 - @click="search(0)" 92 + @click="clear"
106 - >重置 93 + >
94 + 重置
107 </el-button> 95 </el-button>
108 </el-form-item> 96 </el-form-item>
109 </el-col> 97 </el-col>
110 </el-row> 98 </el-row>
111 -
112 <el-row> 99 <el-row>
100 + <!-- 电商企业代码 -->
113 <el-col :span="5"> 101 <el-col :span="5">
114 - <Formitem label="电商企业代码" prop="consignmentCode"> 102 + <Formitem label="电商企业代码" prop="ebpcode">
115 - <el-popover
116 - placement="bottom"
117 - width="320"
118 - trigger="manual"
119 - popper-class="popoverconsignmentCode"
120 - v-model="textareaVisible.formItemconsignmentCode"
121 - >
122 - <el-input
123 - name="consignmentCode-textarea"
124 - type="textarea"
125 - :rows="5"
126 - id="popoverInputconsignmentCode"
127 - class="inputShadow textareaPopover"
128 - v-model="searchForm.consignmentCode"
129 - resize="none"
130 - maxlength="13000"
131 - placeholder=""
132 - @blur="textareaBlur"
133 - @input="input"
134 - ></el-input>
135 <el-input 103 <el-input
136 - slot="reference" 104 + type="text"
137 - name="consignmentCode"
138 - type="textarea"
139 - :rows="1"
140 class="inputShadow" 105 class="inputShadow"
141 - id="inputInner--consignmentCode" 106 + id="inputInner--ebpcode"
142 - v-model="searchForm.consignmentCode"
143 resize="none" 107 resize="none"
108 + v-model="sreachFormData.ebpcode"
109 + clearable
144 placeholder="" 110 placeholder=""
145 - @focus="textareaFocus"
146 - @input="input"
147 ></el-input> 111 ></el-input>
148 - </el-popover>
149 </Formitem> 112 </Formitem>
150 </el-col> 113 </el-col>
114 + <!-- 回执状态 -->
151 <el-col :span="5"> 115 <el-col :span="5">
152 - <Formitem label="申报企业代码" prop="consignmentCode"> 116 + <Formitem label="回执状态" prop="returnStatus">
153 - <el-popover
154 - placement="bottom"
155 - width="320"
156 - trigger="manual"
157 - popper-class="popoverconsignmentCode"
158 - v-model="textareaVisible.formItemconsignmentCode"
159 - >
160 - <el-input
161 - name="consignmentCode-textarea"
162 - type="textarea"
163 - :rows="5"
164 - id="popoverInputconsignmentCode"
165 - class="inputShadow textareaPopover"
166 - v-model="searchForm.consignmentCode"
167 - resize="none"
168 - maxlength="13000"
169 - placeholder=""
170 - @blur="textareaBlur"
171 - @input="input"
172 - ></el-input>
173 - <el-input
174 - slot="reference"
175 - name="consignmentCode"
176 - type="textarea"
177 - :rows="1"
178 - class="inputShadow"
179 - id="inputInner--consignmentCode"
180 - v-model="searchForm.consignmentCode"
181 - resize="none"
182 - placeholder=""
183 - @focus="textareaFocus"
184 - @input="input"
185 - ></el-input>
186 - </el-popover>
187 - </Formitem>
188 - </el-col>
189 - <el-col :span="4">
190 - <Formitem label="回执状态" prop="receiptStatus">
191 <el-select 117 <el-select
192 type="text" 118 type="text"
193 - id="inputInner--declaredPort" 119 + id="inputInner--returnStatus"
194 - v-model="searchForm.declaredPort" 120 + v-model="sreachFormData.returnStatus"
195 clearable 121 clearable
196 placeholder="" 122 placeholder=""
197 - @change="portChange"
198 > 123 >
199 <el-option 124 <el-option
200 - v-for="(item, index) in dictData.userport" 125 + v-for="(item, index) in dictData.returnStatus"
201 :key="index" 126 :key="index"
202 :label="item.name" 127 :label="item.name"
203 - :value="item.name" 128 + :value="item.code"
204 ></el-option> 129 ></el-option>
205 </el-select> 130 </el-select>
206 </Formitem> 131 </Formitem>
207 </el-col> 132 </el-col>
133 + <!-- 清单编号 -->
208 <el-col :span="5"> 134 <el-col :span="5">
209 - <Formitem label="清单编号" prop="consignmentCode"> 135 + <Formitem label="清单编号" prop="invtNo">
210 - <el-popover
211 - placement="bottom"
212 - width="320"
213 - trigger="manual"
214 - popper-class="popoverconsignmentCode"
215 - v-model="textareaVisible.formItemconsignmentCode"
216 - >
217 - <el-input
218 - name="consignmentCode-textarea"
219 - type="textarea"
220 - :rows="5"
221 - id="popoverInputconsignmentCode"
222 - class="inputShadow textareaPopover"
223 - v-model="searchForm.consignmentCode"
224 - resize="none"
225 - maxlength="13000"
226 - placeholder=""
227 - @blur="textareaBlur"
228 - @input="input"
229 - ></el-input>
230 <el-input 136 <el-input
231 - slot="reference" 137 + type="text"
232 - name="consignmentCode"
233 - type="textarea"
234 - :rows="1"
235 class="inputShadow" 138 class="inputShadow"
236 - id="inputInner--consignmentCode" 139 + id="inputInner--invtNo"
237 - v-model="searchForm.consignmentCode"
238 resize="none" 140 resize="none"
141 + v-model="sreachFormData.invtNo"
142 + clearable
239 placeholder="" 143 placeholder=""
240 - @focus="textareaFocus"
241 - @input="input"
242 ></el-input> 144 ></el-input>
243 - </el-popover>
244 </Formitem> 145 </Formitem>
245 </el-col> 146 </el-col>
246 </el-row> 147 </el-row>
247 </el-form> 148 </el-form>
149 + <div class="optionButton">
150 + <div>
151 + <el-button class="entrySaveButton" size="small" @click="downloadData">
152 + <svg-icon
153 + class="el-icon-user-solid"
154 + icon-class="customCodeConfig"
155 + ></svg-icon>
156 + 汇总申请单
157 + </el-button>
248 </div> 158 </div>
249 - 159 + <div>
250 - <div style="text-align: right; margin: 10px" class="action-buttons">
251 - <div class="prime-button">汇总申请单</div>
252 <el-button 160 <el-button
161 + class="entrySaveButton"
253 size="small" 162 size="small"
254 - :loading="loadings.downloadLoading2" 163 + icon="el-icon-download"
255 - @click="downloadBpiData('log')" 164 + @click="downloadData"
256 > 165 >
257 - <svg-icon class="el-icon-user-solid" icon-class="fedexUpBlue"></svg-icon>
258 导出 166 导出
259 </el-button> 167 </el-button>
260 </div> 168 </div>
261 - 169 + </div>
262 <Table 170 <Table
263 class="fedexDetialTable fedexSreachTable" 171 class="fedexDetialTable fedexSreachTable"
264 ref="entryTable" 172 ref="entryTable"
...@@ -268,234 +176,327 @@ ...@@ -268,234 +176,327 @@
268 :border="true" 176 :border="true"
269 :pagination="true" 177 :pagination="true"
270 :order="false" 178 :order="false"
271 - :loading="loadings.sreachLoading" 179 + :loading="loadings.searchLoading"
272 :page="page.pageIndex" 180 :page="page.pageIndex"
273 :pageSizes="[20, 30, 50, 100]" 181 :pageSizes="[20, 30, 50, 100]"
274 - :totalCount="total" 182 + :totalCount="page.total"
275 @sizeChange="sizeChange" 183 @sizeChange="sizeChange"
276 @currentChange="currentChange" 184 @currentChange="currentChange"
277 - @rowClick="handleRowClick" 185 + @cellClick="cellClick"
278 :selection="true" 186 :selection="true"
279 :selectFixed="false" 187 :selectFixed="false"
188 + :rowSelectDataType="false"
280 @tableSelect="tableSelect" 189 @tableSelect="tableSelect"
281 @tableSelectAll="tableSelectAll" 190 @tableSelectAll="tableSelectAll"
282 - :rowSelectDataType="false"
283 :selected="selected" 191 :selected="selected"
284 > 192 >
285 - <template v-slot:waveName="scope"> 193 + <template v-slot:returnStatus="scope">
286 - <span>{{ `${scope.row.waveName}(${scope.row.waveExt2})` }}</span> 194 + <TablePopover
195 + ref="returnStatusPopover"
196 + dataKey="returnStatus"
197 + :parentDom="$refs.entryTable"
198 + :receiptDataHead="receiptDataHead"
199 + :rowData="scope.row"
200 + :tableData="tableData"
201 + @popoverChange="popoverChange"
202 + @popoverClose="popoverClose"
203 + >
204 + <div slot="title">
205 + <span style="font-weight: 700; color: #515a6e">提单运号：</span
206 + >{{ scope.row.billNo }}
207 + </div>
208 + <div slot="buttonLabel">
209 + {{ scope.row.returnStatus }}
210 + </div>
211 + </TablePopover>
212 + </template>
213 + <template v-slot:billNo="scope">
214 + <el-button type="text" @click="view(scope.row)">{{
215 + scope.row.billNo
216 + }}</el-button>
287 </template> 217 </template>
288 </Table> 218 </Table>
289 </div> 219 </div>
290 </template> 220 </template>
291 221
292 <script> 222 <script>
293 -// import {getAllExportingBills, getAllListBills} from "@/api/query/query"; 223 +import { getAllexportList } from "@/api/exportList-api.js";
294 -import PopoverTextarea from "@/components/PopoverTextarea/index.vue";
295 224
296 export default { 225 export default {
297 - name: "index", 226 + name: "ExportBillQuery",
298 - components: {PopoverTextarea},
299 data() { 227 data() {
300 return { 228 return {
301 - searchForm: { 229 + sreachFormData: {
302 - declaredPort: "", 230 + billNo: "",
303 - consStatus: "", 231 + ebpcode: "",
304 - consignmentCode: "", 232 + invtNo: "",
305 - accsDataImportTime: [], 233 + logisticsNo: "",
306 - ownerName: "", 234 + orderNo: "",
307 - consignmentHeadCode: "", 235 + returnStatus: "",
308 - isPushCustomsSys: "", 236 + createTime: [],
309 - waitOperStatus: "",
310 - declTime: [],
311 - },
312 - selected: [],
313 - sizeChange(val) {
314 - this.page.pageSize = val;
315 - this.sreach(1);
316 - },
317 - //分页
318 - currentChange(val) {
319 - this.page.pageIndex = val.page;
320 - this.search(1);
321 - },
322 - tableSelect(val) {
323 - this.selected = val.selection;
324 - },
325 - tableSelectAll(val) {
326 - this.selected = val;
327 }, 237 },
328 page: { 238 page: {
329 pageIndex: 1, 239 pageIndex: 1,
330 pageSize: 20, 240 pageSize: 20,
331 - },
332 - tableData: [],
333 - tableMaxheight: null,
334 total: 0, 241 total: 0,
335 - dictData: {
336 - userport: [
337 - {name: "Shanghai Port", code: "SH"},
338 - {name: "Beijing Port", code: "BJ"},
339 - {name: "Guangzhou Port", code: "GZ"},
340 - {name: "Shenzhen Port", code: "SZ"},
341 - {name: "Tianjin Port", code: "TJ"},
342 - ],
343 - },
344 - loadings: {
345 - searchLoading: false,
346 - },
347 - textareaVisible: {
348 - formItemconsignmentCode: false,
349 - formItemconsignmentHeadCode: false,
350 }, 242 },
243 + tableData: [],
351 headerData: [ 244 headerData: [
352 { 245 {
353 name: "回执状态", 246 name: "回执状态",
354 value: "returnStatus", 247 value: "returnStatus",
355 - width: "150", 248 + width: "",
356 align: "left", 249 align: "left",
250 + slot: true,
357 }, 251 },
358 { 252 {
359 name: "提运单号", 253 name: "提运单号",
254 + value: "billNo",
255 + width: "",
256 + align: "left",
257 + slot: true,
258 + },
259 + {
260 + name: "订单编号",
360 value: "orderNo", 261 value: "orderNo",
361 - width: '150', 262 + width: "",
362 - align: 'left' 263 + align: "left",
363 }, 264 },
364 { 265 {
365 - name: '订单编号', 266 + name: "物流运单号",
366 - value: 'orderType', 267 + value: "logisticsNo",
367 - width: '150', 268 + width: "",
368 - align: 'left' 269 + align: "left",
369 }, 270 },
370 { 271 {
371 - name: '物流运单号', 272 + name: "电商企业代码",
372 - value: 'ebccode', 273 + value: "ebpcode",
373 - width: '200', 274 + width: "",
374 - align: 'left' 275 + align: "left",
375 }, 276 },
376 { 277 {
377 - name: '电商企业代码', 278 + name: "电商企业名称",
378 - value: 'ebcname', 279 + value: "ebpname",
379 - width: '200', 280 + width: "",
380 - align: 'left' 281 + align: "left",
381 }, 282 },
382 { 283 {
383 - name: '电商企业名称', 284 + name: "申报企业代码",
384 - value: 'ebpname', 285 + value: "agentCode",
385 - width: '250', 286 + width: "",
386 - align: 'left' 287 + align: "left",
387 }, 288 },
289 + ],
290 + selected: [],
291 + receiptDataHead: [
388 { 292 {
389 - name: '申报企业代码', 293 + name: "回执状态",
390 - value: 'declaringEnterprise', 294 + value: "receiptStatus",
391 - width: '200', 295 + width: "",
392 - align: 'left' 296 + align: "left",
393 - } 297 + },
394 - ] 298 + {
395 - } 299 + name: "状态时间",
300 + value: "statusTime",
301 + width: "",
302 + align: "left",
303 + },
304 + {
305 + name: "回执描述",
306 + value: "receiptDescription",
307 + width: "",
308 + align: "left",
309 + },
310 + ],
311 + dictData: {
312 + ebccode: [],
313 + returnStatus: [],
314 + },
315 + loadings: {
316 + searchLoading: false,
317 + },
318 + textareaVisible: {
319 + formItemconsignmentCode: false,
320 + formItemconsignmentHeadCode: false,
321 + },
322 + tableMaxheight: null,
323 + };
396 }, 324 },
397 created() { 325 created() {
398 - // getAllListBills({ 326 + this.search(0);
399 - // pageIndex: 1, 327 + },
400 - // pageSize: 20 328 + mounted() {
401 - // }).then((res) => { 329 + this.tableMaxheight = window.innerHeight - 300;
402 - // console.log('res', res) 330 + },
403 - // this.tableData = res.data.value; 331 + watch: {
404 - // this.total = res.data.totalItems; 332 + $route() {
405 - // debugger; 333 + this.popoverClose();
406 - // }) 334 + },
407 }, 335 },
408 methods: { 336 methods: {
409 - input() { 337 + //查询
410 - this.$forceUpdate(); 338 + search(val) {
339 + this.loadings.searchLoading = true;
340 + if (val == 0) {
341 + this.page.pageIndex = 1;
342 + }
343 + let obj = this.sreachFormData;
344 + obj.pageIndex = this.page.pageIndex;
345 + obj.pageSize = this.page.pageSize;
346 + obj.createTimeStart = "";
347 + obj.createTimeEnd = "";
348 + if (obj.createTime.length > 0) {
349 + obj.createTimeStart = obj.createTime[0];
350 + obj.createTimeEnd = obj.createTime[1];
351 + }
352 + getAllexportList(obj)
353 + .then((res) => {
354 + if (res.code === "200") {
355 + this.tableData = res.data.value;
356 + this.page.total = res.data.totalItems;
357 + this.tableData.forEach((item, idx) => {
358 + item.index = idx;
359 + item.returnStatusPopoverType = false;
360 + item.popoverData = [];
361 + });
362 + } else {
363 + this.alertWarningMsg(res.message);
364 + }
365 + this.loadings.searchLoading = false;
366 + })
367 + .catch((err) => {
368 + console.log(err);
369 + this.loadings.searchLoading = false;
370 + });
411 }, 371 },
412 - handleRowClick(row) { 372 + //重置
413 - const declareId = row.declareId; 373 + clear() {
374 + this.sreachFormData = {
375 + orderNo: "",
376 + ebccode: "",
377 + returnStatus: "",
378 + createTime: [],
379 + };
380 + },
381 + //导出
382 + downloadData() {},
383 + //查询详情
384 + view(val) {
414 this.$router.push({ 385 this.$router.push({
415 - path: '/exportListDetail', 386 + name: "ExportBillDetail",
416 - query: { 387 + params: { data: val },
417 - declareId
418 - }
419 }); 388 });
420 }, 389 },
421 - async search(val) { 390 + popoverChange(val) {
422 - try { 391 + console.log(val);
423 - 392 + this.tableData = val.tableData;
424 - } catch (error) { 393 + this.receiptApi(val.data.declareId, val.status)
425 - console.error("搜索出错：", error); 394 + .then((res) => {
426 - } finally { 395 + val.tableData.forEach((item) => {
427 - // 无论成功还是失败，关闭加载状态 396 + if (item.declareId == val.data.declareId) {
428 - this.loadings.sreachLoading = false; 397 + item.popoverData = res;
429 } 398 }
430 - }, 399 + });
431 - textareaBlur(val) { 400 + this.tableData = val.tableData;
432 - let inputInner = document.querySelector( 401 + })
433 - "#inputInner--" + val.target.name.split("-")[0] 402 + .finally(() => {
434 - );
435 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = false;
436 - inputInner.style.display = "block";
437 this.$nextTick(() => { 403 this.$nextTick(() => {
438 - inputInner.blur(); 404 + this.$refs.returnStatusPopover.tableLoading = false;
439 - if (
440 - inputInner.value != undefined &&
441 - inputInner.value != "" &&
442 - inputInner.value != null
443 - ) {
444 - inputInner.classList.add("inputFocus");
445 - } else {
446 - inputInner.classList.remove("inputFocus");
447 - }
448 }); 405 });
449 - let arr = [];
450 - this.searchForm[val.target.name.split("-")[0]]
451 - .replace(/[\n\，\；\;]/g, ",")
452 - .replace(/[\t]/g, "")
453 - .split(",")
454 - .forEach((str, index) => {
455 - if (str != null && str != "" && index <= 1000) {
456 - arr.push(str.trim());
457 - }
458 }); 406 });
459 - this.searchForm[val.target.name.split("-")[0]] = arr.join("\n");
460 - this.$forceUpdate();
461 }, 407 },
462 - //文本域展示状态切换 408 + //查询回执
463 - textareaFocus(val) { 409 + receiptApi(id, type) {
464 - this.textareaVisible["formItem" + val.target.name.split("-")[0]] = true; 410 + return new Promise((resolve, reject) => {
465 - this.$nextTick(() => { 411 + let obj = { declareId: id };
466 - document 412 + resolve();
467 - .querySelector("#popoverInput" + val.target.name.split("-")[0])
468 - .focus();
469 - document.querySelector(
470 - "#inputInner--" + val.target.name.split("-")[0]
471 - ).style.display = "none";
472 }); 413 });
473 }, 414 },
415 + popoverClose(val) {
416 + this.tableData.forEach((item) => {
417 + item.returnStatusPopoverType = false;
418 + item.popoverData = [];
419 + });
420 + this.$refs.entryTable.$refs.tables.$refs.bodyWrapper.style.overflowY =
421 + "auto";
422 + },
423 + formChange(val) {
424 + this.sreachFormData = val;
425 + },
426 + tableSelect(val) {
427 + this.selected = val.selection;
428 + },
429 + tableSelectAll(val) {
430 + this.selected = val;
431 + },
432 + //分页
433 + currentChange(val) {
434 + this.page.pageIndex = val.page;
435 + this.search(1);
436 + },
437 + sizeChange(val) {
438 + this.page.pageSize = val;
439 + this.search(1);
440 + },
441 + cellClick() {
442 + this.popoverClose();
443 + },
444 + dateChange(val) {
445 + if (val == "" || val == null) {
446 + this.$nextTick(() => {
447 + this.sreachFormData.createTime = [];
448 + });
474 } 449 }
475 -} 450 + },
451 + input() {
452 + this.$forceUpdate();
453 + },
454 + },
455 +};
476 </script> 456 </script>
477 457
478 <style scoped lang="scss"> 458 <style scoped lang="scss">
479 @import "@/assets/styles/variables.scss"; 459 @import "@/assets/styles/variables.scss";
460 +.entrySreach {
461 + height: 100%;
462 + background-color: $menuLightBg;
463 +
464 + .entrySreachButton {
465 + display: inline-block;
466 + font-size: 20px;
467 + color: $fedexButton !important;
468 + }
480 469
481 -.export-list-query { 470 + .optionButton {
482 - .action-buttons { 471 + padding: 10px;
472 + text-align: right;
483 display: flex; 473 display: flex;
484 justify-content: space-between; 474 justify-content: space-between;
475 +
476 + .el-button {
477 + color: $fedexButton;
478 + border-color: $fedexButton !important;
479 +
480 + svg {
481 + display: inline-block;
482 + margin-right: 5px;
483 + fill: $fedexButton;
484 + }
485 + }
486 +
487 + .entrySaveButton:hover,
488 + .entrySaveButton:focus {
489 + color: $menuLightBg !important;
490 + background-color: $fedexButton !important;
485 } 491 }
486 - .prime-button {
487 - color: white;
488 - background-color: #007AB7;
489 - font-size: 12px;
490 - display: flex;
491 - align-items: center;
492 - padding: 0 15px;
493 } 492 }
494 } 493 }
495 494
496 -.entrySreachButton { 495 +.texttareaTip {
497 - display: inline-block; 496 + position: absolute;
498 - font-size: 20px; 497 + top: 52%;
499 - color: $fedexButton !important; 498 + right: 20px;
499 + transform: translate(0, -50%);
500 + z-index: 10;
500 } 501 }
501 </style> 502 </style>
......
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 import { getAllCancellation } from "@/api/exportRevokeBill-api.js"; 124 import { getAllCancellation } from "@/api/exportRevokeBill-api.js";
125 125
126 export default { 126 export default {
127 - name: "ListBranchQuery", 127 + name: "ExportRevokeBillQuery",
128 data() { 128 data() {
129 return { 129 return {
130 sreachFormData: { 130 sreachFormData: {
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
171 }, 171 },
172 { 172 {
173 name: "创建时间", 173 name: "创建时间",
174 - value: "createTime", 174 + value: "createTimeStr",
175 width: "", 175 width: "",
176 align: "left", 176 align: "left",
177 }, 177 },
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
322 }, 322 },
323 //分页 323 //分页
324 currentChange(val) { 324 currentChange(val) {
325 - this.page.pageNum = val.page; 325 + this.page.pageIndex = val.page;
326 this.search(1); 326 this.search(1);
327 }, 327 },
328 sizeChange(val) { 328 sizeChange(val) {
......
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 import { getAllExportingTransportBills } from "@/api/exportQuery.js"; 168 import { getAllExportingTransportBills } from "@/api/exportQuery.js";
169 169
170 export default { 170 export default {
171 - name: "index", 171 + name: "ExportTransportBillQuery",
172 data() { 172 data() {
173 return { 173 return {
174 sreachFormData: { 174 sreachFormData: {
...@@ -369,7 +369,7 @@ export default { ...@@ -369,7 +369,7 @@ export default {
369 }, 369 },
370 //分页 370 //分页
371 currentChange(val) { 371 currentChange(val) {
372 - this.page.pageNum = val.page; 372 + this.page.pageIndex = val.page;
373 this.search(1); 373 this.search(1);
374 }, 374 },
375 sizeChange(val) { 375 sizeChange(val) {
......
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
161 </Formitem> 161 </Formitem>
162 </el-col> 162 </el-col>
163 <!-- <el-col :span="3"> 163 <!-- <el-col :span="3">
164 - <Formitem label="业务状态" prop="returnStatus"> 164 + <Formitem label="回执状态" prop="returnStatus">
165 <el-input 165 <el-input
166 type="text" 166 type="text"
167 class="inputShadow" 167 class="inputShadow"
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
200 </Formitem> 200 </Formitem>
201 </el-col> 201 </el-col>
202 <el-col :span="3"> 202 <el-col :span="3">
203 - <Formitem label="业务状态" prop="appStatus"> 203 + <Formitem label="回执状态" prop="appStatus">
204 <el-input 204 <el-input
205 type="text" 205 type="text"
206 class="inputShadow" 206 class="inputShadow"
......
...@@ -492,7 +492,7 @@ ...@@ -492,7 +492,7 @@
492 </el-row> 492 </el-row>
493 <el-row> 493 <el-row>
494 <el-col :span="4"> 494 <el-col :span="4">
495 - <Formitem label="业务状态" prop="factoryCode"> 495 + <Formitem label="回执状态" prop="factoryCode">
496 <el-select 496 <el-select
497 type="text" 497 type="text"
498 id="inputInner--declaredPort" 498 id="inputInner--declaredPort"
......
...@@ -349,7 +349,7 @@ export default { ...@@ -349,7 +349,7 @@ export default {
349 }, 349 },
350 //分页 350 //分页
351 currentChange(val) { 351 currentChange(val) {
352 - this.page.pageNum = val.page; 352 + this.page.pageIndex = val.page;
353 this.search(1); 353 this.search(1);
354 }, 354 },
355 sizeChange(val) { 355 sizeChange(val) {
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 </Formitem> 68 </Formitem>
69 </el-col> 69 </el-col>
70 <el-col :span="4"> 70 <el-col :span="4">
71 - <Formitem label="业务状态" prop="factoryCode"> 71 + <Formitem label="回执状态" prop="factoryCode">
72 <el-select 72 <el-select
73 type="text" 73 type="text"
74 id="inputInner--declaredPort" 74 id="inputInner--declaredPort"
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
397 </el-row> 397 </el-row>
398 <el-row> 398 <el-row>
399 <el-col :span="4"> 399 <el-col :span="4">
400 - <Formitem label="业务状态" prop="factoryCode"> 400 + <Formitem label="回执状态" prop="factoryCode">
401 <el-select 401 <el-select
402 type="text" 402 type="text"
403 id="inputInner--declaredPort" 403 id="inputInner--declaredPort"
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
27 /> --> 27 /> -->
28 </Formitem> 28 </Formitem>
29 </el-col> 29 </el-col>
30 - <!-- 业务状态 --> 30 + <!-- 回执状态 -->
31 <el-col :span="5"> 31 <el-col :span="5">
32 - <Formitem label="业务状态" prop="returnStatus"> 32 + <Formitem label="回执状态" prop="returnStatus">
33 <el-select 33 <el-select
34 type="text" 34 type="text"
35 id="inputInner--returnStatus" 35 id="inputInner--returnStatus"
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 import { getAllLogisticsDepartureList } from "@/api/logisticsExit-api.js"; 168 import { getAllLogisticsDepartureList } from "@/api/logisticsExit-api.js";
169 169
170 export default { 170 export default {
171 - name: "ListBranchQuery", 171 + name: "LogisticsExitQuery",
172 data() { 172 data() {
173 return { 173 return {
174 sreachFormData: { 174 sreachFormData: {
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
200 }, 200 },
201 { 201 {
202 name: "运单编号", 202 name: "运单编号",
203 - value: "", 203 + value: "logisticsNo",
204 width: "", 204 width: "",
205 align: "left", 205 align: "left",
206 }, 206 },
...@@ -241,12 +241,6 @@ export default { ...@@ -241,12 +241,6 @@ export default {
241 align: "left", 241 align: "left",
242 }, 242 },
243 { 243 {
244 - name: "业务状态",
245 - value: "returnStatus",
246 - width: "",
247 - align: "left",
248 - },
249 - {
250 name: "申报日期", 244 name: "申报日期",
251 value: "appTime", 245 value: "appTime",
252 width: "", 246 width: "",
...@@ -387,7 +381,7 @@ export default { ...@@ -387,7 +381,7 @@ export default {
387 }, 381 },
388 //分页 382 //分页
389 currentChange(val) { 383 currentChange(val) {
390 - this.page.pageNum = val.page; 384 + this.page.pageIndex = val.page;
391 this.search(1); 385 this.search(1);
392 }, 386 },
393 sizeChange(val) { 387 sizeChange(val) {
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 :order="false" 100 :order="false"
101 noLabel="序号" 101 noLabel="序号"
102 :loading="loadings.searchLoading" 102 :loading="loadings.searchLoading"
103 - :page="page.pageNum" 103 + :page="page.pageIndex"
104 :pageSizes="[20, 30, 50, 100]" 104 :pageSizes="[20, 30, 50, 100]"
105 :totalCount="page.total" 105 :totalCount="page.total"
106 @sizeChange="sizeChange" 106 @sizeChange="sizeChange"
...@@ -132,7 +132,7 @@ import { getPortConfigList } from "@/api/system/port-api.js"; ...@@ -132,7 +132,7 @@ import { getPortConfigList } from "@/api/system/port-api.js";
132 import { getPortList } from "@/api/system/user.js"; 132 import { getPortList } from "@/api/system/user.js";
133 import DialogVue from "./dialog.vue"; 133 import DialogVue from "./dialog.vue";
134 export default { 134 export default {
135 - name: "RoleConfig", 135 + name: "PortConfig",
136 components: { 136 components: {
137 DialogVue, 137 DialogVue,
138 }, 138 },
...@@ -143,7 +143,7 @@ export default { ...@@ -143,7 +143,7 @@ export default {
143 dxpid: "", 143 dxpid: "",
144 }, 144 },
145 page: { 145 page: {
146 - pageNum: 1, 146 + pageIndex: 1,
147 pageSize: 20, 147 pageSize: 20,
148 total: 0, 148 total: 0,
149 }, 149 },
...@@ -211,10 +211,10 @@ export default { ...@@ -211,10 +211,10 @@ export default {
211 search(val) { 211 search(val) {
212 this.loadings.searchLoading = true; 212 this.loadings.searchLoading = true;
213 if (val == 0) { 213 if (val == 0) {
214 - this.page.pageNum = 1; 214 + this.page.pageIndex = 1;
215 } 215 }
216 let obj = this.sreachFormData; 216 let obj = this.sreachFormData;
217 - obj.pageNum = this.page.pageNum; 217 + obj.pageIndex = this.page.pageIndex;
218 obj.pageSize = this.page.pageSize; 218 obj.pageSize = this.page.pageSize;
219 getPortConfigList(obj) 219 getPortConfigList(obj)
220 .then((res) => { 220 .then((res) => {
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
272 }, 272 },
273 //分页 273 //分页
274 currentChange(val) { 274 currentChange(val) {
275 - this.page.pageNum = val.page; 275 + this.page.pageIndex = val.page;
276 this.search(1); 276 this.search(1);
277 }, 277 },
278 sizeChange(val) { 278 sizeChange(val) {
......
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
211 :pagination="true" 211 :pagination="true"
212 :order="false" 212 :order="false"
213 :loading="loadings.sreachLoading" 213 :loading="loadings.sreachLoading"
214 - :page="page.pageNum" 214 + :page="page.pageIndex"
215 :pageSizes="[20, 30, 50, 100]" 215 :pageSizes="[20, 30, 50, 100]"
216 :totalCount="page.total" 216 :totalCount="page.total"
217 @sizeChange="sizeChange" 217 @sizeChange="sizeChange"
...@@ -343,7 +343,7 @@ export default { ...@@ -343,7 +343,7 @@ export default {
343 createTime: [], 343 createTime: [],
344 }, 344 },
345 page: { 345 page: {
346 - pageNum: 1, 346 + pageIndex: 1,
347 pageSize: 20, 347 pageSize: 20,
348 total: 0, 348 total: 0,
349 }, 349 },
...@@ -466,10 +466,10 @@ export default { ...@@ -466,10 +466,10 @@ export default {
466 this.loadings.sreachLoading = true; 466 this.loadings.sreachLoading = true;
467 this.selected = []; 467 this.selected = [];
468 if (val == 0) { 468 if (val == 0) {
469 - this.page.pageNum = 1; 469 + this.page.pageIndex = 1;
470 } 470 }
471 let obj = this.sreachFormData; 471 let obj = this.sreachFormData;
472 - obj.pageNum = this.page.pageNum; 472 + obj.pageIndex = this.page.pageIndex;
473 obj.pageSize = this.page.pageSize; 473 obj.pageSize = this.page.pageSize;
474 obj.startCreateTime = ""; 474 obj.startCreateTime = "";
475 obj.endCreateTime = ""; 475 obj.endCreateTime = "";
...@@ -668,7 +668,7 @@ export default { ...@@ -668,7 +668,7 @@ export default {
668 }, 668 },
669 //分页 669 //分页
670 currentChange(val) { 670 currentChange(val) {
671 - this.page.pageNum = val.page; 671 + this.page.pageIndex = val.page;
672 this.search(1); 672 this.search(1);
673 }, 673 },
674 sizeChange(val) { 674 sizeChange(val) {
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 :pagination="true" 55 :pagination="true"
56 :order="false" 56 :order="false"
57 :loading="loadings.searchLoading" 57 :loading="loadings.searchLoading"
58 - :page="page.pageNum" 58 + :page="page.pageIndex"
59 :pageSizes="[20, 30, 50, 100]" 59 :pageSizes="[20, 30, 50, 100]"
60 :totalCount="page.total" 60 :totalCount="page.total"
61 @sizeChange="sizeChange" 61 @sizeChange="sizeChange"
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
101 roleName: "", 101 roleName: "",
102 }, 102 },
103 page: { 103 page: {
104 - pageNum: 1, 104 + pageIndex: 1,
105 pageSize: 20, 105 pageSize: 20,
106 total: 0, 106 total: 0,
107 }, 107 },
...@@ -135,10 +135,10 @@ export default { ...@@ -135,10 +135,10 @@ export default {
135 search(val) { 135 search(val) {
136 this.loadings.searchLoading = true; 136 this.loadings.searchLoading = true;
137 if (val == 0) { 137 if (val == 0) {
138 - this.page.pageNum = 1; 138 + this.page.pageIndex = 1;
139 } 139 }
140 let obj = this.sreachFormData; 140 let obj = this.sreachFormData;
141 - obj.pageNum = this.page.pageNum; 141 + obj.pageIndex = this.page.pageIndex;
142 obj.pageSize = this.page.pageSize; 142 obj.pageSize = this.page.pageSize;
143 getRoleList(obj) 143 getRoleList(obj)
144 .then((res) => { 144 .then((res) => {
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
182 }, 182 },
183 //分页 183 //分页
184 currentChange(val) { 184 currentChange(val) {
185 - this.page.pageNum = val.page; 185 + this.page.pageIndex = val.page;
186 this.search(1); 186 this.search(1);
187 }, 187 },
188 sizeChange(val) { 188 sizeChange(val) {
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 :pagination="true" 112 :pagination="true"
113 :order="false" 113 :order="false"
114 :loading="loadings.searchLoading" 114 :loading="loadings.searchLoading"
115 - :page="page.pageNum" 115 + :page="page.pageIndex"
116 :pageSizes="[20, 30, 50, 100]" 116 :pageSizes="[20, 30, 50, 100]"
117 :totalCount="page.total" 117 :totalCount="page.total"
118 @sizeChange="sizeChange" 118 @sizeChange="sizeChange"
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
162 port: "", 162 port: "",
163 }, 163 },
164 page: { 164 page: {
165 - pageNum: 1, 165 + pageIndex: 1,
166 pageSize: 20, 166 pageSize: 20,
167 total: 0, 167 total: 0,
168 }, 168 },
...@@ -245,10 +245,10 @@ export default { ...@@ -245,10 +245,10 @@ export default {
245 search(val) { 245 search(val) {
246 this.loadings.searchLoading = true; 246 this.loadings.searchLoading = true;
247 if (val == 0) { 247 if (val == 0) {
248 - this.page.pageNum = 1; 248 + this.page.pageIndex = 1;
249 } 249 }
250 let obj = this.sreachFormData; 250 let obj = this.sreachFormData;
251 - obj.pageNum = this.page.pageNum; 251 + obj.pageIndex = this.page.pageIndex;
252 obj.pageSize = this.page.pageSize; 252 obj.pageSize = this.page.pageSize;
253 getUserData(obj) 253 getUserData(obj)
254 .then((res) => { 254 .then((res) => {
...@@ -308,7 +308,7 @@ export default { ...@@ -308,7 +308,7 @@ export default {
308 }, 308 },
309 //分页 309 //分页
310 currentChange(val) { 310 currentChange(val) {
311 - this.page.pageNum = val.page; 311 + this.page.pageIndex = val.page;
312 this.search(1); 312 this.search(1);
313 }, 313 },
314 sizeChange(val) { 314 sizeChange(val) {
......