fix bug

src/views/chartRelevance_manage/components/selectTarget.vue

@@ -170,9 +170,13 @@ export default {
               let FilterSource = (this.$route.path==='/addMixedSheet' && this.$parent.isCalculateDia)
                 ? filterMap[this.$parent.formData.source]||1 
                 : 1;
+              let Frequency = (this.$route.path==='/addMixedSheet' && this.$parent.isCalculateDia && this.$parent.formData.source===2)
+                ? '季度' 
+                : ''
               res = await sheetInterface.searchTarget({
                 ...params,
                 FilterSource,
+                Frequency
               })
             }
             

src/views/datasheet_manage/components/MixedTable.vue

@@ -1041,7 +1041,7 @@ export default {
         cell.ShowValue = this.copyCellItem.ShowValue;
         cell.Value = this.copyCellItem.ShowValue;
         cell.DataTime = '';
-        cell.EdbInfoId = '';
+        cell.EdbInfoId = 0;
       }
 
       // 阻止默认的粘贴操作

src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -414,6 +414,7 @@ export default {
       const { EdbInfoId,EdbInfoType,EdbName,Frequency } = res.Data;
 
       if(this.formData.source===1&&Frequency!=='月度') return this.$message.warning('只能选择月度指标')
+      else if(this.formData.source===2&&Frequency!=='季度') return this.$message.warning('不能选择季度指标')
       else if(this.formData.source===8&&Frequency==='日度') return this.$message.warning('不能选择日度指标')
       else if(this.formData.source===14&&Frequency==='年度') return this.$message.warning('不能选择年度指标')