From f92e07f1edf6fe600183364f1c7e6bb0c71db323 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Mon, 1 Mar 2021 19:00:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96=E3=80=81?= =?UTF-8?q?=E6=8F=90=E6=88=90=E5=88=86=E4=B8=BA=E5=AE=A1=E6=A0=B8=E3=80=81?= =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysCommisionController.java | 1 + .../controller/custom/SysOrderController.java | 17 ++++ .../stdiet/custom/domain/SysCommision.java | 86 +------------------ .../com/stdiet/custom/domain/SysOrder.java | 4 + .../custom/dto/request/SysOrderCommision.java | 25 ++++++ .../custom/mapper/SysCommisionMapper.java | 8 +- .../stdiet/custom/mapper/SysOrderMapper.java | 3 +- .../custom/service/ISysCommisionService.java | 2 - .../service/ISysCommissionDayService.java | 1 + .../service/impl/SysCommisionServiceImpl.java | 5 -- .../impl/SysCommissionDayServiceImpl.java | 3 +- .../com/stdiet/custom/utils/OrderUtils.java | 10 +++ .../mapper/custom/SysCommisionMapper.xml | 15 +++- .../mapper/custom/SysOrderMapper.xml | 27 +++++- stdiet-ui/src/components/OrderAdd/index.vue | 2 +- stdiet-ui/src/components/OrderEdit/index.vue | 2 +- stdiet-ui/src/utils/orderType.js | 2 +- .../views/custom/commision/detail/index.vue | 21 +++++ .../custom/commision/detail_day/index.vue | 21 +++++ stdiet-ui/src/views/custom/customer/index.vue | 8 +- stdiet-ui/src/views/custom/order/index.vue | 51 +++++++++-- 21 files changed, 207 insertions(+), 107 deletions(-) create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java index defba24c1..c7fd11182 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java +++ b/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; diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java index de7b68781..8bf63065d 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java +++ b/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 list = sysOrderService.selectSysOrderList(sysOrder); List 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(); + } + } + } /** * 导出销售订单列表 diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java index 3fa6a8c45..a1fe6f18a 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java +++ b/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; - } - - 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(); - } + //订单审核状态 + private String reviewStatus; } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java index 797c799d0..07534dbd4 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java +++ b/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; + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/SysOrderCommision.java new file mode 100644 index 000000000..c29ad458c --- /dev/null +++ b/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; + +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java index cca1dbfc3..d2b211970 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java +++ b/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 selectSysCommisionDetail(SysCommision sysCommision); - List selectSysCommisionDayDetail(SysCommision sysCommision); + /** + * 查询售后、营养师用户信息 + * @param sysCommision + * @return + */ + List getAfterSaleAndNutri(SysCommision sysCommision); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java index 3782af713..e23a0259e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderMapper.java +++ b/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 selectSimpleOrderMessage(SysCommision sysCommision); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java index e39a7ae56..2a121d1bb 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java +++ b/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 selectSysCommisionDetail(SysCommision sysCommision); - - List selectSysCommisionDayDetail(SysCommision sysCommision); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java index e5b48559b..cb92b0c40 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java +++ b/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; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java index b043f756e..8cfa7824e 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java @@ -98,9 +98,4 @@ public class SysCommisionServiceImpl implements ISysCommisionService public List selectSysCommisionDetail(SysCommision sysCommision) { return sysCommisionMapper.selectSysCommisionDetail(sysCommision); } - - @Override - public List selectSysCommisionDayDetail(SysCommision sysCommision){ - return sysCommisionMapper.selectSysCommisionDayDetail(sysCommision); - } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java index 471ba092f..95cc237a1 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java +++ b/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 calculateCommissionByDay(SysCommision sysCommision){ List result = new ArrayList<>(); //查询用户 - List list = sysCommisionMapper.selectSysCommisionDayDetail(sysCommision); + List list = sysCommisionMapper.getAfterSaleAndNutri(sysCommision); //合计 SysCommissionDayDetail total = new SysCommissionDayDetail(); total.setTotalCommissionAmount(new BigDecimal(0)); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java b/stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java index d536639ce..fe82b06f3 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/utils/OrderUtils.java +++ b/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; } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml index 7ba3957bd..b4b9eebe8 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml +++ b/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' + + AND review_status = #{reviewStatus} + AND date_format(order_time,'%y%m%d') >= date_format(${beginTime},'%y%m%d') @@ -47,6 +49,7 @@ JOIN ( + @@ -54,6 +57,7 @@ UNION + @@ -61,6 +65,7 @@ UNION + @@ -68,6 +73,7 @@ UNION + @@ -75,6 +81,7 @@ UNION + @@ -82,6 +89,7 @@ UNION + @@ -89,6 +97,7 @@ UNION + @@ -96,6 +105,7 @@ UNION + @@ -188,7 +198,8 @@ - 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 diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 04006ff8a..e2c08582a 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -103,6 +103,8 @@ and del_flag = 0 + + AND after_sale_commiss_order = 0 @@ -139,6 +141,26 @@ and 0 > amount + + + + ( + + + order_type = #{type} + + + order_count_type = #{type} + + + order_money_type = #{type} + + + ) + + + + and o.del_flag = 0 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 + + and review_status = #{reviewStatus} + and (su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId}) diff --git a/stdiet-ui/src/components/OrderAdd/index.vue b/stdiet-ui/src/components/OrderAdd/index.vue index 6e2c4e562..5c1faa71e 100644 --- a/stdiet-ui/src/components/OrderAdd/index.vue +++ b/stdiet-ui/src/components/OrderAdd/index.vue @@ -37,7 +37,7 @@ - + diff --git a/stdiet-ui/src/components/OrderEdit/index.vue b/stdiet-ui/src/components/OrderEdit/index.vue index f4e34b65f..72849f5f8 100644 --- a/stdiet-ui/src/components/OrderEdit/index.vue +++ b/stdiet-ui/src/components/OrderEdit/index.vue @@ -16,7 +16,7 @@ - + diff --git a/stdiet-ui/src/utils/orderType.js b/stdiet-ui/src/utils/orderType.js index 0265c859f..9f40a0fb7 100644 --- a/stdiet-ui/src/utils/orderType.js +++ b/stdiet-ui/src/utils/orderType.js @@ -25,7 +25,7 @@ export const orderCountTypeArray = [ } ] -//订单类型 +//订单类型（订单新增） export const orderTypeArray = [ { value: 0, diff --git a/stdiet-ui/src/views/custom/commision/detail/index.vue b/stdiet-ui/src/views/custom/commision/detail/index.vue index 30d219235..3c9e56b93 100644 --- a/stdiet-ui/src/views/custom/commision/detail/index.vue +++ b/stdiet-ui/src/views/custom/commision/detail/index.vue @@ -48,6 +48,21 @@ > + + + + + { + this.reviewStatusOptions = response.data; + }); }, methods: { /** 查询业务提成比例列表 */ diff --git a/stdiet-ui/src/views/custom/commision/detail_day/index.vue b/stdiet-ui/src/views/custom/commision/detail_day/index.vue index a4dd3ae47..af3232316 100644 --- a/stdiet-ui/src/views/custom/commision/detail_day/index.vue +++ b/stdiet-ui/src/views/custom/commision/detail_day/index.vue @@ -48,6 +48,21 @@ > + + + + + { + this.reviewStatusOptions = response.data; + }); }, methods: { /** 查询业务提成比例列表 */ diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue index 9d05de70d..5fb52682d 100644 --- a/stdiet-ui/src/views/custom/customer/index.vue +++ b/stdiet-ui/src/views/custom/customer/index.vue @@ -9,7 +9,7 @@ > - + - + diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue index 997aeaecc..757d69d80 100644 --- a/stdiet-ui/src/views/custom/order/index.vue +++ b/stdiet-ui/src/views/custom/order/index.vue @@ -11,7 +11,7 @@ + + + + + 总计：{{ toThousands(this.totalAmount) }} 元总计收款（已除去二开售后提成金额）：{{ toThousands(this.totalAmount) }} 元 @@ -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: {}, };