技术监督需求整改 修改时间组件

src/components/form/datePicker/index.vue

@@ -28,11 +28,12 @@ import { ref, onMounted, nextTick, watch } from 'vue'
 
 interface Props {
     nextFlag?: boolean
-
+    theCurrentTime: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
-    nextFlag:false
+    nextFlag: false,
+    theCurrentTime: false
 })
 
 const interval = ref(3)
@@ -286,7 +287,7 @@ const next = () => {
                 } else {
                     endTime = year + '-' + presentM + '-' + presentD
                 }
-            } else if (year == presentY ) {
+            } else if (year == presentY) {
                 startTime = year + '-01-01'
                 // 当前月份大约3月份
                 if (presentM > 3) {
@@ -407,7 +408,7 @@ const setTime = (flag = 0, e = 0) => {
 
     let data = ''
 
-    if ((dd < 4 || dd == 0) && interval.value != 4) {
+    if ((dd < 4 || dd == 0) && interval.value != 4 && !props.theCurrentTime) {
         data = window.XEUtils.toDateString(new Date().getTime() - (e + dd) * 3600 * 1000 * 24, 'yyyy-MM-dd')
     } else {
         data = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'yyyy-MM-dd')

src/components/table/header/index.vue

@@ -10,7 +10,7 @@
                 :inline="true"
             >
                 <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 570px">
-                    <DatePicker ref="datePickerRef" :nextFlag="nextFlag"></DatePicker>
+                    <DatePicker ref="datePickerRef" :nextFlag="nextFlag" :theCurrentTime="theCurrentTime"></DatePicker>
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
@@ -61,14 +61,16 @@ interface Props {
     datePicker?: boolean
     area?: boolean
     showSearch?: boolean
-    nextFlag?: boolean
+    nextFlag?: boolean //控制时间是否可以往后推
+    theCurrentTime?: boolean //控制时间前3天展示上个月时间
 }
 
 const props = withDefaults(defineProps<Props>(), {
     datePicker: false,
     area: false,
     showSearch: true,
-    nextFlag: false
+    nextFlag: false,
+    theCurrentTime: false
 })
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {