Merge branch 'develop-yuancheng' into 'develop'

Develop yuancheng See merge request GFP/RBC/rbc-frontend!111

Merge branch 'develop-yuancheng' into 'develop'
Develop yuancheng See merge request GFP/RBC/rbc-frontend!111
eba5cbfd · 乔延琦 · e521d8c7 · e699388f · eba5cbfd
Commit eba5cbfd authored Mar 18, 2022 by 乔延琦
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

index.vue ...ms-plugin-billexpand/src/control/baseDataSelect/index.vue +3 -1

No files found.
--- a/develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue
+++ b/develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue
@@ -293,7 +293,9 @@ export default {
        this.baseDataList = rows
      }
      this.originBaseDataList = JSON.parse(JSON.stringify(this.baseDataList))
-      this.dataListShow = true
+      if (!this.showModal) {
+        this.dataListShow = true
+      }
    },
    // 点击下拉菜单的条目
    handleMainSearchSelectClick(item) {