Showing
2 changed files
with
23 additions
and
15 deletions
| ... | @@ -633,31 +633,31 @@ export default { | ... | @@ -633,31 +633,31 @@ export default { |
| 633 | linkChange(record, type) { | 633 | linkChange(record, type) { |
| 634 | const { | 634 | const { |
| 635 | billNo, | 635 | billNo, |
| 636 | - completedLogisticsNo, | 636 | + completedReceiptStatus, |
| 637 | - uncompletedLogisticsNo, | 637 | + uncompletedReceiptStatus, |
| 638 | - listReleaseLogisticsNo, | 638 | + listReleaseReceiptStatus, |
| 639 | - listDontReleaseLogisticsNo, | 639 | + listDontReleaseReceiptStatus, |
| 640 | - listClearanceLogisticsNo, | 640 | + listClearanceReceiptStatus, |
| 641 | - listNotClearedLogisticsNo, | 641 | + listNotClearedReceiptStatus, |
| 642 | } = record.row; | 642 | } = record.row; |
| 643 | const query = { billNo, search: true }; | 643 | const query = { billNo, search: true }; |
| 644 | if (+type === 1) { | 644 | if (+type === 1) { |
| 645 | - query["logisticsNo"] = uncompletedLogisticsNo; | 645 | + query["receiptStatus"] = JSON.stringify(uncompletedReceiptStatus); |
| 646 | } | 646 | } |
| 647 | if (+type === 2) { | 647 | if (+type === 2) { |
| 648 | - query["logisticsNo"] = completedLogisticsNo; | 648 | + query["receiptStatus"] = JSON.stringify(completedReceiptStatus); |
| 649 | } | 649 | } |
| 650 | if (+type === 3) { | 650 | if (+type === 3) { |
| 651 | - query["logisticsNo"] = listReleaseLogisticsNo; | 651 | + query["receiptStatus"] = JSON.stringify(listReleaseReceiptStatus); |
| 652 | } | 652 | } |
| 653 | if (+type === 4) { | 653 | if (+type === 4) { |
| 654 | - query["logisticsNo"] = listDontReleaseLogisticsNo; | 654 | + query["receiptStatus"] = JSON.stringify(listDontReleaseReceiptStatus); |
| 655 | } | 655 | } |
| 656 | if (+type === 5) { | 656 | if (+type === 5) { |
| 657 | - query["logisticsNo"] = listClearanceLogisticsNo; | 657 | + query["receiptStatus"] = JSON.stringify(listClearanceReceiptStatus); |
| 658 | } | 658 | } |
| 659 | if (+type === 6) { | 659 | if (+type === 6) { |
| 660 | - query["logisticsNo"] = listNotClearedLogisticsNo; | 660 | + query["receiptStatus"] = JSON.stringify(listNotClearedReceiptStatus); |
| 661 | } | 661 | } |
| 662 | console.log(query, record); | 662 | console.log(query, record); |
| 663 | 663 | ... | ... |
| ... | @@ -309,6 +309,7 @@ | ... | @@ -309,6 +309,7 @@ |
| 309 | <vxe-table | 309 | <vxe-table |
| 310 | :max-height="tableMaxheight" | 310 | :max-height="tableMaxheight" |
| 311 | :data="tableData" | 311 | :data="tableData" |
| 312 | + :column-config="{ resizable: true }" | ||
| 312 | :row-config="{ isCurrent: true, isHover: true }" | 313 | :row-config="{ isCurrent: true, isHover: true }" |
| 313 | :filter-config="{ remote: true }" | 314 | :filter-config="{ remote: true }" |
| 314 | @filter-change="filterChangeEvent" | 315 | @filter-change="filterChangeEvent" |
| ... | @@ -616,7 +617,7 @@ | ... | @@ -616,7 +617,7 @@ |
| 616 | :total="page.total" | 617 | :total="page.total" |
| 617 | :page-size.sync="page.pageSize" | 618 | :page-size.sync="page.pageSize" |
| 618 | :current-page.sync="page.pageIndex" | 619 | :current-page.sync="page.pageIndex" |
| 619 | - :page-sizes="[10, 20, 50, 100, 500, 1000]" | 620 | + :page-sizes="[10, 20, 50, 100, 500, 1000, 2000, 3000]" |
| 620 | background | 621 | background |
| 621 | layout="total,prev, pager, next, jumper, ->, sizes" | 622 | layout="total,prev, pager, next, jumper, ->, sizes" |
| 622 | class="tablePagination" | 623 | class="tablePagination" |
| ... | @@ -630,7 +631,7 @@ | ... | @@ -630,7 +631,7 @@ |
| 630 | @change="sizeChange" | 631 | @change="sizeChange" |
| 631 | > | 632 | > |
| 632 | <el-option | 633 | <el-option |
| 633 | - v-for="(item, index) in [10, 20, 50, 100, 500, 1000]" | 634 | + v-for="(item, index) in [10, 20, 50, 100, 500, 1000, 2000, 3000]" |
| 634 | :label="item + $t('system.custom.pageSize')" | 635 | :label="item + $t('system.custom.pageSize')" |
| 635 | :value="item" | 636 | :value="item" |
| 636 | :key="index" | 637 | :key="index" |
| ... | @@ -824,7 +825,14 @@ export default { | ... | @@ -824,7 +825,14 @@ export default { |
| 824 | try { | 825 | try { |
| 825 | if (this.$route.query.billNo && this.$route.query.search == "true") { | 826 | if (this.$route.query.billNo && this.$route.query.search == "true") { |
| 826 | this.sreachFormData.billNo = this.$route.query.billNo; | 827 | this.sreachFormData.billNo = this.$route.query.billNo; |
| 827 | - this.sreachFormData.logisticsNo = this.$route.query.logisticsNo; | 828 | + console.log( |
| 829 | + this.$route.query, | ||
| 830 | + JSON.parse(this.$route.query.receiptStatus) | ||
| 831 | + ); | ||
| 832 | + this.activeType = true; | ||
| 833 | + this.sreachFormData.receiptStatus = JSON.parse( | ||
| 834 | + this.$route.query.receiptStatus | ||
| 835 | + ); | ||
| 828 | } | 836 | } |
| 829 | } catch (error) { | 837 | } catch (error) { |
| 830 | console.log(error); | 838 | console.log(error); | ... | ... |
-
Please register or login to post a comment