本日新bug修改

src/components/byTable/index.vue

@@ -232,7 +232,11 @@ export default defineComponent({
 			default() {
 				return {}
 			},
-		}
+		},
+		searchKey: {
+			type: String,
+			default: 'keyword',
+		},
 	},
 	setup(props) {
 		
@@ -317,10 +321,10 @@ export default defineComponent({
 			return isFn(fn)
 		}
 		const searchFn = (val) => {
-			console.log(keywrod)
+			console.log(props)
 			proxy.$emit(
 				'getList',
-				Object.assign(props.filterParams, { keyword: keywrod.value })
+				Object.assign(props.filterParams, { [props.searchKey]: keywrod.value })
 			)
 		}
 		const handlePageChange = (val) => {

src/views/system/dept2/index.vue

@@ -187,7 +187,7 @@ const sourceList = ref({
 let dialogVisible = ref(false);
 let modalType = ref("add");
 let rules = ref({
-	roleKey: [{ required: true, message: '请选择部门', trigger: 'blur' }],
+	parentId: [{ required: true, message: '请选择上级机构', trigger: 'blur' }],
 	orderNum: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
 	deptName: [{ required: true, message: '机构名称不能为空', trigger: 'blur' }],
 })
@@ -406,6 +406,16 @@ const treeChange = (e) => {
   getList({ tenantId: e.id });
 };
 
+const handleAdd = (row) => {
+	dialogVisible.value = true;
+	modalType.value = "add";
+	console.log(row)
+	formData.data = {
+		parentId: row.deptId,
+		tenantId: row.tenantId,
+	};
+};
+
 const openModal = () => {
   dialogVisible.value = true;
   modalType.value = "add";
@@ -426,13 +436,13 @@ const submitForm = () => {
 	byform.value.handleSubmit((valid) => {
 		const method = modalType.value == 'add' ? 'POST' : 'PUT'
 		console.log(method)
-		if(!formData.data.parentId) formData.data.parentId = '0'
+		if(!formData.data.parentId) formData.data.parentId = 0
 		proxy
 			.post(
 				'/tenantDept',
 				{
 					...formData.data,
-					tenantId: sourceList.value.pagination.tenantId,
+					tenantId: formData.data.tenantId ? formData.data.tenantId : sourceList.value.pagination.tenantId,
 				},
 				method
 			)

src/views/system/tenant/index.vue

@@ -114,6 +114,8 @@ let roomDialogVisible = ref(false)
 let modalType = ref('add')
 let rules = ref({
 	tenantId: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],
+	password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+	enterpriseName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
 })
 const { proxy } = getCurrentInstance()
 const selectConfig = computed(() => {
@@ -225,34 +227,35 @@ const config = computed(() => {
 							getDtl(row)
 						},
 					},
-					{
-						attrs: {
-							label: '删除',
-							type: 'danger',
-							text: true,
-						},
-						el: 'button',
-						click() {
-							// 弹窗提示是否删除
-							ElMessageBox.confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-								confirmButtonText: '确定',
-								cancelButtonText: '取消',
-								type: 'warning',
-							})
-								.then(() => {
-									// 删除
-									proxy.post('/tenantInfo/delete', {
-										id: row.id,
-									}).then((res) => {
-										ElMessage({
-											message: '删除成功',
-											type: 'success',
-										})
-										getList()
-									})
-								})
-						},
-					},
+					// {
+					// 	attrs: {
+					// 		label: '删除',
+					// 		type: 'danger',
+					// 		text: true,
+					// 		disabled:true,
+					// 	},
+					// 	el: 'button',
+					// 	click() {
+					// 		// 弹窗提示是否删除
+					// 		ElMessageBox.confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					// 			confirmButtonText: '确定',
+					// 			cancelButtonText: '取消',
+					// 			type: 'warning',
+					// 		})
+					// 			.then(() => {
+					// 				// 删除
+					// 				proxy.post('/tenantInfo/delete', {
+					// 					id: row.id,
+					// 				}).then((res) => {
+					// 					ElMessage({
+					// 						message: '删除成功',
+					// 						type: 'success',
+					// 					})
+					// 					getList()
+					// 				})
+					// 			})
+					// 	},
+					// },
 				]
 			},
 		},

src/views/system/user2/index.vue

@@ -17,6 +17,7 @@
 				:loading="loading"
 				highlight-current-row
 				:selectConfig="selectConfig"
+				searchKey="userName"
 				:table-events="{
 					//element talbe事件都能传
 					select: select,
@@ -131,20 +132,23 @@ const config = computed(() => {
 		{
 			attrs: {
 				label: '姓名',
-				prop: 'userName',
+				prop: 'nickName',
 				align: 'left',
 			},
 		},
 		{
 			attrs: {
 				label: '用户名',
-				prop: 'nickName',
+				prop: 'userName',
 			},
 		},
 		{
 			attrs: {
 				label: '系统用户',
-				prop: 'remark',
+				prop: 'userType',
+			},
+			render (userType) {
+				return userType == 1 ? '是' : '否'
 			},
 		},
 		{