Browse Source

弹窗未关闭时 切换日期也刷数据

Karsa 1 year ago
parent
commit
df4f1d283b

+ 3 - 0
src/views/datasheet_manage/components/MixedTable.vue

@@ -127,6 +127,7 @@
     <selectTargetValueDia
       :isShow.sync="isSelectTargetValueDialog"
       @insert="insertSelectData"
+      ref="selectTargetValueRef"
     />
   </div>
 </template>
@@ -231,6 +232,8 @@ export default {
         relation_date.key && setRelationStyle(relation_date)
         relation_edb.key && setRelationStyle(relation_edb)
       }
+
+      this.isSelectTargetValueDialog&&this.$refs.selectTargetValueRef.chooseEdb(this.$refs.selectTargetValueRef.edbInfo)
     },
 
     /* 插入值 往左往上寻找同行同列是否有符合条件的一指标一日期 */

+ 17 - 6
src/views/datasheet_manage/components/selectTargetValueDia.vue

@@ -47,6 +47,7 @@ export default {
   data() {
     return {
       result: {},
+      edbInfo: null,
       chooseItem: {
         edbId: 0,
         value:''
@@ -56,12 +57,17 @@ export default {
   methods:{
     /* 选择指标和日期获取近5期数据 */
     async chooseEdb(edb) {
-      if(!edb) return
+      if(!edb){
+        this.initData();
+        return
+      } 
+
+      this.edbInfo = edb;
       
       if(this.$parent.selectCell.DataType !== 1){
 
-        this.$message.warning('请先在表格中选择日期')
-        this.$refs.selectRef.search_txt='';
+        this.$message.warning('请在表格中选择日期')
+        this.initData();
         return
       }
 
@@ -85,10 +91,15 @@ export default {
       this.cancelHandle();
     },
 
-    cancelHandle() {
-      this.result = {};
-      this.chooseItem = {};
+    initData() {
       this.$refs.selectRef.search_txt='';
+      this.result = {};
+      this.edbInfo=null;
+      this.chooseItem = { edbId: 0,value: '' }
+    },
+
+    cancelHandle() {
+      this.initData();
       this.$emit('update:isShow',false);
       resetDialogCellStyle();
     }