报表导出新增条件，优化报表，财务

src/views/Pricesystem/Price/PriceDelivery.vue

@@ -708,7 +708,7 @@ const form = ref({
   ],
 });
 async function updateDictionary(targetArray, dictionaryType) {
- await getDictionaryBiz(dictionaryType)
+  await getDictionaryBiz(dictionaryType)
     .then(res => {
       console.log(res, '字典');
       if (res.data.code == 200) {
@@ -765,7 +765,7 @@ async function addItemAfterId(array) {
     price: 0, //价格
     options: pricevehicle.value, //选择框列表
   };
- await array.push(newItem);
+  await array.push(newItem);
 }
 // 仓储减
 const storagereduce = id => {
@@ -824,9 +824,24 @@ const onLoad = async () => {
     billing(); //显示条件
     // 整车
     if (form.value.dispatchPricingType.includes(4)) {
-      addItemAfterId(form.value.fullVehicleData);
+      console.log('执行整车');
+      if (request.value.fullVehicle && request.value.fullVehicle) {
+        addItemAfterId(form.value.fullVehicleData);
+      } else {
+        form.value.fullVehicleData = [
+          {
+            index: 1, // 新对象的 ID 为当前数组长度加 1
+            plus: false, // 是否显示加号
+            reduce: true, // 是否显示减号
+            vehicleType: '', //	车型
+            loading: false,
+            price: 0, //价格
+            options: pricevehicle.value, //选择框列表
+          },
+        ];
+        console.log(form.value.fullVehicleData, '整车数据');
+      }
     }
-
     // 按件品类计费
     if (request.value.dispatchIsByCategory) {
       if (form.value.dispatchPricingType.includes(1)) {
@@ -844,7 +859,8 @@ const onLoad = async () => {
       }
       //  按方计费
       if (form.value.dispatchPricingType.includes(3)) {
-        request.value.dispatchCubeCategorys.forEach((item, index) => {
+        if(request.value.dispatchCubeCategorys.length){
+          request.value.dispatchCubeCategorys.forEach((item, index) => {
           form.value.cubeCategoryData.push({
             index: index + 1,
             categoryId: item.id, //品类
@@ -853,10 +869,13 @@ const onLoad = async () => {
             options: [{ label: item.name, value: item.id }],
           });
         });
+        }
+
       }
       //  按重量
       if (form.value.dispatchPricingType.includes(2)) {
-        request.value.dispatchWeightCategorys.forEach((item, index) => {
+        if(  request.value.dispatchWeightCategorys.length){
+          request.value.dispatchWeightCategorys.forEach((item, index) => {
           form.value.weightCategoryData.push({
             index: index + 1,
             categoryId: item.id, //品类
@@ -865,9 +884,10 @@ const onLoad = async () => {
             options: [{ label: item.name, value: item.id }],
           });
         });
+        }
+
       }
-    } else {
-    }
+    } 
 
     console.log(request.value, ' request.value');
     //  附加费品类
@@ -893,13 +913,16 @@ const onLoad = async () => {
     // 最低计费等级
     console.log(form.value.Minimumbilling, 'Minimumbilling');
     console.log(request.value.dispatchMinCostType);
-    form.value.Minimumbilling.forEach(res => {
+    if( form.value.Minimumbilling.length){
+      form.value.Minimumbilling.forEach(res => {
       if (res.index == request.value.dispatchMinCostType) {
         res.disabled = true;
       } else {
         res.disabled = false;
       }
     });
+    }
+
     // if (request.value.dispatchMinCostType != 1) {
     //   form.value.Minimumbilling.find(res => res.label == '加算价格').disabled = true;
     //   console.log('有加算价格');
@@ -908,13 +931,16 @@ const onLoad = async () => {
     //   console.log('加算价格没有');
     // }
     // 遗留控制
-    form.value.Minimumlegacy.forEach(res => {
+    if(form.value.Minimumlegacy.length){
+      form.value.Minimumlegacy.forEach(res => {
       if (res.index == request.value.dispatchMinCostType) {
         res.disabled = true;
       } else {
         res.disabled = false;
       }
     });
+    } 
+
 
     // 附加费用
     // 是否有操作/装卸费
@@ -1044,38 +1070,36 @@ const onLoad = async () => {
       }
       //按整车
       if (form.value.dispatchPricingType.includes(4)) {
-        form.value.fullVehicleData = [];
-        if(requestInfo.value.fullVehicle && requestInfo.value.fullVehicle.length){
+        if (requestInfo.value.fullVehicle && requestInfo.value.fullVehicle.length) {
+          form.value.fullVehicleData = [];
           requestInfo.value.fullVehicle.forEach((item, index) => {
-          form.value.fullVehicleData.push({
-            index: index + 1,
-            loading: false,
-            options: pricevehicle.value,
-            plus: true,
-            price: item.price || 0,
-            vehicleType: item.vehicleType,
+            form.value.fullVehicleData.push({
+              index: index + 1,
+              loading: false,
+              options: pricevehicle.value,
+              plus: true,
+              price: item.price || 0,
+              vehicleType: item.vehicleType,
+            });
           });
-        });
         }
-
       }
 
       //  附加费用
       if (request.value.dispatchIsCategorySubjoin) {
-        if( requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length){
+        if (requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length) {
           requestInfo.value.additionalCategory.forEach(item => {
-          let data = form.value.additionalCategoryData.find(
-            res => res.categoryId == item.categoryId
-          );
-          if (data) {
-            data.handlingPrice = item.handlingPrice || 0;
-            data.relocationPrice = item.relocationPrice || 0;
-            data.sortPrice = item.sortPrice || 0;
-            data.upstairsDeliveryPrice = item.upstairsDeliveryPrice || 0;
-          }
-        });
+            let data = form.value.additionalCategoryData.find(
+              res => res.categoryId == item.categoryId
+            );
+            if (data) {
+              data.handlingPrice = item.handlingPrice || 0;
+              data.relocationPrice = item.relocationPrice || 0;
+              data.sortPrice = item.sortPrice || 0;
+              data.upstairsDeliveryPrice = item.upstairsDeliveryPrice || 0;
+            }
+          });
         }
-
       } else {
         const data = requestInfo.value.additionalCategory[0];
         console.log(data, 'data===>');
@@ -1111,18 +1135,16 @@ const onLoad = async () => {
     }
   }
 
-let setTime = setTimeout(()=>{
-  formCopy.value = deepClone(form.value);
+  let setTime = setTimeout(() => {
+    formCopy.value = deepClone(form.value);
     loading.value = false;
     clearTimeout(setTime);
- },500)
-
+  }, 500);
 };
 
 onLoad();
 // 提交信息
 const handleSubmit = () => {
-
   let data = {
     checkType: '4',
     id: $route.query.id,
@@ -1212,23 +1234,22 @@ const handleSubmit = () => {
     });
   }
   // 整车计费
-  if(form.value.dispatchPricingType.includes(4)){
+  if (form.value.dispatchPricingType.includes(4)) {
     let fullVehicleDataState = form.value.fullVehicleData.every(res => res.vehicleType);
-  if (fullVehicleDataState && form.value.fullVehicleData.length) {
-    form.value.fullVehicleData.forEach(item => {
-      data.dispatch['fullVehicle'].push({
-        price: item.price || 0, //	整车计费（元/车）
-        vehicleType: item.vehicleType, //车型
+    if (fullVehicleDataState && form.value.fullVehicleData.length) {
+      form.value.fullVehicleData.forEach(item => {
+        data.dispatch['fullVehicle'].push({
+          price: item.price || 0, //	整车计费（元/车）
+          vehicleType: item.vehicleType, //车型
+        });
       });
-    });
-  } else {
-    ElMessage({
-      message: '整车计费有未选择车型',
-      type: 'warning',
-    });
-    return;
-  }
-
+    } else {
+      ElMessage({
+        message: '整车计费有未选择车型',
+        type: 'warning',
+      });
+      return;
+    }
   }
 
   // 附加费用
@@ -1280,19 +1301,22 @@ const handleSubmit = () => {
   }
   console.log(data, '要提交的数据');
   loading.value = true;
-  putBasicdataPrice(data).then(res => {
-    console.log(res, '处理好的值');
-    if (res.data.code == 200) {
-      ElMessage({
-        message: res.data.msg,
-        type: 'success',
-      });
-    }
-  }).catch(res=>{
-    console.log(res,'错误信息');
-  }).finally(()=>{
-    loading.value = false;
-  })
+  putBasicdataPrice(data)
+    .then(res => {
+      console.log(res, '处理好的值');
+      if (res.data.code == 200) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+      }
+    })
+    .catch(res => {
+      console.log(res, '错误信息');
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 
 // 返回

src/views/distribution/inventory/distrilbutionBillLadingView.vue

@@ -239,6 +239,29 @@ export default {
             sortable: true,
             head: false,
           },
+
+        {
+            prop: 'scanUser',
+            label: '签收人',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'signingTime',
+            label: '签收时间',
+            type: 1,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
           // {
           //   prop: 'trainNumber',
           //   label: '客户车次号',

src/views/financialsector/Financialse/FinancialDelivery.vue

@@ -650,15 +650,17 @@ const removeTag = value => {
   Timedelive(); //加载效果
 };
 
-// 移除对象
 // 移除对象
 function removeItemById(array, id) {
   const index = array.findIndex(item => item.index === id);
   if (index !== -1) {
     array.splice(index, 1);
-    array.forEach((item, index) => {
+    if(array.length){
+      array.forEach((item, index) => {
       item.index = index + 1;
     });
+    }
+
   }
 }
 // 添加对象
@@ -715,9 +717,12 @@ function FmremoveItemById(array, id) {
   const index = array.findIndex(item => item.id === id);
   if (index !== -1) {
     array.splice(index, 1);
-    array.forEach((item, index) => {
+    if(array.length){
+      array.forEach((item, index) => {
       item.id = index + 1;
     });
+    }
+
   }
   let timerId = setTimeout(() => {
     goriesloading.value = false;
@@ -755,7 +760,8 @@ async function updateDictionary(targetArray, dictionaryType) {
       //服务类型
       if (dictionaryType === 'dispatch_pricing_type') {
         Commercialcial.value = []; //清空服务类型
-        res.data.data.forEach(res => {
+        if(res.data.data && res.data.data.length){
+          res.data.data.forEach(res => {
           let data = {
             title: res.dictValue, // 标题
             id: Number(res.dictKey), //码表ID
@@ -777,6 +783,8 @@ async function updateDictionary(targetArray, dictionaryType) {
             ...data,
           });
         });
+        }
+
 
         CommercialcialCopy.value = deepClone(Commercialcial.value);
         // 配送服务类型标题
@@ -826,7 +834,8 @@ const search = val => {
             let data = null;
             SelectData.value.options = []; //如果有新的参数就清空之前的
             console.log(SelectData.value.StateName, 'SelectData.value.StateName');
-            res.data.data.forEach(item => {
+            if(res.data.data && res.data.data.length){
+              res.data.data.forEach(item => {
               if (SelectData.value.StateName == 'storage') {
                 //仓储
                 concatdata = form.value.dispatchCubeCategoryData.concat(
@@ -839,7 +848,6 @@ const search = val => {
                 data = form.value.dispatchSubjoinCategoryData.find(
                   res => res.Warehousecategory == item.goodsId
                 );
-                console.log(data, '213123');
               }
               SelectData.value.options.push({
                 label: item.goodsName,
@@ -847,6 +855,8 @@ const search = val => {
                 disabled: data ? true : false,
               });
             });
+            }
+
           }
         }
       })
@@ -920,34 +930,11 @@ const SurchargeChange = val => {
         ];
   }
 };
-// 附加品类的搜索
-const categoriesearch = goodsName => {
-  console.log(goodsName, '当前搜索参数');
-  if (!goodsName) {
-    return;
-  }
-  let data = {
-    goodsName: goodsName,
-  };
 
-  console.log(SelectOpin.value, '当前点击的谁');
-  postFindCategoryInfo(data).then(res => {
-    console.log(res, '附加费品类计费');
-    if (res.data.code == 200) {
-      if (res.data.data.length) {
-        SelectOpin.value.Additionalcategories = []; //如果有新的参数就清空之前的
-        res.data.data.forEach(item => {
-          SelectOpin.value.Additionalcategories.push({
-            label: item.goodsName,
-            value: item.goodsId,
-          });
-        });
-      }
-    }
-  });
-};
 const clink = () => {
-  if (ServiceList.value.length) ServiceList.value.forEach(res => (res.check = false));
+  if (ServiceList.value.length) {
+    ServiceList.value.forEach(res => (res.check = false));
+  }
 };
 /** 重置数据 */
 const resetFormData = () => {
@@ -961,7 +948,8 @@ const resetFormData = () => {
     if ($route.query.id) {
       console.log(form.value.dispatchPricingType, 'form.value.dispatchPricingType');
       form.value = await deepClone(formedit.value);
-      ServiceList.value.forEach((res, index) => {
+      if(ServiceList.value.length){
+        ServiceList.value.forEach((res, index) => {
         console.log(res);
 
         if (form.value.dispatchPricingType.includes(res.value)) {
@@ -972,6 +960,8 @@ const resetFormData = () => {
           res.check = false;
         }
       });
+      }
+
     } else {
       clink();
       Commercialcial.value = deepClone(CommercialcialCopy.value);
@@ -1005,8 +995,8 @@ const onLoad = async () => {
     form.value.dispatchPricingType = request.value.dispatchPricingType
       ? request.value.dispatchPricingType.split(',').map(Number)
       : []; //服务类型
-
-    ServiceList.value.forEach(dataItem => {
+    if(ServiceList.value.length){
+      ServiceList.value.forEach(dataItem => {
       if (form.value.dispatchPricingType.includes(dataItem.value)) {
         dataItem.check = true;
         if (dataItem.value == 1) {
@@ -1018,6 +1008,8 @@ const onLoad = async () => {
         }
       }
     });
+    }
+
 
     StateDelivery.value = true; //显示表格
     form.value.dispatchPieceCategoryData = [];

src/views/reportforms/DeliveryCustomers.vue

@@ -25,7 +25,7 @@
             <el-form-item label="仓库">
               <el-select
                 multiple
-                v-model="TopQuery.warehouseNameRange"
+                v-model="TopQuery.warehouseNameRange"   
                 filterable
                 clearable
                 placeholder="多选仓库搜索"
@@ -71,10 +71,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+      
         </el-form>
       </el-row>
 
@@ -89,6 +86,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -159,7 +158,13 @@ import { ElMessageBox } from 'element-plus';
 import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
-const TopQuery = ref({}); //顶部搜索
+const TopQuery = ref({
+  time:[],
+  warehouseNameRange:[],
+  consigneeRange:'',
+  driverNameRange:'',
+  vehicleNameRange:'',
+}); //顶部搜索
 const warehouseList = ref([]); //仓库列表
 // const DeliveryTypeList =ref([])
 const queryCarn = ref({}); //查询顶部
@@ -346,7 +351,7 @@ const selectionChange = list => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -388,9 +393,10 @@ const searchChange = () => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -493,6 +499,7 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportCustomer(data)
         .then(res => {

src/views/reportforms/DeliveryDetails.vue

@@ -82,10 +82,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+   
         </el-form>
       </el-row>
 
@@ -100,6 +97,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -170,8 +169,13 @@ import { ElMessageBox } from 'element-plus';
 import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
-const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({}); //查询顶部
+const queryCarn = ref({
+
+}); //查询顶部
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[],
+}); //查询顶部
 const warehouseList = ref([]); //仓库列表
 const DeliveryTypeList = ref([
   {
@@ -248,7 +252,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnList: deepClone(columnLists),
+  columnList: deepClone(columnList),
 
   /** 列表数据 */
   data: [],
@@ -362,9 +366,11 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
+
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -374,7 +380,7 @@ const searchReset = () => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -517,6 +523,7 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportDetails(data)
         .then(res => {

src/views/reportforms/DeliveryTrainNumber.vue

@@ -82,8 +82,7 @@
             </el-form-item> -->
           </div>
           <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+        
           </el-form-item>
         </el-form>
       </el-row>
@@ -99,6 +98,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -195,7 +196,12 @@ const DeliverygenericList = ref([
   },
 ]); //配送类型
 
-const TopQuery = ref({}); //顶部搜索
+const TopQuery = ref({
+  time:[],
+  warehouseNameRange:[],
+  vehicleNameRange:'',
+  driverNameRange:'',
+}); //顶部搜索
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -347,7 +353,7 @@ const selectionChange = list => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -380,10 +386,12 @@ const searchChange = () => {
 //顶部清空搜索
 const searchReset = () => {
   TopQuery.value = {};
-  TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.warehouseNameRange = []; 
+  TopQuery.value.time = []; 
   queryCarn.value = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
+    console.log(item,'item');
   });
   (details.query = {}), (details.page.total = 0);
   details.data = [];
@@ -495,6 +503,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportTrain(data)
         .then(res => {

src/views/reportforms/Inventory.vue

@@ -80,10 +80,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+
         </el-form>
       </el-row>
 
@@ -98,6 +95,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -173,7 +172,9 @@ import { downloadXls,deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[]
+});
 const warehouseList = ref([]); //仓库列表
 const DeliveryType = ref([
   {
@@ -417,7 +418,7 @@ const searchReset = () => {
   TopQuery.value.warehouseNameRange = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -498,6 +499,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportInventory(data)
         .then(res => {

src/views/reportforms/InventoryOutbound.vue

@@ -92,10 +92,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+  
         </el-form>
       </el-row>
 
@@ -110,6 +107,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -181,7 +180,10 @@ import { downloadXls } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[]
+});
 const warehouseList = ref([]); //仓库列表
 const DeliveryType = ref([
   {
@@ -353,9 +355,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -366,7 +369,7 @@ const searchReset = () => {
 const searchChange = () => {
   console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startCreateTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endCreateTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -515,6 +518,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportOutStocks(data)
         .then(res => {

src/views/reportforms/InventoryReceipt.vue

@@ -93,10 +93,6 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
         </el-form>
       </el-row>
 
@@ -111,6 +107,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -182,7 +180,10 @@ import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[],
+});
 const warehouseList = ref([]); //仓库列表
 const DeliveryType=ref([{
   label:'商配',
@@ -354,9 +355,11 @@ const selectionChange = list => {
 const searchReset=()=>{
 TopQuery.value={};
 TopQuery.value.warehouseNameRange=[]
+TopQuery.value.time=[]
 queryCarn.value={};
 details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
+    console.log(item,'item');
       item.values = '';
     });
     details.page.total  =  0
@@ -367,7 +370,7 @@ details.query = {};
 const searchChange = () => {
   console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startWarehousingTime = dayjs(TopQuery.value.time[0]).format(
       'YYYY-MM-DD HH:mm:ss'
     ); //开始日期
@@ -379,6 +382,7 @@ const searchChange = () => {
     delete queryCarn.value.endWarehousingTime;
   }
   // 仓库处理
+  console.log(TopQuery.value,'TopQuery.value');
   if (TopQuery.value.warehouseNameRange.length) {
     queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
   } else {
@@ -519,6 +523,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportInStocks(data)
         .then(res => {

src/views/reportforms/Selfpickupreport.vue

@@ -70,10 +70,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+  
         </el-form>
       </el-row>
 
@@ -88,6 +85,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -163,7 +162,10 @@ import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({});
+const TopQuery = ref({
+  warehouseNameRange:[],
+  time:[],
+});
 const warehouseList = ref([]); //仓库列表
 const details = reactive({
   /** 是否开启搜索 */
@@ -317,9 +319,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+ columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -330,7 +333,7 @@ const searchReset = () => {
 const searchChange = () => {
   console.log(TopQuery.value, 'TopQuery.value');
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startScanTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endScanTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -459,6 +462,7 @@ const exportReport = () => {
       details.loadingObj.list = true;
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportSelfpickup(data)
         .then(res => {

src/views/reportforms/Selfpickuptask.vue

@@ -81,10 +81,7 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
+
         </el-form>
       </el-row>
 
@@ -99,6 +96,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -168,13 +167,18 @@ import {
   $_getMyWarehouseList,
   $_exportStockOrder,
   $_getstockOrder,
+  $_getasks,
+  $_exportTasks
 } from '@/api/reportforms/index.js';
 import { ElMessageBox } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({}); //查询顶部
+const TopQuery = ref({
+  warehouseRange:[],
+  time:[],
+}); //查询顶部
 const warehouseList = ref([]); //仓库列表
 const DeliveryTypeList = ref([
   {
@@ -351,9 +355,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -363,7 +368,7 @@ const searchReset = () => {
 // 网页顶部搜索按钮
 const searchChange = () => {
   // 日期处理
-  if (TopQuery.value.time) {
+  if (TopQuery.value.time.length) {
     queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
     queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
@@ -478,7 +483,7 @@ const getrain = val => {
   };
   details.loadingObj.list = true;
 
-  $_getstockOrder(data)
+  $_getasks(data)
     .then(res => {
       console.log(res, '当前参数');
       details.page.total = res.data.data.total;
@@ -500,10 +505,11 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
-      $_exportStockOrder(data)
+      $_exportTasks(data)
         .then(res => {
-          downloadXls(res.data, `在库订单报表数据.xlsx`);
+          downloadXls(res.data, `自提任务报表数据.xlsx`);
         })
         .catch(() => {})
         .finally(() => {

src/views/reportforms/Stockordertable.vue

@@ -67,10 +67,6 @@
               />
             </el-form-item>
           </div>
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
         </el-form>
       </el-row>
 
@@ -85,6 +81,8 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -161,7 +159,10 @@ import { downloadXls, deepClone } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 const queryCarn = ref({}); //查询顶部
-const TopQuery = ref({}); //查询顶部
+const TopQuery = ref({
+  warehouseRange:[],
+  time:[],
+}); //查询顶部
 const warehouseList = ref([]); //仓库列表
 const DeliveryTypeList = ref([
   {
@@ -338,9 +339,10 @@ const selectionChange = list => {
 const searchReset = () => {
   TopQuery.value = {};
   TopQuery.value.warehouseNameRange = [];
+  TopQuery.value.time = [];
   queryCarn.value = {};
   details.query = {};
-  details.columnList.forEach(item => {
+  columnList.forEach(item => {
     item.values = '';
   });
   details.page.total = 0;
@@ -350,10 +352,10 @@ const searchReset = () => {
 const searchChange = () => {
   // 日期处理
   // 处理开始和结束日期
-  queryCarn.value.startWarehouseEntryTime = TopQuery.value.time
+  queryCarn.value.startWarehouseEntryTime = TopQuery.value.time.length
     ? dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss')
     : undefined;
-  queryCarn.value.endWarehouseEntryTime = TopQuery.value.time
+  queryCarn.value.endWarehouseEntryTime = TopQuery.value.time.length
     ? dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss')
     : undefined;
 
@@ -475,6 +477,7 @@ const exportReport = () => {
     .then(() => {
       let data = {
         ...details.query,
+        ...queryCarn.value
       };
       $_exportTasks(data)
         .then(res => {