Merge branch 'xqc_353' into debug

src/views/datasheet_manage/components/insertDateDia.vue

@@ -22,9 +22,12 @@
               <selectTarget
                 :defaultId="search_edb"
                 :defaultOpt="searchOptions"
+                :defaultType="EdbInfoType"
                 ref="selectRef"
                 @select="e => { selectEdbInfo = e ||{} }"
-                :filter="false"
+                :filter="true"
+                :selectStyleType="3"
+                selectBoxWidth="110px"
                 width="240px"
               />
               
@@ -103,11 +106,12 @@ export default {
           if(this.info.DataTimeType===2) { //指标日期时获取指标详情
             const { Data } = await dataBaseInterface.targetDetail({EdbInfoId: valueObj.EdbInfoId})
 
-            const { EdbName,LatestDate,Frequency,EdbInfoId,EndDate } = Data;
-            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId,EndDate }
+            const { EdbName,LatestDate,Frequency,EdbInfoId,EndDate,EdbInfoType } = Data;
+            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId,EndDate,EdbInfoType }
 
             this.search_edb = valueObj.EdbInfoId;
             this.searchOptions = [this.selectEdbInfo];
+            this.EdbInfoType=this.selectEdbInfo.EdbInfoType
           }
 
           this.$nextTick(() => {
@@ -140,6 +144,8 @@ export default {
 
       dateChangeSelect: 2,//日期方式选择 1系统日期 2指标日期
 
+      EdbInfoType:0,//0普通 1预测
+
     }
   },
   methods:{