xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
辉 2024-05-07 11:12:50 +08:00
commit bf84ff3273
16 changed files with 109 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 新医路院后患者管理平台
ENV = 'development'
# 新医路院后患者管理平台/开发环境
VUE_APP_BASE_API = 'http://8.131.93.145:54011'
VUE_APP_BASE_API = 'http://192.168.16.48:8080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

2
src/views/manage/blacklist/index.vue
View File

@ -470,7 +470,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {

4
src/views/manage/manualReview/index.vue
View File

@ -190,7 +190,7 @@ export default {
//主治医生
usergetListinfo() {
usergetList({
agencyId: this.queryParams.hospitalAgencyId,
hospitalAgencyId: this.queryParams.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data
@ -312,7 +312,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
// this.departmentlist = res.data

4
src/views/manage/patientInfo/index.vue
View File

@ -223,7 +223,7 @@ export default {
//主治医生
usergetListinfo() {
usergetList({
agencyId: this.queryParams.hospitalAgencyId,
hospitalAgencyId: this.queryParams.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data
@ -345,7 +345,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
// this.departmentlist = res.data

4
src/views/manage/preHospitalized/index.vue
View File

@ -713,7 +713,7 @@ export default {
//主治医生
usergetListinfo(id, type) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
if (type) {
@ -785,7 +785,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {

2
src/views/manage/propaganda/index.vue
View File

@ -1090,7 +1090,7 @@ export default {
this.form.diseaseTypeId = '';
let query = {
nodeType: 'DEPARTMENT',
agencyId: e,
hospitalAgencyId: e,
}
getDepartmentList(query).then(res => {
this.Departmentdata = res.data

6
src/views/manage/servicewaycontent/index.vue
View File

@ -8,10 +8,10 @@
v-show="showSearch"
label-width="100px"
>
<el-form-item label="服务方式名称" prop="serviceWayName">
<el-form-item label="服务内容" prop="serviceContent">
<el-input
v-model="queryParams.serviceWayName"
placeholder="请输入服务方式名称"
v-model="queryParams.serviceContent"
placeholder="请输入服务内容"
clearable
@keyup.enter.native="handleQuery"
/>

2
src/views/manage/signRecord/index.vue
View File

@ -600,7 +600,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
this.queryParams.departmentId = null

4
src/views/manage/visitin/index.vue
View File

@ -805,7 +805,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {
@ -893,7 +893,7 @@ export default {
//主治医生
usergetListinfo(id, type) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
if (type) {

6
src/views/manage/visitout/index.vue
View File

@ -638,7 +638,7 @@ export default {
//开单医生
usergetListinfotwo(id) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
this.addsignattendingPhysicianlist = res.data
@ -873,7 +873,7 @@ export default {
//主治医生
usergetListinfo(id, type) {
usergetList({
agencyId: id,
hospitalAgencyId: id,
postName: 'DOCTOR'
}).then(res => {
if (type) {
@ -945,7 +945,7 @@ export default {
this.getAgencyListinfo('CAMPUS', id, type)
// let query = {
// nodeType: 'DEPARTMENT',
// agencyId: id,
// hospitalAgencyId: id,
// }
// getDepartmentList(query).then(res => {
if (type) {

6
src/views/system/agency/index.vue
View File

@ -374,8 +374,9 @@
placeholder="请输入机构简称"
/>
</el-form-item>
<el-form-item label="机构代码" prop="agencyCode">
<el-form-item label="机构代码" prop="agencyCode" v-if="disabled">
<el-input
:disabled="disabled"
maxlength="20"
v-model="form.agencyCode"
style="width: 205px"
@ -581,6 +582,7 @@ export default {
name: "Agency",
data() {
return {
disabled: true,
arealist: [],
citylist: [],
arealists: [],
@ -1101,11 +1103,13 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.disabled = false;
this.title = "添加机构信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.disabled = true;
console.log(this.id);
if (this.id == "") {

15
src/views/system/agencyCategory/index.vue
View File

@ -134,7 +134,13 @@
</template>
</el-table-column> -->
<el-table-column label="类别排序" align="center" prop="categorySort" />
<el-table-column label="类别概述" align="center" prop="categoryRemark" />
<el-table-column
label="类别概述"
align="center"
prop="categoryRemark"
show-overflow-tooltip
/>
<el-table-column
label="操作"
align="center"
@ -199,9 +205,10 @@
placeholder="请输入类别名称"
/>
</el-form-item>
<el-form-item label="类别编码" prop="categoryCode">
<el-form-item label="类别编码" prop="categoryCode" v-if="disabled">
<el-input
maxlength="50"
:disabled="disabled"
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.categoryCode"
style="width: 250px"
@ -264,7 +271,7 @@ export default {
data() {
return {
treeOptions: [],
disabled: true,
// 遮罩层
loading: true,
isResouceShow: 1,
@ -390,12 +397,14 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.disabled = false;
this.open = true;
this.title = "添加机构类别";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.disabled = true;
const id = row.id || this.ids;
getAgencyCategory(id).then((response) => {
this.form = response.data;

32
src/views/system/department/index.vue
View File

@ -138,7 +138,7 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<!-- <el-table-column label="上级科室id" align="center" prop="parentDepartmentId" />
<el-table-column label="所属机构id" align="center" prop="agencyId" /> -->
<el-table-column label="所属机构id" align="center" prop="hospitalAgencyId" /> -->
<!-- <el-table-column label="所属机构名称" align="center" prop="agencyName" /> -->
<el-table-column
label="科室名称"
@ -330,8 +330,8 @@
placeholder="请输入上级科室id"
/>
</el-form-item>
<el-form-item label="所属机构id" prop="agencyId">
<el-input v-model="form.agencyId" placeholder="请输入所属机构id" />
<el-form-item label="所属机构id" prop="hospitalAgencyId">
<el-input v-model="form.hospitalAgencyId" placeholder="请输入所属机构id" />
</el-form-item>
<el-form-item label="所属机构名称" prop="agencyName">
<el-input
@ -408,17 +408,17 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属机构" prop="agencyName">
<el-form-item label="所属机构" prop="hospitalAgencyName">
<el-cascader
clearable
:props="{ checkStrictly: true }"
:options="treeOptions"
@change="change($event)"
style="width: 205px; color: black"
v-model="form.agencyId"
v-model="form.hospitalAgencyId"
:show-all-levels="false"
:placeholder="
form.agencyName ? form.agencyName : '请选择所属机构'
form.hospitalAgencyName ? form.hospitalAgencyName : '请选择所属机构'
"
ref="cascader"
:key="isResouceShow"
@ -682,8 +682,8 @@ export default {
pageNum: 1,
pageSize: 10,
parentDepartmentId: null,
agencyId: null,
agencyName: null,
hospitalAgencyId: null,
hospitalAgencyName: null,
departmentName: null,
departmentCode: null,
departmentType: null,
@ -724,7 +724,7 @@ export default {
id: "",
// 表单校验
rules: {
agencyName: [
hospitalAgencyName: [
{ required: true, message: "所属机构不能为空", trigger: "blur" },
],
departmentName: [
@ -834,14 +834,14 @@ export default {
change(e) {
console.log(e, "78");
if (e) {
this.form.agencyId = e[e.length - 1];
if (this.form.agencyId) {
this.form.hospitalAgencyId = e[e.length - 1];
if (this.form.hospitalAgencyId) {
const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels;
// console.log(arr, "5555555");
this.form.agencyName = arr.slice(-1).join(",");
this.form.hospitalAgencyName = arr.slice(-1).join(",");
// console.log(this.form.agencyName);
} else {
this.form.agencyName = "";
this.form.hospitalAgencyName = "";
}
}
},
@ -912,7 +912,7 @@ export default {
// 节点单击事件
handleNodeClick(data) {
console.log(data, "5");
this.queryParams.agencyId = data.id;
this.queryParams.hospitalAgencyId = data.id;
this.getList();
},
/** 查询科室信息列表 */
@ -934,8 +934,8 @@ export default {
this.form = {
id: null,
parentDepartmentId: null,
agencyId: null,
agencyName: null,
hospitalAgencyId: null,
hospitalAgencyName: null,
departmentName: null,
departmentCode: null,
departmentType: null,

2
src/views/system/followup/index.vue
View File

@ -313,7 +313,7 @@ export default {
//主治医生
usergetListinfo() {
usergetList({
agencyId: this.queryParams.hospitalAgencyId,
hospitalAgencyId: this.queryParams.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data

76
src/views/system/user/index.vue
View File

@ -372,7 +372,32 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="岗位名称" prop="postName">
<el-select
v-model="form.postName"
placeholder="请选择岗位名称"
style="width: 205px"
clearable
>
<el-option
v-for="item in nodeTypeoptions"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option>
</el-select>
<!-- <el-select v-model="form.postName" placeholder="请选择岗位名称">
<el-option
v-for="dict in dict.nodeTypeoptions"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select> -->
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<treeselect
@ -398,22 +423,22 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select
v-model="form.roleIds"
multiple
placeholder="请选择角色"
>
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-form-item label="角色">
<el-select
v-model="form.roleIds"
multiple
placeholder="请选择角色"
>
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="账号类型" prop="email">
<el-input
@ -481,7 +506,6 @@
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
@ -875,6 +899,7 @@ import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { getAgencytype } from "@/api/system/agency";
export default {
name: "User",
@ -976,7 +1001,7 @@ export default {
},
formlist: {
userId: "",
agencyId: "",
hospitalAgencyId: "",
userName: "",
},
formlistdep: {
@ -991,7 +1016,7 @@ export default {
},
formlists: {
userId: "",
agencyId: "",
hospitalAgencyId: "",
userName: "",
},
// 列信息
@ -1052,6 +1077,7 @@ export default {
],
},
// abc:{}
nodeTypeoptions: [],
};
},
watch: {
@ -1062,12 +1088,19 @@ export default {
},
created() {
this.getList();
this.infopostname();
this.getTreeselect();
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
});
},
methods: {
infopostname() {
var dictType = "post_name";
getAgencytype(dictType).then((res) => {
this.nodeTypeoptions = res.data;
});
},
// // 科室左边选中事件
handleSelectionChangendep(selection) {
if (selection.length > 1) {
@ -1109,7 +1142,7 @@ export default {
});
this.nowSelectData = selection;
if (selection.length > 0) {
this.formlist.agencyId = selection[0].agencyId;
this.formlist.hospitalAgencyId = selection[0].hospitalAgencyId;
}
},
@ -1255,6 +1288,7 @@ export default {
userCardNo: undefined,
userBirthDate: undefined,
sex: undefined,
postName: undefined,
status: "0",
remark: undefined,
postIds: [],

4
src/views/unitconfig/PatientConfigurationVisitRecords/index.vue
View File

@ -227,7 +227,7 @@ export default {
//主治医生
usergetListinfo() {
usergetList({
agencyId: this.$route.query.hospitalAgencyId,
hospitalAgencyId: this.$route.query.hospitalAgencyId,
postName: 'DOCTOR'
}).then(res => {
this.attendingPhysicianlist = res.data
@ -237,7 +237,7 @@ export default {
changecampusAgency() {
let query = {
nodeType: 'DEPARTMENT',
agencyId: this.$route.query.hospitalAgencyId,
hospitalAgencyId: this.$route.query.hospitalAgencyId,
}
getDepartmentList(query).then(res => {
this.departmentlist = res.data