Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

src/views/set/framework.vue

@@ -412,15 +412,14 @@ export default {
 			})
 		},
 		dirSup_confirm(date){
-			console.log(date)
-			if(date.employee.length == 0) {
-				this.$message.warning('请选择上级')
-				this.scope_loading = false
-				return
-			}
+			// if(date.employee.length == 0) {
+			// 	this.$message.warning('请选择上级')
+			// 	this.scope_loading = false
+			// 	return
+			// }
 			let data = {
 				employee_ids: [this.newId],
-				superior_id: date.employee[0].id
+				superior_id: date.employee.length > 0 ? date.employee[0].id : null
 			}
 			this.$axios('post','/api/employee/directly_superior',data).then(res =>{
 				if(res.data.code == 1){