From 1739422c2ab97afea38b08d4bd5468093e264ca2 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 21:00:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html | 14 ++------------
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 14 +++++---------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index aaeab95..9e7fba3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -225,24 +225,20 @@
b.open_id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
- a.create_time createTime,
- a.apply_way applyWay,
- (select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = a.user_id) doneNum
- FROM
- shop_salesman_apply a
- LEFT JOIN biz_user b ON b.parent_open_id = a.user_id
+ b.binding_parent_time createTime,
+ (select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = b.open_id) doneNum
+ FROM biz_user b
<where>
- a.company_id = #{record.companyId}
+ b.company_id = #{record.companyId}
AND b.is_sales != 1
and b.parent_open_id = #{record.userId}
- and a.apply_status = 2
<if test="record.userName != null and record.userName != ''">
and b.nick_name like concat('%',#{record.userName},'%')
</if>
</where>
<if test="record.sort !=null">
order by
- a.${record.sort} ${record.order}
+ b.${record.sort} ${record.order}
</if>
</select>
<select id="findCustomLow" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
index 642a592..7611622 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
@@ -154,15 +154,6 @@
show-overflow-tooltip>
</el-table-column>
<el-table-column
- label="绑定方式">
- <template slot-scope="scope">
- <span v-if="scope.row.applyWay == 1">自主申请</span>
- <span v-if="scope.row.applyWay == 2">自动添加</span>
- <span v-if="scope.row.applyWay == 3">上级邀请</span>
- <span v-if="scope.row.applyWay == 4">手动添加</span>
- </template>
- </el-table-column>
- <el-table-column
label="客户状态">
<template slot-scope="scope">
<span v-if="scope.row.doneNum == 0">已成交</span>
@@ -664,13 +655,12 @@
url: basePath + '/fenXiao/fenXiaoUser/unbundlingSaleMan',
callback: function (data) {
_this.$message.success(data.info);
- if(this.activeName == 'first'){
+ if(_this.activeName == "first"){
_this.loadParamSetting();
}
- if(this.activeName == 'second'){
+ if(_this.activeName == "second"){
_this.loadParamSettinglow();
}
- _this.loadParamSettingBasic();
}
});
},
--
Gitblit v1.9.1