scorpio 2 gadi atpakaļ
vecāks
revīzija
0f0a7ef569

+ 4 - 4
src/views/home/component/dash.vue

@@ -62,8 +62,8 @@
       </template>
       <template #plan_storage_time="{row}">
         <div class='flex flex-center'>
-          <div class='mr-5 red' v-if='row.is_storage === 0 '>{{ row.plan_storage_time.substring(0, 10) }}</div>
-          <div class='mr-5 blue' v-else>{{ row.storage_time.substring(0, 10) }}</div>
+          <div class='mr-5 red' v-if='row.plan_storage_time !== undefined && row.is_storage === 0 '>{{ row.plan_storage_time.substring(0, 10) }}</div>
+          <div class='mr-5 blue' v-else>{{ row.storage_time ? row.storage_time.substring(0, 10) : '' }}</div>
         </div>
       </template>
 
@@ -79,11 +79,11 @@
       </template>
       <template #plan_commencement_time="{row}">
         <div class='flex flex-center'>
-          <div class='mr-5 red' v-if='row.is_start === undefined ||row.is_start === 0 '>{{
+          <div class='mr-5 red' v-if='plan_commencement_time !== undefined && (row.is_start === undefined ||row.is_start === 0 )'>{{
               row.plan_commencement_time.substring(0, 10)
             }}
           </div>
-          <div class='mr-5 blue' v-else>{{ row.start_time.substring(0, 10) }}</div>
+          <div class='mr-5 blue' v-else>{{ row.start_time ? row.start_time.substring(0, 10) :'' }}</div>
         </div>
       </template>
     </avue-crud>

+ 4 - 1
src/views/home/component/params/params3.vue

@@ -70,7 +70,10 @@
     <el-dialog v-model='show' :title='current ? current.year + "年度" : ""' width='1260px'>
       <div class='flex flex-center flex-wrap'>
         <div class='flex flex-center'>
-          <span style='margin-top: 40px;margin-right: 20px' class='bold'>计划投资:</span>
+          <div>
+            <span style='margin-top: 40px;margin-right: 20px' class='bold'>计划投资:</span>
+            <span style='margin-top: 40px;margin-right: 20px' class='bold'>计划投资:</span>
+          </div>
           <div class='flex flex-center flex-col' v-for='item in current.editType === 1 ? current.planMonths : current.months' :key='item'>
             <div class='bold mb-10 mt-10'>{{ item.name }}月</div>
             <input :disabled='!detail.can_update' class='input flex flex-center' v-model="item.value" :min="1"