From 831ddfc0451a4e15cf9d3c781993f664c4617648 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 15 Aug 2023 13:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=84=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9,=E8=BF=98=E9=9C=80=E6=8A=8A?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/cpts/edit.vue     | 40 ++++++-------
 src/views/modules/cpts/base/index.vue         | 56 ++++++++++++++-----
 .../shequzhili/tuceng/anquan/weihua/index.vue |  2 +-
 3 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index afc83f45b..e3ebd02fb 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -936,26 +936,26 @@ export default {
           text-align: left;
           padding-left: 35px;
 
-          &::before {
-            content: "";
-            display: block;
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 20px;
-            width: 6px;
-            height: 6px;
-            margin: auto;
-            background: #0c81fe;
-            border-radius: 3px;
-            margin-right: 10px;
-          }
-
-          &::after {
-            content: " :";
-            display: inline;
-            color: #333;
-          }
+          // &::before {
+          //   content: "";
+          //   display: block;
+          //   position: absolute;
+          //   top: 0;
+          //   bottom: 0;
+          //   left: 20px;
+          //   width: 6px;
+          //   height: 6px;
+          //   margin: auto;
+          //   background: #0c81fe;
+          //   border-radius: 3px;
+          //   margin-right: 10px;
+          // }
+
+          // &::after {
+          //   content: " :";
+          //   display: inline;
+          //   color: #333;
+          // }
         }
       }
     }
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 346906b04..43076ec85 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -3,7 +3,12 @@
     <div v-show="true">
       <div class="m-search"
            ref="ref_search">
-        <el-form :inline="true"
+          <section :class="
+					showSercahStatus
+						? 'm-form-box-height-auto'
+						: 'm-form-box-height'
+				">
+            <el-form :inline="true"
                  ref="ref_searchform"
                  label-width="100px">
           <div>
@@ -13,7 +18,7 @@
                           :prop="item.keyName">
               <template v-if="item.type == 'input'">
                 <el-input v-model="item.value"
-                          style="width: 240px"
+                          class="u-item-width-normal"
                           size="small"
                           clearable
                           :placeholder="item.placeholder || '请输入'">
@@ -23,8 +28,8 @@
                 <el-select v-model="item.value"
                            :placeholder="item.placeholder || '请选择'"
                            size="small"
+                           class="u-item-width-normal"
                            clearable
-                           style="width: 240px"
                            :multiple="item.multiple || false">
                   <el-option v-for="item in item.optionList"
                              :key="'serach' + item.keyName + item.value"
@@ -40,9 +45,9 @@
                              :options="item.optionList"
                              :props="item.optionProps"
                              :show-all-levels="false"
+                             class="u-item-width-normal"
                              size="small"
                              clearable
-                             style="width: 240px"
                              @change="(e) => handleChangeCascader(e, item)">
                 </el-cascader>
               </template>
@@ -50,31 +55,48 @@
                 <el-date-picker v-model="item.supValues[0]"
                                 type="date"
                                 placeholder="开始时间"
-                                style="width: 150px"
                                 value-format="yyyy-MM-dd"
+                                class="u-item-width-daterange"
                                 clearable>
                 </el-date-picker>
-                <span style="display: inline-block; margin: 0 10px">至</span>
+                <span class="u-data-tag">至</span>
                 <el-date-picker v-model="item.supValues[1]"
+                                class="u-item-width-daterange u-data-tag"
                                 type="date"
                                 placeholder="结束时间"
-                                style="width: 150px"
                                 value-format="yyyy-MM-dd"
                                 clearable>
                 </el-date-picker>
               </template>
             </el-form-item>
-
-            <el-button style="margin-left: 30px; margin-bottom: 20px"
+          </div>
+        </el-form> 
+          </section>
+        <el-row>
+            <el-col :span="24" align="right">
+              <el-button style="margin-left: 30px;"
                        size="small"
                        class="diy-button--add"
                        @click="handleSearch">查询</el-button>
-            <el-button style="margin-left: 10px; margin-bottom: 20px"
+              <el-button style="margin-left: 10px;"
                        size="small"
                        class="diy-button--white"
                        @click="resetSearch">重置</el-button>
-          </div>
-        </el-form>
+               <el-button v-if="heightBtn"
+                     type="text"
+                     size="small"
+                     style="margin-left: 10px"
+                     class="f-right5"
+                     @click="showSercahStatus = !showSercahStatus">
+            <i :class="
+								showSercahStatus
+									? 'el-icon-arrow-up'
+									: 'el-icon-arrow-down'
+							"></i>
+            {{ showSercahStatus ? "收起" : "展开" }}
+          </el-button>
+          </el-col>
+      </el-row>
       </div>
 
       <div class="m-table"
@@ -125,7 +147,7 @@
                   :data="tableData"
                   border
                   class="table"
-                  style="width: 100%"
+                  style="width: 100%;margin-top: 16px;"
                   :height="maxTableHeight"
                   @selection-change="handleSelectionChange">
           <template v-for="(item, index) in tableParams"
@@ -381,6 +403,14 @@ export default {
       type: Function,
       default: (val) => val,
     },
+    heightBtn:{
+      type: Boolean,
+      default: false,
+    },
+    showSercahStatus:{
+      type: Boolean,
+      default: false,
+    }
   },
 
   data () {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
index 7103c5be3..cb5470a15 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
@@ -174,4 +174,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>