Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): 基础数据选择组件修改

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

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

@@ -165,7 +165,6 @@ export default {
     },
     'groupTableName.define.showFields': {
       handler(nv) {
-        console.log({nv})
         let choiceColumns = this.groupTableName.define.choiceColumns;
         let column = nv.filter(item => item.isQueryColumn && choiceColumns.indexOf(item.columnName)>-1);
         let width = 0
@@ -287,10 +286,33 @@ export default {
       this.getBaseDataList()
     },
     handleBlur() {
-      if (!this.onResultList) {
-        this.hasFocus = false
-        this.dataListShow = false
+      if (this.onResultList) {
+        this.$refs.searchInput.focus()
+        return
       }
+
+      if (
+        this.selectIndex >= 0
+        && this.selectIndex < this.baseDataList.length
+      ) {
+        this.selectValue = this.baseDataList[this.selectIndex].name
+        this.value = this.baseDataList[this.selectIndex]
+        this.selectedItem = this.baseDataList[this.selectIndex]
+        this.$emit('data-change', this.value)
+        this.selectIndex = -1
+      }
+      else if (
+        this.selectValue != this.selectedItem.code
+        && this.selectValue != this.selectedItem.name
+      ) {
+        this.clearList()
+      }
+      else {
+        this.$emit('data-change', this.value)
+      }
+
+      this.hasFocus = false
+      this.dataListShow = false
     },
     // 输入查询时
     handleChange() {
@@ -402,9 +424,10 @@ export default {
       this.selectValue = item.code
       this.hasFocus = false
       this.dataListShow = false
+      this.onResultList = false
       this.value = item
       this.selectedItem = item
-      this.$emit('data-change', this.value)
+      this.handleSelected()
     },
     // 列表上、下、回车
     handleSelectPrev() {
@@ -424,17 +447,6 @@ export default {
       }
     },
     handleSelected() {
-      for (var i = 0; i < this.baseDataList.length; i++) {
-        if (this.selectIndex === i) {
-          this.selectValue = this.baseDataList[i].code
-          this.value = this.baseDataList[i]
-          this.selectedItem = this.baseDataList[i]
-        }
-      }
-      this.hasFocus = false
-      this.dataListShow = false
-      this.$emit('data-change', this.value)
-      this.selectIndex = -1
       this.$refs.searchInput.blur()
     },
     // 查找索引位置