【新增】折叠

src/components/Common/collapse.vue

@@ -15,11 +15,11 @@
           :loading="btnOptions.loading"
           :disabled="btnOptions.disabled"
           @click="handleCollapse"
-          >{{ (isScoped ? vIsCollapse : isCollapse) ? '展开' : '折叠' }}</el-button
+          >{{ (isGlobal ? vIsCollapse : isCollapse) ? '展开' : '折叠' }}</el-button
         >
       </div>
     </div>
-    <div :class="(isScoped ? vIsCollapse : isCollapse) ? 'search_box' : ''">
+    <div :class="(isGlobal ? vIsCollapse : isCollapse) ? 'search_box' : ''">
       <slot name="search"></slot>
     </div>
   </div>
@@ -31,8 +31,8 @@ import { mapState } from 'vuex'
 export default {
   name: 'Collapse',
   props: {
-    // isScoped为true 全局同一状态 ，isScoped为false局部状态
-    isScoped: {
+    // isGlobal为true 全局同一状态 ，isGlobal为false局部状态
+    isGlobal: {
       type: Boolean,
       default: false
     },
@@ -76,7 +76,7 @@ export default {
   },
   methods: {
     handleCollapse() {
-      if (!this.isScoped) {
+      if (!this.isGlobal) {
         this.$parent.isCollapse = !this.isCollapse
       } else {
         this.$store.dispatch('user/setStatus', this.isCollapse)

src/views/basic_data/taker/taker_car.vue

@@ -2,27 +2,28 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form :model="searchForm" ref="searchForm" label-width="100px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="customerName">
-              <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="车牌" prop="carBrand">
-              <el-input v-model="searchForm.carBrand" placeholder="请输入车牌"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="12" class="tr">
-            <el-form-item label="">
-              <el-button size="mini" @click="clearFn">清空</el-button>
-              <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <template #right_btn>
+          <el-button size="mini" @click="clearFn">清空</el-button>
+          <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form :model="searchForm" ref="searchForm" label-width="100px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="经销商名称" prop="customerName">
+                  <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="车牌" prop="carBrand">
+                  <el-input v-model="searchForm.carBrand" placeholder="请输入车牌"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -226,6 +227,7 @@ export default {
         carBrand: [{ required: true, message: '车牌号不能为空', trigger: 'blur' }]
       },
       dialogForm: false,
+      isCollapse: true,
       dataList: [],
       searchForm: {
         customerName: '',

src/views/basic_data/taker/taker_list.vue

@@ -2,32 +2,33 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="customerName">
-              <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="提货人姓名" prop="takerName">
-              <el-input v-model="searchForm.takerName" placeholder="请输入提货人姓名"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="电话" prop="phoneKeyword">
-              <el-input v-model="searchForm.phoneKeyword" placeholder="请输入电话"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="6" class="tr">
-            <el-form-item label="">
-              <el-button size="mini" @click="clearFn">清空</el-button>
-              <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <template #right_btn>
+          <el-button size="mini" @click="clearFn">清空</el-button>
+          <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="经销商名称" prop="customerName">
+                  <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="提货人姓名" prop="takerName">
+                  <el-input v-model="searchForm.takerName" placeholder="请输入提货人姓名"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="电话" prop="phoneKeyword">
+                  <el-input v-model="searchForm.phoneKeyword" placeholder="请输入电话"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -265,7 +266,7 @@ export default {
   data() {
     return {
       baseURL: process.env.VUE_APP_BASE_API,
-
+      isCollapse: true,
       fileList: [],
       listLoading: false, // 列表加载loading
       currentPage: 1, // 当前页码

src/views/deposit_commerce/deposit_list.vue

@@ -1,231 +1,242 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
-      <el-radio-group v-model="deduction" size="mini" @change="handleRadio">
-        <el-radio-button label="全部" />
-        <el-radio-button label="已退押" />
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerKeyword">
-                <el-input
-                  v-model="screenForm.customerKeyword"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.startSubmitTime"
-                  class="dateStyle"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.endSubmitTime"
-                  class="dateStyle"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始受理日期" prop="startConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.startConfirmTime"
-                  class="dateStyle"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束受理日期" prop="endConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.endConfirmTime"
-                  class="dateStyle"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.isRefundDeposit"
-                  clearable
-                  placeholder="请选择是否退押 "
-                >
-                  <el-option v-for="item in refundDepositArr" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="状态 " prop="examineStatus">
-                <el-select style="width: 100%" v-model="screenForm.examineStatus" clearable placeholder="请选择状态 ">
-                  <el-option v-for="item in examineStatusArr" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <template v-if="!isCustomer">
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="审核人" prop="confirmName">
-                  <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="区域" prop="refRegionWork">
-                  <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
-                </el-form-item>
-              </el-col>
+        <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 #left_btn>
+            <el-radio-group v-model="deduction" size="mini" @change="handleRadio">
+              <el-radio-button label="全部" />
+              <el-radio-button label="已退押" />
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                    <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerKeyword">
+                    <el-input
+                      v-model="screenForm.customerKeyword"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="行业类别" prop="refTradeCategory">
+                    <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="使用单位" prop="refUseUnit">
+                    <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始申请日期" prop="startSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.startSubmitTime"
+                      class="dateStyle"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束申请日期" prop="endSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.endSubmitTime"
+                      class="dateStyle"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始受理日期" prop="startConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.startConfirmTime"
+                      class="dateStyle"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束受理日期" prop="endConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.endConfirmTime"
+                      class="dateStyle"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否退押 " prop="isRefundDeposit">
+                    <el-select
+                      style="width: 100%"
+                      v-model="screenForm.isRefundDeposit"
+                      clearable
+                      placeholder="请选择是否退押 "
+                    >
+                      <el-option
+                        v-for="item in refundDepositArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="状态 " prop="examineStatus">
+                    <el-select
+                      style="width: 100%"
+                      v-model="screenForm.examineStatus"
+                      clearable
+                      placeholder="请选择状态 "
+                    >
+                      <el-option
+                        v-for="item in examineStatusArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <template v-if="!isCustomer">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="审核人" prop="confirmName">
+                      <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="区域" prop="refRegionWork">
+                      <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+                    </el-form-item>
+                  </el-col>
 
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startInstallTime">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="安装日期" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.startInstallTime"
+                            class="dateStyle"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            placeholder="选择日期"
+                          />
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.endInstallTime"
+                            class="dateStyle"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="选择日期"
+                          />
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="规格型号" prop="specification">
+                      <el-input v-model="screenForm.specification" placeholder="请输入规格型号"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="特价编号" prop="specialNo">
+                      <el-input v-model="screenForm.specialNo" placeholder="请输入特价编号"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                      <el-input v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="格力内部备注" prop="geLiInerNote">
+                      <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <!-- <el-col :xs="24" :sm="12" :lg="6">
+                      <el-form-item label="厂编号" prop="factoryNo">
+                      <el-input  v-model="screenForm.factoryNo" placeholder="请输入厂编号" ></el-input>
+                    </el-form-item>
+                  </el-col> -->
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="厂编号" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startFactoryNo">
+                          <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始"></el-input>
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endFactoryNo">
+                          <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束"></el-input>
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核开始日期" prop="startAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.startInstallTime"
-                        class="dateStyle"
+                        v-model="screenForm.startAcceptTime"
                         value-format="yyyy-MM-dd HH:mm:ss"
+                        class="dateStyle"
                         type="datetime"
                         placeholder="选择日期"
                       />
                     </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endInstallTime">
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核结束日期" prop="endAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.endInstallTime"
+                        v-model="screenForm.endAcceptTime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         class="dateStyle"
                         type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="选择日期"
                       />
                     </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="规格型号" prop="specification">
-                  <el-input v-model="screenForm.specification" placeholder="请输入规格型号"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="特价编号" prop="specialNo">
-                  <el-input v-model="screenForm.specialNo" placeholder="请输入特价编号"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                  <el-input v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="格力内部备注" prop="geLiInerNote">
-                  <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
-                </el-form-item>
-              </el-col>
-              <!-- <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="厂编号" prop="factoryNo">
-                  <el-input  v-model="screenForm.factoryNo" placeholder="请输入厂编号" ></el-input>
-                </el-form-item>
-              </el-col> -->
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="厂编号" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startFactoryNo">
-                      <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始"></el-input>
-                    </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endFactoryNo">
-                      <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束"></el-input>
-                    </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.startAcceptTime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    class="dateStyle"
-                    type="datetime"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.endAcceptTime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    class="dateStyle"
-                    type="datetime"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-            </template>
-            <el-col :xs="24" :sm="24" :lg="24">
-              <div class="fl" v-if="!isCustomer">
-                <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-            <el-radio-button label="TRADE">家用工程</el-radio-button>
-            <el-radio-button label="TRADE">商用工程</el-radio-button>
-          </el-radio-group> -->
-                <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
-              </div>
-              <el-form-item label="" class="fr">
-                <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>
+                  </el-col>
+                </template>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix" style="display: flex">
@@ -435,7 +446,6 @@ export default {
         startAcceptTime: '',
         endAcceptTime: '',
         geLiInerNote: '',
-        factoryNo: '',
         startFactoryNo: '',
         endFactoryNo: ''
       }, // 搜索表单
@@ -445,6 +455,7 @@ export default {
       importFileList: [],
       selectData: [],
       baseURL: '',
+      isCollapse: true,
       refundDepositArr: [
         {
           label: '是',

src/views/deposit_commerce/nodeduct_list.vue

@@ -1,61 +1,63 @@
 <template>
   <div class="app-container">
     <div v-if="showExamine">
-      <el-radio-group v-model="examine" size="">
-        <el-radio-button label="全部"></el-radio-button>
-        <el-radio-button label="待审核"></el-radio-button>
-        <el-radio-button label="审核驳回"></el-radio-button>
-        <el-radio-button label="审核通过"></el-radio-button>
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程订单编号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请日期" prop="">
-                <el-date-picker class="dateStyle" type="date" placeholder="选择日期"> </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="24" :lg="6">
-              <el-form-item label="" class="fr">
-                <el-button size="small">清空</el-button>
-                <el-button size="small" type="primary">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini">清空</el-button>
+            <el-button size="mini" type="primary">搜索</el-button>
+          </template>
+          <template #left_btn>
+            <el-radio-group v-model="examine" size="mini">
+              <el-radio-button label="全部"></el-radio-button>
+              <el-radio-button label="待审核"></el-radio-button>
+              <el-radio-button label="审核驳回"></el-radio-button>
+              <el-radio-button label="审核通过"></el-radio-button>
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程订单编号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="发货申请日期" prop="">
+                    <el-date-picker class="dateStyle" type="date" placeholder="选择日期"> </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -177,6 +179,7 @@ export default {
       searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading
       examine: '全部',
+      isCollapse: true,
       showExamine: true
     }
   },

src/views/deposit_commerce/refund_list.vue

@@ -1,251 +1,257 @@
 <template>
   <div class="app-container">
     <div v-if="showSurrender">
-      <el-radio-group @change="changeRadioFn" v-model="examine" size="mini">
-        <el-radio-button label="">全部</el-radio-button>
-        <el-radio-button label="SAVE">保存</el-radio-button>
-        <el-radio-button label="WAIT">待审核</el-radio-button>
-        <!--   <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
-        <el-radio-button label="OK">审核通过</el-radio-button>
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <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="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerKeyword">
-                <el-input
-                  v-model="screenForm.customerKeyword"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.startSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.endSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
+        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+          <template #right_btn>
+            <el-button size="mini" @click="resetFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #left_btn>
+            <el-radio-group @change="changeRadioFn" v-model="examine" size="mini">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="SAVE">保存</el-radio-button>
+              <el-radio-button label="WAIT">待审核</el-radio-button>
+              <!--   <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
+              <el-radio-button label="OK">审核通过</el-radio-button>
+            </el-radio-group>
+          </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="refEnginRecordNo">
+                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                    <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerKeyword">
+                    <el-input
+                      v-model="screenForm.customerKeyword"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="行业类别" prop="refTradeCategory">
+                    <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="使用单位" prop="refUseUnit">
+                    <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始申请日期" prop="startSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.startSubmitTime"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束申请日期" prop="endSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.endSubmitTime"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select style="width: 100%" v-model="screenForm.isRefundDeposit" placeholder="请选择是否退押 ">
-                  <el-option label="默认" :value="null"></el-option>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否退押 " prop="isRefundDeposit">
+                    <el-select style="width: 100%" v-model="screenForm.isRefundDeposit" placeholder="请选择是否退押 ">
+                      <el-option label="默认" :value="null"></el-option>
 
-                  <el-option v-for="item in refundDepositArr" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="状态 " prop="examineStatus">
-                <el-select style="width: 100%" v-model="screenForm.examineStatus" placeholder="请选择状态 ">
-                  <el-option label="默认" :value="null"></el-option>
+                      <el-option
+                        v-for="item in refundDepositArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="状态 " prop="examineStatus">
+                    <el-select style="width: 100%" v-model="screenForm.examineStatus" placeholder="请选择状态 ">
+                      <el-option label="默认" :value="null"></el-option>
 
-                  <el-option v-for="item in examineStatusArr" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始受理日期" prop="startConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.startConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束受理日期" prop="endConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.endConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <template v-if="!isCustomer">
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="审核人" prop="confirmName">
-                  <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="区域" prop="refRegionWork">
-                  <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startInstallTime">
+                      <el-option
+                        v-for="item in examineStatusArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始受理日期" prop="startConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.startConfirmTime"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束受理日期" prop="endConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.endConfirmTime"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
+                <template v-if="!isCustomer">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="审核人" prop="confirmName">
+                      <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="区域" prop="refRegionWork">
+                      <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="安装日期" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.startInstallTime"
+                            class="dateStyle"
+                            type="datetime"
+                            placeholder="选择日期"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                          />
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.endInstallTime"
+                            class="dateStyle"
+                            type="datetime"
+                            placeholder="选择日期"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                          />
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="规格型号" prop="specification">
+                      <el-input v-model="screenForm.specification"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="特价编号" prop="specialNo">
+                      <el-input v-model="screenForm.specialNo"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                      <el-input v-model="screenForm.refFactoryNo"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="格力内部备注" prop="geLiInerNote">
+                      <el-input v-model="screenForm.geLiInerNote"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <!-- <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="厂编号" prop="factoryNo">
+                      <el-input v-model="screenForm.factoryNo"></el-input>
+                    </el-form-item>
+
+                  </el-col> -->
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="厂编号" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startFactoryNo">
+                          <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始"></el-input>
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endFactoryNo">
+                          <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束"></el-input>
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核开始日期" prop="startAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.startInstallTime"
+                        v-model="screenForm.startAcceptTime"
                         class="dateStyle"
                         type="datetime"
-                        placeholder="选择日期"
                         value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择日期"
                       />
                     </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endInstallTime">
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核结束日期" prop="endAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.endInstallTime"
+                        v-model="screenForm.endAcceptTime"
                         class="dateStyle"
                         type="datetime"
-                        placeholder="选择日期"
                         value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="选择日期"
                       />
                     </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="规格型号" prop="specification">
-                  <el-input v-model="screenForm.specification"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="特价编号" prop="specialNo">
-                  <el-input v-model="screenForm.specialNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                  <el-input v-model="screenForm.refFactoryNo"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="格力内部备注" prop="geLiInerNote">
-                  <el-input v-model="screenForm.geLiInerNote"></el-input>
-                </el-form-item>
-              </el-col>
-              <!-- <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="厂编号" prop="factoryNo">
-                  <el-input v-model="screenForm.factoryNo"></el-input>
-                </el-form-item>
-
-              </el-col> -->
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="厂编号" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startFactoryNo">
-                      <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始"></el-input>
-                    </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endFactoryNo">
-                      <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束"></el-input>
-                    </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.startAcceptTime"
-                    class="dateStyle"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.endAcceptTime"
-                    class="dateStyle"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品编码" >
-                  <div class="fanwei">
-                     <el-form-item prop="startMaterialOldNumber">
-                        <el-input type="startMaterialOldNumber" ></el-input>
-                     </el-form-item>
+                  </el-col>
+                  <!-- <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品编码" >
+                      <div class="fanwei">
+                         <el-form-item prop="startMaterialOldNumber">
+                            <el-input type="startMaterialOldNumber" ></el-input>
+                         </el-form-item>
 
-                  <span>-</span>
-                    <el-form-item prop="endMaterialOldNumber">
-                    <el-input type="endMaterialOldNumber" ></el-input>
-                     </el-form-item>
-                  </div>
+                      <span>-</span>
+                        <el-form-item prop="endMaterialOldNumber">
+                        <el-input type="endMaterialOldNumber" ></el-input>
+                         </el-form-item>
+                      </div>
 
-                </el-form-item>
+                    </el-form-item>
 
 
-              </el-col> -->
-            </template>
-            <el-col :xs="24" :sm="24" :lg="24">
-              <div class="fl">
-                <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-            <el-radio-button label="HOME">家用工程</el-radio-button>
-            <el-radio-button label="TRADE">商用工程</el-radio-button>
-          </el-radio-group> -->
-                <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
-              </div>
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+                  </el-col> -->
+                </template>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -560,7 +566,7 @@ export default {
           value: false
         }
       ],
-
+      isCollapse: true,
       examineStatusArr: [
         {
           label: '保存',

src/views/deposit_home/deposit_list.vue

@@ -1,239 +1,240 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
-      <el-radio-group v-model="deduction" size="mini" @change="handleRadio">
-        <el-radio-button label="全部" />
-        <el-radio-button label="已退押" />
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerKeyword">
-                <el-input
-                  v-model="screenForm.customerKeyword"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.startSubmitTime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.endSubmitTime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始受理日期" prop="startConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.startConfirmTime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束受理日期" prop="endConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.endConfirmTime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select
-                  v-model="screenForm.isRefundDeposit"
-                  style="width: 100%"
-                  clearable
-                  placeholder="请选择是否退押 "
-                >
-                  <el-option
-                    v-for="item in refundDepositArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="状态 " prop="examineStatus">
-                <el-select v-model="screenForm.examineStatus" style="width: 100%" clearable placeholder="请选择状态 ">
-                  <el-option
-                    v-for="item in examineStatusArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <template v-if="!isCustomer">
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="审核人" prop="confirmName">
-                  <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="区域" prop="refRegionWork">
-                  <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
-                </el-form-item>
-              </el-col>
+        <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 #left_btn>
+            <el-radio-group v-model="deduction" size="mini" @change="handleRadio">
+              <el-radio-button label="全部" />
+              <el-radio-button label="已退押" />
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                    <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerKeyword">
+                    <el-input
+                      v-model="screenForm.customerKeyword"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="行业类别" prop="refTradeCategory">
+                    <el-input v-model="screenForm.refTradeCategory" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="使用单位" prop="refUseUnit">
+                    <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始申请日期" prop="startSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.startSubmitTime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束申请日期" prop="endSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.endSubmitTime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始受理日期" prop="startConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.startConfirmTime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束受理日期" prop="endConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.endConfirmTime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否退押 " prop="isRefundDeposit">
+                    <el-select
+                      v-model="screenForm.isRefundDeposit"
+                      style="width: 100%"
+                      clearable
+                      placeholder="请选择是否退押 "
+                    >
+                      <el-option
+                        v-for="item in refundDepositArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="状态 " prop="examineStatus">
+                    <el-select
+                      v-model="screenForm.examineStatus"
+                      style="width: 100%"
+                      clearable
+                      placeholder="请选择状态 "
+                    >
+                      <el-option
+                        v-for="item in examineStatusArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <template v-if="!isCustomer">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="审核人" prop="confirmName">
+                      <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="区域" prop="refRegionWork">
+                      <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+                    </el-form-item>
+                  </el-col>
 
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startInstallTime">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="安装日期" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.startInstallTime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            class="dateStyle"
+                            type="datetime"
+                            placeholder="选择日期"
+                          />
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.endInstallTime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            class="dateStyle"
+                            type="datetime"
+                            placeholder="选择日期"
+                          />
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="规格型号" prop="specification">
+                      <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="特价编号" prop="specialNo">
+                      <el-input v-model="screenForm.specialNo" placeholder="请输入特价编号" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                      <el-input v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="格力内部备注" prop="geLiInerNote">
+                      <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注" />
+                    </el-form-item>
+                  </el-col>
+                  <!-- <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="厂编号" prop="factoryNo">
+                      <el-input v-model="screenForm.factoryNo" placeholder="请输入厂编号"></el-input>
+                    </el-form-item>
+                  </el-col> -->
+                  <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="厂编号" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startFactoryNo">
+                          <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始" />
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endFactoryNo">
+                          <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束" />
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核开始日期" prop="startAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.startInstallTime"
+                        v-model="screenForm.startAcceptTime"
                         value-format="yyyy-MM-dd HH:mm:ss"
                         class="dateStyle"
                         type="datetime"
                         placeholder="选择日期"
                       />
                     </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endInstallTime">
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核结束日期" prop="endAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.endInstallTime"
+                        v-model="screenForm.endAcceptTime"
                         value-format="yyyy-MM-dd HH:mm:ss"
                         class="dateStyle"
                         type="datetime"
                         placeholder="选择日期"
                       />
                     </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="规格型号" prop="specification">
-                  <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
-                </el-form-item>
-              </el-col>
-              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
-                <el-form-item label="特价编号" prop="specialNo">
-                  <el-input v-model="screenForm.specialNo" placeholder="请输入特价编号" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                  <el-input v-model="screenForm.refFactoryNo" placeholder="请输入跨区厂编号" />
-                </el-form-item>
-              </el-col>
-              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
-                <el-form-item label="格力内部备注" prop="geLiInerNote">
-                  <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注" />
-                </el-form-item>
-              </el-col>
-              <!-- <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
-                <el-form-item label="厂编号" prop="factoryNo">
-                  <el-input v-model="screenForm.factoryNo" placeholder="请输入厂编号"></el-input>
-                </el-form-item>
-              </el-col> -->
-              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
-                <el-form-item label="厂编号" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startFactoryNo">
-                      <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始" />
-                    </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endFactoryNo">
-                      <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束" />
-                    </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.startAcceptTime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    class="dateStyle"
-                    type="datetime"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.endAcceptTime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    class="dateStyle"
-                    type="datetime"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-            </template>
-            <el-col :xs="24" :sm="24" :lg="24">
-              <div v-if="!isCustomer" class="fl">
-                <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-                  <el-radio-button label="HOME">家用工程</el-radio-button>
-                  <el-radio-button label="TRADE">商用工程</el-radio-button>
-                </el-radio-group> -->
-                <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
-              </div>
-              <el-form-item label="" class="fr">
-                <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>
+                  </el-col>
+                </template>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix" style="display: flex">
@@ -584,6 +585,7 @@ export default {
       importFileList: [],
       selectData: [],
       baseURL: '',
+      isCollapse: true,
       refundDepositArr: [
         {
           label: '是',

src/views/deposit_home/nodeduct_list.vue

@@ -1,61 +1,63 @@
 <template>
   <div class="app-container">
     <div v-if="showExamine">
-      <el-radio-group v-model="examine" size="">
-        <el-radio-button label="全部"></el-radio-button>
-        <el-radio-button label="待审核"></el-radio-button>
-        <el-radio-button label="审核驳回"></el-radio-button>
-        <el-radio-button label="审核通过"></el-radio-button>
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程订单编号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请日期" prop="">
-                <el-date-picker class="dateStyle" type="date" placeholder="选择日期"> </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="24" :lg="6">
-              <el-form-item label="" class="fr">
-                <el-button size="small">清空</el-button>
-                <el-button size="small" type="primary">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini">清空</el-button>
+            <el-button size="mini" type="primary">搜索</el-button>
+          </template>
+          <template #left_btn>
+            <el-radio-group v-model="examine" size="" size="mini">
+              <el-radio-button label="全部"></el-radio-button>
+              <el-radio-button label="待审核"></el-radio-button>
+              <el-radio-button label="审核驳回"></el-radio-button>
+              <el-radio-button label="审核通过"></el-radio-button>
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程订单编号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="发货申请日期" prop="">
+                    <el-date-picker class="dateStyle" type="date" placeholder="选择日期"> </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -177,6 +179,7 @@ export default {
       searchForm: {}, //搜索表单
       listLoading: false, // 列表加载loading
       examine: '全部',
+      isCollapse: true,
       showExamine: true
     }
   },

src/views/deposit_home/refund_list.vue

@@ -1,252 +1,258 @@
 <template>
   <div class="app-container">
     <div v-if="showSurrender">
-      <el-radio-group v-model="examine" size="mini" @change="changeRadioFn">
-        <el-radio-button label="">全部</el-radio-button>
-        <el-radio-button label="SAVE">保存</el-radio-button>
-        <el-radio-button label="WAIT">待审核</el-radio-button>
-        <!--    <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
-        <el-radio-button label="OK">审核通过</el-radio-button>
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerKeyword">
-                <el-input
-                  v-model="screenForm.customerKeyword"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.startSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.endSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
+        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+          <template #right_btn>
+            <el-button size="mini" @click="resetFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #left_btn>
+            <el-radio-group v-model="examine" size="mini" @change="changeRadioFn">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="SAVE">保存</el-radio-button>
+              <el-radio-button label="WAIT">待审核</el-radio-button>
+              <!--    <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
+              <el-radio-button label="OK">审核通过</el-radio-button>
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码/名称" prop="customerKeyword">
+                    <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerKeyword">
+                    <el-input
+                      v-model="screenForm.customerKeyword"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="行业类别" prop="refTradeCategory">
+                    <el-input v-model="screenForm.refTradeCategory" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="使用单位" prop="refUseUnit">
+                    <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始申请日期" prop="startSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.startSubmitTime"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束申请日期" prop="endSubmitTime">
+                    <el-date-picker
+                      v-model="screenForm.endSubmitTime"
+                      class="dateStyle"
+                      type="datetime"
+                      placeholder="选择日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select v-model="screenForm.isRefundDeposit" style="width: 100%" placeholder="请选择是否退押 ">
-                  <el-option label="默认" :value="null" />
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否退押 " prop="isRefundDeposit">
+                    <el-select v-model="screenForm.isRefundDeposit" style="width: 100%" placeholder="请选择是否退押 ">
+                      <el-option label="默认" :value="null" />
 
-                  <el-option
-                    v-for="item in refundDepositArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="状态 " prop="examineStatus">
-                <el-select v-model="screenForm.examineStatus" style="width: 100%" placeholder="请选择状态 ">
-                  <el-option label="默认" :value="null" />
+                      <el-option
+                        v-for="item in refundDepositArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="状态 " prop="examineStatus">
+                    <el-select v-model="screenForm.examineStatus" style="width: 100%" placeholder="请选择状态 ">
+                      <el-option label="默认" :value="null" />
 
-                  <el-option
-                    v-for="item in examineStatusArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="">
-                <el-input placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始受理日期" prop="startConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.startConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束受理日期" prop="endConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.endConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-            <template v-if="!isCustomer">
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="审核人" prop="confirmName">
-                  <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="区域" prop="refRegionWork">
-                  <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startInstallTime">
+                      <el-option
+                        v-for="item in examineStatusArr"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="">
+                    <el-input placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始受理日期" prop="startConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.startConfirmTime"
+                      class="dateStyle"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束受理日期" prop="endConfirmTime">
+                    <el-date-picker
+                      v-model="screenForm.endConfirmTime"
+                      class="dateStyle"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <template v-if="!isCustomer">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="审核人" prop="confirmName">
+                      <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="区域" prop="refRegionWork">
+                      <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="安装日期" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.startInstallTime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            class="dateStyle"
+                            type="datetime"
+                            placeholder="选择日期"
+                          />
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endInstallTime">
+                          <el-date-picker
+                            v-model="screenForm.endInstallTime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            class="dateStyle"
+                            type="datetime"
+                            placeholder="选择日期"
+                          />
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="规格型号" prop="specification">
+                      <el-input v-model="screenForm.specification" placeholder="规格型号" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="特价编号" prop="specialNo">
+                      <el-input v-model="screenForm.specialNo" placeholder="特价编号" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                      <el-input v-model="screenForm.refFactoryNo" placeholder="跨区厂编号" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="格力内部备注" prop="geLiInerNote">
+                      <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="厂编号" style="margin-bottom: 0">
+                      <div class="fanwei">
+                        <el-form-item prop="startFactoryNo">
+                          <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始" />
+                        </el-form-item>
+                        <span>-</span>
+                        <el-form-item prop="endFactoryNo">
+                          <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束" />
+                        </el-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核开始日期" prop="startAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.startInstallTime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
+                        v-model="screenForm.startAcceptTime"
                         class="dateStyle"
                         type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="选择日期"
                       />
                     </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endInstallTime">
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="资料审核结束日期" prop="endAcceptTime">
                       <el-date-picker
-                        v-model="screenForm.endInstallTime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
+                        v-model="screenForm.endAcceptTime"
                         class="dateStyle"
                         type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         placeholder="选择日期"
                       />
                     </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="规格型号" prop="specification">
-                  <el-input v-model="screenForm.specification" placeholder="规格型号" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="特价编号" prop="specialNo">
-                  <el-input v-model="screenForm.specialNo" placeholder="特价编号" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                  <el-input v-model="screenForm.refFactoryNo" placeholder="跨区厂编号" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="格力内部备注" prop="geLiInerNote">
-                  <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注" />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="厂编号" style="margin-bottom: 0">
-                  <div class="fanwei">
-                    <el-form-item prop="startFactoryNo">
-                      <el-input v-model="screenForm.startFactoryNo" placeholder="厂编号开始" />
-                    </el-form-item>
-                    <span>-</span>
-                    <el-form-item prop="endFactoryNo">
-                      <el-input v-model="screenForm.endFactoryNo" placeholder="厂编号结束" />
-                    </el-form-item>
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.startAcceptTime"
-                    class="dateStyle"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
-                  <el-date-picker
-                    v-model="screenForm.endAcceptTime"
-                    class="dateStyle"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="选择日期"
-                  />
-                </el-form-item>
-              </el-col>
-              <!-- <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品编码" >
-                  <div class="fanwei">
-                     <el-form-item prop="startMaterialOldNumber">
-                        <el-input type="startMaterialOldNumber" ></el-input>
-                     </el-form-item>
+                  </el-col>
+                  <!-- <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品编码" >
+                      <div class="fanwei">
+                         <el-form-item prop="startMaterialOldNumber">
+                            <el-input type="startMaterialOldNumber" ></el-input>
+                         </el-form-item>
 
-                  <span>-</span>
-                    <el-form-item prop="endMaterialOldNumber">
-                    <el-input type="endMaterialOldNumber" ></el-input>
-                     </el-form-item>
-                  </div>
+                      <span>-</span>
+                        <el-form-item prop="endMaterialOldNumber">
+                        <el-input type="endMaterialOldNumber" ></el-input>
+                         </el-form-item>
+                      </div>
 
-                </el-form-item>
+                    </el-form-item>
 
-              </el-col> -->
-            </template>
-            <el-col :xs="24" :sm="24" :lg="24">
-              <div class="fl">
-                <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
-            <el-radio-button label="HOME">家用工程</el-radio-button>
-            <el-radio-button label="TRADE">商用工程</el-radio-button>
-          </el-radio-group> -->
-                <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
-              </div>
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="resetFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+                  </el-col> -->
+                </template>
+                <el-col :xs="24" :sm="24" :lg="24">
+                  <div class="fl">
+                    <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+                <el-radio-button label="HOME">家用工程</el-radio-button>
+                <el-radio-button label="TRADE">商用工程</el-radio-button>
+              </el-radio-group> -->
+                    <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+                  </div>
+                  <el-form-item label="" class="fr"> > </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -648,7 +654,7 @@ export default {
           value: false
         }
       ],
-
+      isCollapse: true,
       examineStatusArr: [
         {
           label: '保存',

src/views/finance/account_list.vue

@@ -3,73 +3,80 @@
     <div v-if="showReconciliation">
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerId">
-                <el-select
-                  v-model="searchForm.customerId"
-                  class="selectStyle"
-                  placeholder="请选择"
-                  filterable
-                  @change="changeFn"
-                >
-                  <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="钱包" prop="customerWalletId">
-                <el-select v-model="searchForm.customerWalletId" class="selectStyle" placeholder="请选择" filterable>
-                  <el-option
-                    v-for="(v, i) in walletList"
-                    :key="i"
-                    :label="v.customerWalletName"
-                    :value="v.customerWalletId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据号" prop="billNo">
-                <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.startTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.endTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  default-time="23:59:59"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="18">
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="clearFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini" @click="clearFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerId">
+                    <el-select
+                      v-model="searchForm.customerId"
+                      class="selectStyle"
+                      placeholder="请选择"
+                      filterable
+                      @change="changeFn"
+                    >
+                      <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="customerWalletId">
+                    <el-select
+                      v-model="searchForm.customerWalletId"
+                      class="selectStyle"
+                      placeholder="请选择"
+                      filterable
+                    >
+                      <el-option
+                        v-for="(v, i) in walletList"
+                        :key="i"
+                        :label="v.customerWalletName"
+                        :value="v.customerWalletId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="单据号" prop="billNo">
+                    <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始时间" prop="startTime">
+                    <el-date-picker
+                      class="selectStyle"
+                      v-model="searchForm.startTime"
+                      placeholder="选择日期"
+                      type="datetime"
+                      default-time="00:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束时间" prop="endTime">
+                    <el-date-picker
+                      class="selectStyle"
+                      v-model="searchForm.endTime"
+                      placeholder="选择日期"
+                      type="datetime"
+                      default-time="23:59:59"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -231,7 +238,8 @@ export default {
       listLoading: false, // 列表加载loading
       showReconciliation: true,
       customerList: [],
-      walletList: []
+      walletList: [],
+      isCollapse: true
     }
   },
   computed: {

src/views/finance/balance_sum.vue

@@ -2,37 +2,40 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="customerNumber">
-              <el-select v-model="searchForm.customerNumber" class="selectStyle" placeholder="请选择" filterable>
-                <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.number"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="钱包" prop="walletId">
-              <el-select v-model="searchForm.walletId" class="selectStyle" placeholder="请选择" filterable>
-                <el-option v-for="(v, i) in walletList" :key="i" :label="v.name" :value="v.id"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="区域" prop="area">
-              <el-select v-model="searchForm.area" class="selectStyle" placeholder="请选择" filterable>
-                <el-option v-for="(v, i) in areaList" :key="i" :label="v.name" :value="v.adminWebsitId"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="6">
-            <el-form-item label="" class="fr">
-              <el-button size="mini" @click="clearFn">清空</el-button>
-              <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <template #right_btn>
+          <el-button size="mini" @click="clearFn">清空</el-button>
+          <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="经销商名称" prop="customerNumber">
+                  <el-select v-model="searchForm.customerNumber" class="selectStyle" placeholder="请选择" filterable>
+                    <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.number"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="钱包" prop="walletId">
+                  <el-select v-model="searchForm.walletId" class="selectStyle" placeholder="请选择" filterable>
+                    <el-option v-for="(v, i) in walletList" :key="i" :label="v.name" :value="v.id"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="区域" prop="area">
+                  <el-select v-model="searchForm.area" class="selectStyle" placeholder="请选择" filterable>
+                    <el-option v-for="(v, i) in areaList" :key="i" :label="v.name" :value="v.adminWebsitId">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -127,6 +130,7 @@ export default {
         walletId: ''
       }, //搜索表单
       customerList: [],
+      isCollapse: true,
       listLoading: false // 列表加载loading
     }
   },

src/views/finance/change_list.vue

@@ -1,58 +1,60 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
-      <el-radio-group @change="changeRadioGroupFn" v-model="category" size="mini">
-        <el-radio-button label="">全部</el-radio-button>
-        <el-radio-button label="WAIT">待审核</el-radio-button>
-        <el-radio-button label="OK">审核通过</el-radio-button>
-        <el-radio-button label="REJECT">已驳回</el-radio-button>
-        <!-- <el-radio-button label="FAIL_ONE">审核驳回</el-radio-button> -->
-        <!-- <el-radio-button label="复核通过"></el-radio-button>
-        <el-radio-button label="待复核"></el-radio-button>
-        <el-radio-button label="复核驳回"></el-radio-button> -->
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="返利互转单号" prop="id">
-                <el-input v-model="searchForm.id" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerName">
-                <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini" @click="clearFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #left_btn>
+            <el-radio-group @change="changeRadioGroupFn" v-model="category" size="mini">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="WAIT">待审核</el-radio-button>
+              <el-radio-button label="OK">审核通过</el-radio-button>
+              <el-radio-button label="REJECT">已驳回</el-radio-button>
+              <!-- <el-radio-button label="FAIL_ONE">审核驳回</el-radio-button> -->
+              <!-- <el-radio-button label="复核通过"></el-radio-button>
+              <el-radio-button label="待复核"></el-radio-button>
+              <el-radio-button label="复核驳回"></el-radio-button> -->
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="返利互转单号" prop="id">
+                    <el-input v-model="searchForm.id" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerName">
+                    <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="返利类型" prop="walletName">
-                <el-input v-model="searchForm.walletName" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="申请日期" prop="startTime">
-                <el-date-picker
-                  class="dateStyle"
-                  v-model="searchForm.startTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="24">
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="clearFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="返利类型" prop="walletName">
+                    <el-input v-model="searchForm.walletName" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="申请日期" prop="startTime">
+                    <el-date-picker
+                      class="dateStyle"
+                      v-model="searchForm.startTime"
+                      placeholder="选择日期"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <br />
@@ -333,6 +335,7 @@ export default {
       listLoading: false, // 列表加载loading
       category: '',
       showPage: 1,
+      isCollapse: true,
       detailList: {}
     }
   },

src/views/finance/credit_list.vue

@@ -3,23 +3,25 @@
     <div v-if="showRecord">
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerId">
-                <el-select class="selectStyle" v-model="searchForm.customerId" placeholder="请选择" filterable>
-                  <el-option v-for="v in customerList" :key="v.id" :label="v.name" :value="v.id"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="18">
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="clearFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini" @click="clearFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerId">
+                    <el-select class="selectStyle" v-model="searchForm.customerId" placeholder="请选择" filterable>
+                      <el-option v-for="v in customerList" :key="v.id" :label="v.name" :value="v.id"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -174,7 +176,7 @@ export default {
       data: null,
       recordsListId: {}, //记录
       customerList: null,
-
+      isCollapse: true,
       rules: {
         startTime: [{ required: true, message: '请选择开始时间', trigger: 'blur' }],
         endTime: [{ required: true, message: '请选择结束时间', trigger: 'blur' }],

src/views/finance/details/loan_list.vue

@@ -3,41 +3,43 @@
     <div v-if="showReconciliation">
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="钱包类型" prop="type">
-                <el-select v-model="searchForm.type" class="selectStyle" placeholder="请选择" filterable clearable>
-                  <el-option v-for="(v, i) in walletType" :key="i" :label="v.label" :value="v.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="月份" prop="month">
-                <el-date-picker v-model="searchForm.month" style="width: 100%" type="month" placeholder="选择月" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="对账状态" prop="isReconciliation">
-                <el-select
-                  v-model="searchForm.isReconciliation"
-                  class="selectStyle"
-                  placeholder="请选择对账状态"
-                  filterable
-                  clearable
-                >
-                  <el-option v-for="(v, i) in statusList" :key="i" :label="v.label" :value="v.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="clearFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm" :is-show="false">
+          <template #right_btn>
+            <el-button size="mini" @click="clearFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包类型" prop="type">
+                    <el-select v-model="searchForm.type" class="selectStyle" placeholder="请选择" filterable clearable>
+                      <el-option v-for="(v, i) in walletType" :key="i" :label="v.label" :value="v.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="月份" prop="month">
+                    <el-date-picker v-model="searchForm.month" style="width: 100%" type="month" placeholder="选择月" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="对账状态" prop="isReconciliation">
+                    <el-select
+                      v-model="searchForm.isReconciliation"
+                      class="selectStyle"
+                      placeholder="请选择对账状态"
+                      filterable
+                      clearable
+                    >
+                      <el-option v-for="(v, i) in statusList" :key="i" :label="v.label" :value="v.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -170,7 +172,8 @@ export default {
           value: 'REBATE',
           label: '返利钱包'
         }
-      ]
+      ],
+      isCollapse: true
     }
   },
   computed: {

src/views/finance/finance_sum.vue

@@ -2,24 +2,26 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="区域" prop="websitId">
-              <el-select v-model="searchForm.websitId" class="selectStyle" placeholder="请选择" filterable>
-                <el-option v-for="(v, i) in areaList" :key="i" :label="v.name" :value="v.adminWebsitId"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="18">
-            <el-form-item label="" class="fr">
-              <el-button size="mini" @click="clearFn">清空</el-button>
-              <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <template #right_btn>
+          <el-button size="mini" @click="clearFn">清空</el-button>
+          <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="区域" prop="websitId">
+                  <el-select v-model="searchForm.websitId" class="selectStyle" placeholder="请选择" filterable>
+                    <el-option v-for="(v, i) in areaList" :key="i" :label="v.name" :value="v.adminWebsitId">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 列表 -->
     <div class="mymain-container">
@@ -105,6 +107,7 @@ export default {
       // listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       areaList: [],
+      isCollapse: true,
       searchForm: {
         // mainId: "",
         websitId: ''

src/views/finance/rebate_list.vue

@@ -1,83 +1,86 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
-      <el-radio-group @change="changeRadioFn" v-model="searchForm.examineStatus" size="mini">
-        <el-radio-button label="">全部</el-radio-button>
-        <el-radio-button label="SAVE">保存</el-radio-button>
-        <el-radio-button label="WAIT">待审核</el-radio-button>
-        <el-radio-button label="OK_ONE">初审通过</el-radio-button>
-        <el-radio-button label="FAIL_ONE">初审不通过</el-radio-button>
-        <el-radio-button label="OK">复核通过</el-radio-button>
-        <el-radio-button label="FAIL">复核不通过</el-radio-button>
-        <el-radio-button label="CLOSE">已关闭</el-radio-button>
-        <el-radio-button label="OK_ONE_AND_CONFIRM">已确认未复核</el-radio-button>
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="customerName">
-                <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="返利类型" prop="walletName">
-                <el-input v-model="searchForm.walletName" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="customerNumber">
-                <el-input v-model="searchForm.customerNumber" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="返利单号" prop="id">
-                <el-input v-model="searchForm.id" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.startTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.endTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="商家已确认" prop="isConfirm">
-                <el-radio-group v-model="searchForm.isConfirm">
-                  <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button label="true">是</el-radio-button>
-                  <el-radio-button label="false">否</el-radio-button>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="cancelFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini" @click="cancelFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #left_btn>
+            <el-radio-group @change="changeRadioFn" v-model="searchForm.examineStatus" size="mini">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="SAVE">保存</el-radio-button>
+              <el-radio-button label="WAIT">待审核</el-radio-button>
+              <el-radio-button label="OK_ONE">初审通过</el-radio-button>
+              <el-radio-button label="FAIL_ONE">初审不通过</el-radio-button>
+              <el-radio-button label="OK">复核通过</el-radio-button>
+              <el-radio-button label="FAIL">复核不通过</el-radio-button>
+              <el-radio-button label="CLOSE">已关闭</el-radio-button>
+              <el-radio-button label="OK_ONE_AND_CONFIRM">已确认未复核</el-radio-button>
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerName">
+                    <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="返利类型" prop="walletName">
+                    <el-input v-model="searchForm.walletName" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码" prop="customerNumber">
+                    <el-input v-model="searchForm.customerNumber" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="返利单号" prop="id">
+                    <el-input v-model="searchForm.id" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始时间" prop="startTime">
+                    <el-date-picker
+                      class="selectStyle"
+                      v-model="searchForm.startTime"
+                      placeholder="选择日期"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束时间" prop="endTime">
+                    <el-date-picker
+                      class="selectStyle"
+                      v-model="searchForm.endTime"
+                      placeholder="选择日期"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="商家已确认" prop="isConfirm">
+                    <el-radio-group v-model="searchForm.isConfirm">
+                      <el-radio-button label="">全部</el-radio-button>
+                      <el-radio-button label="true">是</el-radio-button>
+                      <el-radio-button label="false">否</el-radio-button>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -620,6 +623,7 @@ export default {
       isCustomer: null,
       secondId: null,
       isShow: null,
+      isCollapse: true,
       isShowExamineDialog: false,
       examineForm: {
         status: '',

src/views/finance/receipt_list.vue

@@ -3,110 +3,111 @@
     <div v-if="showDetail == 1">
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据类型" prop="billType">
-                <!-- <el-input v-model="searchForm.billType" placeholder="请输入"></el-input> -->
-                <el-select v-model="searchForm.billType" class="selectStyle" placeholder="请选择" filterable>
-                  <el-option label="收款单" value="1"> </el-option>
-                  <el-option label="付款单" value="3"> </el-option>
-                  <el-option label="退款单" value="2"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据编号" prop="billNo">
-                <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="往来单位" prop="wlCompanyType">
-                <!-- <el-input v-model="searchForm.wlCompanyType" placeholder="请输入"></el-input> -->
-                <el-select
-                  class="selectStyle"
-                  v-model="searchForm.wlCompanyType"
-                  placeholder="请选择"
-                  filterable
-                  clearable
-                >
-                  <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="付款单位" prop="customerName">
-                <!-- <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input> -->
-                <el-select
-                  class="selectStyle"
-                  v-model="searchForm.customerName"
-                  placeholder="请选择"
-                  filterable
-                  clearable
-                >
-                  <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结算方式" prop="settleType">
-                <el-input v-model="searchForm.settleType" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="收款用途" prop="">
-                <el-input v-model="searchForm." placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.startTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker
-                  class="selectStyle"
-                  v-model="searchForm.endTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="websitNumber">
-                <!-- <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input> -->
-                <el-select
-                  class="selectStyle"
-                  v-model="searchForm.websitNumber"
-                  placeholder="请选择"
-                  filterable
-                  clearable
-                >
-                  <el-option v-for="(v, i) in orage" :key="i" :label="v.label" :value="v.value"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="24">
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="cancelFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini" @click="cancelFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="单据类型" prop="billType">
+                    <!-- <el-input v-model="searchForm.billType" placeholder="请输入"></el-input> -->
+                    <el-select v-model="searchForm.billType" class="selectStyle" placeholder="请选择" filterable>
+                      <el-option label="收款单" value="1"> </el-option>
+                      <el-option label="付款单" value="3"> </el-option>
+                      <el-option label="退款单" value="2"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="单据编号" prop="billNo">
+                    <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="往来单位" prop="wlCompanyType">
+                    <!-- <el-input v-model="searchForm.wlCompanyType" placeholder="请输入"></el-input> -->
+                    <el-select
+                      class="selectStyle"
+                      v-model="searchForm.wlCompanyType"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                    >
+                      <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="付款单位" prop="customerName">
+                    <!-- <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input> -->
+                    <el-select
+                      class="selectStyle"
+                      v-model="searchForm.customerName"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                    >
+                      <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结算方式" prop="settleType">
+                    <el-input v-model="searchForm.settleType" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="收款用途" prop="">
+                    <el-input v-model="searchForm." placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="开始时间" prop="startTime">
+                    <el-date-picker
+                      class="selectStyle"
+                      v-model="searchForm.startTime"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      default-time="00:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="结束时间" prop="endTime">
+                    <el-date-picker
+                      class="selectStyle"
+                      v-model="searchForm.endTime"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      default-time="00:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="区域" prop="websitNumber">
+                    <!-- <el-input v-model="searchForm.customerName" placeholder="请输入"></el-input> -->
+                    <el-select
+                      class="selectStyle"
+                      v-model="searchForm.websitNumber"
+                      placeholder="请选择"
+                      filterable
+                      clearable
+                    >
+                      <el-option v-for="(v, i) in orage" :key="i" :label="v.label" :value="v.value"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -318,6 +319,7 @@ export default {
       tableSelection: [],
       company: '',
       panel: '',
+      isCollapse: true,
       hiprintTemplate: '',
       orage: [
         {

src/views/finance/receivable_list.vue

@@ -1,75 +1,77 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
-      <el-radio-group @change="changeRadioGroupFn" v-model="examine" size="mini">
-        <el-radio-button label="">全部</el-radio-button>
-        <el-radio-button label="WAIT">待审核</el-radio-button>
-        <el-radio-button label="OK">审核通过</el-radio-button>
-        <!-- <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
-      </el-radio-group>
-      <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据来源" prop="source">
-                <el-select v-model="searchForm.source" class="selectStyle" placeholder="请选择" filterable>
-                  <el-option value="工程押金"> </el-option>
-                  <el-option value="保证金"> </el-option>
-                  <el-option value="工程价差"> </el-option>
-                  <el-option value="仓储费"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据编号" prop="code">
-                <el-input v-model="searchForm.code" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="往来单位" prop="userName">
-                <!-- <el-input v-model="searchForm.userName" placeholder="请输入"></el-input> -->
-                <el-select class="selectStyle" v-model="searchForm.userName" placeholder="请选择" filterable>
-                  <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务开始时间" prop="startTime">
-                <el-date-picker
-                  class="dateStyle"
-                  v-model="searchForm.startTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务结束时间" prop="endTime">
-                <el-date-picker
-                  class="dateStyle"
-                  v-model="searchForm.endTime"
-                  placeholder="选择日期"
-                  type="datetime"
-                  default-time="23:59:59"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="18">
-              <el-form-item label="" class="fr">
-                <el-button size="mini" @click="clearFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+          <template #right_btn>
+            <el-button size="mini" @click="clearFn">清空</el-button>
+            <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+          </template>
+          <template #left_btn>
+            <el-radio-group @change="changeRadioGroupFn" v-model="examine" size="mini">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="WAIT">待审核</el-radio-button>
+              <el-radio-button label="OK">审核通过</el-radio-button>
+              <!-- <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="单据来源" prop="source">
+                    <el-select v-model="searchForm.source" class="selectStyle" placeholder="请选择" filterable>
+                      <el-option value="工程押金"> </el-option>
+                      <el-option value="保证金"> </el-option>
+                      <el-option value="工程价差"> </el-option>
+                      <el-option value="仓储费"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="单据编号" prop="code">
+                    <el-input v-model="searchForm.code" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="往来单位" prop="userName">
+                    <!-- <el-input v-model="searchForm.userName" placeholder="请输入"></el-input> -->
+                    <el-select class="selectStyle" v-model="searchForm.userName" placeholder="请选择" filterable>
+                      <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.name"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="业务开始时间" prop="startTime">
+                    <el-date-picker
+                      class="dateStyle"
+                      v-model="searchForm.startTime"
+                      placeholder="选择日期"
+                      type="datetime"
+                      default-time="00:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="业务结束时间" prop="endTime">
+                    <el-date-picker
+                      class="dateStyle"
+                      v-model="searchForm.endTime"
+                      placeholder="选择日期"
+                      type="datetime"
+                      default-time="23:59:59"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -281,6 +283,7 @@ export default {
       showPage: 1,
       approvalId: null,
       czType: '',
+      isCollapse: true,
       deleList: []
     }
   },

src/views/finance/standbook_list.vue

@@ -17,91 +17,96 @@
       >
     </el-radio-group>
     <br /><br /> -->
-    <el-radio-group v-model="bill" @change="checkFn" size="mini">
-      <el-radio-button label="COMMONLY">货款台账</el-radio-button>
-      <el-radio-button label="REBATE">返利台账</el-radio-button>
-    </el-radio-group>
+
     <h1></h1>
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="searchForm" :model="searchForm" label-width="90px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="customerId">
-              <el-select
-                :disabled="isDisabled"
-                class="selectStyle"
-                v-model="searchForm.customerId"
-                placeholder="请选择"
-                filterable
-                @change="changeFn"
-              >
-                <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="返利类型" prop="customerWalletId">
-              <el-select class="selectStyle" v-model="searchForm.customerWalletId" placeholder="请选择" filterable>
-                <el-option
-                  v-for="(v, i) in walletList"
-                  :key="i"
-                  :label="v.customerWalletName"
-                  :value="v.customerWalletId"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据号" prop="billNo">
-              <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="开始时间" prop="startTime">
-              <el-date-picker
-                class="selectStyle"
-                v-model="searchForm.startTime"
-                type="date"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="结束时间" prop="endTime">
-              <el-date-picker
-                class="selectStyle"
-                v-model="searchForm.endTime"
-                type="date"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商编码" prop="customerNumber">
-              <el-input v-model="searchForm.customerNumber" placeholder="请输入经销商编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据类型" prop="billType">
-              <el-select class="selectStyle" v-model="searchForm.billType" placeholder="请选择" filterable>
-                <el-option v-for="(v, i) in typeList" :key="i" :label="v" :value="v"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="" class="fr">
-              <el-button size="mini" @click="resetFn">清空</el-button>
-              <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="searchForm">
+        <template #right_btn>
+          <el-button size="mini" @click="resetFn">清空</el-button>
+          <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+        </template>
+        <template #left_btn>
+          <el-radio-group v-model="bill" @change="checkFn" size="mini">
+            <el-radio-button label="COMMONLY">货款台账</el-radio-button>
+            <el-radio-button label="REBATE">返利台账</el-radio-button>
+          </el-radio-group>
+        </template>
+        <template #search>
+          <el-form ref="searchForm" :model="searchForm" label-width="90px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="经销商名称" prop="customerId">
+                  <el-select
+                    :disabled="isDisabled"
+                    class="selectStyle"
+                    v-model="searchForm.customerId"
+                    placeholder="请选择"
+                    filterable
+                    @change="changeFn"
+                  >
+                    <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="返利类型" prop="customerWalletId">
+                  <el-select class="selectStyle" v-model="searchForm.customerWalletId" placeholder="请选择" filterable>
+                    <el-option
+                      v-for="(v, i) in walletList"
+                      :key="i"
+                      :label="v.customerWalletName"
+                      :value="v.customerWalletId"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="单据号" prop="billNo">
+                  <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="开始时间" prop="startTime">
+                  <el-date-picker
+                    class="selectStyle"
+                    v-model="searchForm.startTime"
+                    type="date"
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="结束时间" prop="endTime">
+                  <el-date-picker
+                    class="selectStyle"
+                    v-model="searchForm.endTime"
+                    type="date"
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="经销商编码" prop="customerNumber">
+                  <el-input v-model="searchForm.customerNumber" placeholder="请输入经销商编码"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="单据类型" prop="billType">
+                  <el-select class="selectStyle" v-model="searchForm.billType" placeholder="请选择" filterable>
+                    <el-option v-for="(v, i) in typeList" :key="i" :label="v" :value="v"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -453,6 +458,7 @@ export default {
       // dataListRebate: [], // 列表数据
       // dataListLoan: [], // 列表数据
       dataList: [],
+      isCollapse: true,
       walletList: [],
       // dictList: [],
       customerName: '',

src/views/merchant/merchant_list.vue

@@ -2,50 +2,52 @@
   <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="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="nickname">
-              <el-input v-model="screenForm.nickname" placeholder="请输入商户昵称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="screenForm.phone" placeholder="请输入联系电话"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="电子邮箱" prop="email">
-              <el-input v-model="screenForm.email" placeholder="请输入电子邮箱"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="状态" prop="state">
-              <el-select v-model="screenForm.status" placeholder="全部">
-                <el-option label="全部" value=""></el-option>
-                <el-option
-                  :label="item.label"
-                  :value="item.value"
-                  v-for="(item, index) in select_status"
-                  :key="index"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+      <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>
+        </template>
 
-          <el-col :xs="24" :sm="12" :lg="18" 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>
+        <template #search>
+          <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="nickname">
+                  <el-input v-model="screenForm.nickname" placeholder="请输入商户昵称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="联系电话" prop="phone">
+                  <el-input v-model="screenForm.phone" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="电子邮箱" prop="email">
+                  <el-input v-model="screenForm.email" placeholder="请输入电子邮箱"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="状态" prop="state">
+                  <el-select v-model="screenForm.status" placeholder="全部">
+                    <el-option label="全部" value=""></el-option>
+                    <el-option
+                      :label="item.label"
+                      :value="item.value"
+                      v-for="(item, index) in select_status"
+                      :key="index"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -304,6 +306,7 @@ export default {
       baseURL: process.env.VUE_APP_BASE_API,
       myHeaders: { 'x-token': getToken() },
       id: null,
+      isCollapse: true,
       companyWechatId: null,
       step: 'first',
       mainForm: {

src/views/supply/deliver/commerce_list.vue

@@ -3,123 +3,125 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <!-- <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="orderNum" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium">
-                  <el-radio-button label="1">全部</el-radio-button>
-                  <el-radio-button label="2">已发货</el-radio-button>
-                  <el-radio-button label="3">已取消</el-radio-button>
-                </el-radio-group>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单号" prop="orderNo">
-                <el-input v-model="screenForm.orderNo" placeholder="请输入订单号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="合同号" prop="contractNo">
-                <el-input v-model="screenForm.contractNo" placeholder="请输入合同号" />
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="仓库" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编号" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
-              </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="至"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item prop="type" label="存货类别">
-                <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
-                  <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select
-                  v-model="screenForm.salesMan"
-                  placeholder="选择业务员"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <!--                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />-->
-                <el-select
-                  v-model="screenForm.refRegionWork"
-                  placeholder="选择区域"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option label="广州" value="GZ" />
+        <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="85px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <!-- <el-col :xs="24" :sm="24" :lg="24">
+                  <el-form-item prop="orderNum" label-width="0">
+                    <el-radio-group v-model="screenForm.status" size="medium">
+                      <el-radio-button label="1">全部</el-radio-button>
+                      <el-radio-button label="2">已发货</el-radio-button>
+                      <el-radio-button label="3">已取消</el-radio-button>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="发货单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单号" prop="orderNo">
+                    <el-input v-model="screenForm.orderNo" placeholder="请输入订单号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="合同号" prop="contractNo">
+                    <el-input v-model="screenForm.contractNo" placeholder="请输入合同号" />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="仓库" prop="warehouse">
+                    <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编号" prop="jxsNum">
+                    <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="jxsName">
+                    <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
+                  </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="至"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="chName">
+                    <el-input v-model="screenForm.chName" placeholder="请输入产品名称" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="model">
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item prop="type" label="存货类别">
+                    <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
+                      <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="业务员" prop="salesMan">
+                    <el-select
+                      v-model="screenForm.salesMan"
+                      placeholder="选择业务员"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="区域" prop="refRegionWork">
+                    <!--                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />-->
+                    <el-select
+                      v-model="screenForm.refRegionWork"
+                      placeholder="选择区域"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option label="广州" value="GZ" />
 
-                  <el-option label="佛山" value="FS" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="制单人" prop="createBy">
-                <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+                      <el-option label="佛山" value="FS" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="制单人" prop="createBy">
+                    <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -375,6 +377,16 @@ export default {
   components: {
     CommerceDetail
   },
+  filters: {
+    statusFilter(val) {
+      const obj = that.statusList.find(o => o.value == val)
+      return obj ? obj.label : ''
+    },
+    orderTypeFilter(val) {
+      const obj = that.orderTypeList.find(o => o.value == val)
+      return obj ? obj.label : ''
+    }
+  },
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -400,7 +412,7 @@ export default {
       },
       categoryList: [],
       salesmanList: [],
-
+      isCollapse: true,
       isShowDialog: false, // 密码记录 - 弹窗
       dialogTable_dataList: null, // 密码记录 - 列表数据
       dialogTable_listLoading: true, // 密码记录 - 列表加载loading

src/views/supply/deliver/deliver_list.vue

@@ -3,92 +3,93 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单号" prop="orderNo">
-                <el-input v-model="screenForm.orderNo" placeholder="请输入订单号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编号" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item prop="type" label="产品类别">
-                <el-select v-model="screenForm.type" placeholder="选择产品类别" style="width: 100%" clearable>
-                  <el-option
-                    v-for="item in categoryList"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.name"
-                  ></el-option>
-                </el-select>
-              </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="salesMan">
-                <el-select
-                  v-model="screenForm.salesMan"
-                  placeholder="选择业务员"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button 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="85px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="发货单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单号" prop="orderNo">
+                    <el-input v-model="screenForm.orderNo" placeholder="请输入订单号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编号" prop="jxsNum">
+                    <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="jxsName">
+                    <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="chName">
+                    <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="model">
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item prop="type" label="产品类别">
+                    <el-select v-model="screenForm.type" placeholder="选择产品类别" style="width: 100%" clearable>
+                      <el-option
+                        v-for="item in categoryList"
+                        :key="item.name"
+                        :label="item.name"
+                        :value="item.name"
+                      ></el-option>
+                    </el-select>
+                  </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="salesMan">
+                    <el-select
+                      v-model="screenForm.salesMan"
+                      placeholder="选择业务员"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -362,7 +363,7 @@ export default {
       },
       categoryList: [],
       salesmanList: [],
-
+      isCollapse: true,
       isShowDialog: false, // 密码记录 - 弹窗
       dialogTable_dataList: null, // 密码记录 - 列表数据
       dialogTable_listLoading: true, // 密码记录 - 列表加载loading

src/views/supply/deliver/home_list.vue

@@ -3,110 +3,111 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <!-- <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="orderNum" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium">
-                  <el-radio-button label="1">全部</el-radio-button>
-                  <el-radio-button label="2">已发货</el-radio-button>
-                  <el-radio-button label="3">已取消</el-radio-button>
-                </el-radio-group>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单号" prop="orderNo">
-                <el-input v-model="screenForm.orderNo" placeholder="请输入订单号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="合同号" prop="contractNo">
-                <el-input v-model="screenForm.contractNo" placeholder="请输入合同号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编号" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" 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="至"
-                  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="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item prop="type" label="存货类别">
-                <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
-                  <el-option
-                    v-for="item in categoryList"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.name"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select
-                  v-model="screenForm.salesMan"
-                  placeholder="选择业务员"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button 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="85px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <!-- <el-col :xs="24" :sm="24" :lg="24">
+                  <el-form-item prop="orderNum" label-width="0">
+                    <el-radio-group v-model="screenForm.status" size="medium">
+                      <el-radio-button label="1">全部</el-radio-button>
+                      <el-radio-button label="2">已发货</el-radio-button>
+                      <el-radio-button label="3">已取消</el-radio-button>
+                    </el-radio-group>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="发货单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单号" prop="orderNo">
+                    <el-input v-model="screenForm.orderNo" placeholder="请输入订单号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="合同号" prop="contractNo">
+                    <el-input v-model="screenForm.contractNo" placeholder="请输入合同号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编号" prop="jxsNum">
+                    <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="jxsName">
+                    <el-input v-model="screenForm.jxsName" 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="至"
+                      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="chName">
+                    <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="model">
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item prop="type" label="存货类别">
+                    <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
+                      <el-option
+                        v-for="item in categoryList"
+                        :key="item.name"
+                        :label="item.name"
+                        :value="item.name"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="业务员" prop="salesMan">
+                    <el-select
+                      v-model="screenForm.salesMan"
+                      placeholder="选择业务员"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="区域" prop="refRegionWork">
+                    <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -404,7 +405,7 @@ export default {
       },
       salesmanList: [],
       categoryList: [],
-
+      isCollapse: true,
       isShowDialog: false, // 密码记录 - 弹窗
       dialogTable_dataList: null, // 密码记录 - 列表数据
       dialogTable_listLoading: true, // 密码记录 - 列表加载loading

src/views/supply/engin/commerce_list.vue

@@ -3,119 +3,119 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="status" label-width="0">
-                <el-checkbox-group v-model="screenForm.status" @change="getList()">
-                  <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                    item.label
-                  }}</el-checkbox-button>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程订单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入工程订单号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程编号" prop="enginNum">
-                <el-input v-model="screenForm.enginNum" placeholder="请输入工程编号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程信息单号" prop="loginNum">
-                <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="项目名称" prop="enginName">
-                <el-input v-model="screenForm.enginName" 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="saleType">
-                <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
-                  <el-option
-                    v-for="item in salesTypeList"
-                    :key="item.id"
-                    :label="item.saleName"
-                    :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商" prop="dealer">
-                <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="制表人" prop="createMan">
-                <el-input v-model="screenForm.createMan" placeholder="请输入制表人"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="examineMan">
-                <el-input v-model="screenForm.examineMan" placeholder="请输入审核人"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表头业务员" prop="salesMan">
-                <el-select
-                  v-model="screenForm.salesMan"
-                  placeholder="选择表头业务员"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否直调" prop="isDirectTransfer">
-                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
-                  <el-option :value="null" label="默认"></el-option>
-                  <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button 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 #left_btn>
+            <el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
+              <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                item.label
+              }}</el-checkbox-button>
+            </el-checkbox-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程订单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入工程订单号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程编号" prop="enginNum">
+                    <el-input v-model="screenForm.enginNum" placeholder="请输入工程编号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程信息单号" prop="loginNum">
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="项目名称" prop="enginName">
+                    <el-input v-model="screenForm.enginName" 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="saleType">
+                    <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
+                      <el-option
+                        v-for="item in salesTypeList"
+                        :key="item.id"
+                        :label="item.saleName"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商" prop="dealer">
+                    <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="制表人" prop="createMan">
+                    <el-input v-model="screenForm.createMan" placeholder="请输入制表人"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="审核人" prop="examineMan">
+                    <el-input v-model="screenForm.examineMan" placeholder="请输入审核人"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表头业务员" prop="salesMan">
+                    <el-select
+                      v-model="screenForm.salesMan"
+                      placeholder="选择表头业务员"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="model">
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否直调" prop="isDirectTransfer">
+                    <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
+                      <el-option :value="null" label="默认"></el-option>
+                      <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">

src/views/supply/engin/engin_list.vue

@@ -3,112 +3,112 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="status" label-width="0">
-                <el-checkbox-group v-model="screenForm.status" @change="getList()">
-                  <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                    item.label
-                  }}</el-checkbox-button>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入工程登录编号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程编码" prop="enginNum">
-                <el-input v-model="screenForm.enginNum" placeholder="请输入工程编码"></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="loginNum">
-                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="项目名称" prop="enginName">
-                <el-input v-model="screenForm.enginName" 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.orderDate"
-                  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="dealer">
-                <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="company">
-                <el-input v-model="screenForm.company" placeholder="请输入使用单位"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="制表人" prop="createMan">
-                <el-input v-model="screenForm.createMan" placeholder="请输入制表人"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="examineMan">
-                <el-input v-model="screenForm.examineMan" placeholder="请输入审核人"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select
-                  v-model="screenForm.salesMan"
-                  placeholder="选择业务员"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否直调" prop="isDirectTransfer">
-                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
-                  <el-option :value="null" label="默认"></el-option>
-                  <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button 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 #left_btn>
+            <el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
+              <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                item.label
+              }}</el-checkbox-button>
+            </el-checkbox-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程登录编号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入工程登录编号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程编码" prop="enginNum">
+                    <el-input v-model="screenForm.enginNum" placeholder="请输入工程编码"></el-input>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程登录编号" prop="loginNum">
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="项目名称" prop="enginName">
+                    <el-input v-model="screenForm.enginName" 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.orderDate"
+                      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="dealer">
+                    <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="使用单位" prop="company">
+                    <el-input v-model="screenForm.company" placeholder="请输入使用单位"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="制表人" prop="createMan">
+                    <el-input v-model="screenForm.createMan" placeholder="请输入制表人"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="审核人" prop="examineMan">
+                    <el-input v-model="screenForm.examineMan" placeholder="请输入审核人"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="业务员" prop="salesMan">
+                    <el-select
+                      v-model="screenForm.salesMan"
+                      placeholder="选择业务员"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="model">
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否直调" prop="isDirectTransfer">
+                    <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
+                      <el-option :value="null" label="默认"></el-option>
+                      <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -539,7 +539,8 @@ export default {
       isShowEditDateDialog: false,
       dateForm: {
         date: ''
-      }
+      },
+      isCollapse: true
     }
   },
 

src/views/supply/engin/home_list.vue

@@ -3,172 +3,177 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="status" label-width="0">
-                <el-checkbox-group v-model="screenForm.status" @change="getList()">
-                  <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                    item.label
-                  }}</el-checkbox-button>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程订单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入工程订单号" />
-              </el-form-item>
-            </el-col>
-            <!--            <el-col :xs="24" :sm="12" :lg="6">-->
-            <!--              <el-form-item label="工程编码" prop="enginNum">-->
-            <!--                <el-input-->
-            <!--                  v-model="screenForm.enginNum"-->
-            <!--                  placeholder="请输入工程编码"-->
-            <!--                />-->
-            <!--              </el-form-item>-->
-            <!--            </el-col>-->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="loginNum">
-                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入项目名称" />
-              </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-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售类型" prop="saleType">
-                <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
-                  <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="制单人" prop="createMan">
-                <el-input v-model="screenForm.createMan" placeholder="请输入制单人" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="examineMan">
-                <el-input v-model="screenForm.examineMan" placeholder="请输入审核人" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表头业务员" prop="salesMan">
-                <el-select
-                  v-model="screenForm.salesMan"
-                  placeholder="选择表头业务员"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品编码" prop="materialOldNumber">
-                <el-input v-model="screenForm.materialOldNumber" placeholder="请输入产品编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="specification">
-                <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入经销商" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="备注" prop="remark">
-                <el-input v-model="screenForm.remark" placeholder="备注" />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
-              <el-form-item label="格力内部备注" prop="geLiInerNote">
-                <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="跨区厂编号" prop="refFactoryNo">
-                <el-input v-model="screenForm.refFactoryNo" placeholder="跨区厂编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="购买单位" prop="refBuyUnitName">
-                <el-input v-model="screenForm.refBuyUnitName" placeholder="购买单位" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="保证函" prop="refPromiseProvide">
-                <el-select v-model="screenForm.refPromiseProvide" placeholder="保证函" filterable style="width: 100%">
-                  <el-option label="全部" value="" />
-                  <el-option label="未保证" value="未保证" />
-                  <el-option label="已保证" value="已保证" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否直调" prop="isDirectTransfer">
-                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
-                  <el-option :value="null" label="默认" />
-                  <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单日期" prop="orderTime">
-                <el-date-picker
-                  v-model="screenForm.orderTime"
-                  type="datetimerange"
-                  range-separator="至"
-                  style="width: 100%"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="!isCustomer ? 12 : 24" :lg="!isCustomer ? 24 : 24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button 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 #left_btn>
+            <el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
+              <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                item.label
+              }}</el-checkbox-button>
+            </el-checkbox-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程订单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入工程订单号" />
+                  </el-form-item>
+                </el-col>
+                <!--            <el-col :xs="24" :sm="12" :lg="6">-->
+                <!--              <el-form-item label="工程编码" prop="enginNum">-->
+                <!--                <el-input-->
+                <!--                  v-model="screenForm.enginNum"-->
+                <!--                  placeholder="请输入工程编码"-->
+                <!--                />-->
+                <!--              </el-form-item>-->
+                <!--            </el-col>-->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="工程登录编号" prop="loginNum">
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="行业类别" prop="refTradeCategory">
+                    <el-input v-model="screenForm.refTradeCategory" placeholder="请输入项目名称" />
+                  </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-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售类型" prop="saleType">
+                    <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
+                      <el-option v-for="item in salesTypeList" :key="item.id" :label="item.saleName" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="制单人" prop="createMan">
+                    <el-input v-model="screenForm.createMan" placeholder="请输入制单人" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="审核人" prop="examineMan">
+                    <el-input v-model="screenForm.examineMan" placeholder="请输入审核人" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表头业务员" prop="salesMan">
+                    <el-select
+                      v-model="screenForm.salesMan"
+                      placeholder="选择表头业务员"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="使用单位" prop="refUseUnit">
+                    <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品编码" prop="materialOldNumber">
+                    <el-input v-model="screenForm.materialOldNumber" placeholder="请输入产品编码" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="specification">
+                    <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商" prop="customerKeyword">
+                    <el-input v-model="screenForm.customerKeyword" placeholder="请输入经销商" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="区域" prop="refRegionWork">
+                    <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input v-model="screenForm.remark" placeholder="备注" />
+                  </el-form-item>
+                </el-col>
+                <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="格力内部备注" prop="geLiInerNote">
+                    <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                    <el-input v-model="screenForm.refFactoryNo" placeholder="跨区厂编号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="购买单位" prop="refBuyUnitName">
+                    <el-input v-model="screenForm.refBuyUnitName" placeholder="购买单位" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="保证函" prop="refPromiseProvide">
+                    <el-select
+                      v-model="screenForm.refPromiseProvide"
+                      placeholder="保证函"
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option label="全部" value="" />
+                      <el-option label="未保证" value="未保证" />
+                      <el-option label="已保证" value="已保证" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否直调" prop="isDirectTransfer">
+                    <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
+                      <el-option :value="null" label="默认" />
+                      <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单日期" prop="orderTime">
+                    <el-date-picker
+                      v-model="screenForm.orderTime"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -649,6 +654,7 @@ export default {
       dateForm: {
         date: ''
       },
+      isCollapse: true,
       salesTypeList: []
     }
   },

src/views/supply/pickup/pickup_list.vue

@@ -3,102 +3,109 @@
     <div v-show="!isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="申请发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编码" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="仓库" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库" />
-              </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="请选择">
-                  <el-option label="未打单" :value="0" />
-                  <el-option label="已打单" :value="1" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="手机号" prop="takerPhone">
-                <el-input
-                  v-model.number="screenForm.takerPhone"
-                  type="number"
-                  placeholder="请输入手机号"
-                  @mousewheel.native.prevent
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="提货人" prop="takerId">
-                <el-select v-model="screenForm.takerId" placeholder="请选择">
-                  <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id" />
-                </el-select>
-              </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-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="打印时间" prop="printTime">
-                <el-date-picker
-                  v-model="screenForm.printTime"
-                  type="datetimerange"
-                  range-separator="至"
-                  style="width: 100%"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="出库单号" prop="salesOrderId">
-                <el-input
-                  v-model.number="screenForm.salesOrderId"
-                  type="number"
-                  placeholder="请输入出库单号"
-                  @mousewheel.native.prevent
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="制单人" prop="createBy">
-                <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button 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 type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="申请发货单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="jxsName">
+                    <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编码" prop="jxsNum">
+                    <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="仓库" prop="warehouse">
+                    <el-input v-model="screenForm.warehouse" placeholder="请输入仓库" />
+                  </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="请选择">
+                      <el-option label="未打单" :value="0" />
+                      <el-option label="已打单" :value="1" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="手机号" prop="takerPhone">
+                    <el-input
+                      v-model.number="screenForm.takerPhone"
+                      type="number"
+                      placeholder="请输入手机号"
+                      @mousewheel.native.prevent
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="提货人" prop="takerId">
+                    <el-select v-model="screenForm.takerId" placeholder="请选择">
+                      <el-option
+                        v-for="item in pickupManList"
+                        :key="item.id"
+                        :label="item.takerName"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </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-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="打印时间" prop="printTime">
+                    <el-date-picker
+                      v-model="screenForm.printTime"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="出库单号" prop="salesOrderId">
+                    <el-input
+                      v-model.number="screenForm.salesOrderId"
+                      type="number"
+                      placeholder="请输入出库单号"
+                      @mousewheel.native.prevent
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="制单人" prop="createBy">
+                    <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -320,6 +327,7 @@ export default {
       },
       pickupManList: '',
       flag: false,
+      isCollapse: true,
       queryItem: {},
       isShowForm: false
     }

src/views/supply/policy/policy_list.vue

@@ -3,143 +3,148 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
-                  <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                    item.label
-                  }}</el-radio-button>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入订单号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售政策编号" prop="policyCode">
-                <el-input v-model="screenForm.policyCode" placeholder="请输入销售政策编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售政策说明" prop="policyRemark">
-                <el-input v-model="screenForm.policyRemark" placeholder="请输入销售政策说明" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商" />
-              </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"
-                  class="dateStyle"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择订单日期"
-                >
-                </el-date-picker> -->
-                <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-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="制表人" prop="zbMan">
-                <el-input v-model="screenForm.zbMan" placeholder="请输入制表人" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="shMan">
-                <el-input v-model="screenForm.shMan" placeholder="请输入审核人" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表头业务员" prop="k3ServiceId">
-                <el-select
-                  v-model="screenForm.k3ServiceId"
-                  placeholder="选择表头业务员"
-                  size="small"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表体业务员" prop="serviceId">
-                <el-select
-                  v-model="screenForm.serviceId"
-                  placeholder="选择表体业务员"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否直调" prop="isDirectTransfer">
-                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
-                  <el-option :value="null" label="默认"></el-option>
-                  <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="specification">
-                <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品类别">
-                <el-select
-                  v-model="screenForm.categoryNumber"
-                  style="width: 100%"
-                  placeholder="选择产品类别"
-                  filterable
-                  clearable
-                >
-                  <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.number" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="24" 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 #left_btn>
+            <el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                item.label
+              }}</el-radio-button>
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入订单号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售政策编号" prop="policyCode">
+                    <el-input v-model="screenForm.policyCode" placeholder="请输入销售政策编号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售政策说明" prop="policyRemark">
+                    <el-input v-model="screenForm.policyRemark" placeholder="请输入销售政策说明" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商" prop="jxsName">
+                    <el-input v-model="screenForm.jxsName" placeholder="请输入经销商" />
+                  </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"
+                      class="dateStyle"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择订单日期"
+                    >
+                    </el-date-picker> -->
+                    <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-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="制表人" prop="zbMan">
+                    <el-input v-model="screenForm.zbMan" placeholder="请输入制表人" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="审核人" prop="shMan">
+                    <el-input v-model="screenForm.shMan" placeholder="请输入审核人" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表头业务员" prop="k3ServiceId">
+                    <el-select
+                      v-model="screenForm.k3ServiceId"
+                      placeholder="选择表头业务员"
+                      size="small"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表体业务员" prop="serviceId">
+                    <el-select
+                      v-model="screenForm.serviceId"
+                      placeholder="选择表体业务员"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否直调" prop="isDirectTransfer">
+                    <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直" style="width: 100%">
+                      <el-option :value="null" label="默认"></el-option>
+                      <el-option v-for="item in transfer" :key="item.value" :label="item.label" :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="specification">
+                    <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品类别">
+                    <el-select
+                      v-model="screenForm.categoryNumber"
+                      style="width: 100%"
+                      placeholder="选择产品类别"
+                      filterable
+                      clearable
+                    >
+                      <el-option
+                        v-for="item in categoryList"
+                        :key="item.name"
+                        :label="item.name"
+                        :value="item.number"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <div class="mymain-container">
         <div class="btn-group clearfix">
@@ -562,7 +567,8 @@ export default {
         status: 'OK',
         remark: ''
       },
-      categoryList: []
+      categoryList: [],
+      isCollapse: true
     }
   },
   computed: {

src/views/supply/price/difference_modify_list.vue

@@ -4,84 +4,91 @@
       <!-- 筛选条件 -->
       <div>
         <div>
-          <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="materialNumber">
-                  <el-input placeholder="请输入物料编码" v-model="screenForm.materialNumber"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品名称" prop="materialName">
-                  <el-input placeholder="请输入产品名称" v-model="screenForm.materialName"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品编码" prop="materialOldNumber">
-                  <el-input placeholder="请输入产品编码" v-model="screenForm.materialOldNumber"></el-input>
-                </el-form-item>
-              </el-col>
-              <!--              <el-col :xs="24" :sm="12" :lg="6">-->
-              <!--                <el-form-item label="生效日期" prop="startDate">-->
-              <!--                  <el-date-picker-->
-              <!--                    v-model="screenForm.startDate"-->
-              <!--                    type="datetime"-->
-              <!--                    placeholder="请输入生效日期"-->
-              <!--                    value-format="yyyy-MM-dd HH:mm:ss"-->
-              <!--                  >-->
-              <!--                  </el-date-picker>-->
-              <!--                </el-form-item>-->
-              <!--              </el-col>-->
-              <!--              <el-col :xs="24" :sm="12" :lg="6">-->
-              <!--                <el-form-item label="失效日期" prop="endDate">-->
-              <!--                  <el-date-picker-->
-              <!--                    v-model="screenForm.endDate"-->
-              <!--                    type="datetime"-->
-              <!--                    placeholder="请输入生效日期"-->
-              <!--                    value-format="yyyy-MM-dd HH:mm:ss "-->
-              <!--                  >-->
-              <!--                  </el-date-picker>-->
-              <!--                </el-form-item>-->
-              <!--              </el-col>-->
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="销售类型" prop="saleTypeId">
-                  <el-select v-model="screenForm.saleTypeId" filterable placeholder="选择销售类型" style="width: 100%">
-                    <el-option label="全部" value=""></el-option>
-                    <el-option
-                      v-for="item in typeList"
-                      :key="item.id"
-                      :label="item.saleName"
-                      :value="item.id"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品类别" prop="k3CategoryNumber">
-                  <el-select style="width: 100%" placeholder="请选择产品类别" v-model="screenForm.k3CategoryNumber">
-                    <el-option label="全部" value=""></el-option>
-                    <el-option v-for="item in dictList" :label="item.name" :value="item.number"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="规格型号" prop="specification">
-                  <el-input placeholder="请输入规格型号" v-model="screenForm.specification"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="备注" prop="remark">
-                  <el-input placeholder="请输入备注" v-model="screenForm.remark"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="24" :lg="24" 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="70px" size="mini" label-position="left">
+                <el-row :gutter="20">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="物料编码" prop="materialNumber">
+                      <el-input placeholder="请输入物料编码" v-model="screenForm.materialNumber"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品名称" prop="materialName">
+                      <el-input placeholder="请输入产品名称" v-model="screenForm.materialName"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品编码" prop="materialOldNumber">
+                      <el-input placeholder="请输入产品编码" v-model="screenForm.materialOldNumber"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <!--              <el-col :xs="24" :sm="12" :lg="6">-->
+                  <!--                <el-form-item label="生效日期" prop="startDate">-->
+                  <!--                  <el-date-picker-->
+                  <!--                    v-model="screenForm.startDate"-->
+                  <!--                    type="datetime"-->
+                  <!--                    placeholder="请输入生效日期"-->
+                  <!--                    value-format="yyyy-MM-dd HH:mm:ss"-->
+                  <!--                  >-->
+                  <!--                  </el-date-picker>-->
+                  <!--                </el-form-item>-->
+                  <!--              </el-col>-->
+                  <!--              <el-col :xs="24" :sm="12" :lg="6">-->
+                  <!--                <el-form-item label="失效日期" prop="endDate">-->
+                  <!--                  <el-date-picker-->
+                  <!--                    v-model="screenForm.endDate"-->
+                  <!--                    type="datetime"-->
+                  <!--                    placeholder="请输入生效日期"-->
+                  <!--                    value-format="yyyy-MM-dd HH:mm:ss "-->
+                  <!--                  >-->
+                  <!--                  </el-date-picker>-->
+                  <!--                </el-form-item>-->
+                  <!--              </el-col>-->
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="销售类型" prop="saleTypeId">
+                      <el-select
+                        v-model="screenForm.saleTypeId"
+                        filterable
+                        placeholder="选择销售类型"
+                        style="width: 100%"
+                      >
+                        <el-option label="全部" value=""></el-option>
+                        <el-option
+                          v-for="item in typeList"
+                          :key="item.id"
+                          :label="item.saleName"
+                          :value="item.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品类别" prop="k3CategoryNumber">
+                      <el-select style="width: 100%" placeholder="请选择产品类别" v-model="screenForm.k3CategoryNumber">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="item in dictList" :label="item.name" :value="item.number"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="规格型号" prop="specification">
+                      <el-input placeholder="请输入规格型号" v-model="screenForm.specification"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="备注" prop="remark">
+                      <el-input placeholder="请输入备注" v-model="screenForm.remark"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </template>
+          </Collapse>
         </div>
       </div>
       <!-- 按钮 -->
@@ -503,6 +510,7 @@ export default {
       cid: '',
       typeList: [],
       dictList: [],
+      isCollapse: true,
       importLoading: false,
       isShowExamineDialog: false,
       examineForm: {

src/views/supply/price/difference_price_list.vue

@@ -2,80 +2,81 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <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="materialNumber">
-              <el-input v-model="screenForm.materialNumber" placeholder="请输入物料编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="materialName">
-              <el-input v-model="screenForm.materialName" placeholder="请输入产品名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="materialOldNumber">
-              <el-input v-model="screenForm.materialOldNumber" placeholder="请输入产品编码" />
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :xs="24" :sm="12" :lg="6">-->
-          <!--            <el-form-item label="生效日期" prop="startDate">-->
-          <!--              <el-date-picker-->
-          <!--                v-model="screenForm.startDate"-->
-          <!--                type="datetime"-->
-          <!--                placeholder="请输入生效日期"-->
-          <!--                value-format="yyyy-MM-dd HH:mm:ss"-->
-          <!--              >-->
-          <!--              </el-date-picker>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!--          <el-col :xs="24" :sm="12" :lg="6">-->
-          <!--            <el-form-item label="失效日期" prop="endDate">-->
-          <!--              <el-date-picker-->
-          <!--                v-model="screenForm.endDate"-->
-          <!--                type="datetime"-->
-          <!--                placeholder="请输入生效日期"-->
-          <!--                value-format="yyyy-MM-dd HH:mm:ss "-->
-          <!--              >-->
-          <!--              </el-date-picker>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="销售类型" prop="saleTypeId">
-              <el-select v-model="screenForm.saleTypeId" filterable placeholder="选择销售类型" style="width: 100%">
-                <el-option label="全部" value="" />
-                <el-option v-for="item in ztypeList" :key="item.id" :label="item.saleName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品类别" prop="k3CategoryNumber">
-              <el-select v-model="screenForm.k3CategoryNumber" placeholder="请选择产品类别">
-                <el-option label="全部" value="" />
-                <el-option v-for="item in dictList" :label="item.name" :value="item.number" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="规格型号" prop="specification">
-              <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="screenForm.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="24" :lg="24" 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="70px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="物料编码" prop="materialNumber">
+                  <el-input v-model="screenForm.materialNumber" placeholder="请输入物料编码" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品名称" prop="materialName">
+                  <el-input v-model="screenForm.materialName" placeholder="请输入产品名称" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品编码" prop="materialOldNumber">
+                  <el-input v-model="screenForm.materialOldNumber" placeholder="请输入产品编码" />
+                </el-form-item>
+              </el-col>
+              <!--          <el-col :xs="24" :sm="12" :lg="6">-->
+              <!--            <el-form-item label="生效日期" prop="startDate">-->
+              <!--              <el-date-picker-->
+              <!--                v-model="screenForm.startDate"-->
+              <!--                type="datetime"-->
+              <!--                placeholder="请输入生效日期"-->
+              <!--                value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--              >-->
+              <!--              </el-date-picker>-->
+              <!--            </el-form-item>-->
+              <!--          </el-col>-->
+              <!--          <el-col :xs="24" :sm="12" :lg="6">-->
+              <!--            <el-form-item label="失效日期" prop="endDate">-->
+              <!--              <el-date-picker-->
+              <!--                v-model="screenForm.endDate"-->
+              <!--                type="datetime"-->
+              <!--                placeholder="请输入生效日期"-->
+              <!--                value-format="yyyy-MM-dd HH:mm:ss "-->
+              <!--              >-->
+              <!--              </el-date-picker>-->
+              <!--            </el-form-item>-->
+              <!--          </el-col>-->
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="销售类型" prop="saleTypeId">
+                  <el-select v-model="screenForm.saleTypeId" filterable placeholder="选择销售类型" style="width: 100%">
+                    <el-option label="全部" value="" />
+                    <el-option v-for="item in ztypeList" :key="item.id" :label="item.saleName" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品类别" prop="k3CategoryNumber">
+                  <el-select v-model="screenForm.k3CategoryNumber" placeholder="请选择产品类别">
+                    <el-option label="全部" value="" />
+                    <el-option v-for="item in dictList" :label="item.name" :value="item.number" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="规格型号" prop="specification">
+                  <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="screenForm.remark" placeholder="请输入备注" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -312,7 +313,8 @@ export default {
         remark: ''
       },
       ztypeList: [],
-      dictList: {}
+      dictList: {},
+      isCollapse: true
     }
   },
   computed: {

src/views/supply/price/modify_list.vue

@@ -4,84 +4,91 @@
       <!-- 筛选条件 -->
       <div>
         <div>
-          <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="materialNumber">
-                  <el-input placeholder="请输入物料编码" v-model="screenForm.materialNumber"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品名称" prop="materialName">
-                  <el-input placeholder="请输入产品名称" v-model="screenForm.materialName"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品编码" prop="materialOldNumber">
-                  <el-input placeholder="请输入产品编码" v-model="screenForm.materialOldNumber"></el-input>
-                </el-form-item>
-              </el-col>
-              <!--              <el-col :xs="24" :sm="12" :lg="6">-->
-              <!--                <el-form-item label="生效日期" prop="startDate">-->
-              <!--                  <el-date-picker-->
-              <!--                    v-model="screenForm.startDate"-->
-              <!--                    type="datetime"-->
-              <!--                    placeholder="请输入生效日期"-->
-              <!--                    value-format="yyyy-MM-dd HH:mm:ss"-->
-              <!--                  >-->
-              <!--                  </el-date-picker>-->
-              <!--                </el-form-item>-->
-              <!--              </el-col>-->
-              <!--              <el-col :xs="24" :sm="12" :lg="6">-->
-              <!--                <el-form-item label="失效日期" prop="endDate">-->
-              <!--                  <el-date-picker-->
-              <!--                    v-model="screenForm.endDate"-->
-              <!--                    type="datetime"-->
-              <!--                    placeholder="请输入生效日期"-->
-              <!--                    value-format="yyyy-MM-dd HH:mm:ss "-->
-              <!--                  >-->
-              <!--                  </el-date-picker>-->
-              <!--                </el-form-item>-->
-              <!--              </el-col>-->
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="销售类型" prop="saleTypeId">
-                  <el-select v-model="screenForm.saleTypeId" filterable placeholder="选择销售类型" style="width: 100%">
-                    <el-option label="全部" value=""></el-option>
-                    <el-option
-                      v-for="item in typeList"
-                      :key="item.id"
-                      :label="item.saleName"
-                      :value="item.id"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品类别" prop="k3CategoryNumber">
-                  <el-select style="width: 100%" placeholder="请选择产品类别" v-model="screenForm.k3CategoryNumber">
-                    <el-option label="全部" value=""></el-option>
-                    <el-option v-for="item in dictList" :label="item.name" :value="item.number"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="规格型号" prop="specification">
-                  <el-input placeholder="请输入规格型号" v-model="screenForm.specification"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="备注" prop="remark">
-                  <el-input placeholder="请输入备注" v-model="screenForm.remark"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="24" :lg="24" 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="70px" size="mini" label-position="left">
+                <el-row :gutter="20">
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="物料编码" prop="materialNumber">
+                      <el-input placeholder="请输入物料编码" v-model="screenForm.materialNumber"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品名称" prop="materialName">
+                      <el-input placeholder="请输入产品名称" v-model="screenForm.materialName"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品编码" prop="materialOldNumber">
+                      <el-input placeholder="请输入产品编码" v-model="screenForm.materialOldNumber"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <!--              <el-col :xs="24" :sm="12" :lg="6">-->
+                  <!--                <el-form-item label="生效日期" prop="startDate">-->
+                  <!--                  <el-date-picker-->
+                  <!--                    v-model="screenForm.startDate"-->
+                  <!--                    type="datetime"-->
+                  <!--                    placeholder="请输入生效日期"-->
+                  <!--                    value-format="yyyy-MM-dd HH:mm:ss"-->
+                  <!--                  >-->
+                  <!--                  </el-date-picker>-->
+                  <!--                </el-form-item>-->
+                  <!--              </el-col>-->
+                  <!--              <el-col :xs="24" :sm="12" :lg="6">-->
+                  <!--                <el-form-item label="失效日期" prop="endDate">-->
+                  <!--                  <el-date-picker-->
+                  <!--                    v-model="screenForm.endDate"-->
+                  <!--                    type="datetime"-->
+                  <!--                    placeholder="请输入生效日期"-->
+                  <!--                    value-format="yyyy-MM-dd HH:mm:ss "-->
+                  <!--                  >-->
+                  <!--                  </el-date-picker>-->
+                  <!--                </el-form-item>-->
+                  <!--              </el-col>-->
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="销售类型" prop="saleTypeId">
+                      <el-select
+                        v-model="screenForm.saleTypeId"
+                        filterable
+                        placeholder="选择销售类型"
+                        style="width: 100%"
+                      >
+                        <el-option label="全部" value=""></el-option>
+                        <el-option
+                          v-for="item in typeList"
+                          :key="item.id"
+                          :label="item.saleName"
+                          :value="item.id"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="产品类别" prop="k3CategoryNumber">
+                      <el-select style="width: 100%" placeholder="请选择产品类别" v-model="screenForm.k3CategoryNumber">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="item in dictList" :label="item.name" :value="item.number"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="规格型号" prop="specification">
+                      <el-input placeholder="请输入规格型号" v-model="screenForm.specification"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="备注" prop="remark">
+                      <el-input placeholder="请输入备注" v-model="screenForm.remark"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </template>
+          </Collapse>
         </div>
       </div>
       <!-- 按钮 -->
@@ -480,6 +487,7 @@ export default {
       cid: '',
       typeList: [],
       dictList: [],
+      isCollapse: true,
       importLoading: false,
       isShowExamineDialog: false,
       examineForm: {

src/views/supply/reserve/reserve_list.vue

@@ -8,19 +8,17 @@
             <el-button size="mini" @click="resetScreenForm">清空</el-button>
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
+          <template #left_btn>
+            <el-radio-group v-model="screenForm.status" @change="getList()" size="mini">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                item.label
+              }}</el-radio-button>
+            </el-radio-group>
+          </template>
           <template #search>
             <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
               <el-row :gutter="20">
-                <el-col :xs="24" :sm="24" :lg="24">
-                  <el-form-item prop="status" label-width="0">
-                    <el-radio-group v-model="screenForm.status" @change="getList()">
-                      <el-radio-button label="">全部</el-radio-button>
-                      <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                        item.label
-                      }}</el-radio-button>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="产品名称" prop="goodsName">
                     <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>

src/views/supply/retail/retail_list.vue

@@ -3,131 +3,131 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" @change="getList()">
-                  <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                    item.label
-                  }}</el-radio-button>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入订单号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="goodsName">
-                <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" 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="isDirectTransfer">
-                <el-select v-model="screenForm.isDirectTransfer" placeholder="请选择是否直调">
-                  <el-option label="是" :value="true"></el-option>
-                  <el-option label="否" :value="false"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="制表人" prop="zbMan">
-                <el-input v-model="screenForm.zbMan" placeholder="请输入制表人"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="shMan">
-                <el-input v-model="screenForm.shMan" placeholder="请输入审核人"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表头业务员" prop="k3ServiceId">
-                <el-select
-                  v-model="screenForm.k3ServiceId"
-                  placeholder="选择表头业务员"
-                  size="small"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表体业务员" prop="serviceId">
-                <el-select
-                  v-model="screenForm.serviceId"
-                  placeholder="选择表体业务员"
-                  size="small"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
-                    :value="item.adminUserId"
-                  >
-                  </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 @click="resetScreenForm">清空</el-button>
-                <el-button 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 #left_btn>
+            <el-radio-group v-model="screenForm.status" @change="getList()" size="mini">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                item.label
+              }}</el-radio-button>
+            </el-radio-group>
+          </template>
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入订单号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="goodsName">
+                    <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="model">
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商" prop="jxsName">
+                    <el-input v-model="screenForm.jxsName" 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="isDirectTransfer">
+                    <el-select v-model="screenForm.isDirectTransfer" placeholder="请选择是否直调">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="制表人" prop="zbMan">
+                    <el-input v-model="screenForm.zbMan" placeholder="请输入制表人"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="审核人" prop="shMan">
+                    <el-input v-model="screenForm.shMan" placeholder="请输入审核人"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="业务员" prop="salesMan">
+                    <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表头业务员" prop="k3ServiceId">
+                    <el-select
+                      v-model="screenForm.k3ServiceId"
+                      placeholder="选择表头业务员"
+                      size="small"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表体业务员" prop="serviceId">
+                    <el-select
+                      v-model="screenForm.serviceId"
+                      placeholder="选择表体业务员"
+                      size="small"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in salesmanList"
+                        :key="item.adminUserId"
+                        :label="item.nickName"
+                        :value="item.adminUserId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -584,7 +584,7 @@ export default {
       isShowForm: false,
       isShowExamine: false,
       isShowReturn: false,
-
+      isCollapse: true,
       editId: null,
       isShowEditDateDialog: false,
       dateForm: {

src/views/supply/sales/sales_list.vue

@@ -3,137 +3,142 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="24" :lg="24">
-              <el-form-item prop="orderNum" label-width="0">
-                <el-radio-group v-model="screenForm.status" @change="getList()">
-                  <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                    item.label
-                  }}</el-radio-button>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货单号" prop="orderNum">
-                <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号（多个单号请用逗号隔开）" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="订单号" prop="mainOrderId">
-                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商名称" prop="jxsName">
-                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="经销商编号" prop="jxsNum">
-                <el-input v-model="screenForm.jxsNum" placeholder="请输入规格型号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="物料编码" prop="chNum">
-                <el-input v-model="screenForm.chNum" placeholder="请输入物料编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="规格型号" prop="model">
-                <el-input v-model="screenForm.model" placeholder="请输入规格型号" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="仓库" prop="warehouse">
-                <el-select
-                  v-model="screenForm.warehouse"
-                  placeholder="请选择仓库"
-                  filterable
-                  clearable
-                  multiple
-                  collapse-tags
-                  style="width: 100%"
-                >
-                  <el-option v-for="(item, index) in warehouseList" :key="index" :label="item.name" :value="item.id" />
-                </el-select>
-              </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-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核日期" prop="approval">
-                <el-date-picker
-                  v-model="screenForm.approval"
-                  type="datetimerange"
-                  range-separator="至"
-                  style="width: 100%"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                />
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="打印时间排序" prop="printDesc">
-                <el-select v-model="screenForm.printDesc" clearable filterable>
-                  <el-option label="默认" :value="null"> </el-option>
-                  <el-option label="倒序" :value="1"> </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="打印日期" prop="printTime">
-                <el-date-picker
-                  v-model="screenForm.printTime"
-                  type="datetimerange"
-                  range-separator="至"
-                  style="width: 100%"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="出库单号" prop="id">
-                <el-input v-model="screenForm.id" placeholder="请输入出库单号（多个单号请用逗号隔开）" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="金蝶推送状态" prop="syncStatus">
-                <el-select v-model="screenForm.syncStatus" clearable filterable>
-                  <el-option label="未推送" :value="0" />
-                  <el-option label="推送成功" :value="1" />
-                  <el-option label="失败推送" :value="-1" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button 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 #left_btn>
+            <el-radio-group v-model="screenForm.status" @change="getList()" size="mini">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+                item.label
+              }}</el-radio-button>
+            </el-radio-group>
+          </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="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号（多个单号请用逗号隔开）" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单号" prop="mainOrderId">
+                    <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商名称" prop="jxsName">
+                    <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="经销商编号" prop="jxsNum">
+                    <el-input v-model="screenForm.jxsNum" placeholder="请输入规格型号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="chName">
+                    <el-input v-model="screenForm.chName" placeholder="请输入产品名称" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="物料编码" prop="chNum">
+                    <el-input v-model="screenForm.chNum" placeholder="请输入物料编码" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="规格型号" prop="model">
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="仓库" prop="warehouse">
+                    <el-select
+                      v-model="screenForm.warehouse"
+                      placeholder="请选择仓库"
+                      filterable
+                      clearable
+                      multiple
+                      collapse-tags
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="(item, index) in warehouseList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </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-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="审核日期" prop="approval">
+                    <el-date-picker
+                      v-model="screenForm.approval"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="打印时间排序" prop="printDesc">
+                    <el-select v-model="screenForm.printDesc" clearable filterable>
+                      <el-option label="默认" :value="null"> </el-option>
+                      <el-option label="倒序" :value="1"> </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col> -->
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="打印日期" prop="printTime">
+                    <el-date-picker
+                      v-model="screenForm.printTime"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="出库单号" prop="id">
+                    <el-input v-model="screenForm.id" placeholder="请输入出库单号（多个单号请用逗号隔开）" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="金蝶推送状态" prop="syncStatus">
+                    <el-select v-model="screenForm.syncStatus" clearable filterable>
+                      <el-option label="未推送" :value="0" />
+                      <el-option label="推送成功" :value="1" />
+                      <el-option label="失败推送" :value="-1" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -544,6 +549,7 @@ export default {
       warehouseList: [],
       centerDialogVisible: false,
       cid: '',
+      isCollapse: true,
       queryItem: {},
       isShowDetail: false,
       isShowExamine: false,