From 6de29718a453bf36caa3cf06ec9b55a02eb52518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 11 Nov 2023 17:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mdp-ui/mdp-date-range/Index.vue | 9 +++------
 src/views/xm/core/xmTask/XmTaskMng.vue         | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/mdp-ui/mdp-date-range/Index.vue b/src/components/mdp-ui/mdp-date-range/Index.vue
index 483dd725..5d0ccabb 100644
--- a/src/components/mdp-ui/mdp-date-range/Index.vue
+++ b/src/components/mdp-ui/mdp-date-range/Index.vue
@@ -1,7 +1,6 @@
 <template> 
-<span>
-  <span v-if="showStyle=='origin'||showStyle==''||!showStyle">
-    <el-date-picker :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
+
+     <el-date-picker v-if="showStyle=='origin'||showStyle==''||!showStyle" :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
       unlink-panels 
       :range-separator="rangeSepaSrator"
       :start-placeholder="startPlaceholder"
@@ -10,8 +9,7 @@
       @change="onDateRangeChange"
       :picker-options="pickerOptions"   
       ></el-date-picker>    
-  </span>
-  <span v-else :class="showStyle=='x'?{'field-box-x':true}:{'field-box':true}" >  
+   <span v-else :class="showStyle=='x'?{'field-box-x':true}:{'field-box':true}" >  
     <slot class="field-avater" name="avater">
       <el-avatar :size="size"  :class="{'dashed-circle':avaterCpd.isNull,disabled:disabled===true,enabled:disabled!==true}"  :icon="avaterCpd.icon" :style="{backgroundColor:avaterCpd.color}">{{avaterCpd.innerText}}</el-avatar> 
     </slot> 
@@ -49,7 +47,6 @@
             ></el-date-picker>  
     </span>
   </span>  
-</span>
 </template>
 
 <script> 
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 7c0ca0f7..edc83b15 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -223,7 +223,7 @@
               </el-descriptions-item>
               <el-descriptions-item>
                   <template slot="label">实际结束时间</template>
-                <mdp-date-range
+                <mdp-date-range style="max-width:120px;"
                   v-model="filters"
                   type="daterange"
                   start-key="actEndTimeStart"