diff --git a/pages/customer/allot/index.js b/pages/customer/allot/index.js
index f68dad4..4d1ef73 100644
--- a/pages/customer/allot/index.js
+++ b/pages/customer/allot/index.js
@@ -1,5 +1,4 @@
import _ from '../../../commons/js/commons'
-import popularData from '../../../commons/js/lib/popularData';
const app = getApp()
Page({
data: {
@@ -20,6 +19,9 @@ Page({
v_id:'',//车型级别id
cfrom:'',//客户来源
o_type:'',//排序类型
+ cid:[],//客户id
+ clerkid:'',//店员id
+ isShowEmployees: false,
},
onLoad(options) {
for (let key in options) {
@@ -28,6 +30,7 @@ Page({
})
}
this.getAppCustomersList()
+ this.getAppEmployees()
},
onShow(){
@@ -105,14 +108,65 @@ Page({
})
},
- //选择客户
- radioPicker(e){
- if(e.currentTarget.dataset.index != this.data.customerIndex){
- this.setData({
- isSubmiting: false,
- customerIndex:e.currentTarget.dataset.index,
- })
+ //选择订单
+ checkboxChange(e) {
+ const list = this.data.list
+ const values = e.detail.value
+ for (let i = 0, lenI = list.length; i < lenI; ++i) {
+ list[i].checked = false
+
+ for (let j = 0, lenJ = values.length; j < lenJ; ++j) {
+ if (list[i].id === values[j]) {
+ list[i].checked = true
+ break
+ }
+ }
}
+
+ this.setData({
+ list:list,
+ cid:e.detail.value,
+ })
+ },
+
+ //获取店员列表
+ getAppEmployees(){
+ let params = {};
+ params['page'] = 1;
+ params['size'] = 20000;
+ _.apiQuery.getAppEmployees(params).then(res => {
+ if(res.data.total>0){
+ let employeeArray = []
+ res.data.list.forEach(item => {
+ employeeArray.push(item.uname)
+ })
+ this.setData({
+ employeeArray:employeeArray,
+ employeeList:res.data.list,
+ employeeIndex:-1,
+ })
+ }
+ wx.stopPullDownRefresh()
+ });
+ },
+
+ //选择店员
+ changeEmployee(e) {
+ let clerkid = ''
+ if(e.detail.value >= 0){
+ clerkid = this.data.employeeList[e.detail.value].id
+ }
+ this.setData({
+ clerkid:clerkid,
+ employeeIndex:e.detail.value,
+ })
+ },
+
+ //销售弹窗显示隐藏
+ optEmployees(){
+ this.setData({
+ isShowEmployees:!this.data.isShowEmployees,
+ })
},
//推送链接
diff --git a/pages/customer/allot/index.wxml b/pages/customer/allot/index.wxml
index 37383db..12412f6 100644
--- a/pages/customer/allot/index.wxml
+++ b/pages/customer/allot/index.wxml
@@ -2,29 +2,43 @@
-
-
-
- {{item.name}}
- {{item.mobile}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+ 销售选择
+
+ 请选择
+ {{employeeArray[employeeIndex]}}
+
+
-
- 取消
- 确定
+
+
+
\ No newline at end of file
diff --git a/pages/customer/allot/index.wxss b/pages/customer/allot/index.wxss
index 8ef669b..e69de29 100644
--- a/pages/customer/allot/index.wxss
+++ b/pages/customer/allot/index.wxss
@@ -1,28 +0,0 @@
-.mobiletip{position:fixed;bottom:120rpx;right:40rpx;width:100rpx;height:100rpx;}
-
-.tabmenu2{display:inline-block;line-height:72rpx;}
-.tabmenu2.active view.relative{display:inline-block;}
-.tabmenu2.active view.relative::before{display:inline-block;position:absolute;bottom:0;left:50%;transform:translate(-50%,0);width:64rpx;height:4rpx;content:"";background-color:#36afa2;}
-
-.subtab{height:100rpx;}
-.opt-item{border:#ebebeb 1rpx solid;line-height:40rpx;}
-.opt-item.active{background-color:#36afa2;border:#36afa2 1rpx solid;}
-
-.fixedopt{position:fixed;bottom:120rpx;right:40rpx;}
-.optpin{width:100rpx;height:100rpx;}
-
-.search-sort{right:-650rpx;width:650rpx;}
-.search-sort.sortin{animation:sortin.5s;animation-fill-mode:forwards;}
-.search-sort.sortout{animation:sortout.5s;animation-fill-mode:forwards;}
-@keyframes sortin
-{
- from {right:-650rpx;}
- to {right:0;}
-}
-@keyframes sortout
-{
- from {right:0;}
- to {right:-650rpx;}
-}
-
-.radio-btn{min-width:104rpx;box-sizing:border-box;text-align:center;}
\ No newline at end of file
diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml
index 1b63e1a..fae052b 100644
--- a/pages/customer/detail/index.wxml
+++ b/pages/customer/detail/index.wxml
@@ -103,9 +103,9 @@
-
- 取消
- 确定
+
+
+
diff --git a/pages/customer/filterList/index.wxml b/pages/customer/filterList/index.wxml
index 0e33a19..4b1ea4b 100644
--- a/pages/customer/filterList/index.wxml
+++ b/pages/customer/filterList/index.wxml
@@ -48,9 +48,9 @@
-
- 取消
- 确定
+
+
+
\ No newline at end of file
diff --git a/pages/customer/index.js b/pages/customer/index.js
index d216582..b74fb1c 100644
--- a/pages/customer/index.js
+++ b/pages/customer/index.js
@@ -393,10 +393,11 @@ Page({
},
//显示高级搜索
- showfilter(){
+ optfilter(){
this.setData({
isShowfilter: !this.data.isShowfilter
})
+ this.resetFilter()
},
//确定高级搜索
diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml
index 18eb276..f9f60eb 100644
--- a/pages/customer/index.wxml
+++ b/pages/customer/index.wxml
@@ -10,7 +10,7 @@
-
+
-
+
客户建卡
@@ -82,9 +82,9 @@
-
- 取消
- 确定
+
+
+
@@ -181,4 +181,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/customer/index.wxss b/pages/customer/index.wxss
index 8ef669b..465dd79 100644
--- a/pages/customer/index.wxss
+++ b/pages/customer/index.wxss
@@ -2,7 +2,7 @@
.tabmenu2{display:inline-block;line-height:72rpx;}
.tabmenu2.active view.relative{display:inline-block;}
-.tabmenu2.active view.relative::before{display:inline-block;position:absolute;bottom:0;left:50%;transform:translate(-50%,0);width:64rpx;height:4rpx;content:"";background-color:#36afa2;}
+.tabmenu2.active view.relative::before{display:inline-block;position:absolute;bottom:0;left:50%;transform:translate(-50%,0);width:64rpx;height:6rpx;content:"";background-color:#36afa2;}
.subtab{height:100rpx;}
.opt-item{border:#ebebeb 1rpx solid;line-height:40rpx;}
diff --git a/pages/mine/install/staff/index.js b/pages/mine/install/staff/index.js
index 876711d..2d273c3 100644
--- a/pages/mine/install/staff/index.js
+++ b/pages/mine/install/staff/index.js
@@ -20,7 +20,7 @@ Page({
this.getAppEmployees()
},
- //获取客户列表
+ //获取店员列表
getAppEmployees() {
this.setData({
load: false,
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 6704058..35f98cb 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -180,9 +180,9 @@
-
- 取消
- 确定
+
+
+
\ No newline at end of file
diff --git a/pages/order/filterList/index.wxml b/pages/order/filterList/index.wxml
index 88cd838..eecad28 100644
--- a/pages/order/filterList/index.wxml
+++ b/pages/order/filterList/index.wxml
@@ -42,9 +42,9 @@
-
- 取消
- 确定
+
+
+
\ No newline at end of file
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index f7e9d54..3ae263c 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -10,7 +10,7 @@
-
+