Browse Source

明细+明细查询,字段设置bug修改

master
安虹睿 1 year ago
parent
commit
b7ebdde436
  1. 5
      Code/Fe/src/components/commonTabel-drawer/index.vue
  2. 3
      Code/Fe/src/components/filterForDetailPage/index.vue
  3. 2
      Code/Fe/src/mixins/TableMixins.js
  4. 2
      Code/Fe/src/views/interfaceBoard/TestSchool.vue

5
Code/Fe/src/components/commonTabel-drawer/index.vue

@ -69,6 +69,7 @@
@rowDrop="rowDrop" @rowDrop="rowDrop"
:searchOverallCoverHeight="'calc(100vh - 345px)'" :searchOverallCoverHeight="'calc(100vh - 345px)'"
:rowSource="'detail_api'" :rowSource="'detail_api'"
:rowMaxHeight="rowMaxHeight"
:totalCount="totalCountForDetail" :totalCount="totalCountForDetail"
:MaxResultCount="MaxResultCount" :MaxResultCount="MaxResultCount"
@sortChange="sortChangeForDetail" @sortChange="sortChangeForDetail"
@ -183,6 +184,10 @@ export default {
LoadingMixins, LoadingMixins,
], ],
props: { props: {
rowMaxHeight:{
type:String,
default:'calc(90vh - 450px)'
},
// //
buttonOperationList_left:{ buttonOperationList_left:{
type: Array, type: Array,

3
Code/Fe/src/components/filterForDetailPage/index.vue

@ -229,6 +229,7 @@ mounted(){
}, },
methods: { methods: {
rowDropForDetail(data,type){ rowDropForDetail(data,type){
this.listColumns = data
this.$emit("rowDropForDetail", data,type) this.$emit("rowDropForDetail", data,type)
}, },
// //
@ -262,7 +263,7 @@ methods: {
// //
let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/')) let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
let _Columns = this.initApiColumnsForDto(res.items[0],_parentName) let _Columns = this.initApiColumnsForDto(res.items[0],_parentName)
this.listColumns = this.initTableColumns(_Columns) this.listColumns = this.initTableColumns(_Columns,'detailPage_api')
// //
if(res){ if(res){
this.Loading.tableLoading = false this.Loading.tableLoading = false

2
Code/Fe/src/mixins/TableMixins.js

@ -197,7 +197,7 @@ export const tableMixins = {
.then(res=>{ .then(res=>{
// 表头处理 // 表头处理
let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/')) let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName)) this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName),'detail_api')
// 打印使用的全部数据存储 // 打印使用的全部数据存储
this.tableDataDetails = JSON.parse(JSON.stringify(res)) this.tableDataDetails = JSON.parse(JSON.stringify(res))
this.propsData = res this.propsData = res

2
Code/Fe/src/views/interfaceBoard/TestSchool.vue

@ -68,9 +68,7 @@
@goBack="goBack" @goBack="goBack"
></newAndEdiDialog> ></newAndEdiDialog>
<!-- 明细查询页面 --> <!-- 明细查询页面 -->
<!-- :listColumns="apiColumns_DetailsPage" -->
<filterForDetailPage <filterForDetailPage
@rowDropForDetail="rowDrop"
v-if="filterForDetailShow" v-if="filterForDetailShow"
:parentColumns="apiColumns_Table" :parentColumns="apiColumns_Table"
@closeDialog="changeFilterForDetailShow" @closeDialog="changeFilterForDetailShow"

Loading…
Cancel
Save