From 8c17ad4d8d72c31bc3e4b48e9b0e28b1087931a2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 21 Jun 2022 13:32:36 +0800
Subject: [PATCH] logs

---
 src/views/ops/log_request.vue |  4 +-
 src/views/sys/user.vue        | 97 ++++++-----------------------------
 2 files changed, 18 insertions(+), 83 deletions(-)

diff --git a/src/views/ops/log_request.vue b/src/views/ops/log_request.vue
index 3461c8b1..bd109f55 100644
--- a/src/views/ops/log_request.vue
+++ b/src/views/ops/log_request.vue
@@ -38,7 +38,6 @@
 				apiObj: this.$API.ops.logs.list,
 				search:{
 					id:null,
-					page:1
 				},
 				logLists:[],
 				infoDrawer:false,
@@ -48,6 +47,9 @@
 		mounted() {
 		},
 		methods: {
+			getSearch(){
+				this.$refs.table.reload(this.search);
+			},
 			rowClick(row){
 				this.infoDrawer = true;
 				this.$nextTick(() => {
diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index c7591c1a..f663cbcf 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -174,18 +174,11 @@
 			<el-form-item label="手机">
 				<el-input
 					v-model="addForm.phone"
-					placeholder="请输入完整的真实姓名"
+					placeholder="请输入手机号码"
 					clearable
 				></el-input>
 			</el-form-item>
-			<!--<el-form-item label="邮箱">
-				<el-input
-					v-model="addForm.email"
-					placeholder="请输入邮箱"
-					clearable
-				></el-input>
-			</el-form-item>-->
-			<el-form-item label="所属部门">
+			<!--<el-form-item label="所属部门">
 				<el-cascader
 					v-model="addForm.belong_dept"
 					:options="group"
@@ -194,7 +187,7 @@
 					clearable
 					style="width: 100%"
 				></el-cascader>
-			</el-form-item>
+			</el-form-item>-->
 			<el-form-item label="是否在用">
 				<el-switch v-model="addForm.is_active" />
 			</el-form-item>
@@ -231,40 +224,15 @@
 					id: "",
 					username: "",
 					name: "",
-					email: "",
+					// email: "",
 					phone: "",
-					belong_dept: [],
+					// belong_dept: [],
 					is_active:true
 				},
 				//验证规则
 				rules: {
 					username: [{required: true, message: "请输入登录账号"}],
 					name: [{required: true, message: "请输入真实姓名"}],
-					password: [
-						{required: true, message: "请输入登录密码"},
-						{
-							validator: (rule, value, callback) => {
-								if (this.form.password2 !== "") {
-									this.$refs.addForm.validateField(
-										"password2"
-									);
-								}
-								callback();
-							},
-						},
-					],
-					password2: [
-						{required: true, message: "请再次输入密码"},
-						{
-							validator: (rule, value, callback) => {
-								if (value !== this.form.password) {
-									callback(new Error("两次输入密码不一致!"));
-								} else {
-									callback();
-								}
-							},
-						},
-					],
 					group: [{required: true, message: "请选择所属角色"}],
 				},
 				//所需数据选项
@@ -298,7 +266,6 @@
 			},
 		},
 		mounted() {
-			this.getList();
 			this.getGroup();
 		},
 		methods: {
@@ -324,11 +291,10 @@
 				this.addForm.name = row.name;
 				this.addForm.username = row.username;
 				this.addForm.phone = row.phone;
-				this.addForm.email = row.email;
-				debugger;
-				console.log();
+				/*
 				let belong_dept = this.findParents(this.postList,row.belong_dept);
 				this.addForm.belong_dept=belong_dept.reverse();
+				*/
 				this.addForm.is_active = row.is_active;
 			},
 			findParents(arr,belong_dept){
@@ -352,15 +318,13 @@
 				this.addForm.id = row.id;
 			},
 			//删除
-			async table_del(row, index) {
-				var reqData = {id: row.id};
-				var res = await this.$API.system.user.delete.req(reqData);
-				if (res.code == 200) {
-					//这里选择刷新整个表格 OR 插入/编辑现有表格数据
-					this.$refs.table.tableData.splice(index, 1);
-					this.$message.success("删除成功");
-				} else {
+			async table_del(row) {
+				let res = await this.$API.system.user.delete.req(row.id);
+				if (res.err.msg) {
 					this.$alert(res.message, "提示", {type: "error"});
+				} else {
+					this.$refs.table.refresh();
+					this.$message.success("删除成功");
 				}
 			},
 			//表格选择后回调事件
@@ -370,7 +334,7 @@
 			//加载树数据
 			async getGroup() {
 				this.showGrouploading = true;
-				var res = await this.$API.system.dept.list.req({page: 0});
+				let res = await this.$API.system.dept.list.req({page: 0});
 				this.showGrouploading = false;
 				// var allNode = { id: "", label: "所有" };
 				// res.data.unshift(allNode);
@@ -414,27 +378,6 @@
 			upsearch() {
 				this.$refs.table.upData(this.search);
 			},
-			//本地更新数据
-			handleSuccess(data, mode) {
-				if (mode == "add") {
-					data.id = new Date().getTime();
-					this.$refs.table.tableData.unshift(data);
-				} else if (mode == "edit") {
-					this.$refs.table.tableData
-						.filter((item) => item.id === data.id)
-						.forEach((item) => {
-							Object.assign(item, data);
-						});
-				}
-			},
-			getList() {
-				let that = this;
-				this.$API.system.user.list.req({page:1,page_size:20}).then((res) => {
-					debugger;
-					console.log(res);
-					that.userList = res.results;
-				});
-			},
 			//表单提交方法
 			submit(){
 				debugger;
@@ -442,7 +385,7 @@
 					if (valid) {
 						debugger;
 						this.isSaveing = true;
-						this.addForm.belong_dept = this.addForm.belong_dept[this.addForm.belong_dept.length - 1];
+						// this.addForm.belong_dept = this.addForm.belong_dept[this.addForm.belong_dept.length - 1];
 						let res;
 						if(this.type==='add'){
 							res = await this.$API.system.user.create.req(this.addForm);
@@ -461,16 +404,6 @@
 						return false;
 					}
 				})
-			},
-			//表单注入数据
-			setData(data){
-				this.addForm.id = data.id;
-				this.addForm.username = data.username;
-				this.addForm.avatar = data.avatar;
-				this.addForm.name = data.name;
-				this.addForm.group = data.group;
-				//可以和上面一样单个注入，也可以像下面一样直接合并进去
-				//Object.assign(this.form, data)
 			}
 		},
 	};