Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng

See merge request GFP/RBC/rbc-frontend!27

develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue

@@ -19,7 +19,7 @@
       <!-- </div> -->
     </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-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" />
   </div>
 </template>
 <script>
@@ -136,6 +136,7 @@ export default {
           this.selection[0] = this.value
           this.showModal = true
         }
+        this.dataListShow = false
       }
     },
     // 下拉列表
@@ -398,6 +399,8 @@ export default {
     box-sizing: border-box;
     background-color: #fff;
     list-style: none;
+    max-height: 250px;
+    overflow: auto;
   }
 
   .acct-search-list .acct-search-item {