【新增】折叠

src/views/merchant/merchant_list.vue

@@ -4,12 +4,12 @@
     <div class="screen-container">
       <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
         <template #right_btn>
-          <el-button size="small" @click="resetScreenForm">清空</el-button>
-          <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
         </template>
 
         <template #search>
-          <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
+          <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
             <el-row :gutter="20">
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="商户账号" prop="account">
@@ -53,7 +53,7 @@
     <div class="mymain-container">
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button size="small" type="primary" @click="toCreate()">开通账号</el-button>
+          <el-button size="mini" type="primary" @click="toCreate()">开通账号</el-button>
         </div>
         <div class="fr">
           <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />

src/views/setting/account.vue

@@ -34,28 +34,31 @@
         <!-- <div class="top clearfix">
           <div class="title fl">条件筛选</div>
         </div> -->
-        <el-form ref="screenForm" :model="screenForm" label-width="150px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="8">
-              <el-form-item label="账号/用户名名称:" prop="name">
-                <el-input v-model="screenForm.name" placeholder="请输入账号/用户名名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="8">
-              <el-form-item label="角色:" prop="roleId">
-                <el-select class="selectStyle" v-model="screenForm.roleId" placeholder="请选择" filterable>
-                  <el-option v-for="(v, i) in roleList" :key="i" :label="v.name" :value="v.adminRoleId"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="8" class="tr">
-              <el-form-item label="">
-                <el-button size="mini" @click="resetScreenForm">清空</el-button>
-                <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+          <template #right_btn>
+            <el-button size="mini" @click="resetScreenForm">清空</el-button>
+            <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="150px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="8">
+                  <el-form-item label="账号/用户名名称:" prop="name">
+                    <el-input v-model="screenForm.name" placeholder="请输入账号/用户名名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="8">
+                  <el-form-item label="角色:" prop="roleId">
+                    <el-select class="selectStyle" v-model="screenForm.roleId" placeholder="请选择" filterable>
+                      <el-option v-for="(v, i) in roleList" :key="i" :label="v.name" :value="v.adminRoleId">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <div class="btn-group clearfix" style="margin-top: 20px">
         <div class="fl">
@@ -447,9 +450,8 @@ export default {
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
-
       selectDepartment: null, // 选中的部门
-
+      isCollapse: true,
       AccountFormType: 'add',
       AccountFormVisible: false,
       AccountForm: {

src/views/setting/api.vue

@@ -2,34 +2,35 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="接口名称" prop="name">
-              <el-input v-model="screenForm.name" placeholder="请输入接口名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="接口状态" prop="status">
-              <el-select v-model="screenForm.status" placeholder="请选择接口状态" clearable>
-                <el-option
-                  :label="item.label"
-                  :value="item.value"
-                  v-for="(item, index) in statusList"
-                  :key="index"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="24" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="接口名称" prop="name">
+                  <el-input v-model="screenForm.name" placeholder="请输入接口名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="接口状态" prop="status">
+                  <el-select v-model="screenForm.status" placeholder="请选择接口状态" clearable>
+                    <el-option
+                      :label="item.label"
+                      :value="item.value"
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -86,7 +87,7 @@ let that
 export default {
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val)
+      const obj = that.statusList.find(o => o.value === val)
       return obj ? obj.label : ''
     }
   },
@@ -104,7 +105,7 @@ export default {
         { label: '已同步', value: 1 },
         { label: '同步失败', value: 2 }
       ],
-
+      isCollapse: true,
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0 // 列表总数

src/views/setting/components/log-examine.vue

@@ -2,62 +2,63 @@
   <div class="detail-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="账号" prop="account">
-              <el-input v-model="screenForm.account" placeholder="请输入账号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="screenForm.name" placeholder="请输入姓名"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="审批时间" prop="examineDate">
-              <el-date-picker
-                v-model="screenForm.examineDate"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="提交时间" prop="submitDate">
-              <el-date-picker
-                v-model="screenForm.submitDate"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="24" class="tr">
-            <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="账号" prop="account">
+                  <el-input v-model="screenForm.account" placeholder="请输入账号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="screenForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="审批时间" prop="examineDate">
+                  <el-date-picker
+                    v-model="screenForm.examineDate"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="提交时间" prop="submitDate">
+                  <el-date-picker
+                    v-model="screenForm.submitDate"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
       <div class="btn-group clearfix">
         <div class="fl" />
         <div class="fr">
-          <el-button size="small" type="primary" @click="handleExport">导出</el-button>
+          <el-button size="mini" type="primary" @click="handleExport">导出</el-button>
         </div>
       </div>
 
@@ -118,7 +119,8 @@ export default {
       },
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
-      listTotal: 0 // 列表总数
+      listTotal: 0, // 列表总数
+      isCollapse: true
     }
   },
 

src/views/setting/components/log-login.vue

@@ -2,53 +2,54 @@
   <div class="detail-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="账号" prop="account">
-              <el-input v-model="screenForm.account" placeholder="请输入账号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="screenForm.name" placeholder="请输入姓名"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="登陆时间" prop="date">
-              <el-date-picker
-                v-model="screenForm.date"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="所在地区" prop="region">
-              <el-input v-model="screenForm.region" placeholder="请输入所在地区"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="24" class="tr">
-            <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="账号" prop="account">
+                  <el-input v-model="screenForm.account" placeholder="请输入账号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="screenForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="登陆时间" prop="date">
+                  <el-date-picker
+                    v-model="screenForm.date"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="所在地区" prop="region">
+                  <el-input v-model="screenForm.region" placeholder="请输入所在地区"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
       <div class="btn-group clearfix">
         <div class="fl" />
         <div class="fr">
-          <el-button size="small" type="primary" @click="handleExport">导出</el-button>
+          <el-button size="mini" type="primary" @click="handleExport">导出</el-button>
         </div>
       </div>
 
@@ -111,7 +112,8 @@ export default {
       },
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
-      listTotal: 0 // 列表总数
+      listTotal: 0, // 列表总数
+      isCollapse: true
     }
   },
 

src/views/setting/components/log-operation.vue

@@ -2,46 +2,47 @@
   <div class="detail-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="账号" prop="account">
-              <el-input v-model="screenForm.account" placeholder="请输入账号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="screenForm.name" placeholder="请输入姓名"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="操作对象" prop="obj">
-              <el-input v-model="screenForm.obj" placeholder="请输入操作对象"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="操作时间" prop="date">
-              <el-date-picker
-                v-model="screenForm.date"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="24" class="tr">
-            <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="账号" prop="account">
+                  <el-input v-model="screenForm.account" placeholder="请输入账号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="screenForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="操作对象" prop="obj">
+                  <el-input v-model="screenForm.obj" placeholder="请输入操作对象"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="操作时间" prop="date">
+                  <el-date-picker
+                    v-model="screenForm.date"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -107,7 +108,8 @@ export default {
       },
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
-      listTotal: 0 // 列表总数
+      listTotal: 0, // 列表总数
+      isCollapse: true
     }
   },
 

src/views/setting/oplog.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <!-- <el-radio-group v-model="logType" size="small">
+    <!--  <el-radio-group v-model="logType" size="small">
       <el-radio-button label="login">登录日志</el-radio-button>
       <el-radio-button label="operation">操作日志</el-radio-button>
       <el-radio-button label="examine">审批日志</el-radio-button>

src/views/supply/price/price_list.vue

@@ -59,7 +59,7 @@
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="产品类别" prop="k3CategoryNumber">
-                  <el-select style="width: 100%" v-model="screenForm.k3CategoryNumber" placeholder="请选择产品类别">
+                  <el-select v-model="screenForm.k3CategoryNumber" placeholder="请选择产品类别" width="100%">
                     <el-option label="全部" value="" />
                     <el-option v-for="item in dictList" :label="item.name" :key="item" :value="item.number" />
                   </el-select>
@@ -358,4 +358,7 @@ export default {
 ::v-deep .el-date-editor {
   width: 100%;
 }
+::v-deep .el-select {
+  width: 100%;
+}
 </style>