Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java

@@ -5,6 +5,7 @@ import java.math.RoundingMode;
 import java.util.List;
 
 import com.stdiet.custom.domain.SysCommissionDayDetail;
+import com.stdiet.custom.dto.request.SysOrderCommision;
 import com.stdiet.custom.service.ISysCommissionDayService;
 import com.stdiet.framework.web.domain.server.Sys;
 import com.stdiet.system.domain.CusSalesman;

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java

@@ -1,5 +1,6 @@
 package com.stdiet.web.controller.custom;
 
+import com.alibaba.fastjson.JSONArray;
 import com.stdiet.common.annotation.Log;
 import com.stdiet.common.core.domain.AjaxResult;
 import com.stdiet.common.core.domain.entity.SysUser;
@@ -19,6 +20,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.net.URLDecoder;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 
@@ -47,6 +49,7 @@ public class SysOrderController extends OrderBaseController {
     @GetMapping("/list")
     public OrderTableDataInfo list(SysOrder sysOrder) {
         startPage();
+        dealOrderType(sysOrder);
         List<SysOrder> list = sysOrderService.selectSysOrderList(sysOrder);
         List<SysUser> userList = userService.selectAllUser();
         BigDecimal totalAmount = sysOrderService.selectAllOrderAmount(sysOrder);
@@ -68,6 +71,20 @@ public class SysOrderController extends OrderBaseController {
         return getOrderDataTable(list, totalAmount);
     }
 
+    /**
+     * 处理订单类型
+     * @param sysOrder
+     */
+    private void dealOrderType(SysOrder sysOrder) {
+        if(StringUtils.isNotEmpty(sysOrder.getOrderType())){
+            try {
+                JSONArray array = JSONArray.parseArray(URLDecoder.decode(sysOrder.getOrderType(),"UTF-8"));
+                sysOrder.setSearchOrderTypeArray(array.size() > 0 ? array : null);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+    }
 
     /**
      * 导出销售订单列表

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java

@@ -1,5 +1,6 @@
 package com.stdiet.custom.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.stdiet.common.annotation.Excel;
@@ -13,6 +14,7 @@ import java.math.BigDecimal;
  * @author wonder
  * @date 2020-09-24
  */
+@Data
 public class SysCommision extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -58,86 +60,6 @@ public class SysCommision extends BaseEntity {
     @Excel(name = "提成", scale = 2)
     private BigDecimal commision;
 
-    public BigDecimal getCommision() {
+    //订单审核状态
-        return commision;
+    private String reviewStatus;
-    }
-
-    public void setCommision(BigDecimal commision) {
-        this.commision = commision;
-    }
-
-    public Long getPostId() {
-        return postId;
-    }
-
-    public void setPostId(Long postId) {
-        this.postId = postId;
-    }
-
-    public void setPostName(String postName) {
-        this.postName = postName;
-    }
-
-    public String getPostName() {
-        return postName;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setRate(Float rate) {
-        this.rate = rate;
-    }
-
-    public Float getRate() {
-        return rate;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("ruleId", getRuleId())
-                .append("userId", getUserId())
-                .append("userName", getUserName())
-                .append("postId", getPostId())
-                .append("postName", getPostName())
-                .append("amount", getAmount())
-                .append("commision", getCommision())
-                .append("rate", getRate())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.stdiet.common.annotation.Excel;
@@ -269,6 +270,9 @@ public class SysOrder extends BaseEntity {
     //拆分比例，如：1,9就是按照比例10%、90%拆分，非持久化字段
     private String nutritionistRate;
 
+    //订单查询时的订单类型二维数组
+    private JSONArray searchOrderTypeArray;
+
 
 
 }

stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java

@@ -0,0 +1,25 @@
+package com.stdiet.custom.dto.request;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class SysOrderCommision implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    //后台用户ID
+    private Long userId;
+
+    //岗位ID
+    private Long postId;
+
+    //订单审核状态
+    private String reviewStatus;
+
+    //订单截止结束时间
+    private String endTime;
+
+}

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java

@@ -2,6 +2,7 @@ package com.stdiet.custom.mapper;
 
 import java.util.List;
 import com.stdiet.custom.domain.SysCommision;
+import com.stdiet.custom.dto.request.SysOrderCommision;
 
 /**
  * 业务提成比例Mapper接口
@@ -61,5 +62,10 @@ public interface SysCommisionMapper
 
     public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision);
 
-    List<SysCommision> selectSysCommisionDayDetail(SysCommision sysCommision);
+    /**
+     * 查询售后、营养师用户信息
+     * @param sysCommision
+     * @return
+     */
+    List<SysCommision> getAfterSaleAndNutri(SysCommision sysCommision);
 }

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java

@@ -6,6 +6,7 @@ import java.util.List;
 import com.stdiet.custom.domain.SysCommision;
 import com.stdiet.custom.domain.SysCommissionDayDetail;
 import com.stdiet.custom.domain.SysOrder;
+import com.stdiet.custom.dto.request.SysOrderCommision;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -72,7 +73,7 @@ public interface SysOrderMapper
     public BigDecimal selectAllOrderAmount(SysOrder sysOrder);
 
     /**
-     * 获取订单信息
+     * 获取订单信息（按天提成计算）
      * @return
      */
     List<SysOrder> selectSimpleOrderMessage(SysCommision sysCommision);

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java

@@ -62,6 +62,4 @@ public interface ISysCommisionService
     public int deleteSysCommisionById(Long ruleId);
 
     public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision);
-
-    List<SysCommision> selectSysCommisionDayDetail(SysCommision sysCommision);
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java

@@ -4,6 +4,7 @@ import com.stdiet.custom.domain.SysCommision;
 import com.stdiet.custom.domain.SysCommissionDayDetail;
 import com.stdiet.custom.domain.SysOrder;
 import com.stdiet.custom.domain.SysOrderCommisionDayDetail;
+import com.stdiet.custom.dto.request.SysOrderCommision;
 
 import java.time.LocalDate;
 import java.util.Date;

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java

@@ -98,9 +98,4 @@ public class SysCommisionServiceImpl implements ISysCommisionService
     public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision) {
         return sysCommisionMapper.selectSysCommisionDetail(sysCommision);
     }
-
-    @Override
-    public List<SysCommision> selectSysCommisionDayDetail(SysCommision sysCommision){
-        return sysCommisionMapper.selectSysCommisionDayDetail(sysCommision);
-    }
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java

@@ -3,6 +3,7 @@ package com.stdiet.custom.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.stdiet.common.utils.DateUtils;
 import com.stdiet.custom.domain.*;
+import com.stdiet.custom.dto.request.SysOrderCommision;
 import com.stdiet.custom.mapper.SysCommisionMapper;
 import com.stdiet.custom.mapper.SysOrderMapper;
 import com.stdiet.custom.mapper.SysOrderPauseMapper;
@@ -32,7 +33,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
     public List<SysCommissionDayDetail> calculateCommissionByDay(SysCommision sysCommision){
         List<SysCommissionDayDetail> result = new ArrayList<>();
         //查询用户
-        List<SysCommision> list = sysCommisionMapper.selectSysCommisionDayDetail(sysCommision);
+        List<SysCommision> list = sysCommisionMapper.getAfterSaleAndNutri(sysCommision);
         //合计
         SysCommissionDayDetail total = new SysCommissionDayDetail();
         total.setTotalCommissionAmount(new BigDecimal(0));

stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java

@@ -10,6 +10,8 @@ public class OrderUtils {
 
     private static final String[] orderMoneyTypeArray = {"全款单","定金单","尾款单"};
 
+    private static final String[] orderMainTypeArray = {"主单","副单"};
+
     /**
      * 根据订单对象获取订单类型名称
      * @param sysOrder
@@ -18,8 +20,16 @@ public class OrderUtils {
     public static final String getOrderTypeName(SysOrder sysOrder){
         String orderTypeName = "";
         orderTypeName += orderTypeArray[Integer.parseInt(sysOrder.getOrderType())];
+        //比例拆分单需要确认出主单副单
+        /*if("1".equals(sysOrder.getOrderType())){
+            orderTypeName += "("+(sysOrder.getMainOrderId().intValue() == 0 ? orderMainTypeArray[0] : orderMainTypeArray[1])+")";
+        }*/
         orderTypeName += "/"+orderCountTypeArray[Integer.parseInt(sysOrder.getOrderCountType())];
         orderTypeName += "/"+orderMoneyTypeArray[Integer.parseInt(sysOrder.getOrderMoneyType())];
+        //判断是不是二开提成单
+        if("1".equals(sysOrder.getOrderCountType()) && sysOrder.getAfterSaleCommissOrder().intValue() == 1){
+            orderTypeName += "/提成单";
+        }
         return orderTypeName;
     }
 

stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml

@@ -32,7 +32,9 @@
         SELECT ${column} AS user_id, ${postId} AS post_id, SUM(amount) AS amount
         FROM sys_order
         WHERE ${column} IS NOT NULL AND ${column} <> 0 AND del_flag = 0
-        AND review_status = 'yes'
+        <if test="reviewStatus != null and reviewStatus != ''">
+            AND review_status = #{reviewStatus}
+        </if>
         <if test="beginTime != null and beginTime != ''">AND date_format(order_time,'%y%m%d') &gt;=
             date_format(${beginTime},'%y%m%d')
         </if>
@@ -47,6 +49,7 @@
         JOIN (
         <include refid="groupAmountVo">
             <property name="column" value="pre_sale_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="5"/>
@@ -54,6 +57,7 @@
         UNION
         <include refid="groupAmountVo">
             <property name="column" value="after_sale_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="6"/>
@@ -61,6 +65,7 @@
         UNION
         <include refid="groupAmountVo">
             <property name="column" value="nutritionist_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="9"/>
@@ -68,6 +73,7 @@
         UNION
         <include refid="groupAmountVo">
             <property name="column" value="nutri_assis_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="10"/>
@@ -75,6 +81,7 @@
         UNION
         <include refid="groupAmountVo">
             <property name="column" value="operator_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="11"/>
@@ -82,6 +89,7 @@
         UNION
         <include refid="groupAmountVo">
             <property name="column" value="operator_assis_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="13"/>
@@ -89,6 +97,7 @@
         UNION
         <include refid="groupAmountVo">
             <property name="column" value="planner_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="7"/>
@@ -96,6 +105,7 @@
         UNION
         <include refid="groupAmountVo">
             <property name="column" value="planner_assis_id"/>
+            <property name="reviewStatus" value="#{reviewStatus}"/>
             <property name="beginTime" value="#{beginTime}"/>
             <property name="endTime" value="#{endTime}"/>
             <property name="postId" value="8"/>
@@ -188,7 +198,8 @@
         </foreach>
     </delete>
 
-    <select id="selectSysCommisionDayDetail" parameterType="SysCommision" resultMap="SysCommisionResult">
+    <!-- 查询售后和营养师 -->
+    <select id="getAfterSaleAndNutri" parameterType="SysCommision" resultMap="SysCommisionResult">
         SELECT su.user_id,su.nick_name as user_name,sp.post_id, sp.post_code,sp.post_name FROM sys_user su
         LEFT JOIN sys_user_post sup ON sup.user_id = su.user_id
         LEFT JOIN sys_post sp ON sp.post_id = sup.post_id

stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml

@@ -103,6 +103,8 @@
                 </if>
             </if>
             <if test="true">and del_flag = 0</if>
+            <!-- 计算总额时需要除去二开售后提成单 -->
+            AND after_sale_commiss_order = 0
         </where>
     </select>
 
@@ -139,6 +141,26 @@
                     and 0 > amount
                 </if>
             </if>
+            <if test="searchOrderTypeArray != null">
+                <trim prefix="AND (" suffix=")" suffixOverrides="or">
+                <foreach collection="searchOrderTypeArray"  separator="or" item="typeArray" index="i">
+                    (
+                    <foreach collection="typeArray" separator="and" item="type" index="j">
+                        <if test="j == 0">
+                            order_type = #{type}
+                        </if>
+                        <if test="j == 1">
+                            order_count_type = #{type}
+                        </if>
+                        <if test="j == 2">
+                            order_money_type = #{type}
+                        </if>
+                    </foreach>
+                    )
+                    <!--(order_type = #{typeArray[0]} and order_count_type = #{typeArray[1]} and order_money_type =#{typeArray[2]})-->
+                </foreach>
+                </trim>
+            </if>
             <if test="true">and o.del_flag = 0</if>
         </where>
         order by order_time desc
@@ -365,7 +387,10 @@
       from sys_order o
       left join sys_user su_sale on su_sale.user_id = o.after_sale_id and su_sale.del_flag = 0
       left join sys_user su_nutritionist on su_nutritionist.user_id = o.nutritionist_id and su_nutritionist.del_flag = 0
-      where review_status = 'yes' and o.order_time >= '2021-01-01' and o.del_flag = 0
+      where o.order_time >= '2021-01-01' and o.del_flag = 0
+        <if test="reviewStatus != null and reviewStatus != ''">
+            and review_status = #{reviewStatus}
+        </if>
       <if test="userId != null">
           and (su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId})
       </if>

stdiet-ui/src/components/OrderAdd/index.vue

@@ -37,7 +37,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="成交金额" prop="amount">
-            <el-input v-model="form.amount" placeholder="请输入金额" />
+            <el-input v-model.trim="form.amount" placeholder="请输入金额" />
           </el-form-item>
         </el-col>
         <el-col :span="8">

stdiet-ui/src/components/OrderEdit/index.vue

@@ -16,7 +16,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="成交金额" prop="amount">
-            <el-input v-model="form.amount" placeholder="请输入金额" />
+            <el-input v-model.trim="form.amount" placeholder="请输入金额" />
           </el-form-item>
         </el-col>
         <el-col :span="8">

stdiet-ui/src/utils/orderType.js

@@ -25,7 +25,7 @@ export const orderCountTypeArray = [
   }
 ]
 
-//订单类型
+//订单类型（订单新增）
 export const orderTypeArray = [
   {
     value: 0,

stdiet-ui/src/views/custom/commision/detail/index.vue

@@ -48,6 +48,21 @@
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="订单状态" prop="reviewStatus">
+        <el-select
+          v-model="queryParams.reviewStatus"
+          placeholder="请选择审核状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in reviewStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="cyan"
@@ -155,6 +170,8 @@ export default {
       totalUserIdOptions: [],
       //
       searchUserIdOptions: [],
+      // 审核状态
+      reviewStatusOptions: [],
       //
       options: {},
       // 查询参数
@@ -163,6 +180,7 @@ export default {
         pageSize: 10,
         userId: null,
         postId: null,
+        reviewStatus: "yes"
       },
     };
   },
@@ -202,6 +220,9 @@ export default {
       );
       this.searchUserIdOptions = this.totalUserIdOptions.slice();
     });
+    this.getDicts("cus_review_status").then((response) => {
+      this.reviewStatusOptions = response.data;
+    });
   },
   methods: {
     /** 查询业务提成比例列表 */

stdiet-ui/src/views/custom/commision/detail_day/index.vue

@@ -48,6 +48,21 @@
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="订单状态" prop="reviewStatus">
+        <el-select
+          v-model="queryParams.reviewStatus"
+          placeholder="请选择审核状态"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in reviewStatusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="cyan"
@@ -242,6 +257,8 @@ export default {
       //
       searchUserIdOptions: [],
       //
+      // 审核状态
+      reviewStatusOptions: [],
       options: {},
       // 查询参数
       queryParams: {
@@ -249,6 +266,7 @@ export default {
         pageSize: 20,
         userId: null,
         postId: null,
+        reviewStatus: "yes",
       },
       sendCommissionPlanTable: false,
       sendCommissionPlan: {},
@@ -291,6 +309,9 @@ export default {
       );
       this.searchUserIdOptions = this.totalUserIdOptions.slice();
     });
+    this.getDicts("cus_review_status").then((response) => {
+      this.reviewStatusOptions = response.data;
+    });
   },
   methods: {
     /** 查询业务提成比例列表 */

stdiet-ui/src/views/custom/customer/index.vue

@@ -9,7 +9,7 @@
     >
       <el-form-item label="名字" prop="name">
         <el-input
-          v-model="queryParams.name"
+          v-model.trim="queryParams.name"
           placeholder="请输入名字"
           clearable
           size="small"
@@ -18,7 +18,7 @@
       </el-form-item>
       <el-form-item label="手机号" prop="phone">
         <el-input
-          v-model="queryParams.phone"
+          v-model.trim="queryParams.phone"
           placeholder="请输入手机号"
           clearable
           size="small"
@@ -260,12 +260,12 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="100px">
           <el-col :span="12">
             <el-form-item label="客户名字" prop="name">
-              <el-input v-model="form.name" placeholder="请输入名字" />
+              <el-input v-model.trim="form.name" placeholder="请输入名字" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="手机号" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入手机号" />
+              <el-input v-model.trim="form.phone" placeholder="请输入手机号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

stdiet-ui/src/views/custom/order/index.vue

@@ -11,7 +11,7 @@
         <el-col :span="6">
           <el-form-item label="客户信息" prop="customer">
             <el-input
-              v-model="queryParams.customer"
+              v-model.trim="queryParams.customer"
               placeholder="请输入客户姓名或手机号"
               clearable
               size="small"
@@ -248,6 +248,19 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="订单类型" prop="searchOrderTypeArray" >
+            <el-cascader
+              placeholder="请选择订单类型"
+              v-model="searchOrderTypeArray"
+              :options="orderTypeOptions"
+              :props="orderTypeProps"
+              collapse-tags
+              clearable
+              style="width: 300px"
+              ></el-cascader>
+          </el-form-item><!--   -->
+        </el-col>
         <el-col :span="12">
           <el-form-item label="成交日期" prop="orderTime">
             <el-date-picker
@@ -428,7 +441,7 @@
       @pagination="getList"
     >
       <span style="margin-right: 12px"
-        >总计：{{ toThousands(this.totalAmount) }} 元</span
+        >总计收款（已除去二开售后提成金额）：{{ toThousands(this.totalAmount) }} 元</span
       >
     </pagination>
 
@@ -459,7 +472,7 @@
 import { delOrder, exportOrder, listOrder } from "@/api/custom/order";
 import dayjs from "dayjs";
 import orderPause from "./orderPause";
-
+import * as orderTypeData from "@/utils/orderType";
 import OrderDetail from "@/components/OrderDetail";
 import OrderEdit from "@/components/OrderEdit";
 import AutoHideMessage from "@/components/AutoHideMessage";
@@ -510,6 +523,9 @@ export default {
       conditioningProjectIdOption: [],
       // 审核状态
       reviewStatusOptions: [],
+      //订单类型
+      orderTypeOptions: orderTypeData["orderTypeArray"],
+      orderTypeProps: { multiple: true,expandTrigger: 'click' },//,checkStrictly:true
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -531,6 +547,8 @@ export default {
         reviewStatus: null,
         serveTimeId: null,
       },
+      //查询时选择的订单类型数组
+      searchOrderTypeArray: null
     };
   },
   computed: {
@@ -578,6 +596,9 @@ export default {
     /** 查询销售订单列表 */
     getList() {
       this.loading = true;
+      this.queryParams.orderType = this.searchOrderTypeArray != null ? encodeURIComponent(JSON.stringify(this.searchOrderTypeArray)) : null;
+      console.log(this.queryParams.searchOrderTypeArray);
+      //this.dealOrderTypeArray();
       listOrder(this.addDateRange(this.queryParams, this.daterange)).then(
         (response) => {
           this.orderList = response.rows;
@@ -586,7 +607,27 @@ export default {
           this.totalAmount = response.totalAmount;
         }
       );
-    }, // 收款方式字典翻译
+    },
+    /*dealOrderTypeArray(){
+      this.queryParams.orderType = "";
+      this.queryParams.orderCountType = "";
+      this.queryParams.orderMoneyType = "";
+      if(this.searchOrderTypeArray == null){
+        return;
+      }
+      this.searchOrderTypeArray.forEach((item,index) => {
+          if(this.queryParams.orderType.indexOf(item[0]+"") == -1){
+              this.queryParams.orderType += this.queryParams.orderType != "" ? (","+item[0]) : item[0];
+          }
+          if(this.queryParams.orderCountType.indexOf(item[1]+"") == -1){
+            this.queryParams.orderCountType += this.queryParams.orderCountType != "" ? (","+item[1]) : item[1];
+          }
+          if(this.queryParams.orderMoneyType.indexOf(item[2]+"") == -1){
+            this.queryParams.orderMoneyType += this.queryParams.orderMoneyType != "" ? (","+item[2]) : item[2];
+          }
+      });
+    },*/
+    // 收款方式字典翻译
     payTypeIdFormat(row, column) {
       return this.selectDictLabel(this.payTypeIdOptions, row.payTypeId);
     },
@@ -711,7 +752,7 @@ export default {
         return "warning-row";
       }
       return "success-row";
-    },
+    }
   },
   watch: {},
 };