Commit 673039b1 authored by jingnan's avatar jingnan 👀

入库明细取消分页(因为有树结构~)

parent ccf24b34
...@@ -19,12 +19,9 @@ ...@@ -19,12 +19,9 @@
ref="treeTable" ref="treeTable"
:data="tableData" :data="tableData"
:columns="columns" :columns="columns"
:pagination="pagination"
table-height="300px" table-height="300px"
:options="optionsTree" :options="optionsTree"
:empty-content="emptyContent" :empty-content="emptyContent"
@pagination-size-change="changePageSize"
@pagination-current-change="changePageNum"
> >
<!-- <div slot="header" class="table-title-wrap"> <!-- <div slot="header" class="table-title-wrap">
<dee-tools v-if="!isSignApproval" :tools="tools" mode="normal" /> <dee-tools v-if="!isSignApproval" :tools="tools" mode="normal" />
...@@ -676,8 +673,8 @@ export default { ...@@ -676,8 +673,8 @@ export default {
this.newDataImportResId = id this.newDataImportResId = id
const param = { const param = {
'rootCondition': { 'rootCondition': {
'pageFrom': this.pagination.currentPage, 'pageFrom': 1,
'pageSize': this.pagination.pageSize, 'pageSize': 9999,
'searchItems': { 'searchItems': {
'children': [ 'children': [
{ {
......
...@@ -20,12 +20,9 @@ ...@@ -20,12 +20,9 @@
ref="treeTable" ref="treeTable"
:data="tableData" :data="tableData"
:columns="columns" :columns="columns"
:pagination="pagination"
table-height="300px" table-height="300px"
:options="optionsTree" :options="optionsTree"
:empty-content="emptyContent" :empty-content="emptyContent"
@pagination-size-change="changePageSize"
@pagination-current-change="changePageNum"
> >
<div slot="header" class="table-title-wrap"> <div slot="header" class="table-title-wrap">
<dee-tools v-if="!isSignApproval" :tools="tools" mode="normal" /> <dee-tools v-if="!isSignApproval" :tools="tools" mode="normal" />
...@@ -719,8 +716,8 @@ export default { ...@@ -719,8 +716,8 @@ export default {
this.newDataImportResId = reqObj && reqObj.id || '' this.newDataImportResId = reqObj && reqObj.id || ''
const param = { const param = {
'rootCondition': { 'rootCondition': {
'pageFrom': this.pagination.currentPage, 'pageFrom': 1,
'pageSize': this.pagination.pageSize, 'pageSize': 9999,
'searchItems': { 'searchItems': {
'children': [ 'children': [
{ {
......
...@@ -17,13 +17,10 @@ ...@@ -17,13 +17,10 @@
<dee-up-table <dee-up-table
v-if="basicData.id" v-if="basicData.id"
ref="treeTable" ref="treeTable"
:pagination="pagination"
:data="tableData" :data="tableData"
table-height="calc(100vh - 460px)" table-height="calc(100vh - 460px)"
:columns="columns" :columns="columns"
:options="optionsTree" :options="optionsTree"
@pagination-size-change="changePageSize"
@pagination-current-change="changePageNum"
/> />
</div> </div>
</template> </template>
...@@ -232,8 +229,8 @@ export default { ...@@ -232,8 +229,8 @@ export default {
searchInStorageRequestItem() { searchInStorageRequestItem() {
const param = { const param = {
'rootCondition': { 'rootCondition': {
'pageFrom': this.pagination.currentPage, 'pageFrom': 1,
'pageSize': this.pagination.pageSize, 'pageSize': 9999,
'searchItems': { 'searchItems': {
'children': [ 'children': [
{ {
......
...@@ -16,15 +16,12 @@ ...@@ -16,15 +16,12 @@
<dee-up-table <dee-up-table
v-if="basicData.id" v-if="basicData.id"
ref="treeTable" ref="treeTable"
:pagination="pagination"
:selection-row="{selectable: selectable}" :selection-row="{selectable: selectable}"
:data="tableData" :data="tableData"
table-height="calc(100vh - 460px)" table-height="calc(100vh - 460px)"
:columns="columns" :columns="columns"
:options="optionsTree" :options="optionsTree"
@selection-change="selectionChange" @selection-change="selectionChange"
@pagination-size-change="changePageSize"
@pagination-current-change="changePageNum"
> >
<dee-tools v-if="basicData.state === 'In_Confirm'" slot="header" :tools="tools" mode="normal" :collapse="false" /></dee-up-table> <dee-tools v-if="basicData.state === 'In_Confirm'" slot="header" :tools="tools" mode="normal" :collapse="false" /></dee-up-table>
<EditDrawer ref="editDrawer" :basic-data="basicData" /> <EditDrawer ref="editDrawer" :basic-data="basicData" />
...@@ -379,8 +376,8 @@ export default { ...@@ -379,8 +376,8 @@ export default {
searchInStorageRequestItem() { searchInStorageRequestItem() {
const param = { const param = {
'rootCondition': { 'rootCondition': {
'pageFrom': this.pagination.currentPage, 'pageFrom': 1,
'pageSize': this.pagination.pageSize, 'pageSize': 9999,
'searchItems': { 'searchItems': {
'children': [ 'children': [
{ {
......
...@@ -3,13 +3,10 @@ ...@@ -3,13 +3,10 @@
<dee-up-table <dee-up-table
v-if="basicData.id" v-if="basicData.id"
ref="treeTable" ref="treeTable"
:pagination="pagination"
:data="tableData" :data="tableData"
:columns="columns" :columns="columns"
table-height="calc(100vh - 200px)" table-height="calc(100vh - 200px)"
:options="optionsTree" :options="optionsTree"
@pagination-size-change="changePageSize"
@pagination-current-change="changePageNum"
/> />
</div> </div>
</template> </template>
...@@ -192,8 +189,8 @@ export default { ...@@ -192,8 +189,8 @@ export default {
searchInStorageRequestItem() { searchInStorageRequestItem() {
const param = { const param = {
'rootCondition': { 'rootCondition': {
'pageFrom': this.pagination.currentPage, 'pageFrom': 1,
'pageSize': this.pagination.pageSize, 'pageSize': 9999,
'searchItems': { 'searchItems': {
'children': [ 'children': [
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment