#1 订单来源可以多选

#2 增加物流公司增加韵达选项
#3 导出将订单来源导出

src/views/store/components/productOrder.vue

@@ -575,7 +575,8 @@ export default {
         { key: "EMS", label: "邮政", value: "EMS" },
         { key: "ZTO", label: "中通", value: "ZTO" },
         { key: "JD", label: "京东", value: "JD" },
-        { key: "DBL", label: "德邦", value: "DBL" }
+        { key: "DBL", label: "德邦", value: "DBL" },
+        { key: "YD", label: "韵达", value: "YD" }
       ],
       editForm:{
         orderType:null,

src/views/store/storeOrder/healthStoreList.vue

@@ -12,11 +12,13 @@
         />
       </el-form-item>
 
-      <el-form-item label="订单来源" prop="appid">
+      <el-form-item label="订单来源" prop="appids">
         <el-select
-          v-model="queryParams.orderSource"
+          v-model="queryParams.orderSources"
           placeholder="请选择订单来源"
           clearable
+          multiple
+          collapse-tags
           size="small"
           style="width: 100%"
         >
@@ -559,6 +561,7 @@ export default {
       deliverySendTimeRange:[],
       // 查询参数
       queryParams: {
+        orderSources:[],
         pageNum: 1,
         pageSize: 10,
         orderCode: null,
@@ -799,40 +802,40 @@ export default {
     /** 查询订单列表 */
     getList() {
       this.loading = true;
-      if(this.queryParams.status=='00'){
-        this.queryParams.status=null;
-      }
 
-      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
-        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
-      }
-      else{
-        this.queryParams.createTimeRange=null;
-      }
+      // 从 queryParams 中提取基础参数，处理订单来源
+      const { orderSources, status, ...restParams } = this.queryParams;
 
-      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
-        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
-      }
-      else{
-        this.queryParams.payTimeRange=null;
-      }
-      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
-        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
-      }
-      else{
-        this.queryParams.deliveryImportTimeRange=null;
-      }
-      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
-        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
-      }
-      else{
-        this.queryParams.deliverySendTimeRange=null;
-      }
+      // 构建请求参数
+      const params = {
+        ...restParams,
+        // 处理订单来源
+        ...(orderSources && Array.isArray(orderSources) && orderSources.length > 0
+          ? { orderSource: orderSources.join(',') }
+          : {}),
+        // 处理状态
+        status: status === '00' ? null : status,
+        // 处理时间范围
+        createTimeRange: this.createTimeRange?.length === 2
+          ? `${this.createTimeRange[0]}--${this.createTimeRange[1]}`
+          : null,
+        payTimeRange: this.payTimeRange?.length === 2
+          ? `${this.payTimeRange[0]}--${this.payTimeRange[1]}`
+          : null,
+        deliveryImportTimeRange: this.deliveryImportTimeRange?.length === 2
+          ? `${this.deliveryImportTimeRange[0]}--${this.deliveryImportTimeRange[1]}`
+          : null,
+        deliverySendTimeRange: this.deliverySendTimeRange?.length === 2
+          ? `${this.deliverySendTimeRange[0]}--${this.deliverySendTimeRange[1]}`
+          : null,
+      };
 
-      listHealthStoreOrder(this.queryParams).then(response => {
+      listHealthStoreOrder(params).then(response => {
         this.storeOrderList = response.rows;
         this.total = response.total;
         this.loading = false;
+      }).catch(() => {
+        this.loading = false;
       });
     },
     // 取消按钮
@@ -856,6 +859,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.orderSources=[];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -906,82 +910,110 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      if(this.queryParams.status=='00'){
-        this.queryParams.status=null;
-      }
-      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
-        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
-      }
-      else{
-        this.queryParams.createTimeRange=null;
-      }
-      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
-        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
+      // 创建请求参数副本，避免污染原始数据
+      const params = { ...this.queryParams };
+
+      // 处理订单来源数组参数：将数组转换为逗号分隔的字符串
+      if (params.orderSources && Array.isArray(params.orderSources)) {
+        params.orderSource = params.orderSources.join(',');
+        delete params.orderSources; // 删除原参数，避免冲突
       }
-      else{
-        this.queryParams.payTimeRange=null;
+
+      // 处理状态参数
+      if (params.status == '00') {
+        params.status = null;
       }
-      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
-        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
+
+      // 处理时间范围参数
+      if (this.createTimeRange != null && this.createTimeRange.length == 2) {
+        params.createTimeRange = this.createTimeRange[0] + "--" + this.createTimeRange[1];
+      } else {
+        params.createTimeRange = null;
       }
-      else{
-        this.queryParams.deliveryImportTimeRange=null;
+
+      if (this.payTimeRange != null && this.payTimeRange.length == 2) {
+        params.payTimeRange = this.payTimeRange[0] + "--" + this.payTimeRange[1];
+      } else {
+        params.payTimeRange = null;
       }
-      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
-        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+
+      if (this.deliveryImportTimeRange != null && this.deliveryImportTimeRange.length == 2) {
+        params.deliveryImportTimeRange = this.deliveryImportTimeRange[0] + "--" + this.deliveryImportTimeRange[1];
+      } else {
+        params.deliveryImportTimeRange = null;
       }
-      else{
-        this.queryParams.deliverySendTimeRange=null;
+
+      if (this.deliverySendTimeRange != null && this.deliverySendTimeRange.length == 2) {
+        params.deliverySendTimeRange = this.deliverySendTimeRange[0] + "--" + this.deliverySendTimeRange[1];
+      } else {
+        params.deliverySendTimeRange = null;
       }
-      const queryParams = this.addDateRange(this.queryParams, this.dateRange);
+
+      // 使用 addDateRange 方法添加额外的日期范围
+      const queryParams = this.addDateRange(params, this.dateRange);
+
       this.$confirm('是否确认导出所有订单数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportHealthStoreOrder(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return exportHealthStoreOrder(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(() => {});
     },
     handleExportItems() {
-      if(this.queryParams.status=='00'){
-        this.queryParams.status=null;
-      }
-      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
-        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
-      }
-      else{
-        this.queryParams.createTimeRange=null;
-      }
-      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
-        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
+      // 创建请求参数副本，避免污染原始数据
+      const params = { ...this.queryParams };
+
+      // 处理订单来源数组参数：将数组转换为逗号分隔的字符串
+      if (params.orderSources && Array.isArray(params.orderSources)) {
+        params.orderSource = params.orderSources.join(',');
+        delete params.orderSources; // 删除原参数，避免冲突
       }
-      else{
-        this.queryParams.payTimeRange=null;
+
+      // 处理状态参数
+      if (params.status == '00') {
+        params.status = null;
       }
-      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
-        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
+
+      // 处理时间范围参数
+      if (this.createTimeRange != null && this.createTimeRange.length == 2) {
+        params.createTimeRange = this.createTimeRange[0] + "--" + this.createTimeRange[1];
+      } else {
+        params.createTimeRange = null;
       }
-      else{
-        this.queryParams.deliveryImportTimeRange=null;
+
+      if (this.payTimeRange != null && this.payTimeRange.length == 2) {
+        params.payTimeRange = this.payTimeRange[0] + "--" + this.payTimeRange[1];
+      } else {
+        params.payTimeRange = null;
       }
-      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
-        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+
+      if (this.deliveryImportTimeRange != null && this.deliveryImportTimeRange.length == 2) {
+        params.deliveryImportTimeRange = this.deliveryImportTimeRange[0] + "--" + this.deliveryImportTimeRange[1];
+      } else {
+        params.deliveryImportTimeRange = null;
       }
-      else{
-        this.queryParams.deliverySendTimeRange=null;
+
+      if (this.deliverySendTimeRange != null && this.deliverySendTimeRange.length == 2) {
+        params.deliverySendTimeRange = this.deliverySendTimeRange[0] + "--" + this.deliverySendTimeRange[1];
+      } else {
+        params.deliverySendTimeRange = null;
       }
-      const queryParams = this.addDateRange(this.queryParams, this.dateRange);
+
+      // 使用 addDateRange 方法添加额外的日期范围
+      const queryParams = this.addDateRange(params, this.dateRange);
+
       this.$confirm('是否确认导出所有订单明细数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportHealthStoreOrderItems(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return exportHealthStoreOrderItems(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(() => {});
     },
     handleImport() {
       this.upload.title = "导入银行回单";

src/views/store/storeOrder/index.vue

@@ -26,22 +26,24 @@
         />
       </el-form-item>
 
-        <el-form-item label="订单来源" prop="appid">
-          <el-select
-            v-model="queryParams.orderSource"
-            placeholder="请选择订单来源"
-            clearable
-            size="small"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="item in miniAppList"
-              :key="item.appId"
-              :label="item.appName"
-              :value="item.appId"
-            />
-          </el-select>
-        </el-form-item>
+      <el-form-item label="订单来源" prop="appids">
+        <el-select
+          v-model="queryParams.orderSources"
+          placeholder="请选择订单来源"
+          clearable
+          multiple
+          collapse-tags
+          size="small"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in miniAppList"
+            :key="item.appId"
+            :label="item.appName"
+            :value="item.appId"
+          />
+        </el-select>
+      </el-form-item>
 
        <el-form-item label="运单号" prop="deliveryId">
         <el-input
@@ -594,6 +596,7 @@ export default {
       orderItemNum:"",
       // 查询参数
       queryParams: {
+        orderSources:[],
         pageNum: 1,
         pageSize: 10,
         orderCode: null,
@@ -838,75 +841,100 @@ export default {
     /** 查询订单列表 */
     getList() {
       this.loading = true;
-      if(this.queryParams.status=='00'){
-        this.queryParams.status=null;
-      }
 
-      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
-        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
-      }
-      else{
-        this.queryParams.createTimeRange=null;
-      }
+      // 创建请求参数副本，避免污染原始数据
+      const params = { ...this.queryParams };
 
-      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
-        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
+      // 1. 处理数组参数：将数组转换为逗号分隔的字符串
+      if (params.orderSources && Array.isArray(params.orderSources)) {
+        params.orderSource = params.orderSources.join(',');
+        delete params.orderSources; // 删除原参数，避免冲突
       }
-      else{
-        this.queryParams.payTimeRange=null;
+
+      // 2. 处理状态参数
+      if (params.status === '00') {
+        params.status = null;
       }
-      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
-        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
+
+      // 3. 处理时间范围参数（根据你的实际变量名调整）
+      // 如果时间范围变量存储在 this.queryParams 中
+      if (params.createTimeRange && Array.isArray(params.createTimeRange) && params.createTimeRange.length === 2) {
+        params.createTimeRange = params.createTimeRange[0] + "--" + params.createTimeRange[1];
+      } else {
+        params.createTimeRange = null;
       }
-      else{
-        this.queryParams.deliveryImportTimeRange=null;
+
+      if (params.payTimeRange && Array.isArray(params.payTimeRange) && params.payTimeRange.length === 2) {
+        params.payTimeRange = params.payTimeRange[0] + "--" + params.payTimeRange[1];
+      } else {
+        params.payTimeRange = null;
       }
-      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
-        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+
+      if (params.deliveryImportTimeRange && Array.isArray(params.deliveryImportTimeRange) && params.deliveryImportTimeRange.length === 2) {
+        params.deliveryImportTimeRange = params.deliveryImportTimeRange[0] + "--" + params.deliveryImportTimeRange[1];
+      } else {
+        params.deliveryImportTimeRange = null;
       }
-      else{
-        this.queryParams.deliverySendTimeRange=null;
+
+      if (params.deliverySendTimeRange && Array.isArray(params.deliverySendTimeRange) && params.deliverySendTimeRange.length === 2) {
+        params.deliverySendTimeRange = params.deliverySendTimeRange[0] + "--" + params.deliverySendTimeRange[1];
+      } else {
+        params.deliverySendTimeRange = null;
       }
 
-      listStoreOrder(this.queryParams).then(response => {
+      // 4. 发送请求
+      listStoreOrder(params).then(response => {
         this.storeOrderList = response.rows;
         this.total = response.total;
         this.loading = false;
+      }).catch(() => {
+        this.loading = false;
       });
     },
     getItemsNum() {
       this.loading = true;
-      if(this.queryParams.status=='00'){
-        this.queryParams.status=null;
-      }
 
-      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
-        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
-      }
-      else{
-        this.queryParams.createTimeRange=null;
-      }
+      // 创建请求参数副本，避免污染原始数据
+      const params = { ...this.queryParams };
 
-      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
-        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
+      // 处理订单来源数组参数：将数组转换为逗号分隔的字符串
+      if (params.orderSources && Array.isArray(params.orderSources)) {
+        params.orderSource = params.orderSources.join(',');
+        delete params.orderSources; // 删除原参数，避免冲突
       }
-      else{
-        this.queryParams.payTimeRange=null;
+
+      // 处理状态参数
+      if (params.status == '00') {
+        params.status = null;
       }
-      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
-        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
+
+      // 处理时间范围参数（这里使用的是独立的时间范围变量）
+      if (this.createTimeRange != null && this.createTimeRange.length == 2) {
+        params.createTimeRange = this.createTimeRange[0] + "--" + this.createTimeRange[1];
+      } else {
+        params.createTimeRange = null;
       }
-      else{
-        this.queryParams.deliveryImportTimeRange=null;
+
+      if (this.payTimeRange != null && this.payTimeRange.length == 2) {
+        params.payTimeRange = this.payTimeRange[0] + "--" + this.payTimeRange[1];
+      } else {
+        params.payTimeRange = null;
       }
-      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
-        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+
+      if (this.deliveryImportTimeRange != null && this.deliveryImportTimeRange.length == 2) {
+        params.deliveryImportTimeRange = this.deliveryImportTimeRange[0] + "--" + this.deliveryImportTimeRange[1];
+      } else {
+        params.deliveryImportTimeRange = null;
       }
-      else{
-        this.queryParams.deliverySendTimeRange=null;
+
+      if (this.deliverySendTimeRange != null && this.deliverySendTimeRange.length == 2) {
+        params.deliverySendTimeRange = this.deliverySendTimeRange[0] + "--" + this.deliverySendTimeRange[1];
+      } else {
+        params.deliverySendTimeRange = null;
       }
 
-      getOrderItemsNum(this.queryParams).then(response => {
+      // 使用处理后的 params 发送请求
+      getOrderItemsNum(params).then(response => {
         this.orderItemNum = response.orderItemsNum;
         this.loading = false;
       });
@@ -933,6 +961,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.orderSources=[];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -983,82 +1012,110 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      if(this.queryParams.status=='00'){
-        this.queryParams.status=null;
-      }
-      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
-        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
-      }
-      else{
-        this.queryParams.createTimeRange=null;
-      }
-      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
-        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
+      // 创建请求参数副本，避免污染原始数据
+      const params = { ...this.queryParams };
+
+      // 处理订单来源数组参数：将数组转换为逗号分隔的字符串
+      if (params.orderSources && Array.isArray(params.orderSources)) {
+        params.orderSource = params.orderSources.join(',');
+        delete params.orderSources; // 删除原参数，避免冲突
       }
-      else{
-        this.queryParams.payTimeRange=null;
+
+      // 处理状态参数
+      if (params.status == '00') {
+        params.status = null;
       }
-      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
-        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
+
+      // 处理时间范围参数
+      if (this.createTimeRange != null && this.createTimeRange.length == 2) {
+        params.createTimeRange = this.createTimeRange[0] + "--" + this.createTimeRange[1];
+      } else {
+        params.createTimeRange = null;
       }
-      else{
-        this.queryParams.deliveryImportTimeRange=null;
+
+      if (this.payTimeRange != null && this.payTimeRange.length == 2) {
+        params.payTimeRange = this.payTimeRange[0] + "--" + this.payTimeRange[1];
+      } else {
+        params.payTimeRange = null;
       }
-      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
-        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+
+      if (this.deliveryImportTimeRange != null && this.deliveryImportTimeRange.length == 2) {
+        params.deliveryImportTimeRange = this.deliveryImportTimeRange[0] + "--" + this.deliveryImportTimeRange[1];
+      } else {
+        params.deliveryImportTimeRange = null;
       }
-      else{
-        this.queryParams.deliverySendTimeRange=null;
+
+      if (this.deliverySendTimeRange != null && this.deliverySendTimeRange.length == 2) {
+        params.deliverySendTimeRange = this.deliverySendTimeRange[0] + "--" + this.deliverySendTimeRange[1];
+      } else {
+        params.deliverySendTimeRange = null;
       }
-      const queryParams = this.addDateRange(this.queryParams, this.dateRange);
+
+      // 使用 addDateRange 方法添加额外的日期范围
+      const queryParams = this.addDateRange(params, this.dateRange);
+
       this.$confirm('是否确认导出所有订单数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportStoreOrder(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return exportStoreOrder(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(() => {});
     },
     handleExportItems() {
-      if(this.queryParams.status=='00'){
-        this.queryParams.status=null;
-      }
-      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
-        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
-      }
-      else{
-        this.queryParams.createTimeRange=null;
-      }
-      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
-        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
+      // 创建请求参数副本，避免污染原始数据
+      const params = { ...this.queryParams };
+
+      // 处理订单来源数组参数：将数组转换为逗号分隔的字符串
+      if (params.orderSources && Array.isArray(params.orderSources)) {
+        params.orderSource = params.orderSources.join(',');
+        delete params.orderSources; // 删除原参数，避免冲突
       }
-      else{
-        this.queryParams.payTimeRange=null;
+
+      // 处理状态参数
+      if (params.status == '00') {
+        params.status = null;
       }
-      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
-        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
+
+      // 处理时间范围参数
+      if (this.createTimeRange != null && this.createTimeRange.length == 2) {
+        params.createTimeRange = this.createTimeRange[0] + "--" + this.createTimeRange[1];
+      } else {
+        params.createTimeRange = null;
       }
-      else{
-        this.queryParams.deliveryImportTimeRange=null;
+
+      if (this.payTimeRange != null && this.payTimeRange.length == 2) {
+        params.payTimeRange = this.payTimeRange[0] + "--" + this.payTimeRange[1];
+      } else {
+        params.payTimeRange = null;
       }
-      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
-        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+
+      if (this.deliveryImportTimeRange != null && this.deliveryImportTimeRange.length == 2) {
+        params.deliveryImportTimeRange = this.deliveryImportTimeRange[0] + "--" + this.deliveryImportTimeRange[1];
+      } else {
+        params.deliveryImportTimeRange = null;
       }
-      else{
-        this.queryParams.deliverySendTimeRange=null;
+
+      if (this.deliverySendTimeRange != null && this.deliverySendTimeRange.length == 2) {
+        params.deliverySendTimeRange = this.deliverySendTimeRange[0] + "--" + this.deliverySendTimeRange[1];
+      } else {
+        params.deliverySendTimeRange = null;
       }
-      const queryParams = this.addDateRange(this.queryParams, this.dateRange);
+
+      // 使用 addDateRange 方法添加额外的日期范围
+      const queryParams = this.addDateRange(params, this.dateRange);
+
       this.$confirm('是否确认导出所有订单明细数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportStoreOrderItems(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return exportStoreOrderItems(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      }).catch(() => {});
     },
     handleImport() {
       this.upload.title = "导入银行回单";