From ede41782b4f8811c6031c7b24710ffecac222171 Mon Sep 17 00:00:00 2001
From: duhe <duhe@ccbjb.com.cn>
Date: Tue, 25 Feb 2025 10:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=BE=E7=97=85=E7=9B=AE=E5=BD=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0=20up=20by=20dh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/catalog/disease/authRole.vue    | 112 ------------
 .../catalog/disease/components/disease.js     |  19 +-
 .../src/views/catalog/disease/index.vue       |  29 ++-
 .../views/catalog/disease/profile/index.vue   |  87 ---------
 .../catalog/disease/profile/resetPwd.vue      |  57 ------
 .../catalog/disease/profile/userAvatar.vue    | 171 ------------------
 .../catalog/disease/profile/userInfo.vue      |  67 -------
 7 files changed, 16 insertions(+), 526 deletions(-)
 delete mode 100644 openhis-ui-vue3/src/views/catalog/disease/authRole.vue
 delete mode 100644 openhis-ui-vue3/src/views/catalog/disease/profile/index.vue
 delete mode 100644 openhis-ui-vue3/src/views/catalog/disease/profile/resetPwd.vue
 delete mode 100644 openhis-ui-vue3/src/views/catalog/disease/profile/userAvatar.vue
 delete mode 100644 openhis-ui-vue3/src/views/catalog/disease/profile/userInfo.vue

diff --git a/openhis-ui-vue3/src/views/catalog/disease/authRole.vue b/openhis-ui-vue3/src/views/catalog/disease/authRole.vue
deleted file mode 100644
index 0b5c14bc..00000000
--- a/openhis-ui-vue3/src/views/catalog/disease/authRole.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-   <div class="app-container">
-      <h4 class="form-header h4">基本信息</h4>
-      <el-form :model="form" label-width="80px">
-         <el-row>
-            <el-col :span="8" :offset="2">
-               <el-form-item label="用户昵称" prop="nickName">
-                  <el-input v-model="form.nickName" disabled />
-               </el-form-item>
-            </el-col>
-            <el-col :span="8" :offset="2">
-               <el-form-item label="登录账号" prop="userName">
-                  <el-input v-model="form.userName" disabled />
-               </el-form-item>
-            </el-col>
-         </el-row>
-      </el-form>
-
-      <h4 class="form-header h4">角色信息</h4>
-      <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
-         <el-table-column label="序号" width="55" type="index" align="center">
-            <template #default="scope">
-               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
-         <el-table-column label="角色编号" align="center" prop="roleId" />
-         <el-table-column label="角色名称" align="center" prop="roleName" />
-         <el-table-column label="权限字符" align="center" prop="roleKey" />
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
-
-      <el-form label-width="100px">
-         <div style="text-align: center;margin-left:-120px;margin-top:30px;">
-            <el-button type="primary" @click="submitForm()">提交</el-button>
-            <el-button @click="close()">返回</el-button>
-         </div>
-      </el-form>
-   </div>
-</template>
-
-<script setup name="AuthRole">
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
-
-const route = useRoute();
-const { proxy } = getCurrentInstance();
-
-const loading = ref(true);
-const total = ref(0);
-const pageNum = ref(1);
-const pageSize = ref(10);
-const roleIds = ref([]);
-const roles = ref([]);
-const form = ref({
-  nickName: undefined,
-  userName: undefined,
-  userId: undefined
-});
-
-/** 单击选中行数据 */
-function clickRow(row) {
-  proxy.$refs["roleRef"].toggleRowSelection(row);
-};
-/** 多选框选中数据 */
-function handleSelectionChange(selection) {
-  roleIds.value = selection.map(item => item.roleId);
-};
-/** 保存选中的数据编号 */
-function getRowKey(row) {
-  return row.roleId;
-};
-/** 关闭按钮 */
-function close() {
-  const obj = { path: "/system/user" };
-  proxy.$tab.closeOpenPage(obj);
-};
-/** 提交按钮 */
-function submitForm() {
-  const userId = form.value.userId;
-  const rIds = roleIds.value.join(",");
-  updateAuthRole({ userId: userId, roleIds: rIds }).then(response => {
-    proxy.$modal.msgSuccess("授权成功");
-    close();
-  });
-};
-
-(() => {
-  const userId = route.params && route.params.userId;
-  if (userId) {
-    loading.value = true;
-    getAuthRole(userId).then(response => {
-      form.value = response.user;
-      roles.value = response.roles;
-      total.value = roles.value.length;
-      nextTick(() => {
-        roles.value.forEach(row => {
-          if (row.flag) {
-            proxy.$refs["roleRef"].toggleRowSelection(row);
-          }
-        });
-      });
-      loading.value = false;
-    });
-  }
-})();
-</script>
diff --git a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
index 3f947607..9d8fe7d9 100644
--- a/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
+++ b/openhis-ui-vue3/src/views/catalog/disease/components/disease.js
@@ -45,23 +45,10 @@ export function delUser(userId) {
   })
 }
 
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
+// 病种目录分类查询
+export function getDiseaseCategory() {
   return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/system/user/profile',
+    url: '/datadictionary/disease/information-category',
     method: 'get'
   })
 }
diff --git a/openhis-ui-vue3/src/views/catalog/disease/index.vue b/openhis-ui-vue3/src/views/catalog/disease/index.vue
index 2c5bed27..a63201c0 100644
--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -12,9 +12,9 @@
                   style="margin-bottom: 20px"
                />
             </div> -->
-        <div class="head-container">
+        <!-- <div class="head-container">
           <el-tree
-            :data="deptOptions"
+            :data="conditionDefinitionOptions"
             :props="{ label: 'label', children: 'children' }"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
@@ -24,7 +24,7 @@
             default-expand-all
             @node-click="handleNodeClick"
           />
-        </div>
+        </div> -->
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
@@ -282,20 +282,16 @@
 
 <script setup name="Disease">
 import {
-  changeUserStatus,
   getDiseaseList,
   editDisease,
   addDisease,
-  deptTreeSelect,
+  getDiseaseCategory,
   getDiseaseOne,
 } from "./components/disease";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
-  "sys_normal_disable",
-  "sys_user_sex"
-);
+const { sys_normal_disable, sys_user_sex } = proxy.useDict( "sys_normal_disable","sys_user_sex");
 
 const diseaseList = ref([]);
 const open = ref(false);
@@ -309,7 +305,7 @@ const total = ref(0);
 const title = ref("");
 const dateRange = ref([]);
 const deptName = ref("");
-const deptOptions = ref(undefined);
+const conditionDefinitionOptions = ref(undefined);
 // const initPassword = ref(undefined);
 // const postOptions = ref([]);
 // const roleOptions = ref([]);
@@ -377,10 +373,11 @@ const filterNode = (value, data) => {
 // watch(deptName, val => {
 //   proxy.$refs["deptTreeRef"].filter(val);
 // });
-/** 查询部门下拉树结构 */
-function getDeptTree() {
-  deptTreeSelect().then((response) => {
-    deptOptions.value = response.data;
+/** 病种目录分类查询下拉树结构 */
+function getDiseaseCategoryList() {
+  getDiseaseCategory().then((response) => {
+    console.log(response, "response病种目录分类查询下拉树结构");
+    conditionDefinitionOptions.value = response.data;
   });
 }
 /** 查询病种目录列表 */
@@ -548,11 +545,11 @@ function handleView(row) {
   reset();
   open.value = true;
   getDiseaseOne(row.id).then((response) => {
-    console.log(response, "responsebbbb",row.id);
+    console.log(response, "responsebbbb", row.id);
     form.value = response.data;
     //  getList();
   });
 }
-getDeptTree();
+getDiseaseCategoryList();
 getList();
 </script>
diff --git a/openhis-ui-vue3/src/views/catalog/disease/profile/index.vue b/openhis-ui-vue3/src/views/catalog/disease/profile/index.vue
deleted file mode 100644
index 5851f05d..00000000
--- a/openhis-ui-vue3/src/views/catalog/disease/profile/index.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-   <div class="app-container">
-      <el-row :gutter="20">
-         <el-col :span="6" :xs="24">
-            <el-card class="box-card">
-               <template v-slot:header>
-                 <div class="clearfix">
-                   <span>个人信息</span>
-                 </div>
-               </template>
-               <div>
-                  <div class="text-center">
-                     <userAvatar />
-                  </div>
-                  <ul class="list-group list-group-striped">
-                     <li class="list-group-item">
-                        <svg-icon icon-class="user" />用户名称
-                        <div class="pull-right">{{ state.user.userName }}</div>
-                     </li>
-                     <li class="list-group-item">
-                        <svg-icon icon-class="phone" />手机号码
-                        <div class="pull-right">{{ state.user.phonenumber }}</div>
-                     </li>
-                     <li class="list-group-item">
-                        <svg-icon icon-class="email" />用户邮箱
-                        <div class="pull-right">{{ state.user.email }}</div>
-                     </li>
-                     <li class="list-group-item">
-                        <svg-icon icon-class="tree" />所属部门
-                        <div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
-                     </li>
-                     <li class="list-group-item">
-                        <svg-icon icon-class="peoples" />所属角色
-                        <div class="pull-right">{{ state.roleGroup }}</div>
-                     </li>
-                     <li class="list-group-item">
-                        <svg-icon icon-class="date" />创建日期
-                        <div class="pull-right">{{ state.user.createTime }}</div>
-                     </li>
-                  </ul>
-               </div>
-            </el-card>
-         </el-col>
-         <el-col :span="18" :xs="24">
-            <el-card>
-               <template v-slot:header>
-                 <div class="clearfix">
-                   <span>基本资料</span>
-                 </div>
-               </template>
-               <el-tabs v-model="activeTab">
-                  <el-tab-pane label="基本资料" name="userinfo">
-                     <userInfo :user="state.user" />
-                  </el-tab-pane>
-                  <el-tab-pane label="修改密码" name="resetPwd">
-                     <resetPwd />
-                  </el-tab-pane>
-               </el-tabs>
-            </el-card>
-         </el-col>
-      </el-row>
-   </div>
-</template>
-
-<script setup name="Profile">
-import userAvatar from "./userAvatar";
-import userInfo from "./userInfo";
-import resetPwd from "./resetPwd";
-import { getUserProfile } from "@/api/system/user";
-
-const activeTab = ref("userinfo");
-const state = reactive({
-  user: {},
-  roleGroup: {},
-  postGroup: {}
-});
-
-function getUser() {
-  getUserProfile().then(response => {
-    state.user = response.data;
-    state.roleGroup = response.roleGroup;
-    state.postGroup = response.postGroup;
-  });
-};
-
-getUser();
-</script>
diff --git a/openhis-ui-vue3/src/views/catalog/disease/profile/resetPwd.vue b/openhis-ui-vue3/src/views/catalog/disease/profile/resetPwd.vue
deleted file mode 100644
index 96daef39..00000000
--- a/openhis-ui-vue3/src/views/catalog/disease/profile/resetPwd.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-   <el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
-      <el-form-item label="旧密码" prop="oldPassword">
-         <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
-      </el-form-item>
-      <el-form-item label="新密码" prop="newPassword">
-         <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
-      </el-form-item>
-      <el-form-item label="确认密码" prop="confirmPassword">
-         <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
-      </el-form-item>
-      <el-form-item>
-      <el-button type="primary" @click="submit">保存</el-button>
-      <el-button type="danger" @click="close">关闭</el-button>
-      </el-form-item>
-   </el-form>
-</template>
-
-<script setup>
-import { updateUserPwd } from "@/api/system/user";
-
-const { proxy } = getCurrentInstance();
-
-const user = reactive({
-  oldPassword: undefined,
-  newPassword: undefined,
-  confirmPassword: undefined
-});
-
-const equalToPassword = (rule, value, callback) => {
-  if (user.newPassword !== value) {
-    callback(new Error("两次输入的密码不一致"));
-  } else {
-    callback();
-  }
-};
-const rules = ref({
-  oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "blur" }],
-  newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
-  confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, validator: equalToPassword, trigger: "blur" }]
-});
-
-/** 提交按钮 */
-function submit() {
-  proxy.$refs.pwdRef.validate(valid => {
-    if (valid) {
-      updateUserPwd(user.oldPassword, user.newPassword).then(response => {
-        proxy.$modal.msgSuccess("修改成功");
-      });
-    }
-  });
-};
-/** 关闭按钮 */
-function close() {
-  proxy.$tab.closePage();
-};
-</script>
diff --git a/openhis-ui-vue3/src/views/catalog/disease/profile/userAvatar.vue b/openhis-ui-vue3/src/views/catalog/disease/profile/userAvatar.vue
deleted file mode 100644
index 3b39636c..00000000
--- a/openhis-ui-vue3/src/views/catalog/disease/profile/userAvatar.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-  <div class="user-info-head" @click="editCropper()">
-    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
-      <el-row>
-        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
-          <vue-cropper
-            ref="cropper"
-            :img="options.img"
-            :info="true"
-            :autoCrop="options.autoCrop"
-            :autoCropWidth="options.autoCropWidth"
-            :autoCropHeight="options.autoCropHeight"
-            :fixedBox="options.fixedBox"
-            :outputType="options.outputType"
-            @realTime="realTime"
-            v-if="visible"
-          />
-        </el-col>
-        <el-col :xs="24" :md="12" :style="{ height: '350px' }">
-          <div class="avatar-upload-preview">
-            <img :src="options.previews.url" :style="options.previews.img" />
-          </div>
-        </el-col>
-      </el-row>
-      <br />
-      <el-row>
-        <el-col :lg="2" :md="2">
-          <el-upload
-            action="#"
-            :http-request="requestUpload"
-            :show-file-list="false"
-            :before-upload="beforeUpload"
-          >
-            <el-button>
-              选择
-              <el-icon class="el-icon--right"><Upload /></el-icon>
-            </el-button>
-          </el-upload>
-        </el-col>
-        <el-col :lg="{ span: 1, offset: 2 }" :md="2">
-          <el-button icon="Plus" @click="changeScale(1)"></el-button>
-        </el-col>
-        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-          <el-button icon="Minus" @click="changeScale(-1)"></el-button>
-        </el-col>
-        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-          <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
-        </el-col>
-        <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-          <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
-        </el-col>
-        <el-col :lg="{ span: 2, offset: 6 }" :md="2">
-          <el-button type="primary" @click="uploadImg()">提 交</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import "vue-cropper/dist/index.css";
-import { VueCropper } from "vue-cropper";
-import { uploadAvatar } from "@/api/system/user";
-import useUserStore from "@/store/modules/user";
-
-const userStore = useUserStore();
-const { proxy } = getCurrentInstance();
-
-const open = ref(false);
-const visible = ref(false);
-const title = ref("修改头像");
-
-//图片裁剪数据
-const options = reactive({
-  img: userStore.avatar,     // 裁剪图片的地址
-  autoCrop: true,            // 是否默认生成截图框
-  autoCropWidth: 200,        // 默认生成截图框宽度
-  autoCropHeight: 200,       // 默认生成截图框高度
-  fixedBox: true,            // 固定截图框大小 不允许改变
-  outputType: "png",         // 默认生成截图为PNG格式
-  filename: 'avatar',        // 文件名称
-  previews: {}               //预览数据
-});
-
-/** 编辑头像 */
-function editCropper() {
-  open.value = true;
-}
-/** 打开弹出层结束时的回调 */
-function modalOpened() {
-  visible.value = true;
-}
-/** 覆盖默认上传行为 */
-function requestUpload() {}
-/** 向左旋转 */
-function rotateLeft() {
-  proxy.$refs.cropper.rotateLeft();
-}
-/** 向右旋转 */
-function rotateRight() {
-  proxy.$refs.cropper.rotateRight();
-}
-/** 图片缩放 */
-function changeScale(num) {
-  num = num || 1;
-  proxy.$refs.cropper.changeScale(num);
-}
-/** 上传预处理 */
-function beforeUpload(file) {
-  if (file.type.indexOf("image/") == -1) {
-    proxy.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
-  } else {
-    const reader = new FileReader();
-    reader.readAsDataURL(file);
-    reader.onload = () => {
-      options.img = reader.result;
-      options.filename = file.name;
-    };
-  }
-}
-/** 上传图片 */
-function uploadImg() {
-  proxy.$refs.cropper.getCropBlob(data => {
-    let formData = new FormData();
-    formData.append("avatarfile", data, options.filename);
-    uploadAvatar(formData).then(response => {
-      open.value = false;
-      options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
-      userStore.avatar = options.img;
-      proxy.$modal.msgSuccess("修改成功");
-      visible.value = false;
-    });
-  });
-}
-/** 实时预览 */
-function realTime(data) {
-  options.previews = data;
-}
-/** 关闭窗口 */
-function closeDialog() {
-  options.img = userStore.avatar;
-  options.visible = false;
-}
-</script>
-
-<style lang='scss' scoped>
-.user-info-head {
-  position: relative;
-  display: inline-block;
-  height: 120px;
-}
-
-.user-info-head:hover:after {
-  content: "+";
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  color: #eee;
-  background: rgba(0, 0, 0, 0.5);
-  font-size: 24px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  cursor: pointer;
-  line-height: 110px;
-  border-radius: 50%;
-}
-</style>
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/catalog/disease/profile/userInfo.vue b/openhis-ui-vue3/src/views/catalog/disease/profile/userInfo.vue
deleted file mode 100644
index a5e1c773..00000000
--- a/openhis-ui-vue3/src/views/catalog/disease/profile/userInfo.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-   <el-form ref="userRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="用户昵称" prop="nickName">
-         <el-input v-model="form.nickName" maxlength="30" />
-      </el-form-item>
-      <el-form-item label="手机号码" prop="phonenumber">
-         <el-input v-model="form.phonenumber" maxlength="11" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-         <el-input v-model="form.email" maxlength="50" />
-      </el-form-item>
-      <el-form-item label="性别">
-         <el-radio-group v-model="form.sex">
-            <el-radio label="0">男</el-radio>
-            <el-radio label="1">女</el-radio>
-         </el-radio-group>
-      </el-form-item>
-      <el-form-item>
-      <el-button type="primary" @click="submit">保存</el-button>
-      <el-button type="danger" @click="close">关闭</el-button>
-      </el-form-item>
-   </el-form>
-</template>
-
-<script setup>
-import { updateUserProfile } from "@/api/system/user";
-
-const props = defineProps({
-  user: {
-    type: Object
-  }
-});
-
-const { proxy } = getCurrentInstance();
-
-const form = ref({});
-const rules = ref({
-  nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-  email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-  phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
-});
-
-/** 提交按钮 */
-function submit() {
-  proxy.$refs.userRef.validate(valid => {
-    if (valid) {
-      updateUserProfile(form.value).then(response => {
-        proxy.$modal.msgSuccess("修改成功");
-        props.user.phonenumber = form.value.phonenumber;
-        props.user.email = form.value.email;
-      });
-    }
-  });
-};
-
-/** 关闭按钮 */
-function close() {
-  proxy.$tab.closePage();
-};
-
-// 回显当前登录用户信息
-watch(() => props.user, user => {
-  if (user) {
-    form.value = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex };
-  }
-},{ immediate: true });
-</script>