From 93f30ecb74eea1c7ed460d45bc01df2ef14d69a3 Mon Sep 17 00:00:00 2001
From: 阳洁 <2077506045@qq.com>
Date: 星期三, 10 五月 2023 14:53:57 +0800
Subject: [PATCH] Merge branch 'v13-20230413'
---
src/views/demography/index.vue | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/views/demography/index.vue b/src/views/demography/index.vue
index 96ac625..997ece0 100644
--- a/src/views/demography/index.vue
+++ b/src/views/demography/index.vue
@@ -7,7 +7,7 @@
<div v-if="item.types== 'text' && item.isRequired=='1'">
<el-form-item :label="item.paramName"
:prop="'data.'+index+'.paramValue'"
- :rules="[{ required: true, message: $t('required'),trigger: 'change'},{max: 32, message: $t('range32'), trigger: 'change'}]">
+ :rules="[{ required: true, message: $t('required'),trigger: 'change'},{max: 200, message: $t('range32'), trigger: 'change'}]">
<el-input v-model="item.paramValue"></el-input>
</el-form-item>
</div>
@@ -56,20 +56,23 @@
</div>
<div v-if="item.types=='select' && item.isRequired =='1'">
<el-form-item :label="item.paramName"
+ :prop="'data.'+index+'.paramValue'"
:rules="[{ required: true, message: $t('required'),trigger: 'change'}]">
- <el-select v-model="item.paramValue" :placeholder= "$t('pleaseSelect')">
+ <el-select v-model="item.paramValue" :placeholder= "$t('pleaseSelect')" :popper-append-to-body="false">
<el-option
v-for="itemIter in item.dictData"
:key="itemIter.dictValue"
:label="itemIter.dictLabel"
- :value="itemIter.dictValue">
+ :value="itemIter.dictValue"
+ :title="itemIter.dictLabel">
+ <span>{{ itemIter.dictLabel }}</span>
</el-option>
</el-select>
</el-form-item>
</div>
<div v-if="item.types=='select' && item.isRequired !='1'">
<el-form-item :label="item.paramName">
- <el-select v-model="item.paramValue" :placeholder= "$t('pleaseSelect')">
+ <el-select v-model="item.paramValue" :placeholder= "$t('pleaseSelect')" :popper-append-to-body="false">
<el-option
v-for="itemIter in item.dictData"
:key="itemIter.dictValue"
@@ -115,6 +118,7 @@
submitDemography: function () {
let _this = this
_this.submitDisable = true
+ console.log( this.$refs.demographyMenber)
this.$refs.demographyMenber.validate(vaild => {
if (vaild) {
_this.parasInfos = []
@@ -214,4 +218,27 @@
.align-center {
text-align: center
}
+
+/* .product-style /deep/ .el-select-dropdown__item {
+ width: 300px;
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }*/
+
+ //鏍峰紡淇敼閮ㄥ垎
+ .el-select .el-select-dropdown .el-scrollbar .el-select-dropdown__wrap .el-scrollbar__view .el-select-dropdown__item{
+ white-space: pre-wrap;
+ color: #606266;
+ height: auto;
+ font-weight: normal;
+ width: 300px;
+ }
+ /*.el-select .el-select-dropdown .el-scrollbar .el-select-dropdown__wrap .el-scrollbar__view .el-select-dropdown__item.selected{
+ background: #0090FF;
+ color: #fff;
+ font-weight: 700
+ }*/
+
</style>
--
Gitblit v1.9.1