From 0c0fa2483fd431104f6498e40fffd983d913dce2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 25 四月 2023 17:11:09 +0800
Subject: [PATCH] 修改

---
 src/views/analyse/plan/components/planDialog.vue |   49 ++++++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/views/analyse/plan/components/planDialog.vue b/src/views/analyse/plan/components/planDialog.vue
index 3aed91e..4eec5fc 100644
--- a/src/views/analyse/plan/components/planDialog.vue
+++ b/src/views/analyse/plan/components/planDialog.vue
@@ -16,24 +16,25 @@
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+                      <el-form-item label="评估时间" prop="assessTime">
+                        <el-date-picker
+                            :disabled="planDialogState.disabled"
+                            type="datetimerange"
+                            v-model="planDialogState.planForm.assessTime"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                            format="YYYY-MM-DD HH:mm:ss"
+                            value-format="YYYY-MM-DD HH:mm:ss"
+                            popper-class="pickTime"
+                            @change="formatTime">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
                         <el-form-item label="计划制定人" prop="planUserId">
                             <el-select :disabled="planDialogState.disabled" v-model="planDialogState.planForm.planUserId" style="width:100%"  placeholder="计划制定人" clearable>
                                 <el-option v-for="item in planDialogState.personList" :key="item.id" :label="item.realName" :value="item.id"></el-option>
                             </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-                        <el-form-item label="评估时间" prop="assessTime">
-                            <el-date-picker
-                                :disabled="planDialogState.disabled"
-                                type="datetimerange"
-                                v-model="planDialogState.planForm.assessTime"
-                                start-placeholder="开始时间"
-                                end-placeholder="结束时间"
-                                format="YYYY-MM-DD HH:mm:ss"
-                                value-format="YYYY-MM-DD HH:mm:ss"
-                                @change="formatTime">
-                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -121,35 +122,34 @@
     }else if(title === '查看'){
         planDialogState.title = '查看';
         planDialogState.disabled = true
-        planDialogState.planForm.assessTime = [value.assessStartTime, value.assessEndTime]
         for(let i in planDialogState.planForm){
             if(isValidKey(i, planDialogState.planForm)){
                 planDialogState.planForm[i] = value[i]
             }
         }
+        planDialogState.planForm.assessTime=[value.assessStartTime, value.assessEndTime]
+        console.log(value,planDialogState.planForm.assessTime,'time')
     }else{
         planDialogState.title = '编辑';
         planDialogState.planForm.id = value.id
-        planDialogState.planForm.assessTime=[value.assessStartTime, value.assessEndTime]
-        console.log(planDialogState.planForm.assessTime,'5')
-        formatTime()
-        console.log(planDialogState.planForm.assessTime,'6 ')
         for(let i in planDialogState.planForm){
             if(isValidKey(i, planDialogState.planForm)){
                 planDialogState.planForm[i] = value[i]
             }
         }
+        planDialogState.planForm.assessTime=[value.assessStartTime, value.assessEndTime]
     }
 };
 
 const formatTime = () => {
-    planDialogState.planForm.assessStartTime = planDialogState.planForm.assessTime === null ? '' : planDialogState.planForm.assessTime[0]
-    planDialogState.planForm.assessEndTime = planDialogState.planForm.assessTime === null ? '' : planDialogState.planForm.assessTime[1]
+    planDialogState.planForm.assessStartTime = planDialogState.planForm.assessTime == [] ? '' : planDialogState.planForm.assessTime[0]
+    planDialogState.planForm.assessEndTime = planDialogState.planForm.assessTime == [] ? '' : planDialogState.planForm.assessTime[1]
 };
 
 const onSubmitPlan = () => {
     planFormRef.value.validate(async(valid: boolean) => {
         if(valid){
+            formatTime()
             delete planDialogState.planForm.assessTime
             if(planDialogState.title === '新增'){
                 let res = await planApi().addPlan(planDialogState.planForm);
@@ -198,6 +198,9 @@
 })
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+    ::v-deep(.pickTime){
+      position: absolute !important;
+      top: 0 !important;
+    }
 </style>

--
Gitblit v1.9.2