Commit ee49da15 by qiaoyanqi

错误提示

parent 537ebe08
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
break; break;
} }
} }
return errorPreMessage === "" ? this.commonMessage : errorPreMessage + this.saveAction.getErrorBaseDataName(a); return errorPreMessage === "" ? (a?a:this.commonMessage) : errorPreMessage + this.saveAction.getErrorBaseDataName(a);
}, },
getCommonMessage(){ getCommonMessage(){
return this.commonMessage; return this.commonMessage;
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
break break
} }
} }
return errorPreMessage === "" ? this.commonMessage : errorPreMessage return errorPreMessage === "" ? (a?a:this.commonMessage) : errorPreMessage
} }
} }
} }
<template> <template>
<div class="rbc-basedata"> <div class="rbc-basedata">
<el-popover ref="popover" popper-class="rbc-basedata-popover" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth"> <el-popover ref="popover" popper-class="rbc-basedata-popover" placement="top" trigger="manual" v-model="dataListShow" :visible-arrow="false" :width="searchPopperMinWidth">
<div class="select-box" slot="reference">
<Input ref="searchInput" v-model="selectValue" :disabled="disabled" :readonly="readonly || multiple" :class="{'multiple-input': multiple && !readonly}" placeholder="" @on-change="handleChange" @on-focus="handleFocus" @on-blur="handleBlur" @keydown.down.native="handleSelectNext" @keydown.up.native="handleSelectPrev" @keydown.enter.native="handleSelected">
<Icon type="ios-close-circle" :class="{'clear-icon': true, 'hidden-icon': disabled || readonly || !selectValue }" slot="suffix" @click="clearList" />
<Icon type="ios-more" class="more-select" slot="suffix" @click="handleInputSelect" />
</Input>
</div>
<ul ref="searchList" class="acct-search-list" :class="{'is-focus': hasFocus}" @mouseleave="onResultList = false" @mouseenter="onResultList = true"> <ul ref="searchList" class="acct-search-list" :class="{'is-focus': hasFocus}" @mouseleave="onResultList = false" @mouseenter="onResultList = true">
<li :class="['acct-search-item',selectIndex === index ? 'selected' : '',{active: activeName == item.name}]" v-for="(item,index) in baseDataList" :key="item.code" :value="item.code" @click="handleMainSearchSelectClick(item)"> <li :class="['acct-search-item',selectIndex === index ? 'selected' : '',{active: activeName == item.name}]" v-for="(item,index) in baseDataList" :key="item.code" :value="item.code" @click="handleMainSearchSelectClick(item)">
<span class="acct-search-label">{{ item.code + ' ' + item.name }}</span> <span class="acct-search-label">{{ item.code + ' ' + item.name }}</span>
...@@ -15,6 +9,12 @@ ...@@ -15,6 +9,12 @@
<span class="list-empty">无匹配数据</span> <span class="list-empty">无匹配数据</span>
</li> </li>
</ul> </ul>
<div class="select-box" slot="reference">
<Input ref="searchInput" v-model="selectValue" :disabled="disabled" :readonly="readonly || multiple" :class="{'multiple-input': multiple && !readonly}" placeholder="" @on-change="handleChange" @on-focus="handleFocus" @on-blur="handleBlur" @keydown.down.native="handleSelectNext" @keydown.up.native="handleSelectPrev" @keydown.enter.native="handleSelected">
<Icon type="ios-close-circle" :class="{'clear-icon': true, 'hidden-icon': disabled || readonly || !selectValue }" slot="suffix" @click="clearList" />
<Icon type="ios-more" class="more-select" slot="suffix" @click="handleInputSelect" />
</Input>
</div>
</el-popover> </el-popover>
<!-- 弹框 --> <!-- 弹框 -->
<EditModal v-if="showModal" v-model="showModal" :title="title" :selection="selection" :table-name="tableName" :multiple="multiple" :tableKey="tableKey" :treeKey="treeKey" :tableColumns="tableColumns" :searchPlaceholder="searchPlaceholder" :authType="authType" :versionDate="versionDate" :modalWidth="modalWidth" :isLeaf="isLeaf" :hideSelected="hideSelected" :structtype="structtype" :groupTableName="groupTableName" :treeTableName="treeTableName" :filterFormular="filterFormular" :filterFormularSP="filterFormularSP" :billdefineName="billdefineName" :billId="billId" :bill="bill" :isFilter="isFilter" :rowIndex="rowIndex" @on-ok="onSelectOk" /> <EditModal v-if="showModal" v-model="showModal" :title="title" :selection="selection" :table-name="tableName" :multiple="multiple" :tableKey="tableKey" :treeKey="treeKey" :tableColumns="tableColumns" :searchPlaceholder="searchPlaceholder" :authType="authType" :versionDate="versionDate" :modalWidth="modalWidth" :isLeaf="isLeaf" :hideSelected="hideSelected" :structtype="structtype" :groupTableName="groupTableName" :treeTableName="treeTableName" :filterFormular="filterFormular" :filterFormularSP="filterFormularSP" :billdefineName="billdefineName" :billId="billId" :bill="bill" :isFilter="isFilter" :rowIndex="rowIndex" @on-ok="onSelectOk" />
...@@ -420,7 +420,7 @@ export default { ...@@ -420,7 +420,7 @@ export default {
} }
.acct-search-list { .acct-search-list {
position: static; position: relative;
z-index: 999; z-index: 999;
margin: 0; margin: 0;
padding: 18px 12px; padding: 18px 12px;
......
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