0.0

Component/selectEnevt/selectEnevt.acss

@@ -167,7 +167,8 @@
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    padding: 10rpx 0; 
+    padding-top: 10rpx;
+    margin-bottom: 10rpx;
 }
 .main-right .date{
    color: #909399;

pages/deploy/organization/organization.axml

@@ -47,8 +47,8 @@
         </label>
       </view>
     </view>
-    <block a:if="{{minuteIndex==1}}">
-        <view class="flex-box flex-v-ce li" a:for="{{userList}}" a:if="{{item.is_official==1}}">
+    <block a:if="{{minuteIndex>0}}">
+        <view class="flex-box flex-v-ce li" a:for="{{userList}}" a:if="{{item.is_official==(minuteIndex==1? 1:0)}}">
           <label class="flex-box flex-v-ce flex-1 userItem">
             <img-box imgUrl="{{item.img_url}}" name="{{item.name}}" height="90rpx" width="90rpx" fSize="24rpx"></img-box>
             <view class="flex-box-v flex-1" style="margin-left:20rpx;">
@@ -76,6 +76,7 @@
       <no-data content="未找到相关人员"/>
     </view>
   </scroll-view>
+  <!-- 搜索的人员 -->
   <scroll-view a:else class="main" scroll-y="{{true}}" style="height: calc(100vh - 388rpx)">
     <view class="flex-box flex-v-ce title2">
       <view class="flex-1 fontColorF">
@@ -90,8 +91,8 @@
         </label>
       </view>
     </view>
-    <block a:if="{{minuteIndex==1}}">
-        <view class="flex-box flex-v-ce li" a:for="{{searchUser}}" a:if="{{item.is_official==1}}">
+    <block a:if="{{minuteIndex>0}}">
+        <view class="flex-box flex-v-ce li" a:for="{{userList}}" a:if="{{item.is_official==(minuteIndex==1? 1:0)}}">
           <label class="flex-box flex-v-ce flex-1 userItem">
             <img-box imgUrl="{{item.img_url}}" name="{{item.name}}" height="90rpx" width="90rpx" fSize="24rpx"></img-box>
             <view class="flex-box-v flex-1" style="margin-left:20rpx;">

pages/deploy/organization/organization.js

@@ -1,236 +1,266 @@
 var app = getApp();
 var that;
 Page({
-  data: {
-    userList: [],
-    all_rule_list: [],
-    rule_tree: [],
-    terr: [{ name: '全公司', id: 0 }],
-    searchUser: [],//搜索
-    searchName:'',
-    isItem: true,//是否为搜索的值
-    isAllChecked: false,
-    isAllChecked2: false,
-    dept_id:0,
-    minuteIndex: 0,//条件选择
-    minuteArray: [
-      { id: 0, name: '全部人员' },
-      { id: 1, name: '仅显示已开启人员' }
-    ],
-  },
-  onLoad() {
-    that = this;
-    dd.setNavigationBar({ title: "部门/员工" });
-    this.setData({
-      terr: [{ name: '全公司', id: 0 }],
-    })
-    this.getMessage();
-    this.getBmData();
-    this.getUserData(0);
-  },
-    //选择积分分类
-  bingIntegralType(e) {
-    this.setData({
-      minuteIndex: e.detail.value,
-    });
-  },
-  radioChange(e){
-    var list = this.data.isItem? this.data.userList:this.data.searchUser;
-    let id = e.target.dataset.id;
-    list.map(item => {
-        if(item.id==id){
-          item.isChecked = e.detail.value;
-        }
-    })
-  },
-  //全选择
-  ruleActiveAll(e) {
-    var list = this.data.isItem? this.data.userList:this.data.searchUser;
-    if (e.detail.value) {
-      list.map(item => {
-        if(item.is_creator!=1){
-          if(this.data.minuteIndex==1){
-            if(item.is_official==1){
-                item.isChecked = true;
-            }
-          }else{
-            item.isChecked = true;
-          }
-        }
-      })
-    } else {
-      list.map(item => {
-        if(item.is_creator!=1){
-          if(this.data.minuteIndex==1){
-            if(item.is_official==1){
-                item.isChecked = false;
-            }
-          }else{
-            item.isChecked = false;
-          }
-        }
-      })
-    }
-    if(this.data.isItem){
-      this.setData({
-        userList:list,
-        isAllChecked:e.detail.value
-      })
-    }else{
-      this.setData({
-        searchUser:list,
-        isAllChecked2:e.detail.value
-      })
-    }
-  },
-  // 开启||禁用
-  onOpen(e){
-    var index = e.target.dataset.index;
-    let employeeId=[];
-    var list = this.data.isItem? this.data.userList:this.data.searchUser;
-    list.map(item => {
-      if(item.isChecked){
-          if(this.data.minuteIndex==1){
-            if(item.is_official==1){
-                employeeId.push(item.id)
-            }
-          }else{
-            employeeId.push(item.id)
-          }
-      }
-    })
-    if (employeeId.length == 0) {
-				app.globalData.showToast("请选择一名员工")
-				return;
+	data: {
+		userList: [],
+		all_rule_list: [],
+		rule_tree: [],
+		terr: [{
+			name: '全公司',
+			id: 0
+		}],
+		searchUser: [], //搜索
+		searchName: '',
+		isItem: true, //是否为搜索的值
+		isAllChecked: false,
+		isAllChecked2: false,
+		dept_id: 0,
+		minuteIndex: 0, //条件选择
+		minuteArray: [{
+				id: 0,
+				name: '全部人员'
+			},
+			{
+				id: 1,
+				name: '已开启'
+			},
+			{
+				id: 2,
+				name: '已禁用'
+			}
+		],
+	},
+	onLoad() {
+		that = this;
+		dd.setNavigationBar({
+			title: "部门/员工"
+		});
+		this.setData({
+			terr: [{
+				name: '全公司',
+				id: 0
+			}],
+		})
+		this.getMessage();
+		this.getBmData();
+		this.getUserData(0);
+	},
+	//选择积分分类
+	bingIntegralType(e) {
+		this.setData({
+			minuteIndex: e.detail.value,
+		});
+	},
+	radioChange(e) {
+		var list = this.data.isItem ? this.data.userList : this.data.searchUser;
+		let id = e.target.dataset.id;
+		list.map(item => {
+			if (item.id == id) {
+				item.isChecked = e.detail.value;
+			}
+		})
+	},
+	//全选择
+	ruleActiveAll(e) {
+		var list = this.data.isItem ? this.data.userList : this.data.searchUser;
+		if (e.detail.value) {
+			list.map(item => {
+				if (item.is_creator != 1) {
+					if (this.data.minuteIndex == 1) {
+						if (item.is_official == 1) {
+							item.isChecked = true;
+						}
+					} else {
+						item.isChecked = true;
+					}
+				}
+			})
+		} else {
+			list.map(item => {
+				if (item.is_creator != 1) {
+					if (this.data.minuteIndex == 1) {
+						if (item.is_official == 1) {
+							item.isChecked = false;
+						}
+					} else {
+						item.isChecked = false;
+					}
+				}
+			})
 		}
-    let url=index==1? 'api/employee/disable':'api/employee/enable'
-    app.$post(url, { employee_id: JSON.stringify(employeeId) }).then((res) => {
-        app.globalData.showToast("设置成功")
-        if(this.data.isItem){
-          this.getUserData(this.data.dept_id);
-        }else{
-          let data={
-            detail:{
-              value:this.data.searchName
-            }
-          }
-          this.bindKeyInput(data);
-        }
-    })
-  },
-  tbDd() {
-    dd.confirm({
-      title: '温馨提示',
-      content: '下次同步时间需在10分钟之后，是否同步',
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      success: (result) => {
-        if (result.confirm) {
-          var http1 = app.$post("api/ding/employee_sync", {});
-          Promise.all([http1]).then((item) => {
-            app.globalData.showToast(item[0].data.msg);
-          })
-        }
-      },
-    });
-  },
-  onReset() {
-    this.setData({
-      searchUser: [],
-      isItem: true,
-      isVal: false
-    })
-  },
-  bindKeyInput(e) {
-    app.$get("api/employee/index", { dept_id: 0 }).then((res) => {
-      var list = res.data.data.list;
-      list.forEach(item=>{
-        item.isChecked=false
-        if(item.id==app.globalData.userData.id){
-          item.is_creator=1
-        }
-      })
-      var items = list.filter((item) => {
-        return item.name.indexOf(e.detail.value) >= 0
-      });
-      this.setData({
-        searchUser: items,
-        isItem: e.detail.value ? false : true,
-        isVal: e.detail.value ? true : false,
-        searchName: e.detail.value? e.detail.value:'',
-        isAllChecked2: false,
-      })
-    })
-  },
-  //点击导航栏
-  activeItem(e) {
-    var item = e.target.dataset.item;
-    var index = e.target.dataset.index;
-    var terr = this.data.terr;
-    if ((index + 1) == terr.length) { return false };
-    this.setData({ rule_tree: [] });
-    if (index == 0) {
-      this.setData({
-        terr: [{ name: '全公司', id: 0 }],
-        rule_tree: this.data.all_rule_list,
-        dept_id:0
-      })
-    } else {
-      var arr = terr.slice(0, index + 1);
-      this.setData({
-        rule_tree: item._child,
-        terr: arr,
-        dept_id:item.id
-      })
-    }
-    this.getUserData(item.id);
-  },
-  //点击一级
-  activeTree(e) {
-    var item = e.target.dataset.item
-    var terr = this.data.terr;
-    terr.push(item)
-    this.setData({
-      rule_tree: item._child,
-      terr: terr,
-      dept_id:item.id
-    });
-    this.getUserData(item.id);
-  },
-  //获取部门列表
-  getBmData() {
-    app.$get("api/department/tree", {}).then((res) => {
-      var list = res.data.data.list;
-      this.setData({
-        rule_tree: list,
-        all_rule_list: list
-      })
-    })
-  },
-  //获取员工信息
-  getUserData(dept_id) {
-    this.setData({
-        userList: []
-    })
-    app.$get("api/employee/index", { dept_id: dept_id }).then((res) => {
-      var list = res.data.data.list;
-      list.forEach(item=>{
-        item.isChecked=false
-        if(item.id==app.globalData.userData.id){
-          item.is_creator=1
-        }
-      })
-      this.setData({
-        isAllChecked: false,
-        userList: list
-      })
-    })
-  },
-  getMessage() {
-    app.$get("api/site/info").then((res) => {
-      this.setData({
-        gsData: res.data.data
-      })
-    })
-  }
+		if (this.data.isItem) {
+			this.setData({
+				userList: list,
+				isAllChecked: e.detail.value
+			})
+		} else {
+			this.setData({
+				searchUser: list,
+				isAllChecked2: e.detail.value
+			})
+		}
+	},
+	// 开启||禁用
+	onOpen(e) {
+		var index = e.target.dataset.index;
+		let employeeId = [];
+		var list = this.data.isItem ? this.data.userList : this.data.searchUser;
+		list.map(item => {
+			if (item.isChecked) {
+				if (this.data.minuteIndex == 1) {
+					if (item.is_official == 1) {
+						employeeId.push(item.id)
+					}
+				} else {
+					employeeId.push(item.id)
+				}
+			}
+		})
+		if (employeeId.length == 0) {
+			app.globalData.showToast("请选择一名员工")
+			return;
+		}
+		let url = index == 1 ? 'api/employee/disable' : 'api/employee/enable'
+		app.$post(url, {
+			employee_id: JSON.stringify(employeeId)
+		}).then((res) => {
+			app.globalData.showToast("设置成功")
+			if (this.data.isItem) {
+				this.getUserData(this.data.dept_id);
+			} else {
+				let data = {
+					detail: {
+						value: this.data.searchName
+					}
+				}
+				this.bindKeyInput(data);
+			}
+		})
+	},
+	tbDd() {
+		dd.confirm({
+			title: '温馨提示',
+			content: '下次同步时间需在10分钟之后，是否同步',
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			success: (result) => {
+				if (result.confirm) {
+					var http1 = app.$post("api/ding/employee_sync", {});
+					Promise.all([http1]).then((item) => {
+						app.globalData.showToast(item[0].data.msg);
+					})
+				}
+			},
+		});
+	},
+	onReset() {
+		this.setData({
+			searchUser: [],
+			isItem: true,
+			isVal: false
+		})
+	},
+	bindKeyInput(e) {
+		app.$get("api/employee/index", {
+			dept_id: 0
+		}).then((res) => {
+			var list = res.data.data.list;
+			list.forEach(item => {
+				item.isChecked = false
+				if (item.id == app.globalData.userData.id) {
+					item.is_creator = 1
+				}
+			})
+			var items = list.filter((item) => {
+				return item.name.indexOf(e.detail.value) >= 0
+			});
+			this.setData({
+				searchUser: items,
+				isItem: e.detail.value ? false : true,
+				isVal: e.detail.value ? true : false,
+				searchName: e.detail.value ? e.detail.value : '',
+				isAllChecked2: false,
+			})
+		})
+	},
+	//点击导航栏
+	activeItem(e) {
+		var item = e.target.dataset.item;
+		var index = e.target.dataset.index;
+		var terr = this.data.terr;
+		if ((index + 1) == terr.length) {
+			return false
+		};
+		this.setData({
+			rule_tree: []
+		});
+		if (index == 0) {
+			this.setData({
+				terr: [{
+					name: '全公司',
+					id: 0
+				}],
+				rule_tree: this.data.all_rule_list,
+				dept_id: 0
+			})
+		} else {
+			var arr = terr.slice(0, index + 1);
+			this.setData({
+				rule_tree: item._child,
+				terr: arr,
+				dept_id: item.id
+			})
+		}
+		this.getUserData(item.id);
+	},
+	//点击一级
+	activeTree(e) {
+		var item = e.target.dataset.item
+		var terr = this.data.terr;
+		terr.push(item)
+		this.setData({
+			rule_tree: item._child,
+			terr: terr,
+			dept_id: item.id
+		});
+		this.getUserData(item.id);
+	},
+	//获取部门列表
+	getBmData() {
+		app.$get("api/department/tree", {}).then((res) => {
+			var list = res.data.data.list;
+			this.setData({
+				rule_tree: list,
+				all_rule_list: list
+			})
+		})
+	},
+	//获取员工信息
+	getUserData(dept_id) {
+		this.setData({
+			userList: []
+		})
+		app.$get("api/employee/index", {
+			dept_id: dept_id
+		}).then((res) => {
+			var list = res.data.data.list;
+			list.forEach(item => {
+				item.isChecked = false
+				if (item.id == app.globalData.userData.id) {
+					item.is_creator = 1
+				}
+			})
+			this.setData({
+				isAllChecked: false,
+				userList: list
+			})
+		})
+	},
+	getMessage() {
+		app.$get("api/site/info").then((res) => {
+			this.setData({
+				gsData: res.data.data
+			})
+		})
+	}
 });

pages/statistics/integralEvent/integralEvent.acss

@@ -19,8 +19,8 @@
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    padding: 10rpx 0; 
-    padding-bottom: 0rpx;
+    padding-top: 10rpx;
+    margin-bottom: 10rpx;
 }
 .main-right .date{
    color: #909399;

pages/statistics/my_PrizeBuckle/my_PrizeBuckle.acss

@@ -54,7 +54,8 @@
     -webkit-line-clamp: 2;
      font-size: 32rpx;
     -webkit-box-orient: vertical;
-    padding: 10rpx 0; 
+    padding-top: 10rpx;
+    margin-bottom: 10rpx;
 }
 .main-right .date{
    /* font-size: 24rpx; */

pages/statistics/my_apply/my_apply.acss

@@ -60,7 +60,8 @@
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
-    padding: 10rpx 0; 
+    padding-top: 10rpx;
+    margin-bottom: 10rpx;
 }
 .main-right .date{
    color: #909399;

pages/statistics/my_issue/my_issue.acss

@@ -61,7 +61,8 @@
     -webkit-line-clamp: 2;
      font-size: 32rpx;
     -webkit-box-orient: vertical;
-    padding: 10rpx 0; 
+    padding-top: 10rpx;
+    margin-bottom: 10rpx;
 }
 .main-right .date{
    font-size: 24rpx;

pages/workbench/apply/apply.js

@@ -433,6 +433,11 @@ Page({
   },
   //添加一条
   addArr() {
+    var list = that.data.items
+    if(list.length>=10){
+      this.showToast('一次只能添加10条申请')
+      return;
+    }
     var arr = {//录入选项列表
       employee_id: app.globalData.isCreator ? '' : app.globalData.userData.id,
       employeeName: app.globalData.isCreator ? '' : app.globalData.userData.name,
@@ -445,7 +450,6 @@ Page({
       revieweName: this.data.getReviewerObj.name,
       files: '',//附件数组列表
     };
-    var list = that.data.items
     list.push(arr);
     that.setData({
       items: list

pages/workbench/jk_B/jk_B.js

@@ -290,6 +290,11 @@ Page({
   },
   //添加一条
   addArr() {
+    var list = that.data.items
+    if(list.length>=10){
+      this.showToast('一次只能添加10条奖扣')
+      return;
+    }
     var arr = {//录入选项列表
       checked: true,
       rule_id: '',
@@ -308,7 +313,6 @@ Page({
       isArrindex2: true,
       selectRule: '',
     };
-    var list = that.data.items
     list.push(arr);
     that.setData({
       items: list

pages/workbench/my_approve/my_approve.acss

@@ -74,7 +74,8 @@
   -webkit-line-clamp: 2;
   font-size: 32rpx;
   -webkit-box-orient: vertical;
-  padding: 10rpx 0;
+  padding-top: 10rpx;
+  margin-bottom: 10rpx;
 }
 
 .main-right .date {