merge master

src/views/wmsStatisticalReports/inventoryReport.vue

@@ -1,3 +1,11 @@
+<!--/*
+* @Author: zwq
+* @Date: 2020-12-29 15:41:11
+* @LastEditTime: 2022-04-15
+* @LastEditors: juzi
+* @Description: 拆分了搜索区和功能按钮区，增加了toptitle
+*/
+-->
 <template>
   <div class="app-container">
     <head-form :form-config="headFormConfig" @headBtnClick="btnClick" />
@@ -22,6 +30,7 @@
     />
   </div>
 </template>
+
 <script>
 import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
@@ -134,3 +143,14 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.edit-input {
+  padding-right: 100px;
+}
+.cancel-btn {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+}
+</style>