Karsa 1 éve
szülő
commit
88bfbe8055

+ 1 - 1
src/views/dataEntry_manage/databaseComponents/util.js

@@ -190,7 +190,7 @@ export const allFromArr = [
 	{ name: 'wind',key: 2 },
 	{ name: '同花顺',key: 1 },
 	{ name: '彭博',key: 3 },
-	{name:'彭博财务',key:28},
+	{ name:'彭博财务',key:28},
 	{ name: '路透', key: 25 },
 	{ name: '手工指标', key: 9 },
 	{ name: '隆众指标', key: 10 },

+ 20 - 2
src/views/datasheet_manage/components/MixedTable.vue

@@ -239,6 +239,7 @@ export default {
           6公式计算单元格 
           1系统日期导入格 DataTimeType 1
           1指标日期导入格 DataTimeType 2
+          7指标计算的插入值单元格
         */
         data: [], 
         contextMenuOption: [],
@@ -874,8 +875,25 @@ export default {
     },
 
     /* 导入指标计算值 */
-    insertCalculateData() {
+    insertCalculateData(val) {
+      // this.insertTargetCell.DataType = 7;
+      // this.insertTargetCell.ShowValue = value;
+      // this.insertTargetCell.Value = value;
+      // this.insertTargetCell.EdbInfoId = edbId;
+      // this.insertTargetCell.DataTime = this.selectCell.ShowValue;
+
+      // this.$message.success('插入成功')
+
+      // //建立新的关联关系
+      // let relation = {
+      //   insert_cell: {
+      //     key: this.insertTargetCell.Uid,
+      //     relation_date: this.selectCell.Uid,
+      //     relation_edb: '',
+      //   }
+      // }
 
+      // this.setRelation(relation,7);
     },
 
     /* 初始化8行5列 */
@@ -1105,7 +1123,7 @@ export default {
       box-shadow: 0 1px 4px #999;
       background: #fff;
       position: absolute;
-      right: -174px;
+      right: -172px;
       top: -50%;
     }
   }

+ 1 - 1
src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -47,7 +47,7 @@
         <section class="form-section">
           <el-form
 						ref="form"
-						label-position="right"
+						label-position="left"
 						inline
 						label-width="80px"
 						:model="formData"