|
|
@@ -81,6 +81,7 @@
|
|
|
:perspective-flag="false"
|
|
|
:export="false"
|
|
|
:show-setting-flag="false" :data="batchRowsPage" :operateFlag="true" :height="tableHeight"
|
|
|
+ :pageSize="pageInfo.pageSize"
|
|
|
:refreshSelect="false"
|
|
|
:add-flag="false"
|
|
|
@delRow="delItem"
|
|
|
@@ -106,7 +107,9 @@
|
|
|
:export="false"
|
|
|
:seq-tip-content="vm.$t('doubleSeq')"
|
|
|
:choose-data-flag="true"
|
|
|
- :linkClickChecked="true" @pageChange="pageSizeChange"
|
|
|
+ :linkClickChecked="true"
|
|
|
+ :pageSize="pageInfo.pageSize"
|
|
|
+ @pageChange="pageSizeChange"
|
|
|
@chooseData="chooseData"
|
|
|
>
|
|
|
<DkTableColumn v-for="(item,index) in columns" :key="index" :field="item.field"
|
|
|
@@ -294,6 +297,7 @@ export default {
|
|
|
currentPage: 1
|
|
|
},
|
|
|
otherConditionInner: {},
|
|
|
+ initSearchFlag:false, // 是否打开就查询
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -959,7 +963,10 @@ export default {
|
|
|
*/
|
|
|
onVisibleChange(val) {
|
|
|
if (val) {
|
|
|
- // this.getDataTable()
|
|
|
+ if(this.initSearchFlag){
|
|
|
+ // 查询
|
|
|
+ this.getDataTable()
|
|
|
+ }
|
|
|
// this.batchRowsPage = this.$refs['table-select'].batchRows
|
|
|
} else {
|
|
|
this.searchTable = {} // 关闭选择画面需要清空条件
|
|
|
@@ -1145,7 +1152,10 @@ export default {
|
|
|
// 设置接口相关信息
|
|
|
let set = setting.setSetting(this.$service, self.type);
|
|
|
self = this.objectMerge(self, set)
|
|
|
-
|
|
|
+ if(self.pageSize){
|
|
|
+ self.pageInfo.pageSize = self.pageSize;
|
|
|
+ console.log('bbd34',self.pageSize)
|
|
|
+ }
|
|
|
// // 员工
|
|
|
// if (self.type === self.$config.MagnifierType.staff) {
|
|
|
// self.service = this.$service.commonService
|