谐波普测-普测计划新增&终端退运-历史记录

src/components/form/datePicker/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div style="width: 600px;">
         <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
         <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
@@ -7,7 +7,7 @@
         v-model="timeValue"
         type="daterange"
         :disabled="disabledPicker"
-        style="width: 230px; margin-right: 10px"
+        style="width: 210px; margin-right: 10px"
         unlink-panels
         :clearable="false"
         range-separator="至"

src/components/table/header/index.vue

@@ -2,19 +2,20 @@
     <div ref="tableHeader" class="cn-table-header">
         <div class="table-header ba-scroll-style">
             <el-form
-                style="flex: 1; height: 34px; overflow: hidden; margin-right: 20px"
+                style="flex:1;height: 34px; margin-right: 20px; display: flex;flex-wrap:wrap;"
                 ref="headerForm"
                 @submit.prevent=""
                 @keyup.enter="onComSearch"
                 label-position="left"
                 :inline="true"
             >
+                <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 600px;">
+                    <DatePicker ref="datePickerRef"></DatePicker>
+                </el-form-item>
+
                 <el-form-item label="区域" v-if="area">
                     <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" />
                 </el-form-item>
-                <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: unset">
-                    <DatePicker ref="datePickerRef"></DatePicker>
-                </el-form-item>
                 <slot name="select"></slot>
             </el-form>
             <template v-if="$slots.select || datePicker || showSearch">