juese

src/api/file-upload.ts

@@ -28,7 +28,7 @@ export function handleHttpUploadUrl(options: any, url: string | undefined) {
     let formData = new FormData();
     formData.append('file', options.file);
     formData.append('dir', options.dir)
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         try {
             request({
                 url: url,
@@ -41,7 +41,7 @@ export function handleHttpUploadUrl(options: any, url: string | undefined) {
                 resolve(res.data)
             });
         } catch (error) {
-            reject(error)
+            resolve(error)
         }
     })
 }

src/api/role.ts

@@ -27,6 +27,16 @@ export function addRole(role: any) {
 	})
 }
 
+export function updateRole(role: any) {
+	return new Promise(resolve => {
+		request.put(roleUrl, role).then(res => {
+			resolve(res.data);
+		}).catch(err => {
+			resolve(err);
+		})
+	})
+}
+
 export function saveRoleMenus(roleId: string, menuIds: string) {
 	return new Promise(resolve => {
 		request.put(saveRoleMenuUrl, {roleId, menuIds})
@@ -48,3 +58,14 @@ export function getDetails(id: string) {
 	})
 }
 
+export function deleteById(ids: []) {
+	return new Promise(resolve => {
+		request.delete(roleUrl, {data: ids})
+			.then(res => {
+				resolve(res.data)
+			}).catch(err => {
+			resolve(err);
+		});
+	})
+}
+

src/api/sys-message.ts

@@ -0,0 +1,29 @@
+import request from "@/utils/request";
+
+const saveUrl = "/admin/sysMessage/save";
+const pageUrl = "/admin/sysMessage/page";
+
+export function save(message: any, organization?: [], permissions?: []) {
+	return new Promise(resolve => {
+		request.postForm(saveUrl, message).then(res => {
+			resolve(res.data);
+		}).catch(err => {
+			resolve(err);
+		})
+	})
+}
+
+export function page(current: number, size: number, condition?: {category: string, message: string}) {
+	return new Promise(resolve => {
+		request.postForm(pageUrl, {
+			current: current,
+			size: size,
+			category: condition?.category,
+			message: condition?.message
+		}).then(res => {
+			resolve(res.data)
+		}).catch(err => {
+			resolve(err);
+		})
+	})
+}

src/components/import-dialog.vue

@@ -62,15 +62,19 @@ const importData = () => {
 		return
 	}
 	uploadRef.value.submit()
-	ElMessage.success('上传成功')
-	close()
-	emit('success')
 	// emit('error')
 }
 
 function handleUpload(options: any) {
 	handleHttpUploadUrl(options, props.importUrl).then((res: any) => {
-		console.log(res)
+		if (res.code == 0) {
+			ElMessage.success('上传成功')
+			close()
+			emit('success')
+		} else {
+			ElMessage.error(res.msg ? res.msg : "上传失败")
+			emit("error");
+		}
 	})
 }
 

src/views/logs-manage/form/message-form.vue

@@ -1,37 +1,38 @@
 <template>
 	<el-form ref="formRef" :model="formData" :rules="rules" label-width="100">
-        <el-form-item label="消息类型" prop="type">
+		<el-form-item label="消息类型" prop="category">
-            <el-select v-model="formData.type" placeholder="请选择消息类型">
+			<el-select v-model="formData.category" placeholder="请选择消息类型">
 				<el-option v-for="item in getMessageType()" :key="item.value" :label="item.label"
 									 :value="item.value"/>
 			</el-select>
 		</el-form-item>
-        <el-form-item label="所在医院" prop="hospital">
+<!--		<el-form-item label="所在医院" prop="hospital">
 			<el-select v-model="formData.hospital" placeholder="请选择医院">
-                <el-option v-for="item in hospitals" :key="item.value" :label="item.label"
+				<el-option v-for="item in hospitals" :key="item.id" :label="item.name"
-                    :value="item.value" />
+									 :value="item.id"/>
 			</el-select>
+		</el-form-item>-->
+		<el-form-item label="消息内容" prop="message">
+			<el-input v-model="formData.message" type="textarea" :rows="4" placeholder="请输入消息内容"></el-input>
 		</el-form-item>
-        <el-form-item label="消息内容" prop="content">
+		<!--		<el-form-item label="可见组织" prop="organization">
-            <el-input v-model="formData.content" type="textarea" :rows="4" placeholder="请输入消息内容"></el-input>
+          <el-select v-model="formData.organization" multiple placeholder="请选择组织">
-        </el-form-item>
+            <el-option v-for="item in hospitals" :key="item.id" :label="item.name"
-        <el-form-item label="可见组织" prop="showDept">
+                       :value="item.id"/>
-            <el-select v-model="formData.showDept" multiple placeholder="请选择组织">
-                <el-option v-for="item in hospitals" :key="item.value" :label="item.label"
-                    :value="item.value" />
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
-        <el-form-item label="组织权限" prop="permissions">
+		<!--		<el-form-item label="组织权限" prop="permissions">
           <el-select v-model="formData.permissions" placeholder="请选择组织权限">
-                <el-option v-for="item in [{value: 'default', label: '当前组织和下一组织可见'}]" :key="item.value" :label="item.label"
+            <el-option v-for="item in [{value: 'default', label: '当前组织和下一组织可见'}]" :key="item.value"
+                       :label="item.label"
                        :value="item.value"/>
           </el-select>
+        </el-form-item>-->
+		<el-form-item label="跳转链接" prop="href">
+			<el-input v-model="formData.href" placeholder="跳转链接"></el-input>
 		</el-form-item>
-        <el-form-item label="跳转链接" prop="link">
+		<el-form-item label="是否热点" prop="hotspots">
-            <el-input v-model="formData.link" placeholder="跳转链接"></el-input>
+			<el-switch v-model="formData.hotspots"/>
-        </el-form-item>
-        <el-form-item label="是否热点" prop="isHot">
-            <el-switch v-model="formData.isHot" />
 		</el-form-item>
 
 		<div style="text-align: right;">
@@ -42,50 +43,44 @@
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
+import {onMounted, reactive, ref} from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import {ElMessage} from 'element-plus'
-import { getHospitalsData, getMessageType } from '@/static-data/core'
+import {getMessageType} from '@/static-data/core'
+import * as hospitalApi from "@/api/hospital";
+import * as sysMessageApi from "@/api/sys-message";
 
 const emit = defineEmits(['close'])
-
 const props = defineProps({
 	type: String
 })
-
 const rules = reactive({
-    type: [
+	category: [
 		{required: true, message: '请选择类型', trigger: ['blur', 'change']},
 	],
 	hospital: [
 		{required: true, message: '请选择医院', trigger: ['blur', 'change']},
 	],
-    content: [
+	message: [
 		{required: true, message: '请输入消息内容', trigger: ['blur', 'change']},
 	],
-    showDept: [
+//	organization: [
-        { required: true, message: '请选择可见组织', trigger: ['blur', 'change'] },
+//		{required: true, message: '请选择可见组织', trigger: ['blur', 'change']},
-    ],
+//	],
-    permissions: [
+//	permissions: [
-        { required: true, message: '请选择组织权限', trigger: ['blur', 'change'] },
+//		{required: true, message: '请选择组织权限', trigger: ['blur', 'change']},
-    ],
+//	],
 })
-
 const formRef = ref()
 const formData = ref({
-    type: '',
+	category: '',
 	hospital: '',
-    content: '',
+	message: '',
-    showDept: '',
+	organization: '',
 	permissions: '',
-    link: '',
+	href: '',
-    isHot: true,
+	hotspots: false,
 } as any)
 const hospitals = ref([] as any)
-getHospitalsData().then((res: any) => {
-    hospitals.value = res
-    // console.log(res)
-})
-
 
 onMounted(() => {
 	resetData()
@@ -95,31 +90,50 @@ defineExpose({
 	formData,
 	resetData,
 })
+
 function close() {
 	emit('close')
 }
+
 function resetData() {
+	getHospitalList()
 	formRef.value.resetFields()
 	formData.value = {
-        type: '',
+		category: '',
 		hospital: '',
-        content: '',
+		message: '',
-        showDept: '',
+		organization: '',
 		permissions: '',
-        link: '',
+		href: '',
-        isHot: true,
+		hotspots: false,
 	}
 }
-const saveData = async () => {
+
-    await formRef.value.validate((valid: any, fields: any) => {
+const saveData = () => {
+	formRef.value.validate((valid: any, fields: any) => {
 		if (valid) {
+			sysMessageApi.save(formData.value).then((res: any) => {
+				if (res.code == 0 && res.data) {
 					ElMessage.success('保存成功！')
 					close()
+				} else {
+					ElMessage.error(res.msg ? res.msg : "保存失败");
+				}
+			})
 		} else {
 			// console.log('error submit!', fields)
 		}
 	})
 }
+
+const getHospitalList = () => {
+	hospitalApi.getHospitalList().then((res: any) => {
+		if (res.code == 0) {
+			hospitals.value = res.data;
+		}
+	});
+}
+
 </script>
 
 <style lang='scss' scoped>

src/views/logs-manage/message-manage.vue

@@ -52,18 +52,17 @@
 </template>
 
 <script lang='ts' setup>
-import { onMounted, reactive, ref, toRefs, watch } from 'vue'
+import {onMounted, ref} from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import {useRoute, useRouter} from 'vue-router'
-import { useRouter, useRoute } from 'vue-router'
 import CommonPagination from '@/components/common-pagination.vue'
 import MessageForm from './form/message-form.vue'
 import {tableRemoveRow} from '@/utils/table-util'
 import {getMessageType} from '@/static-data/core'
 import {dateFormater} from '@/utils/date-util'
+import * as sysMessageApi from "@/api/sys-message";
 
 const router = useRouter()
 const route = useRoute()
-
 const tableRef = ref()
 const messageFormRef = ref()
 const isSearch = ref(true)
@@ -72,6 +71,29 @@ const isFormDialog = ref(false)
 const formDialogTitle = ref('')
 const queryParams = ref({} as any)
 const tableData = ref([] as any)
+let current = 0;
+let size = 10;
+const total = ref(0);
+
+onMounted(() => {
+  init();
+})
+
+const init = () => {
+  total.value = 0;
+  current = 0;
+  tableData.value = [];
+  getMessageList();
+}
+
+const getMessageList = () => {
+  sysMessageApi.page(current, size).then((res: any) => {
+    if (res.code == 0) {
+      total.value = res.data.total
+      tableData.value = res.data.records
+    }
+  })
+}
 
 queryData({type: '公告', content: '测试测试测试'})
 
@@ -105,6 +127,7 @@ const addData = () => {
     messageFormRef.value.resetData()
   }, 0)
 }
+
 const editData = (e: any) => {
   isFormDialog.value = true
   formDialogTitle.value = '修改'
@@ -113,6 +136,7 @@ const editData = (e: any) => {
     messageFormRef.value.formData = JSON.parse(JSON.stringify(e))
   }, 0)
 }
+
 const removeData = (e?: any) => {
   const selectRow = e || tableRef.value.getSelectionRows()
   tableRemoveRow({data: selectRow}, (res: boolean) => {
@@ -121,8 +145,11 @@ const removeData = (e?: any) => {
     }
   })
 }
-const paginationChange = (page: number, size: number) => {
 
+const paginationChange = (page: number, s: number) => {
+  current = page;
+  size = s;
+  getMessageList();
 }
 </script>
 

src/views/permissions-manage/doctor-manage.vue

@@ -64,7 +64,8 @@
 								@save="doctorFormSave"/>
 	</el-dialog>
 	<ImportDialog ref="importDialogRef" title="用户导入"
-								templateUrl="/admin/sys-file/local/file/user.xlsx" importUrl="/admin/user/import"/>
+								templateUrl="/admin/sys-file/local/file/user.xlsx"
+		importUrl="/admin/user/import"/>
 </template>
 
 <script lang='ts' setup>

src/views/permissions-manage/form/role-form.vue

@@ -79,21 +79,43 @@ function close() {
 	emit('close')
 }
 
-function resetData() {
+function resetData(form?: any) {
 	formRef.value.resetFields()
+	if (form) {
+		form.menuIds = [];
+		formData.value = form;
+		getRoleMenu(form.roleId);
+	} else {
 		formData.value = {
 			roleId: '',
 			roleName: '',
 			roleCode: '',
 			roleDesc: '',
-		dataPermissions: '',
+			menuIds: []
 		}
 	}
+}
+
+const getRoleMenu = (roleId: string) => {
+	menuApi.getRoleTree(roleId).then((res: any) => {
+		treeRef.value.setCheckedKeys(res.data);
+	})
+}
 
 const saveData = async () => {
 	await formRef.value.validate((valid: any, fields: any) => {
 		if (valid) {
 			const form = Object.assign({}, formData.value);
+			if (props.type == "edit") {
+				updateRole(form);
+			} else {
+				addRole(form);
+			}
+		}
+	})
+}
+
+const addRole = (form: any) => {
 	form.menuIds = form.menuIds.join(",");
 	roleApi.addRole(form).then((res: any) => {
 		if (res.code == 0) {
@@ -104,7 +126,23 @@ const saveData = async () => {
 		}
 	});
 }
-	})
+
+const updateRole = async (form: any) => {
+	const menuIds = form.menuIds.join(",");
+	delete form.menuIds;
+	const res: any = await roleApi.updateRole(form);
+	const res1: any = await roleApi.saveRoleMenus(form.roleId, menuIds);
+	if (res.code == 0 && res1.code == 0) {
+		ElMessage.success("保存成功");
+		close();
+	} else {
+		if (res.code == 1) {
+			ElMessage.error(res.msg ? res.msg : "更新失败");
+		}
+		if (res1.code == 1) {
+			ElMessage.error(res.msg ? res.msg : "授权失败");
+		}
+	}
 }
 
 const checkChange = () => {

src/views/permissions-manage/role-manage.vue

@@ -60,7 +60,8 @@
 	<el-dialog v-model="isFormDialog" :title="formDialogTitle" width="30%">
 		<RoleForm ref="RoleFormRef" :type="formDialogTitle === '添加' ? 'add' : 'edit'" @close="isFormDialog = false"/>
 	</el-dialog>
-	<ImportDialog ref="importDialogRef" title="角色导入" templateUrl="#" importUrl="#"/>
+	<ImportDialog ref="importDialogRef" title="角色导入" templateUrl="/admin/sys-file/local/file/role.xlsx"
+		importUrl="/admin/role/import" @success="importSuccessEvent"/>
 	<EmpowerDialog ref="empowerDialogRef"/>
 </template>
 
@@ -73,6 +74,7 @@ import RoleForm from './form/role-form.vue'
 import ImportDialog from '@/components/import-dialog.vue'
 import EmpowerDialog from './form/empower-dialog.vue'
 import * as roleApi from "@/api/role";
+import {ElMessage} from "element-plus";
 
 const tableRef = ref()
 const RoleFormRef = ref()
@@ -132,10 +134,21 @@ const importData = () => {
 	}, 0);
 }
 const removeData = (e?: any) => {
-	const selectRow = e || tableRef.value.getSelectionRows()
+	const selectRow = [e] || tableRef.value.getSelectionRows();
 	tableRemoveRow({data: selectRow}, (res: boolean) => {
 		if (res) {
-			// console.log('调用删除', selectRow)
+			const ids: any = [];
+			selectRow.forEach((row: any) => {
+				ids.push(row.roleId);
+			})
+			roleApi.deleteById(ids).then((res: any) => {
+				if (res.code == 0) {
+					ElMessage.success("删除成功");
+					init();
+				} else {
+					ElMessage.error(res.msg ? res.msg : "删除失败");
+				}
+			})
 		}
 	})
 }
@@ -148,8 +161,7 @@ const editData = (e: any) => {
 	isFormDialog.value = true
 	formDialogTitle.value = '修改'
 	setTimeout(() => {
-		RoleFormRef.value.resetData()
+		RoleFormRef.value.resetData(JSON.parse(JSON.stringify(e)))
-//		RoleFormRef.value.formData = JSON.parse(JSON.stringify(e))
 	}, 0)
 }
 const tableRowClick = (row: any) => {
@@ -161,6 +173,10 @@ const paginationChange = (page: number, s: number) => {
 	size = s
 	getRoleList()
 }
+
+const importSuccessEvent = () => {
+	init();
+}
 </script>
 
 <style lang='scss' scoped>