fix bug

src/views/chartRelevance_manage/components/selectTarget.vue

@@ -161,7 +161,19 @@ export default {
             if(this.filter) {
                res = this.targetType=='1'?await dataBaseInterface.targetSearchByPage(params):await preDictEdbInterface.edbSearch(params)
             }else {
-              res = await sheetInterface.searchTarget(params)
+              const filterMap = {
+                1: 2,
+                8: 3,
+                14: 6
+              }
+
+              let FilterSource = (this.$route.path==='/addMixedSheet' && this.$parent.isCalculateDia)
+                ? filterMap[this.$parent.formData.source]||1 
+                : 1;
+              res = await sheetInterface.searchTarget({
+                ...params,
+                FilterSource,
+              })
             }
             
 

src/views/datasheet_manage/components/CustomTable.vue

@@ -859,7 +859,7 @@ export default {
       }else {
         cell.DataType = 3;
         cell.ShowValue = this.copyCellItem.ShowValue;
-        cell.Value = this.copyCellItem.Value;
+        cell.Value = this.copyCellItem.ShowValue;
       }
       
       // 阻止默认的粘贴操作

src/views/datasheet_manage/components/MixedTable.vue

@@ -910,6 +910,11 @@ export default {
         }
       }
       this.isInsertDateDialog = true;
+
+      this.isSelectTargetValueDialog = false;
+      this.$refs.selectTargetValueRef.initData();
+      this.isInsertCalculate = false;
+      this.$refs.calculateEdbDiaRef.initData();
     },
 
     /* 插入系统/指标日期 */
@@ -1035,7 +1040,9 @@ export default {
       }else {
         cell.DataType = 3;
         cell.ShowValue = this.copyCellItem.ShowValue;
-        cell.Value = this.copyCellItem.Value;
+        cell.Value = this.copyCellItem.ShowValue;
+        cell.DataTime = '';
+        cell.EdbInfoId = '';
       }
 
       // 阻止默认的粘贴操作

src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -132,6 +132,23 @@
 							</el-select>
 						</el-form-item>
 
+            <el-form-item label="频度" prop="frequency" v-if="[9,13].includes(formData.source)">
+							<el-select
+								v-model="formData.frequency"
+								placeholder="请选择频度"
+								style="width: 200px"
+								clearable
+							>
+								<el-option
+									v-for="item in frequencyArr"
+									:key="item"
+									:label="item"
+									:value="item"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
 						<el-form-item label="数据取值" prop="valueType" v-if="info.fromEdbKey===51">
 							<el-select
 								v-model="formData.valueType"
@@ -250,6 +267,7 @@ export default {
   },
   data() {
     return {
+      isCalculateDia: true,
       formData: {
         source: this.info.fromEdbKey,
         frequency: '',
@@ -262,6 +280,7 @@ export default {
         alphaValue: 0,
       },
       formRules,
+      frequencyArr: ['日度', '周度','旬度', '月度', '季度', '年度'],
 
       showResult: false,
       calculateShowData: [], //计算全部数据