【新增】折叠

src/components/Common/collapse.vue

@@ -15,26 +15,39 @@
           :loading="btnOptions.loading"
           :disabled="btnOptions.disabled"
           @click="handleCollapse"
-          >{{ isCollapse ? '展开' : '折叠' }}</el-button
+          >{{ (isScoped ? vIsCollapse : isCollapse) ? '展开' : '折叠' }}</el-button
         >
       </div>
     </div>
-    <div :class="isCollapse ? 'search_box' : ''">
+    <div :class="(isScoped ? vIsCollapse : isCollapse) ? 'search_box' : ''">
       <slot name="search"></slot>
     </div>
   </div>
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'Collapse',
   props: {
-    isCollapse: {
+    // isScoped为true 全局同一状态 ，isScoped为false局部状态
+    isScoped: {
       type: Boolean,
       default: false
     },
+    // screenForm长度比实际展示长度大时 isShow:false隐藏折叠按钮
+    isShow: {
+      type: Boolean,
+      default: true
+    },
+    isCollapse: {
+      type: Boolean,
+      default: true
+    },
     screenForm: {
       type: Object,
+      required: true,
       defaults: {}
     },
     btnOptions: {
@@ -53,19 +66,21 @@ export default {
       }
     }
   },
-  data() {
-    return {
-      height: 40
-    }
-  },
   computed: {
+    ...mapState({
+      vIsCollapse: state => state.user.isCollapse
+    }),
     comLength() {
-      return Object.keys(this.screenForm).length > 4
+      return this.isShow && Object.keys(this.screenForm).length > 4
     }
   },
   methods: {
     handleCollapse() {
-      this.$parent.isCollapse = !this.isCollapse
+      if (!this.isScoped) {
+        this.$parent.isCollapse = !this.isCollapse
+      } else {
+        this.$store.dispatch('user/setStatus', this.isCollapse)
+      }
     }
   }
 }

src/layout/components/Sidebar/SidebarItem.vue

@@ -108,6 +108,7 @@ export default {
       if (isExternal(this.basePath)) {
         return this.basePath
       }
+
       return path.resolve(this.basePath, routePath)
     }
   }

src/store/modules/user.js

@@ -13,7 +13,8 @@ const getDefaultState = () => {
     customerName: '', //经销商名称
     customerNumber: '', //经销商编码
     showMessages: null, //
-    isNotice: false
+    isNotice: false,
+    isCollapse: true
   }
 }
 
@@ -50,6 +51,9 @@ const mutations = {
   SET_CUSTOMERNUMBER: (state, customerNumber) => {
     state.customerNumber = customerNumber
   },
+  SET_IS_COLLAPSE(state, bool) {
+    state.isCollapse = !bool.isCollapse
+  },
   showMessage: (state, value) => {
     if (value == 'yes') {
       state.showMessages = true
@@ -90,7 +94,6 @@ const actions = {
   // get user info
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
-      console.log(state)
       getInfo(state.userid)
         .then(response => {
           const { data } = response
@@ -208,6 +211,9 @@ const actions = {
       commit('RESET_STATE')
       resolve()
     })
+  },
+  setStatus({ commit, state }) {
+    commit('SET_IS_COLLAPSE', state)
   }
 }
 

src/views/basic_data/dealer/dealer_apply.vue

@@ -3,38 +3,39 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" 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="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="linkName">
-                <el-input v-model="searchForm.linkName" placeholder="请输入联系人"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="联系电话" prop="linkPhone">
-                <el-input v-model="searchForm.linkPhone" 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 #search>
+            <el-form ref="searchForm" :model="searchForm" 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="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="linkName">
+                    <el-input v-model="searchForm.linkName" placeholder="请输入联系人"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="联系电话" prop="linkPhone">
+                    <el-input v-model="searchForm.linkPhone" 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="searchForm.email" placeholder="请输入电子邮箱"></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="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="email">
+                    <el-input v-model="searchForm.email" placeholder="请输入电子邮箱"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -163,7 +164,8 @@ export default {
         email: '',
         linkName: '',
         linkPhone: ''
-      }
+      },
+      isCollapse: true
     }
   },
   components: {

src/views/basic_data/dealer/dealer_deposit.vue

@@ -14,32 +14,32 @@
       </el-row>
     </el-card> -->
       <!-- 筛选条件 -->
-      <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="currentStatus">
-                <el-select class="selectStyle" v-model="searchForm.currentStatus" placeholder="请选择">
-                  <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-              </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 #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="currentStatus">
+                  <el-select class="selectStyle" v-model="searchForm.currentStatus" placeholder="请选择">
+                    <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
 
-            <el-col :xs="24" :sm="12" :lg="12">
-              <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>
-      </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
@@ -332,7 +332,8 @@ export default {
           label: '已结束'
         }
       ],
-      currentStatus: ''
+      currentStatus: '',
+      isCollapse: true
     }
   },
   async created() {

src/views/basic_data/dealer/dealer_list.vue

@@ -3,22 +3,23 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" 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="keyword">
-                <el-input v-model="searchForm.keyword" placeholder="请输入名称"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="18" 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="70px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="名称" prop="keyword">
+                    <el-input v-model="searchForm.keyword" placeholder="请输入名称"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -134,14 +135,10 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       searchForm: {
-        keyword: '',
-        bindUser: '',
-        isGroupCompany: '',
-        keyword: '',
-        region: '',
-        websitNumber: ''
+        keyword: ''
       },
-      inforList: {}
+      inforList: {},
+      isCollapse: true
     }
   },
   components: {

src/views/basic_data/dealer/dealer_stock.vue

@@ -2,22 +2,23 @@
   <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="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="customerName">
+                  <el-input v-model="searchForm.customerName" placeholder="请输入经销商名称"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="btn-group clearfix">
@@ -375,6 +376,7 @@ export default {
       searchForm: {
         customerName: ''
       },
+      isCollapse: true,
       dataList: [], // 列表数据
       listLoading: false, // 列表加载loading
       dealerList: [],

src/views/basic_data/logistics/logistics_list.vue

@@ -2,26 +2,28 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <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="customerTel">
-              <el-input placeholder="请输入物流公司名称" v-model="screenForm.logisticsCompany"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="客服电话" prop="logisticsCompany">
-              <el-input placeholder="请输入客服电话" v-model="screenForm.customerTel"></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="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="120px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="物流公司名称" prop="customerTel">
+                  <el-input placeholder="请输入物流公司名称" v-model="screenForm.logisticsCompany"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="客服电话" prop="logisticsCompany">
+                  <el-input placeholder="请输入客服电话" v-model="screenForm.customerTel"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -228,7 +230,8 @@ export default {
         // customerTel: [
         //   { required: true, message: "请输入客服电话", trigger: "blur" },
         // ],
-      }
+      },
+      isCollapse: true
     }
   },
   methods: {

src/views/basic_data/material/category_list.vue

@@ -3,21 +3,23 @@
     <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="keyword">
-                <el-input placeholder="请输入名称" v-model="screenForm.keyword"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="18" 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="keyword">
+                    <el-input placeholder="请输入名称" v-model="screenForm.keyword"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <div class="mymain-container">
         <div class="table">
@@ -219,7 +221,8 @@ export default {
       ],
       screenForm: {
         keyword: ''
-      }
+      },
+      isCollapse: true
     }
   },
   components: {

src/views/basic_data/material/classify_list.vue

@@ -42,27 +42,28 @@
       <div class="main-right">
         <!-- 筛选条件 -->
         <div>
-          <el-form ref="searchForm" :model="searchForm" 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="productCategoryNumber">
-                  <el-input v-model="searchForm.productCategoryNumber" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="名称" prop="productCategoryName">
-                  <el-input v-model="searchForm.productCategoryName" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :xs="24" :sm="24" :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 ref="searchForm" :model="searchForm" 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="productCategoryNumber">
+                      <el-input v-model="searchForm.productCategoryNumber" placeholder="请输入"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="名称" prop="productCategoryName">
+                      <el-input v-model="searchForm.productCategoryName" placeholder="请输入"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </template>
+          </Collapse>
         </div>
         <!-- 按钮 -->
         <div class="btn-group clearfix">
@@ -201,6 +202,7 @@ export default {
       },
       addGroupFormVisible: false,
       activeGroup: '',
+      isCollapse: true,
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
       // currentPage: 1, // 当前页码

src/views/basic_data/material/machine_list.vue

@@ -2,42 +2,43 @@
   <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="name">
-              <el-input placeholder="请输入名称" v-model="screenForm.name"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="型号" prop="model">
-              <el-input placeholder="请输入型号" v-model="screenForm.model"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="编码" prop="number">
-              <el-input placeholder="请输入编码" v-model="screenForm.number"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="体积" prop="volume">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                placeholder="请输入体积"
-                v-model.number="screenForm.volume"
-              ></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" :is-show="false">
+        <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="名称" prop="name">
+                  <el-input placeholder="请输入名称" v-model="screenForm.name"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="型号" prop="model">
+                  <el-input placeholder="请输入型号" v-model="screenForm.model"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="编码" prop="number">
+                  <el-input placeholder="请输入编码" v-model="screenForm.number"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="体积" prop="volume">
+                  <el-input
+                    type="number"
+                    @mousewheel.native.prevent
+                    placeholder="请输入体积"
+                    v-model.number="screenForm.volume"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -310,7 +311,8 @@ export default {
             trigger: 'blur'
           }
         ]
-      }
+      },
+      isCollapse: true
     }
   },
   created() {

src/views/basic_data/material/material_list.vue

@@ -3,32 +3,33 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <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="keyword">
-                <el-input v-model="screenForm.keyword" placeholder="请输入名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="物料编码" prop="number">
-                <el-input v-model="screenForm.number" placeholder="请输入物料编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="金蝶编码" prop="oldNumber">
-                <el-input v-model="screenForm.oldNumber" placeholder="请输入金蝶编码" />
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="6" 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="keyword">
+                    <el-input v-model="screenForm.keyword" placeholder="请输入名称" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="物料编码" prop="number">
+                    <el-input v-model="screenForm.number" placeholder="请输入物料编码" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="金蝶编码" prop="oldNumber">
+                    <el-input v-model="screenForm.oldNumber" placeholder="请输入金蝶编码" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <div class="mymain-container">
         <div class="table">
@@ -85,7 +86,7 @@
               align="left"
               label="是否维护商城资料"
               prop="maintainData"
-              min-width="100"
+              min-width="150"
               show-overflow-tooltip
             />
             <!--            <el-table-column-->
@@ -152,7 +153,8 @@ export default {
         keyword: '', // 名称
         number: '',
         oldNumber: ''
-      }
+      },
+      isCollapse: true
     }
   },
   methods: {

src/views/basic_data/material/modify_list.vue

@@ -4,80 +4,86 @@
       <!-- 筛选条件 -->
       <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="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-row>
+              </el-form>
+            </template>
+          </Collapse>
         </div>
       </div>
       <!-- 按钮 -->
@@ -477,6 +483,7 @@ export default {
       cid: '',
       typeList: [],
       dictList: [],
+      isCollapse: true,
       isShowExamineDialog: false,
       examineForm: {
         status: 'OK',

src/views/basic_data/material/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="specification">
-              <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="specification">
+                  <el-input v-model="screenForm.remark" placeholder="请输入备注" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -257,7 +258,8 @@ export default {
         remark: ''
       },
       ztypeList: [],
-      dictList: {}
+      dictList: {},
+      isCollapse: true
     }
   },
   mounted() {

src/views/basic_data/material/relation_list.vue

@@ -2,77 +2,78 @@
   <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="name">
-              <el-input placeholder="请输入产品名称" v-model="screenForm.name"></el-input>
-              <!--
-              <el-select placeholder="请选择产品类别" v-model="screenForm.name">
-              <el-option label="默认" value=""></el-option>
-                <el-option
-                  v-for="item in materialLis"
-                  :label="item.name"
-                  :value="item.name"
-                  :key="item.id"
-                ></el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品型号" prop="type">
-              <el-input placeholder="请输入产品型号" v-model="screenForm.type"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="套机编码" prop="number">
-              <el-input placeholder="请输入套机编码" v-model="screenForm.number"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品体积" prop="volume">
-              <el-input placeholder="请输入产品体积" v-model="screenForm.volume"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="外机名称" prop="outsideName">
-              <el-input placeholder="请输入外机名称" v-model="screenForm.outsideName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="外机型号" prop="nickname">
-              <el-input placeholder="请输入外机型号" v-model="screenForm.outsideType"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="外机编码" prop="outsideNumber">
-              <el-input placeholder="请输入内机编码" v-model="screenForm.outsideNumber"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="内机名称" prop="innerName">
-              <el-input placeholder="请输入内机名称" v-model="screenForm.innerName"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="内机型号" prop="innerType">
-              <el-input placeholder="请输入内机型号" v-model="screenForm.innerType"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="内机编码" prop="innerNumber">
-              <el-input placeholder="请输入内机编码" v-model="screenForm.innerNumber"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="24" :lg="12" 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="name">
+                  <el-input placeholder="请输入产品名称" v-model="screenForm.name"></el-input>
+                  <!--
+                  <el-select placeholder="请选择产品类别" v-model="screenForm.name">
+                  <el-option label="默认" value=""></el-option>
+                    <el-option
+                      v-for="item in materialLis"
+                      :label="item.name"
+                      :value="item.name"
+                      :key="item.id"
+                    ></el-option>
+                  </el-select> -->
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品型号" prop="type">
+                  <el-input placeholder="请输入产品型号" v-model="screenForm.type"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="套机编码" prop="number">
+                  <el-input placeholder="请输入套机编码" v-model="screenForm.number"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品体积" prop="volume">
+                  <el-input placeholder="请输入产品体积" v-model="screenForm.volume"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="外机名称" prop="outsideName">
+                  <el-input placeholder="请输入外机名称" v-model="screenForm.outsideName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="外机型号" prop="nickname">
+                  <el-input placeholder="请输入外机型号" v-model="screenForm.outsideType"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="外机编码" prop="outsideNumber">
+                  <el-input placeholder="请输入内机编码" v-model="screenForm.outsideNumber"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="内机名称" prop="innerName">
+                  <el-input placeholder="请输入内机名称" v-model="screenForm.innerName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="内机型号" prop="innerType">
+                  <el-input placeholder="请输入内机型号" v-model="screenForm.innerType"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="内机编码" prop="innerNumber">
+                  <el-input placeholder="请输入内机编码" v-model="screenForm.innerNumber"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -471,6 +472,7 @@ export default {
       materialLis: {},
       typeList: [],
       DistType: [],
+      isCollapse: true,
       machineConfigureId: ''
     }
   },

src/views/basic_data/stock/customer_product_list.vue

@@ -2,66 +2,72 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" 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="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="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="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="specification">
-              <el-input v-model="screenForm.specification" 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 #search>
+          <el-form ref="screenForm" :model="screenForm" 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="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="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="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="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="correspondId">
-              <el-select
-                v-model="screenForm.correspondId"
-                multiple
-                style="width: 100%"
-                placeholder="请选择仓库"
-                size="mini"
-                filterable
-                clearable
-              >
-                <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="存货类别">
-              <el-select
-                v-model="screenForm.categoryId"
-                style="width: 100%"
-                placeholder="选择存货类别"
-                filterable
-                clearable
-              >
-                <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="12" class="tr">
-            <el-form-item>
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="仓库" prop="correspondId">
+                  <el-select
+                    v-model="screenForm.correspondId"
+                    multiple
+                    style="width: 100%"
+                    placeholder="请选择仓库"
+                    size="mini"
+                    filterable
+                    clearable
+                  >
+                    <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="存货类别">
+                  <el-select
+                    v-model="screenForm.categoryId"
+                    style="width: 100%"
+                    placeholder="选择存货类别"
+                    filterable
+                    clearable
+                  >
+                    <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <div class="mymain-container">
       <div class="btn-group clearfix">
@@ -168,7 +174,8 @@ export default {
       },
       typeList: [],
       warehouseList: [],
-      categoryList: []
+      categoryList: [],
+      isCollapse: true
     }
   },
 

src/views/basic_data/stock/material_list.vue

@@ -3,50 +3,51 @@
   <div>
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <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="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="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="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="company">
-              <el-input v-model="screenForm.company" placeholder="请输入供货单位" />
-            </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="70px" 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="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="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="company">
+                  <el-input v-model="screenForm.company" placeholder="请输入供货单位" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <div class="mymain-container">
       <div class="btn-group clearfix">
@@ -173,7 +174,8 @@ export default {
         chNum: '',
         date: '',
         company: ''
-      }
+      },
+      isCollapse: true
     }
   },
   computed: {

src/views/basic_data/stock/product_list.vue

@@ -2,66 +2,72 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" 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="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="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="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="specification">
-              <el-input v-model="screenForm.specification" 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 #search>
+          <el-form ref="screenForm" :model="screenForm" 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="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="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="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="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="correspondId">
-              <el-select
-                v-model="screenForm.correspondId"
-                multiple
-                style="width: 100%"
-                placeholder="请选择仓库"
-                size="mini"
-                filterable
-                clearable
-              >
-                <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="存货类别">
-              <el-select
-                v-model="screenForm.categoryId"
-                style="width: 100%"
-                placeholder="选择存货类别"
-                filterable
-                clearable
-              >
-                <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="12" class="tr">
-            <el-form-item>
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="仓库" prop="correspondId">
+                  <el-select
+                    v-model="screenForm.correspondId"
+                    multiple
+                    style="width: 100%"
+                    placeholder="请选择仓库"
+                    size="mini"
+                    filterable
+                    clearable
+                  >
+                    <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="存货类别">
+                  <el-select
+                    v-model="screenForm.categoryId"
+                    style="width: 100%"
+                    placeholder="选择存货类别"
+                    filterable
+                    clearable
+                  >
+                    <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <div class="mymain-container">
       <div class="btn-group clearfix">
@@ -150,7 +156,8 @@ export default {
       },
       typeList: [],
       warehouseList: [],
-      categoryList: []
+      categoryList: [],
+      isCollapse: true
     }
   },
 

src/views/basic_data/stock/product_list_customer.vue

@@ -2,66 +2,72 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" 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="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="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="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="specification">
-              <el-input v-model="screenForm.specification" 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 #search>
+          <el-form ref="screenForm" :model="screenForm" 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="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="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="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="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="correspondId">
-              <el-select
-                v-model="screenForm.correspondId"
-                multiple
-                style="width: 100%"
-                placeholder="请选择仓库"
-                size="mini"
-                filterable
-                clearable
-              >
-                <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="存货类别">
-              <el-select
-                v-model="screenForm.categoryId"
-                style="width: 100%"
-                placeholder="选择存货类别"
-                filterable
-                clearable
-              >
-                <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="12" class="tr">
-            <el-form-item>
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="仓库" prop="correspondId">
+                  <el-select
+                    v-model="screenForm.correspondId"
+                    multiple
+                    style="width: 100%"
+                    placeholder="请选择仓库"
+                    size="mini"
+                    filterable
+                    clearable
+                  >
+                    <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="存货类别">
+                  <el-select
+                    v-model="screenForm.categoryId"
+                    style="width: 100%"
+                    placeholder="选择存货类别"
+                    filterable
+                    clearable
+                  >
+                    <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <div class="mymain-container">
       <div class="btn-group clearfix">
@@ -150,7 +156,8 @@ export default {
       },
       typeList: [],
       warehouseList: [],
-      categoryList: []
+      categoryList: [],
+      isCollapse: true
     }
   },
 

src/views/basic_data/stock/stock_fee_list.vue

@@ -2,102 +2,109 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <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="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="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="orderType">
-              <el-select v-model="screenForm.orderType" clearable filterable>
-                <el-option v-for="item in orderType" :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="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="orderDate">
-              <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="invoiceDate">
-              <el-date-picker
-                v-model="screenForm.invoiceDate"
-                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="correspondId">
-              <el-select v-model="screenForm.correspondId" clearable filterable multiple>
-                <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="customerName">
-              <el-input v-model="screenForm.customerName" placeholder="请输入经销商名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商编码" prop="customerNumber">
-              <el-input v-model="screenForm.customerNumber" 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="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="specification">
-              <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="24" class="tr">
-            <el-form-item>
-              <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="120px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <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="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="orderType">
+                  <el-select v-model="screenForm.orderType" clearable filterable>
+                    <el-option v-for="item in orderType" :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="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="orderDate">
+                  <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="invoiceDate">
+                  <el-date-picker
+                    v-model="screenForm.invoiceDate"
+                    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="correspondId">
+                  <el-select v-model="screenForm.correspondId" clearable filterable multiple>
+                    <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="customerName">
+                  <el-input v-model="screenForm.customerName" placeholder="请输入经销商名称" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="经销商编码" prop="customerNumber">
+                  <el-input v-model="screenForm.customerNumber" 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="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="specification">
+                  <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <div class="mymain-container">
       <div class="btn-group clearfix">
@@ -225,6 +232,7 @@ export default {
       typeList: [],
       warehouseList: [],
       categoryList: [],
+      isCollapse: true,
       orderType: [
         {
           value: 'TRADE',

src/views/basic_data/wallet/wallet_list.vue

@@ -2,40 +2,41 @@
   <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="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="mainId">
-              <el-select
-                class="selectStyle"
-                filterable
-                v-model="searchForm.mainId"
-                placeholder="名称"
-              >
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.productCategoryNumber"
-                  :label="item.productCategoryName"
-                  :value="item.productCategoryNumber"
-                >
-                </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 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 :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="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="mainId">
+                  <el-select
+                    class="selectStyle"
+                    filterable
+                    v-model="searchForm.mainId"
+                    placeholder="名称"
+                  >
+                    <el-option
+                      v-for="item in categoryList"
+                      :key="item.productCategoryNumber"
+                      :label="item.productCategoryName"
+                      :value="item.productCategoryNumber"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -2,22 +2,23 @@
   <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="customerName">
-              <el-input placeholder="请输入经销商名称" v-model="screenForm.customerName"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="18" 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="120px" 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 placeholder="请输入经销商名称" v-model="screenForm.customerName"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -229,7 +230,8 @@ export default {
         freeDay: '',
         toll: ''
       },
-      type: null // 1 新增  2 修改  null 详情
+      type: null, // 1 新增  2 修改  null 详情
+      isCollapse: true
     }
   },
   created() {

src/views/basic_data/warehouse/warehouse_list.vue

@@ -3,21 +3,23 @@
     <div v-if="isShow">
       <!-- 筛选条件 -->
       <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="name">
-                <el-input placeholder="请输入名称" v-model="screenForm.name"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="18" 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="name">
+                    <el-input placeholder="请输入名称" v-model="screenForm.name"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
       <div class="mymain-container">
         <div class="table">
@@ -90,7 +92,7 @@
               align="left"
               label="允许即时库存负库存"
               prop="allowMinusQty"
-              min-width="100"
+              min-width="150"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -114,7 +116,7 @@
               align="left"
               label="不参与可发量统计"
               prop="notExpQty"
-              min-width="100"
+              min-width="150"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -196,7 +198,8 @@ export default {
         // 筛选表单数据
         name: '' // 名称
       },
-      detail: {}
+      detail: {},
+      isCollapse: true
     }
   },
   components: {

src/views/basic_data/warehouse/warehouse_site.vue

@@ -2,27 +2,28 @@
   <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="name">
-              <el-input placeholder="请输入仓库名称" v-model="screenForm.name"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓位名称" prop="stockName">
-              <el-input placeholder="请输入仓位名称" v-model="screenForm.stockName"></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="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="name">
+                  <el-input placeholder="请输入仓库名称" v-model="screenForm.name"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="仓位名称" prop="stockName">
+                  <el-input placeholder="请输入仓位名称" v-model="screenForm.stockName"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
@@ -263,7 +264,8 @@ export default {
         name: '' // 名称
       },
       type: null,
-      cList: {}
+      cList: {},
+      isCollapse: true
     }
   },
   methods: {

src/views/dashboard/index.vue

@@ -288,6 +288,7 @@ export default {
     handleSaveMenu() {
       setMenuList({ adminModuleIds: this.checkList.join(',') }).then(res => {
         this.$successMsg('设置成功')
+        this.checkList = []
         this.getMenuList()
         this.dialogVisible = false
       })

src/views/finance/wallet.vue

@@ -4,33 +4,35 @@
       <el-page-header @back="goBack" />
     </div>
     <br />
+
     <!-- 筛选条件 -->
     <div v-if="show2">
-      <el-form
-        ref="searchForm"
-        :model="searchForm"
-        :rules="rulesSearchForm"
-        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>
-                <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id" />
-              </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="resetFn">清空</el-button>
-              <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :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 #search>
+          <el-form
+            ref="searchForm"
+            :model="searchForm"
+            :rules="rulesSearchForm"
+            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>
+                    <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">

src/views/issue/index.vue

@@ -2,21 +2,23 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="60px" size="small" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="18" :lg="18">
-            <el-form-item label="标题" prop="title">
-              <el-input v-model="screenForm.title" placeholder="请输入标题"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="6" :lg="6" class="tr">
-            <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" label-width="60px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="18" :lg="18">
+                <el-form-item label="标题" prop="title">
+                  <el-input v-model="screenForm.title" placeholder="请输入标题"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -211,7 +213,7 @@ export default {
       },
       importFormDialog: false,
       fileList: [],
-
+      isCollapse: true,
       detailDialog: false, // 详情 - 弹窗
       detailTable_dataList: null, // 详情 - 列表数据
       detailTable_listLoading: true, // 详情 - 列表加载loading

src/views/notice/index.vue

@@ -2,45 +2,47 @@
   <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="type">
-              <el-input v-model="screenForm.type" placeholder="请输入通知类型"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件编码" prop="code">
-              <el-input v-model="screenForm.code" placeholder="请输入文件编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件标题" prop="title">
-              <el-input v-model="screenForm.title" 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="24" :lg="24" class="tr">
-            <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+          <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="通知类型" prop="type">
+                  <el-input v-model="screenForm.type" placeholder="请输入通知类型"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="文件编码" prop="code">
+                  <el-input v-model="screenForm.code" placeholder="请输入文件编码"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="文件标题" prop="title">
+                  <el-input v-model="screenForm.title" placeholder="请输入文件标题"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="发布日期" prop="date">
+                  <el-date-picker
+                    v-model="screenForm.date"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -365,7 +367,7 @@ export default {
       },
       mainFormDialog: false,
       fileList: [],
-
+      isCollapse: true,
       departmentList: [],
       props: {
         multiple: true,

src/views/sales/price/commercial_list.vue

@@ -2,46 +2,48 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form ref="searchForm" :model="searchForm" 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="categoryId">
-              <el-input v-model="searchForm.categoryId" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物料名称" prop="materialName">
-              <el-input v-model="searchForm.materialName" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物料编码" prop="materialNumber">
-              <el-input v-model="searchForm.materialNumber" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="销售类型" prop="saleTypeId">
-              <el-input v-model="searchForm.saleTypeId" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="规格" prop="specification">
-              <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="18" class="tr">
-            <el-form-item label="">
-              <el-button size="small" @click="clearFn">清空</el-button>
-              <el-button size="small" type="primary" @click="searchFormFn">搜索</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="searchFormFn">搜索</el-button>
+        </template>
+        <template #search>
+          <el-form ref="searchForm" :model="searchForm" 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="categoryId">
+                  <el-input v-model="searchForm.categoryId" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="物料名称" prop="materialName">
+                  <el-input v-model="searchForm.materialName" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="物料编码" prop="materialNumber">
+                  <el-input v-model="searchForm.materialNumber" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="销售类型" prop="saleTypeId">
+                  <el-input v-model="searchForm.saleTypeId" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="规格" prop="specification">
+                  <el-input v-model="searchForm.specification" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fr">
-        <el-button type="primary" size="small" @click="downLoadFn">模板</el-button>
+        <el-button type="primary" size="mini" @click="downLoadFn">模板</el-button>
         <ExportButton class="import-btn" :exUrl="'bus/price/export'" :exParams="exParams" />
         <el-upload
           class="import-btn"
@@ -50,7 +52,7 @@
           :file-list="importFileList"
           :show-file-list="false"
         >
-          <el-button type="primary" size="small">批量导入</el-button>
+          <el-button type="primary" size="mini">批量导入</el-button>
         </el-upload>
       </div>
     </div>
@@ -207,6 +209,7 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [],
       importFileList: [],
+      isCollapse: true,
       searchForm: {
         categoryId: '',
         materialName: '',

src/views/sales_policy/codealer_list.vue

@@ -1,32 +1,46 @@
 <template>
-  <el-container v-if="isShow">
-    <el-header class="mg">
-      <el-form size="mini" :model="screenForm" ref="screenForm" :inline="false">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="8" :lg="8">
-            <el-form-item prop="code">
-              <el-input size="mini" v-model="screenForm.code" placeholder="销售政策编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="8" :lg="8">
-            <el-form-item prop="remark">
-              <el-input size="mini" v-model="screenForm.remark" placeholder="销售政策说明"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="8" :lg="8">
-            <el-form-item prop="title">
-              <el-input size="mini" v-model="screenForm.title" placeholder="表头备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row class="mg">
-          <el-button type="primary" size="mini" @click="submitScreenForm">查询</el-button>
-          <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
-          <el-button type="primary" size="mini" @click="">导出</el-button>
-        </el-row>
-      </el-form>
-    </el-header>
+  <div class="app-container" v-if="isShow">
+    <div class="screen-container">
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
+          <el-button type="primary" size="mini" @click="resetScreenForm">清空</el-button>
+        </template>
+        <template #search>
+          <el-form
+            size="mini"
+            :model="screenForm"
+            ref="screenForm"
+            :inline="false"
+            label-position="left"
+            label-width="120px"
+          >
+            <el-row :gutter="20">
+              <el-col :xs="24" :sm="8" :lg="8">
+                <el-form-item prop="code" label="销售政策编号">
+                  <el-input size="mini" v-model="screenForm.code" placeholder="销售政策编号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="8" :lg="8">
+                <el-form-item prop="remark" label="销售政策说明">
+                  <el-input size="mini" v-model="screenForm.remark" placeholder="销售政策说明"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="8" :lg="8">
+                <el-form-item prop="title" label="表头备注">
+                  <el-input size="mini" v-model="screenForm.title" placeholder="表头备注"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
+    </div>
+    <!--    <div class="btn-group">-->
+    <!--      <el-row type="flex">-->
+    <!--        <el-button type="primary" size="mini" @click="">导出</el-button>-->
+    <!--      </el-row>-->
+    <!--    </div>-->
     <div class="mymain-container">
       <div class="table">
         <el-table :data="dataList" border>
@@ -79,7 +93,7 @@
         />
       </div>
     </div>
-  </el-container>
+  </div>
   <Distributor v-else :cid="id" />
 </template>
 
@@ -92,6 +106,7 @@ export default {
   mixins: [Minxin],
   data() {
     return {
+      isCollapse: true,
       isShow: true,
       id: '',
       input: '',

src/views/sales_policy/policy_list.vue

@@ -1,126 +1,140 @@
 <template>
   <div v-if="isShow === 1" class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" size="mini" :model="screenForm" :inline="false">
-        <el-row>
-          <el-row :gutter="20">
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="code">
-                <el-input v-model="screenForm.code" placeholder="销售政策编号" size="mini" />
-              </el-form-item>
-            </el-col>
+      <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <template #right_btn>
+          <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
+          <el-button size="mini" @click="resetScreenForm">清空</el-button>
+        </template>
+        <template #search>
+          <el-form
+            ref="screenForm"
+            size="mini"
+            :model="screenForm"
+            :inline="false"
+            label-width="120px"
+            label-position="left"
+          >
+            <el-row>
+              <el-row :gutter="20">
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="销售政策编号" prop="code">
+                    <el-input v-model="screenForm.code" placeholder="销售政策编号" size="mini" />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="title">
-                <el-input v-model="screenForm.title" placeholder="销售政策说明" size="mini" />
-              </el-form-item>
-            </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="销售政策说明" prop="title">
+                    <el-input v-model="screenForm.title" placeholder="销售政策说明" size="mini" />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="remark">
-                <el-input v-model="screenForm.remark" placeholder="表头备注" size="mini" />
-              </el-form-item>
-            </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="表头备注" prop="remark">
+                    <el-input v-model="screenForm.remark" placeholder="表头备注" size="mini" />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="startTime1">
-                <el-date-picker
-                  v-model="screenForm.startTime1"
-                  type="datetime"
-                  size="mini"
-                  placeholder="生效日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="endTime1">
-                <el-date-picker
-                  v-model="screenForm.endTime1"
-                  type="datetime"
-                  size="mini"
-                  placeholder="结束日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="生效日期" prop="startTime1">
+                    <el-date-picker
+                      v-model="screenForm.startTime1"
+                      type="datetime"
+                      size="mini"
+                      placeholder="生效日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="结束日期" prop="endTime1">
+                    <el-date-picker
+                      v-model="screenForm.endTime1"
+                      type="datetime"
+                      size="mini"
+                      placeholder="结束日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="startCreateTime">
-                <el-date-picker
-                  v-model="screenForm.startCreateTime"
-                  type="datetime"
-                  size="mini"
-                  placeholder="制表日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
-              </el-form-item>
-            </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="制表日期" prop="startCreateTime">
+                    <el-date-picker
+                      v-model="screenForm.startCreateTime"
+                      type="datetime"
+                      size="mini"
+                      placeholder="制表日期"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                    />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="createBy">
-                <el-input v-model="screenForm.createBy" placeholder="制表人" size="mini" />
-              </el-form-item>
-            </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="制表人" prop="createBy">
+                    <el-input v-model="screenForm.createBy" placeholder="制表人" size="mini" />
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="examineBy">
-                <el-input v-model="screenForm.examineBy" placeholder="审核人" size="mini" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="status">
-                <el-select v-model="screenForm.status" size="mini" placeholder="状态" class="select_height">
-                  <el-option
-                    v-for="(item, index) in statusOptions"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="审核人" prop="examineBy">
+                    <el-input v-model="screenForm.examineBy" placeholder="审核人" size="mini" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="20">
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="状态" prop="status">
+                    <el-select v-model="screenForm.status" size="mini" placeholder="状态" class="select_height">
+                      <el-option
+                        v-for="(item, index) in statusOptions"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="type">
-                <el-select v-model="screenForm.type" size="mini" placeholder="销售政策类型" class="select_height">
-                  <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="customerId">
-                <el-select
-                  v-model="screenForm.customerId"
-                  size="mini"
-                  filterable
-                  placeholder="经销商名称"
-                  class="select_height"
-                >
-                  <el-option label="全部" :value="null"></el-option>
-                  <el-option v-for="item in CrList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="销售政策类型" prop="type">
+                    <el-select v-model="screenForm.type" size="mini" placeholder="销售政策类型" class="select_height">
+                      <el-option
+                        v-for="item in typeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="经销商名称" prop="customerId">
+                    <el-select
+                      v-model="screenForm.customerId"
+                      size="mini"
+                      filterable
+                      placeholder="经销商名称"
+                      class="select_height"
+                    >
+                      <el-option label="全部" :value="null"></el-option>
+                      <el-option v-for="item in CrList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
 
-            <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="specification">
-                <el-input v-model="screenForm.specification" placeholder="机型" size="mini" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :ms="24" :lg="24" class="tr">
-              <el-form-item>
-                <el-button type="primary" size="mini" @click="submitScreenForm">查询</el-button>
-                <el-button size="mini" @click="resetScreenForm">重置</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-row>
-      </el-form>
+                <el-col :xs="24" :ms="6" :lg="6">
+                  <el-form-item label="机型" prop="specification">
+                    <el-input v-model="screenForm.specification" placeholder="机型" size="mini" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
     <div class="btn-group">
       <el-row type="flex">
@@ -337,7 +351,8 @@ export default {
       value: '',
       imageUrl: '',
       baseURL: '',
-      isFlag: ''
+      isFlag: '',
+      isCollapse: true
     }
   },
   created() {

src/views/sales_rebate/rebate_list.vue

@@ -1,70 +1,75 @@
 <template>
   <div class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <!-- <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item label="" prop="mainName">
-              <el-input
-                v-model="screenForm.mainName"
-                placeholder="返利品类"
-                size="mini"
-              ></el-input>
-            </el-form-item>
-          </el-col> -->
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item label="" prop="saleTypeCode">
-              <el-input v-model="screenForm.saleTypeCode" placeholder="销售类型编码" size="mini"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item label="" prop="saleTypeName">
-              <el-input v-model="screenForm.saleTypeName" placeholder="销售类型名称" size="mini"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="status">
-              <el-select v-model="screenForm.status" placeholder="请选择" size="mini">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :xs="24" :ms="18" :lg="18">
-            <el-button
-              type="primary"
-              size="mini"
-              icon="el-icon-plus"
-              v-if="$checkBtnRole('add', $route.meta.roles)"
-              @click=";(dialogVisible = true), (type = 1), getDictList()"
-              >新增</el-button
-            >
+      <Collapse :screen-form="screenForm">
+        <template #right_btn>
+          <el-button icon="el-icon-search" type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
+          <el-button type="primary" size="mini" @click="resetScreenForm">清空</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left" label-width="120px">
+            <el-row :gutter="20">
+              <!-- <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item label="" prop="mainName">
+                  <el-input
+                    v-model="screenForm.mainName"
+                    placeholder="返利品类"
+                    size="mini"
+                  ></el-input>
+                </el-form-item>
+              </el-col> -->
+              <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item label="销售类型编码" prop="saleTypeCode">
+                  <el-input v-model="screenForm.saleTypeCode" placeholder="销售类型编码" size="mini"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item label="销售类型名称" prop="saleTypeName">
+                  <el-input v-model="screenForm.saleTypeName" placeholder="销售类型名称" size="mini"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item prop="status" label="状态">
+                  <el-select v-model="screenForm.status" placeholder="请选择" size="mini">
+                    <el-option v-for="item in options" :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>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-plus"
+          v-if="$checkBtnRole('add', $route.meta.roles)"
+          @click=";(dialogVisible = true), (type = 1), getDictList()"
+          >新增</el-button
+        >
 
-            <!-- <el-button type="primary" size="mini" @click="delfn"
-                >批量删除</el-button
-              > -->
-            <el-popconfirm
-              v-if="$checkBtnRole('del', $route.meta.roles)"
-              class="delClass"
-              @onConfirm="delfn"
-              title="这是一段内容确定删除吗？"
-            >
-              <el-button :disabled="ids.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini"
-                >批量删除</el-button
-              >
-            </el-popconfirm>
-            <el-button icon="el-icon-search" type="primary" size="mini" @click="submitScreenForm">查询</el-button>
-            <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
+        <!-- <el-button type="primary" size="mini" @click="delfn"
+              >批量删除</el-button
+            > -->
+        <el-popconfirm
+          v-if="$checkBtnRole('del', $route.meta.roles)"
+          class="delClass"
+          @onConfirm="delfn"
+          title="这是一段内容确定删除吗？"
+        >
+          <el-button :disabled="ids.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini"
+            >批量删除</el-button
+          >
+        </el-popconfirm>
 
-            <ExportButton
-              style="display: inline-block; margin-left: 10px"
-              :exUrl="'wallet/rebate_saletype/export'"
-              :exParams="exParams"
-            />
-          </el-col>
-        </el-row>
-      </el-form>
+        <ExportButton
+          style="display: inline-block; margin-left: 10px"
+          :exUrl="'wallet/rebate_saletype/export'"
+          :exParams="exParams"
+        />
+      </div>
     </div>
 
     <div class="mymain-container">

src/views/sales_rebate/rebate_list_type.vue

@@ -1,48 +1,49 @@
 <template>
   <div class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" size="mini" label-width="100px" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item label="返利类型" prop="name">
-              <el-input v-model="screenForm.name" placeholder="请输入返利类型" size="mini"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <!-- <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="status">
-              <el-select
-                v-model="screenForm.status"
-                placeholder="请选择"
-                size="small"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <el-col :xs="24" :ms="18" :lg="24">
-            <el-form-item>
-              <el-button
-                type="primary"
-                size="mini"
-                icon="el-icon-plus"
-                v-if="$checkBtnRole('add', $route.meta.roles)"
-                @click=";(dialogVisible = true), (type = 1), getDictList()"
-                >新增</el-button
-              >
+      <Collapse :screen-form="screenForm">
+        <template #right_btn>
+          <el-button type="primary" size="mini" icon="el-icon-search" @click="submitScreenForm">查询</el-button>
+          <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" size="mini" label-width="100px" label-position="left">
+            <el-row :gutter="20">
+              <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item label="返利类型" prop="name">
+                  <el-input v-model="screenForm.name" placeholder="请输入返利类型" size="mini"></el-input>
+                </el-form-item>
+              </el-col>
 
-              <el-button type="primary" size="mini" icon="el-icon-search" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+              <!-- <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item prop="status">
+                  <el-select
+                    v-model="screenForm.status"
+                    placeholder="请选择"
+                    size="small"
+                  >
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
+      <el-button
+        type="primary"
+        size="mini"
+        icon="el-icon-plus"
+        v-if="$checkBtnRole('add', $route.meta.roles)"
+        @click=";(dialogVisible = true), (type = 1), getDictList()"
+        >新增</el-button
+      >
     </div>
 
     <div class="mymain-container">

src/views/sales_rebate/salestype_list.vue

@@ -1,34 +1,36 @@
 <template>
   <div class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="saleCode">
-              <el-input v-model="screenForm.saleCode" placeholder="销售类型编码" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="saleName">
-              <el-input v-model="screenForm.saleName" placeholder="销售类型名称" size="small"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="status">
-              <el-select v-model="screenForm.status" placeholder="状态" size="small">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6" class="tr">
-            <el-form-item>
-              <el-button type="primary" size="mini" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <Collapse :screen-form="screenForm">
+        <template #right_btn>
+          <el-button type="primary" size="mini" @click="submitScreenForm">搜索</el-button>
+          <el-button type="primary" size="mini" @click="resetScreenForm">清空</el-button>
+        </template>
+        <template #search>
+          <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left" label-width="120px">
+            <el-row :gutter="20">
+              <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item prop="saleCode" label="销售类型编码">
+                  <el-input v-model="screenForm.saleCode" placeholder="销售类型编码" size="small"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item prop="saleName" label="销售类型名称">
+                  <el-input v-model="screenForm.saleName" placeholder="销售类型名称" size="small"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :ms="6" :lg="6">
+                <el-form-item prop="status" label="状态">
+                  <el-select v-model="screenForm.status" placeholder="状态" size="small">
+                    <el-option v-for="item in options" :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="btn-group clearfix">
       <div class="fl">

src/views/stock/reserved_stock.vue

@@ -2,54 +2,55 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" 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="type">
-              <el-select v-model="screenForm.type" placeholder="请选择产品大类" clearable>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </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="goodsNum">
-              <el-input v-model="screenForm.goodsNum" 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="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="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 #search>
+          <el-form ref="screenForm" :model="screenForm" 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="type">
+                  <el-select v-model="screenForm.type" placeholder="请选择产品大类" clearable>
+                    <el-option
+                      v-for="item in typeList"
+                      :key="item.dictCode"
+                      :label="item.dictValue"
+                      :value="item.dictCode"
+                    ></el-option>
+                  </el-select>
+                </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="goodsNum">
+                  <el-input v-model="screenForm.goodsNum" 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="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-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -167,7 +168,8 @@ export default {
         jxsName: '',
         jxsNum: ''
       },
-      typeList: []
+      typeList: [],
+      isCollapse: true
     }
   },
 

src/views/stock/stock_list.vue

@@ -2,84 +2,85 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div class="screen-container">
-      <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="warehouse">
-              <el-select
-                v-model="screenForm.warehouse"
-                placeholder="请选择仓库"
-                @change="changeWarehouse"
-                clearable
-                multiple
-                collapse-tags
-              >
-                <el-option
-                  :label="item.name"
-                  :value="item.id"
-                  v-for="(item, index) in warehouseList"
-                  :key="index"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓位" prop="position">
-              <el-select v-model="screenForm.position" placeholder="请选择仓位" clearable>
-                <el-option :label="item.name" :value="item.id" v-for="(item, index) in positionList" :key="index"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品大类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="请选择产品大类" @change="changeType" clearable>
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品类别" prop="categoryId">
-              <el-select
-                v-model="screenForm.categoryId"
-                placeholder="请选择产品类别"
-                filterable
-                clearable
-                multiple
-                collapse-tags
-              >
-                <el-option v-for="item in typeList" :key="item.id" :label="item.name" :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="goodsCode">
-              <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsNum">
-              <el-input v-model="screenForm.goodsNum" 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="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 #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="warehouse">
+                  <el-select
+                    v-model="screenForm.warehouse"
+                    placeholder="请选择仓库"
+                    @change="changeWarehouse"
+                    clearable
+                    multiple
+                    collapse-tags
+                  >
+                    <el-option
+                      :label="item.name"
+                      :value="item.id"
+                      v-for="(item, index) in warehouseList"
+                      :key="index"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="仓位" prop="position">
+                  <el-select v-model="screenForm.position" placeholder="请选择仓位" clearable>
+                    <el-option :label="item.name" :value="item.id" v-for="(item, index) in positionList" :key="index"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品大类" prop="type">
+                  <el-select v-model="screenForm.type" placeholder="请选择产品大类" @change="changeType" clearable>
+                    <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品类别" prop="categoryId">
+                  <el-select
+                    v-model="screenForm.categoryId"
+                    placeholder="请选择产品类别"
+                    filterable
+                    clearable
+                    multiple
+                    collapse-tags
+                  >
+                    <el-option v-for="item in typeList" :key="item.id" :label="item.name" :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="goodsCode">
+                  <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品编码" prop="goodsNum">
+                  <el-input v-model="screenForm.goodsNum" 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-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -225,7 +226,8 @@ export default {
       warehouseList: [],
       positionList: [],
       typeList: [],
-      smallList: []
+      smallList: [],
+      isCollapse: true
     }
   },
 

src/views/supply/allot/allot_list.vue

@@ -3,41 +3,42 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <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="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="wlName">
-                <el-input v-model="screenForm.wlName" 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" 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="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-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="物料名称" prop="wlName">
+                    <el-input v-model="screenForm.wlName" placeholder="请输入物料名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="提货日期" prop="date">
+                    <el-date-picker
+                      v-model="screenForm.date"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -231,7 +232,7 @@ export default {
         wlName: '',
         date: ''
       },
-
+      isCollapse: true,
       queryItem: {}
     }
   },

src/views/supply/deliver/sum_list.vue

@@ -3,204 +3,217 @@
     <div v-show="!isShowPrint">
       <!-- 筛选条件 -->
       <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="12" :lg="6">
-              <el-form-item label="产品名称" prop="goodsName">
-                <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="物料编码" prop="goodsCode">
-                <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品编码" prop="goodsOldCode">
-                <el-input v-model="screenForm.goodsOldCode" 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="createDate">
-                <el-date-picker
-                  v-model="screenForm.createDate"
-                  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="deliverDate">
-                <el-date-picker
-                  v-model="screenForm.deliverDate"
-                  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="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="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="type">
-                <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="correspondId">
-                <el-select
-                  v-model="screenForm.correspondId"
-                  multiple
-                  style="width: 100%"
-                  placeholder="请选择仓库"
-                  size="mini"
-                  filterable
-                  clearable
-                >
-                  <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="k3ServiceId">
-                <el-select
-                  v-model="screenForm.k3ServiceId"
-                  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="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="approvaTime">
-                <el-date-picker
-                  v-model="screenForm.approvaTime"
-                  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="types">
-                <el-select
-                  v-model="screenForm.types"
-                  placeholder="选择申请发货单类型"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option v-for="item in invoiceList" :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="printStatus">
-                <el-select
-                  v-model="screenForm.printStatus"
-                  placeholder="选择打印状态"
-                  clearable
-                  filterable
-                  style="width: 100%"
-                >
-                  <el-option label="是" :value="1" />
-                  <el-option label="否" :value="0" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="discriminate">
-                <el-select
-                  v-model="screenForm.discriminate"
-                  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="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="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>
+        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+          <template #right_btn>
+            <el-button size="mini" @click="resetScreenForm">清空</el-button>
+            <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+          </template>
+
+          <template #search>
+            <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品名称" prop="goodsName">
+                    <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="物料编码" prop="goodsCode">
+                    <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码" />
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="产品编码" prop="goodsOldCode">
+                    <el-input v-model="screenForm.goodsOldCode" 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="createDate">
+                    <el-date-picker
+                      v-model="screenForm.createDate"
+                      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="deliverDate">
+                    <el-date-picker
+                      v-model="screenForm.deliverDate"
+                      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="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="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="type">
+                    <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="correspondId">
+                    <el-select
+                      v-model="screenForm.correspondId"
+                      multiple
+                      style="width: 100%"
+                      placeholder="请选择仓库"
+                      size="mini"
+                      filterable
+                      clearable
+                    >
+                      <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="k3ServiceId">
+                    <el-select
+                      v-model="screenForm.k3ServiceId"
+                      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="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="approvaTime">
+                    <el-date-picker
+                      v-model="screenForm.approvaTime"
+                      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="types">
+                    <el-select
+                      v-model="screenForm.types"
+                      placeholder="选择申请发货单类型"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in invoiceList"
+                        :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="printStatus">
+                    <el-select
+                      v-model="screenForm.printStatus"
+                      placeholder="选择打印状态"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option label="是" :value="1" />
+                      <el-option label="否" :value="0" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="区域" prop="discriminate">
+                    <el-select
+                      v-model="screenForm.discriminate"
+                      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="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="createBy">
+                    <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -844,6 +857,7 @@ export default {
       ],
       check: [],
       checkAll: false,
+      isCollapse: true,
       isIndeterminate: false
     }
   },

src/views/supply/direct/direct_list.vue

@@ -3,71 +3,72 @@
     <div v-show="!isShowDetail && !isShowExamine && !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="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="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-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="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" 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>
+            <div>
+              <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>
+            </div>
+          </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="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-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="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-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -365,7 +366,7 @@ export default {
         //  // { label: '审核驳回', value: 'FAIL' },,
         { label: '已关闭', value: 'CLOSE' }
       ],
-
+      isCollapse: true,
       queryItem: {},
       isShowDetail: false,
       isShowExamine: false,

src/views/supply/implement/commercial_implement_list.vue

@@ -3,82 +3,84 @@
     <div v-show="!isShowDisplaceDetail">
       <!-- 筛选条件 -->
       <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="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="12" :lg="6">
-              <el-form-item label="经销商" prop="customerId">
-                <el-select v-model="screenForm.customerId" filterable class="selectStyle" placeholder="请选择">
-                  <el-option v-for="item in dealerList" :key="item.id" :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="refProjectName">
-                <el-input v-model="screenForm.refProjectName" 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="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="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-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="是否关闭" prop="isClose">
-                <el-select v-model="screenForm.isClose" clearable placeholder="请选择是否">
-                  <el-option label="是" :value="true" />
-                  <el-option label="否" :value="false" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <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="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="100px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <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="12" :lg="6">
+                  <el-form-item label="经销商" prop="customerId">
+                    <el-select v-model="screenForm.customerId" filterable class="selectStyle" placeholder="请选择">
+                      <el-option v-for="item in dealerList" :key="item.id" :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="refProjectName">
+                    <el-input v-model="screenForm.refProjectName" 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="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="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-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="是否关闭" prop="isClose">
+                    <el-select v-model="screenForm.isClose" clearable placeholder="请选择是否">
+                      <el-option label="是" :value="true" />
+                      <el-option label="否" :value="false" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <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-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -290,6 +292,7 @@ export default {
       salesmanList: [],
       dealerList: [],
       queryItem: {},
+      isCollapse: true,
       isShowDisplaceDetail: false
     }
   },

src/views/supply/implement/implement_list.vue

@@ -3,116 +3,121 @@
     <div v-show="!isShowDisplaceDetail">
       <!-- 筛选条件 -->
       <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 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="goodsCode">
-                <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售订单" prop="saleNum">
-                <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单"></el-input>
-              </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="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>
+        <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 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="goodsCode">
+                    <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售订单" prop="saleNum">
+                    <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单"></el-input>
+                  </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="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="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="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="k3CategoryNumber">
-                <el-select v-model="screenForm.k3CategoryNumber" filterable clearable multiple placeholder="请选择">
-                  <el-option v-for="item in categoryList" :key="item.number" :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="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="serviceName ">
-                <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表体业务员" prop="itemServiceName">
-                <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="归属业务员" prop="newServiceName">
-                <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
-              </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-input>
-              </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-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货是否完成" prop="isOver">
-                <el-select v-model="screenForm.isOver" clearable 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" 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-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="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="k3CategoryNumber">
+                    <el-select v-model="screenForm.k3CategoryNumber" filterable clearable multiple placeholder="请选择">
+                      <el-option
+                        v-for="item in categoryList"
+                        :key="item.number"
+                        :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="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="serviceName ">
+                    <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表体业务员" prop="itemServiceName">
+                    <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="归属业务员" prop="newServiceName">
+                    <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
+                  </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-input>
+                  </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-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="发货是否完成" prop="isOver">
+                    <el-select v-model="screenForm.isOver" clearable placeholder="请选择">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -440,7 +445,7 @@ export default {
         { label: '家用工程订单', value: 'HOME' },
         { label: '商用工程订单', value: 'TRADE' }
       ],
-
+      isCollapse: true,
       queryItem: {},
       isShowDisplaceDetail: false
     }

src/views/supply/implement/implement_total_list.vue

@@ -3,120 +3,127 @@
     <div v-show="!isShowDisplaceDetail">
       <!-- 筛选条件 -->
       <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 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="goodsCode">
-                <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="销售订单" prop="saleNum">
-                <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单"></el-input>
-              </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="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="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="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="k3CategoryNumber">
-                <el-select
-                  v-model="screenForm.k3CategoryNumber"
-                  filterable
-                  clearable
-                  multiple
-                  collapse-tags
-                  placeholder="请选择"
-                >
-                  <el-option v-for="item in categoryList" :key="item.number" :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="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="serviceName ">
-                <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="表体业务员" prop="itemServiceName">
-                <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="归属业务员" prop="newServiceName">
-                <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
-              </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-input>
-              </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-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货是否完成" prop="isOver">
-                <el-select v-model="screenForm.isOver" clearable 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" 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="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 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="goodsCode">
+                    <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售订单" prop="saleNum">
+                    <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单"></el-input>
+                  </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="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="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="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="k3CategoryNumber">
+                    <el-select
+                      v-model="screenForm.k3CategoryNumber"
+                      filterable
+                      clearable
+                      multiple
+                      collapse-tags
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="item in categoryList"
+                        :key="item.number"
+                        :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="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="serviceName ">
+                    <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="表体业务员" prop="itemServiceName">
+                    <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="归属业务员" prop="newServiceName">
+                    <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
+                  </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-input>
+                  </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-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="发货是否完成" prop="isOver">
+                    <el-select v-model="screenForm.isOver" clearable placeholder="请选择">
+                      <el-option label="是" :value="true"></el-option>
+                      <el-option label="否" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -449,7 +456,7 @@ export default {
         { label: '家用工程订单', value: 'HOME' },
         { label: '商用工程订单', value: 'TRADE' }
       ],
-
+      isCollapse: true,
       queryItem: {},
       isShowDisplaceDetail: false
     }

src/views/supply/implement/nsales_list.vue

@@ -3,127 +3,127 @@
     <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-input v-model="screenForm.warehouse" 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="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="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="printDesc">
-                <el-select v-model="screenForm.printDesc" clearable filterable>
-                  <el-option label="默认" :value="null" />
-                  <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="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-input v-model="screenForm.warehouse" 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="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="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="printDesc">
+                    <el-select v-model="screenForm.printDesc" clearable filterable>
+                      <el-option label="默认" :value="null" />
+                      <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="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">
@@ -421,7 +421,7 @@ export default {
         { label: '调拨单商用', value: 'REQUISITION_TRADE' },
         { label: '调拨单家用', value: 'REQUISITION_HOME' }
       ],
-
+      isCollapse: true,
       queryItem: {},
       isShowDetail: false,
       isShowExamine: false,

src/views/supply/pickup/sum_list.vue

@@ -2,100 +2,102 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <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-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="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="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="status">
-              <el-select v-model="screenForm.status" placeholder="请选择">
-                <el-option label="未打单" :value="0"> </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="takerPhone">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                v-model.number="screenForm.takerPhone"
-                placeholder="请输入手机号"
-              ></el-input>
-            </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-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="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-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="出库单号" prop="salesOrderId">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                v-model.number="screenForm.salesOrderId"
-                placeholder="请输入出库单号"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :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 #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="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="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="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="status">
+                  <el-select v-model="screenForm.status" placeholder="请选择">
+                    <el-option label="未打单" :value="0"> </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="takerPhone">
+                  <el-input
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.number="screenForm.takerPhone"
+                    placeholder="请输入手机号"
+                  ></el-input>
+                </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-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="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-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="出库单号" prop="salesOrderId">
+                  <el-input
+                    type="number"
+                    @mousewheel.native.prevent
+                    v-model.number="screenForm.salesOrderId"
+                    placeholder="请输入出库单号"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -262,7 +264,8 @@ export default {
         printTime: '',
         salesOrderId: ''
       },
-      pickupManList: ''
+      pickupManList: '',
+      isCollapse: true
     }
   },
 

src/views/supply/purchase/enter_list.vue

@@ -3,51 +3,52 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <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="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="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="chNum">
-                <el-input v-model="screenForm.chNum" 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="company">
-                <el-input v-model="screenForm.company" placeholder="请输入供货单位"></el-input>
-              </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="70px" 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="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="chNum">
+                    <el-input v-model="screenForm.chNum" 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="company">
+                    <el-input v-model="screenForm.company" placeholder="请输入供货单位"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -243,7 +244,7 @@ export default {
         date: '',
         company: ''
       },
-
+      isCollapse: true,
       queryItem: {}
     }
   },

src/views/supply/purchase/plan_list.vue

@@ -2,50 +2,51 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <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-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="chNum">
-              <el-input v-model="screenForm.chNum" 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="type">
-              <el-select v-model="screenForm.type" placeholder="全部">
-                <el-option label="全部" value=""></el-option>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></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="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="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="chNum">
+                  <el-input v-model="screenForm.chNum" 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="type">
+                  <el-select v-model="screenForm.type" placeholder="全部">
+                    <el-option label="全部" value=""></el-option>
+                    <el-option
+                      v-for="item in typeList"
+                      :key="item.dictCode"
+                      :label="item.dictValue"
+                      :value="item.dictCode"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -184,7 +185,7 @@ export default {
         model: '',
         type: ''
       },
-
+      isCollapse: true,
       typeList: []
     }
   },

src/views/supply/purchase/purchase_list.vue

@@ -3,41 +3,42 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <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="business">
-                <el-input v-model="screenForm.business" placeholder="请输入业务类型"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="供应商" prop="supplier">
-                <el-input v-model="screenForm.supplier" 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" 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="70px" size="mini" label-position="left">
+              <el-row :gutter="20">
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="业务类型" prop="business">
+                    <el-input v-model="screenForm.business" placeholder="请输入业务类型"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="供应商" prop="supplier">
+                    <el-input v-model="screenForm.supplier" placeholder="请输入供应商"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="采购日期" prop="date">
+                    <el-date-picker
+                      v-model="screenForm.date"
+                      type="datetimerange"
+                      range-separator="至"
+                      style="width: 100%"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -264,7 +265,7 @@ export default {
         supplier: '',
         date: ''
       },
-
+      isCollapse: true,
       queryItem: {}
     }
   },

src/views/supply/purchase/sum_list.vue

@@ -2,65 +2,66 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <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-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="销售类型" prop="salesType">
-              <el-input v-model="screenForm.salesType" 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="chNum">
-              <el-input v-model="screenForm.chNum" 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="type">
-              <el-select v-model="screenForm.type" placeholder="全部">
-                <el-option label="全部" value=""></el-option>
-                <el-option
-                  v-for="item in typeList"
-                  :key="item.dictCode"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
-                ></el-option>
-              </el-select>
-            </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="jxsNum">
-              <el-input v-model="screenForm.jxsNum" 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="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="salesType">
+                  <el-input v-model="screenForm.salesType" 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="chNum">
+                  <el-input v-model="screenForm.chNum" 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="type">
+                  <el-select v-model="screenForm.type" placeholder="全部">
+                    <el-option label="全部" value=""></el-option>
+                    <el-option
+                      v-for="item in typeList"
+                      :key="item.dictCode"
+                      :label="item.dictValue"
+                      :value="item.dictCode"
+                    ></el-option>
+                  </el-select>
+                </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="jxsNum">
+                  <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </Collapse>
     </div>
 
     <div class="mymain-container">
@@ -224,7 +225,7 @@ export default {
         jxsNum: ''
       },
       typeList: [],
-
+      isCollapse: true,
       multipleSelection: []
     }
   },

src/views/supply/reserve/reserve_list.vue

@@ -3,98 +3,99 @@
     <div v-show="!isShowDetail && !isShowForm">
       <!-- 筛选条件 -->
       <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="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>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="物料编码" prop="goodsNum">
-                <el-input v-model="screenForm.goodsNum" 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="saleNum">
-                <el-input v-model="screenForm.saleNum" 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="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="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="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="updateMan">
-                <el-input v-model="screenForm.updateMan" placeholder="请输入修改人"></el-input>
-              </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="warehouse">
-                <el-select v-model="screenForm.warehouse" placeholder="选择预留仓库" clearable>
-                  <el-option
-                    :label="item.name"
-                    :value="item.id"
-                    v-for="(item, index) in warehouseList"
-                    :key="index"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="6" 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="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>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="物料编码" prop="goodsNum">
+                    <el-input v-model="screenForm.goodsNum" 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="saleNum">
+                    <el-input v-model="screenForm.saleNum" 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="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="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="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="updateMan">
+                    <el-input v-model="screenForm.updateMan" placeholder="请输入修改人"></el-input>
+                  </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="warehouse">
+                    <el-select v-model="screenForm.warehouse" placeholder="选择预留仓库" clearable>
+                      <el-option
+                        :label="item.name"
+                        :value="item.id"
+                        v-for="(item, index) in warehouseList"
+                        :key="index"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </Collapse>
       </div>
 
       <div class="mymain-container">
@@ -341,7 +342,7 @@ export default {
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val)
+      const obj = that.statusList.find(o => o.value === val)
       return obj ? obj.label : ''
     }
   },
@@ -362,7 +363,6 @@ export default {
         date: '',
         createMan: '',
         updateMan: '',
-        orderNum: '',
         saleNum: '',
         model: '',
         status: '',
@@ -373,7 +373,7 @@ export default {
         { label: '已关闭', value: 0 }
       ],
       warehouseList: [],
-
+      isCollapse: true,
       queryItem: {},
       isShowDetail: false,
       isShowForm: false