szh_zidingyibiaoti
lilu 2 years ago
parent 7b14e2407a
commit 6d220590f7

@ -12,7 +12,7 @@
:lg="6" :lg="6"
:xl="4" :xl="4"
:key="findex" :key="findex"
v-if="(findex < 4 && !advanced) || advanced" v-show="(findex < 4 && !advanced) || advanced"
class="from-label" class="from-label"
> >
<a-form-item style="padding-left:10px;padding-right:10px;" :label="formLabel.title"> <a-form-item style="padding-left:10px;padding-right:10px;" :label="formLabel.title">
@ -58,7 +58,6 @@
</span> </span>
<a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4"> <a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4">
{{ advanced ? '收起' : '更多' }} {{ advanced ? '收起' : '更多' }}
<!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
<i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i> <i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i>
</a> </a>
</template> </template>
@ -66,26 +65,6 @@
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
<!-- <template v-for="(formLabel, findex) in formData" v-if="(findex < 4 && !advanced) || advanced">
<div class="form-box" :key="findex">
<div class="form-label">
<span class="label">{{ formLabel.title }}</span>
</div>
<div class="form-content">
<formLabel
:ref="`fromlabel-${formLabel.label}`"
:labelData="formLabel"
:formRes="formRes"
:resetType="ResetType"
:formIndex="findex"
@change="formChange"
@pressEnter="pressEnterFun"
@getCompleteList="getCompleteListFun"
@selectFirst="getSelectFirst"
></formLabel>
</div>
</div>
</template> -->
</div> </div>
</x-card> </x-card>
<x-card class="content-table" style="margin-top:-6px;"> <x-card class="content-table" style="margin-top:-6px;">
@ -745,7 +724,7 @@ export default {
this.formAllData = JSON.parse(JSON.stringify(initData.condAllData)) this.formAllData = JSON.parse(JSON.stringify(initData.condAllData))
this.fromTableAllData = JSON.parse(JSON.stringify(initData.columnsAllData)) this.fromTableAllData = JSON.parse(JSON.stringify(initData.columnsAllData))
this.tableHeight = document.body.clientHeight - 230 this.tableHeight = document.body.clientHeight - 230
this.getList({}, true) // this.getList({}, true)
this.getConfigUser(true) this.getConfigUser(true)
this.getCarrier() this.getCarrier()
}, },
@ -1091,6 +1070,8 @@ export default {
this.gridOptions.pagerConfig.pageSize = JSON.parse(data.configJson).pageSize this.gridOptions.pagerConfig.pageSize = JSON.parse(data.configJson).pageSize
this.getList({}, true, 'add') this.getList({}, true, 'add')
this.$forceUpdate() this.$forceUpdate()
} else {
this.getList({}, true)
} }
}, },
@ -1147,8 +1128,9 @@ export default {
toggleAdvanced() { toggleAdvanced() {
this.advanced = !this.advanced this.advanced = !this.advanced
this.$forceUpdate();
let start = new Date().getTime() let start = new Date().getTime()
console.log('== 点击展开 ==') console.log('== 点击展开 ==', start)
if (!this.advanced) { if (!this.advanced) {
const len = this.formData.length % 4 const len = this.formData.length % 4
if (this.formData.length === 4 || this.formData.length > 4) { if (this.formData.length === 4 || this.formData.length > 4) {
@ -2561,4 +2543,23 @@ export default {
width: 100%; width: 100%;
text-align: left; text-align: left;
} }
// .form-box{
// .form-main{
// float: left;
// margin-right: 10px;
// display: flex;
// width: 16%;
// overflow: hidden;
// .form-label{
// display: inline-block;
// margin-right: 10px;
// }
// .form-content{
// flex: 1;
// }
// }
// .more-btn{
// }
// }
</style> </style>

@ -66,7 +66,7 @@
:dropdown-match-select-width="false" :dropdown-match-select-width="false"
:dropdown-style="{ width: '200px' }" :dropdown-style="{ width: '200px' }"
v-model="value" v-model="value"
option-label-prop="value" option-label-prop="label"
@select="completeSelect" @select="completeSelect"
@focus="completeChangeFirst" @focus="completeChangeFirst"
@change="debounce(completeChange, 300, $event)" @change="debounce(completeChange, 300, $event)"
@ -80,7 +80,7 @@
</a-select-option> </a-select-option>
</template>--> </template>-->
<template slot="dataSource"> <template slot="dataSource">
<a-select-option v-for="(item, index) in dataSourceList" :key="index" :value="item[labelData.showLabel]"> <a-select-option v-for="(item, index) in dataSourceList" :key="`${index}-${item[labelData.showLabel]}`" :value="`${index}-${item[labelData.showLabel]}`" :label="item[labelData.showLabel]">
<div> <div>
<div class="title"> {{ item[labelData.showLabel] }} </div> <div class="title"> {{ item[labelData.showLabel] }} </div>
</div> </div>
@ -257,9 +257,10 @@ export default {
} }
}, },
completeSelect (value) { completeSelect (value) {
const val = value.split('-')[1]
this.$emit('change', { this.$emit('change', {
form: this.labelData, form: this.labelData,
value: value || '' value: val || ''
}) })
}, },
completeChange (value) { completeChange (value) {

Loading…
Cancel
Save