switch branch

src/views/datasheet_manage/components/MixedTable.vue

@@ -51,7 +51,7 @@
                 :data-rindex="rowHeader[index]"
                 :data-cindex="columnHeader[cell_index]"
                 :data-key="cell.Uid"
-                v-if="cell.DataType === 4 || disabled"
+                v-if="[4,5].includes(cell.DataType) || disabled"
               >
                 {{ cell.ShowValue }}</span
               >
@@ -94,6 +94,7 @@
     <!-- 选择指标 -->
     <selectTargetValueDia
       :isShow.sync="isSelectTargetValueDialog"
+      @insert="insertSelectData"
     />
   </div>
 </template>
@@ -234,10 +235,10 @@ export default {
     },
     
     // 建立插入单元格和依赖单元格关联关系
-    setRelation(data) {
+    setRelation(data,cellType=4) {
       const { insert_cell } = data;
       let relation_obj = {
-        type: 4,
+        type: cellType,
         key: insert_cell.key,
         relation_date: {
           type: 1,
@@ -489,18 +490,25 @@ export default {
     /* 打开选择指标弹窗  
     打开弹窗后仍可以在页面上点击 多存一个选择指标时的信息 */
     selectTargetOpen() {
-      this.insertTargetCell = this.rightClickCell;
+      this.insertTargetCell = this.selectCell;
       this.isSelectTargetValueDialog = true;
     },
 
     /* 插入选择指标的值 */
-    insertSelectData() {
+    insertSelectData({ edbId,value }) {
+        // let { key } = this.insertTargetCell;
+      this.insertTargetCell.DataType = 5;
+      this.insertTargetCell.ShowValue = value;
+      this.insertTargetCell.Value = value;
+      this.insertTargetCell.EdbInfoId = edbId;
+
+      // console.log(this.insertTargetCell)
 
     },
 
     /* 清除单元格内容 格式 关联关系 */
     clearCell() {
-      if(this.selectCell.DataType===4) resetRelationStyle();
+      if([4,5].includes(this.selectCell.DataType)) resetRelationStyle();
 
       this.selectCell.DataType = 3;
       this.selectCell.ShowValue = '';

src/views/datasheet_manage/components/selectTargetValueDia.vue

@@ -49,10 +49,8 @@ export default {
         { Value: 1515, DataTime: '2020-5-6' },
         { Value: 1515, DataTime: '2020-5-6' },
       ],
+      edbId: 0,
     }
-  },
-  mounted(){
-
   },
   methods:{
     /* 选择指标和日期获取近5期数据 */
@@ -68,7 +66,9 @@ export default {
     },
 
     insertData() {
-      
+      let data = { edbId:this.edbId,value: '2000' };
+      this.$emit('insert',data)
+      this.cancelHandle();
     },
 
     cancelHandle() {