Merge branch 'bug5372' into custom

src/views/datasheet_manage/components/insertDateDia.vue

@@ -29,7 +29,7 @@
               />
               
               <span v-show="selectEdbInfo.Frequency" style="margin: 0 10px">{{$t('ETableChildren.frequency_lable')}}: {{ getFrequencyTrans(selectEdbInfo.Frequency) }}</span>
-              <span v-show="selectEdbInfo.LatestDate">{{$t('OnlineExcelPage.lastest_date_lab')}}: {{ selectEdbInfo.LatestDate }}</span>
+              <span v-show="selectEdbInfo.EndDate">{{$t('OnlineExcelPage.lastest_date_lab')}}: {{ selectEdbInfo.EndDate }}</span>
             </li>
             <li class="form-item" style="padding-left:10px">
               <label class="el-form-item__label">{{$t('ETableChildren.lagging_period_label')}}</label>
@@ -103,8 +103,8 @@ export default {
           if(this.info.DataTimeType===2) { //指标日期时获取指标详情
             const { Data } = await dataBaseInterface.targetDetail({EdbInfoId: valueObj.EdbInfoId})
 
-            const { EdbName,LatestDate,Frequency,EdbInfoId } = Data;
-            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId }
+            const { EdbName,LatestDate,Frequency,EdbInfoId,EndDate } = Data;
+            this.selectEdbInfo = { EdbName,LatestDate,Frequency,EdbInfoId,EndDate }
 
             this.search_edb = valueObj.EdbInfoId;
             this.searchOptions = [this.selectEdbInfo];