Browse Source

优化

master
陈裕财 2 years ago
parent
commit
6de29718a4
  1. 9
      src/components/mdp-ui/mdp-date-range/Index.vue
  2. 2
      src/views/xm/core/xmTask/XmTaskMng.vue

9
src/components/mdp-ui/mdp-date-range/Index.vue

@ -1,7 +1,6 @@
<template> <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 unlink-panels
:range-separator="rangeSepaSrator" :range-separator="rangeSepaSrator"
:start-placeholder="startPlaceholder" :start-placeholder="startPlaceholder"
@ -10,8 +9,7 @@
@change="onDateRangeChange" @change="onDateRangeChange"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></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"> <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> <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> </slot>
@ -49,7 +47,6 @@
></el-date-picker> ></el-date-picker>
</span> </span>
</span> </span>
</span>
</template> </template>
<script> <script>

2
src/views/xm/core/xmTask/XmTaskMng.vue

@ -223,7 +223,7 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label">实际结束时间</template> <template slot="label">实际结束时间</template>
<mdp-date-range
<mdp-date-range style="max-width:120px;"
v-model="filters" v-model="filters"
type="daterange" type="daterange"
start-key="actEndTimeStart" start-key="actEndTimeStart"

Loading…
Cancel
Save