修复入库查询

src/api/warehouse/warehouseWarehousingEntry.js

@@ -1,14 +1,10 @@
 import request from '@/axios';
 
-export const getList = (current, size, params) => {
+export const getList = (data) => {
   return request({
     url: '/api/logpm-warehouse/warehouseWarehousingEntry/list',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    },
+    method: 'post',
+    data,
   });
 };
 

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -19,9 +19,10 @@
             <el-form-item label="入库时间" prop="receiptDate">
               <!--              <el-input v-model="form.receiptDate" placeholder="请输入入库时间"/>-->
               <el-date-picker
+                class="w100"
                 v-model="form.receiptDate"
                 placeholder="请选择入库时间"
-                type="datetime"
+                type="date"
                 clearable
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
@@ -1337,7 +1338,7 @@ export default {
 
 .avue-crud {
   :deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
-    width: auto !important;
+    width: 100% !important;
     height: auto !important;
   }
 }

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -7,9 +7,24 @@
           <el-form-item label="入库批次:">
             <el-input v-model="query.receiptBatch" placeholder="请输入入库批次"></el-input>
           </el-form-item>
+          
           <el-form-item label="入库时间:">
-            <el-input v-model="query.receiptDate" placeholder="请输入入库时间"></el-input>
+            <!-- <el-input v-model="query.receiptDate" placeholder="请输入入库时间"></el-input> -->
+            <el-date-picker
+              class="w100"
+              v-model="query.receiptDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              value-format="YYYY-MM-DD"
+              clearable
+            >
+            </el-date-picker>
           </el-form-item>
+
           <el-form-item label="客户名称:">
             <el-input v-model="query.customerName" placeholder="请输入客户名称"></el-input>
           </el-form-item>
@@ -272,7 +287,7 @@ export default {
         {
           label: '入库时间',
           prop: 'receiptDate',
-          type: 4,
+          type: 1,
           values: '',
           width: '130',
           checkarr: [],
@@ -414,6 +429,36 @@ export default {
         },
 
         // 更多列的配置...
+      ],
+       /** 时间快捷选择设置 */
+      shortcuts: [
+        {
+          text: '最近一周',
+          value: () => {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            return [start, end];
+          },
+        },
+        {
+          text: '最近一个月',
+          value: () => {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            return [start, end];
+          },
+        },
+        {
+          text: '最近三个月',
+          value: () => {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            return [start, end];
+          },
+        },
       ],
       height: 0,
       excelBox: false,
@@ -848,8 +893,17 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+
+      const submitData = {query: this.page, warehouseWarehousingEntry: {...params, ...this.query} }
+
+      if (getObjType(submitData.warehouseWarehousingEntry.receiptDate) === 'array' && submitData.warehouseWarehousingEntry.receiptDate.length > 0) {
+        submitData.warehouseWarehousingEntry.receiptDateStart = submitData.warehouseWarehousingEntry.receiptDate[0]
+        submitData.warehouseWarehousingEntry.receiptDateStartEnd = submitData.warehouseWarehousingEntry.receiptDate[1]
+      }
+      delete submitData.query.total
+      delete submitData.warehouseWarehousingEntry.receiptDate
       // 获取列表数据
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getList(submitData).then(res => {
         const data = res.data.data;
         console.log('data :>> ', data);
         this.page.total = data.total;