Commit 9805e326 by 黑潮

update: fix bug

parent 5763bf79
......@@ -6,7 +6,7 @@
:visible.sync="visible"
:close-on-click-modal="false"
@close="cancel"
width="636px"
width="480px"
>
<el-tabs v-model="activeName">
<el-tab-pane
......@@ -19,7 +19,6 @@
ref="form"
:model="item.form"
label-width="122px"
:inline="true"
>
<el-form-item v-for="item in babyConfigTemplate.template" :key="item.unifiedIdentification" :label="item.fieldName+ ':'" :prop="item.unifiedIdentification" :rules="getRules(item)">
<el-input
......@@ -27,9 +26,9 @@
v-model="fieldsList[activeName].form[item.systemFieldId]"
:placeholder="item.fieldDescription"
type="text"
show-word-limit
:show-word-limit="item.unifiedIdentification == 'k20301'"
:maxlength="item.limitCountMax"
style="width: 160px;"
:style="{width: item.unifiedIdentification == 'k20301' ? '240px' : '160px'}"
/>
<el-date-picker
v-if="item.fieldType == 4"
......
......@@ -259,6 +259,10 @@ export default {
}
.customer-dialog .el-dialog__body {
padding-bottom: 0;
.tags-list {
max-height: 240px;
overflow: auto;
}
}
.label-dailog {
.el-tabs__header {
......
......@@ -349,6 +349,29 @@
}
}
}
.other-assets-item {
position: relative;
& + .other-assets-item {
margin-top: 20px !important;
}
.icon-wrap {
width: 48px !important;
height: 48px !important;
}
.left {
display: block !important;
}
.label {
position: absolute;
top: 0;
left: 70px;
}
.num {
position: absolute;
top: 25px;
left: 70px;
}
}
.flex-column-wrap {
display: flex;
flex-direction: column;
......
......@@ -142,7 +142,7 @@
{{ item.fieldValue }}
</el-descriptions-item>
</el-descriptions>
<div class="toggleTag" @click="toggleTag=!toggleTag" v-if="extendInfo.fieldList.length>=3">
<div class="toggleTag" @click="toggleTag=!toggleTag" v-if="extendInfo.fieldList.length>3">
{{ toggleTag?'收起':'展开更多' }}<i
:class="toggleTag ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" />
</div>
......@@ -219,8 +219,8 @@
<div class="flex-moudle-item">
<template v-for="item in section.childrenList.assets">
<div
:class="['flex-item line-item assets-item',item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)?'hover':'']"
v-if="item.iconTheme!=='integral_clique'||item.iconTheme==='integral_clique'&&showClique"
:class="['flex-item line-item assets-item',item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)?'hover':'', {'other-assets-item': !showClique}]"
v-if="item.iconTheme!=='integral_clique'||(item.iconTheme==='integral_clique'&&showClique)"
:key="item"
@click="item.iconTheme==='balance'?goStoreValue():goLink(item.path)">
<div class="left">
......
......@@ -274,7 +274,7 @@ export default {
extendInfo.openChildrenField.forEach(el => {
let item = el.sonFields.find(e => e.unifiedIdentification == 'k20301');
babyArr.push(
item && item.fieldValue ? item.fieldValue : el.bName,
item && item.fieldValue ? `${el.bName}${item.fieldValue})` : el.bName,
)
});
this.extendInfo = Object.assign({}, ret.extendInfo);
......
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