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-07-08 15:29:04 +08:00
commit a7309bae00
9 changed files with 76 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/system/question.js
View File

@ -54,10 +54,11 @@ export function getDepartmentList(query) {
}
//科室
export function selectUserDepartment() {
export function selectUserDepartment(query) {
return request({
url: '/system/department/selectUserDepartment',
method: 'get',
params: query
})
}

11
src/views/components/DepartmentList.vue
View File

@ -60,6 +60,7 @@ import { listOperationNum } from "@/api/operationInfo/operationInfo";
import {
listWechatTemplateNum,
} from "@/api/manage/template";
import { getDepartmentList } from "@/api/system/question";
import { listScriptNum } from "@/api/manage/script";
import { listMessageNum } from "@/api/manage/message";
import { selectNumByDept } from "@/api/manage/propaganda";
@ -178,6 +179,8 @@ export default {
method = selectNumByDept(this.querydepartmen)
} else if (this.methods == 'listServicePackageNum') {
method = listServicePackageNum(this.querydepartmen)
} else if (this.methods == 'getDepartmentList') {
method = getDepartmentList(this.querydepartmen)
}
method.then(response => {
this.DepartmentoList = response.data.deptNumList;
@ -188,6 +191,14 @@ export default {
this.count += item.countNum;
}
});
if (this.methods == 'getDepartmentList') {
this.$emit("clickdepartment", {
hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
itemid: '',
itemName: '',
hospitalAgencyName: this.hospitalAgencyName
});
}
this.$emit("clickdepartment", {
hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
itemid: '',

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

@ -7,7 +7,7 @@
</el-col>
<el-col :span="19" :xs="24">
<div ref="topform" class="form">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="短信模板名称" prop="textMessageName" label-width="100px">
<el-input v-model="queryParams.textMessageName" placeholder="请输入微信模版名称" clearable
@ -473,7 +473,7 @@ export default {
this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.$refs.DepartmentList.resetQuery()
this.resetForm("queryForm");
this.resetForm("queryForms");
this.handleQuery();
},
// 多选框选中数据

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

@ -373,7 +373,6 @@ export default {
data() {
//验证身份证
var isimgPath = (rule, value, callback) => {
console.log(value)
if (!this.form.imgPath) {
callback(new Error("素材选择不能为空"));
} else {
@ -807,7 +806,7 @@ export default {
},
// 点击病种
clickdisease() {
if (!this.form.departmentName) {
if (this.form.departmentName == '请选择科室') {
this.$modal.msgError("请先选择科室");
} else {
this.diseaseshowst = true;
@ -888,7 +887,7 @@ export default {
this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.$refs.DepartmentList.resetQuery()
this.resetForm("queryForm");
this.resetForm("queryForms");
this.handleQuery();
},
// 多选框选中数据

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

@ -7,7 +7,7 @@
</el-col>
<el-col :span="19" :xs="24">
<div ref="topform" class="form">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="通用话术名称" prop="commonScriptName" label-width="100px">
<el-input v-model="queryParams.commonScriptName" placeholder="请输入通用话术名称" clearable
@ -585,7 +585,7 @@ export default {
}
this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.$refs.DepartmentList.resetQuery()
this.resetForm("queryForm");
this.resetForm("queryForms");
this.handleQuery();
},
// 多选框选中数据

47
src/views/manage/servicepackage/index.vue
View File

@ -7,7 +7,7 @@
</el-col>
<el-col :span="19" :xs="24">
<div ref="topform" class="form">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
label-width="90px">
<el-form-item label="病种名称" prop="diseaseTypeName">
<el-input v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
@ -88,7 +88,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
<el-form-item label="科室名称" prop="departmentId">
<el-button @click="clickinnerVisible()" style="
width: 379px;
width: 208px;
text-align: left;
height: 36px;
overflow: hidden;
@ -97,7 +97,7 @@
<el-form-item label="病种名称" prop="diseaseTypeName">
<el-button type="" @click="clickdisease()" :style="form.diseaseTypeName == '请选择病种' ? 'color: #c0c4cc;' : ''"
style="
width: 206px;
width: 208px;
text-align: left;
height: 36px;
overflow: hidden;
@ -111,7 +111,7 @@
</el-form-item>
<el-form-item label="服务包价格" prop="packagePrice">
<el-input oninput="value=value.replace(/[^\d.]/g,'')" v-model="form.packagePrice" placeholder="请输入服务包价格"
style="width: 204px">
style="width: 208px">
<template slot="append">元</template>
</el-input>
</el-form-item>
@ -119,7 +119,7 @@
<el-input v-model="form.packageVersion" placeholder="请输入服务包版本" />
</el-form-item>
<el-form-item label="硬件类型" prop="hardwareType">
<el-select v-model="form.hardwareType" placeholder="请选择硬件类型" style="width: 204px">
<el-select v-model="form.hardwareType" placeholder="请选择硬件类型" style="width: 208px">
<el-option v-for="item in optionstype" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -136,13 +136,14 @@
<br />
<div v-for="(aitem, index) in form.voList" :key="index">
<el-form-item label="服务包内容" :rules="rules.voList.serviceWayName" :prop="`voList.${index}.serviceWayName`">
<el-select v-model="aitem.serviceWayName" placeholder="请选择服务方式" @change="changeway($event, index)">
<el-select v-model="aitem.serviceWayName" placeholder="请选择服务方式" @change="changeway($event, index)"
style="width:208px">
<el-option v-for="item in optionsway" :key="item.id" :label="item.serviceWayName"
:value="item.serviceWayName">
</el-option>
</el-select>
<el-form-item label="" :rules="rules.voList.serviceContent" :prop="`voList.${index}.serviceContent`">
<el-select style="margin-left: 10px" v-model="aitem.serviceContent" placeholder="请选择服务内容"
<el-select style="margin-left: 10px;width:208px" v-model="aitem.serviceContent" placeholder="请选择服务内容"
@change="changcontent($event, index)">
<el-option v-for="item in optionscontent[index]" :key="item.id" :label="item.serviceContent"
:value="item.serviceContent">
@ -151,7 +152,7 @@
</el-form-item>
<el-form-item label="" :rules="rules.voList.serviceFrequencyText"
:prop="`voList.${index}.serviceFrequencyText`">
<el-select v-model="aitem.serviceFrequencyText" placeholder="请选择服务频次">
<el-select v-model="aitem.serviceFrequencyText" placeholder="请选择服务频次" style="width:208px">
<el-option v-for="item in optionsfrequency[index]" :key="item.id" :label="item.serviceFrequencyText"
:value="item.serviceFrequencyText">
</el-option>
@ -429,7 +430,6 @@ export default {
hardwareType: null,
whetherRelease: null,
},
// 表单参数
form: {},
formdetail: {},
@ -447,8 +447,6 @@ export default {
packageVersion: [
{ required: true, message: "服务包版本不能为空", trigger: "blur" }
],
// packageVersion:[
// ],
packageName: [
{ required: true, message: "服务包名称不能为空", trigger: "blur" }
],
@ -479,7 +477,6 @@ export default {
]
},
},
serviceWayId: '',
};
},
created() {
@ -609,6 +606,7 @@ export default {
} else {
this.form.voList.push(obj);
}
this.$forceUpdate()
},
/** 查询服务包基础信息列表 */
getList() {
@ -627,8 +625,8 @@ export default {
},
// 服务方式点击事件
changeway(e, index) {
this.serviceWayId = this.optionsway.find(f => f.serviceWayName == e).id
serviccontent(this.serviceWayId).then(response => {
let serviceWayId = this.optionsway.find(f => f.serviceWayName == e).id
serviccontent(serviceWayId).then(response => {
this.optionscontent[index] = response.rows;
});
this.form.voList[index].serviceContent = null
@ -707,7 +705,7 @@ export default {
},
// 点击病种
clickdisease() {
if (!this.form.departmentName) {
if (this.form.departmentName == '请选择科室') {
this.$modal.msgError("请先选择科室");
} else {
this.querydisease.departmentId = this.form.departmentId
@ -758,7 +756,12 @@ export default {
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
updateTime: null,
voList: [{
serviceContent: null,
serviceFrequencyText: null,
serviceWayName: null,
}]
};
this.optionsway = [],
// 服务内容
@ -796,7 +799,7 @@ export default {
this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.$refs.DepartmentList.resetQuery()
this.resetForm("queryForm");
this.resetForm("queryForms");
this.handleQuery();
},
// 多选框选中数据
@ -893,9 +896,14 @@ export default {
},
// 提交
submitForm() {
this.form.hospitalAgencyId = this.queryParams.hospitalAgencyId
this.form.hospitalAgencyName = this.queryParams.hospitalAgencyName
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
if (!this.form.diseaseTypeId) {
this.form.diseaseTypeName = ''
}
if (this.form.voList) {
var obj = JSON.parse(JSON.stringify(this.form))
obj.voList.forEach(e => {
@ -913,6 +921,7 @@ export default {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.$refs.DepartmentList.Departmentlist()
});
}
} else {
@ -933,6 +942,7 @@ export default {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
this.$refs.DepartmentList.Departmentlist()
});
}
}
@ -947,6 +957,7 @@ export default {
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$refs.DepartmentList.Departmentlist()
}).catch(() => { });
},
/** 导出按钮操作 */
@ -988,7 +999,7 @@ export default {
::v-deep .el-input-group {
width: 204px !important;
width: 208px !important;
}
.container {

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

@ -7,7 +7,7 @@
</el-col>
<el-col :span="19" :xs="24">
<div ref="topform" class="form">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item label="微信模版名称" prop="wechatTemplateName" label-width="100px">
<el-input v-model="queryParams.wechatTemplateName" placeholder="请输入微信模版名称" clearable
@ -469,7 +469,7 @@ export default {
this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.$refs.DepartmentList.resetQuery()
this.resetForm("queryForm");
this.resetForm("queryForms");
this.handleQuery();
},
// 多选框选中数据

4
src/views/operationInfo/operationInfo/index.vue
View File

@ -7,7 +7,7 @@
</el-col>
<el-col :span="19" :xs="24">
<div ref="topform" class="form">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
<el-form-item label="手术名称" prop="operationName">
<el-input v-model="queryParams.operationName" placeholder="请输入手术名称" clearable
@ -296,7 +296,7 @@ export default {
this.informationqueryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
this.$refs.DepartmentList.resetQuery()
this.resetForm("queryForm");
this.resetForm("queryForms");
this.handleQuery();
},
// 多选框选中数据

73
src/views/system/question/index.vue
View File

@ -3,18 +3,8 @@
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="5" :xs="24">
<div class="left" ref="box">
<div class="name">科室名称</div>
<div style="padding: 10px 0;">
<el-input v-model="departmentName" placeholder="请输入科室名称" clearable @keyup.enter.native="getTreeselect" />
</div>
<div class="listitem" v-for="(item, index) in deptOptions" :key="index" @click="clickDepartmenitem(item)">
<div :class="queryParams.departmentId == item.id ? 'allactive' : 'all'">
{{ item.departmentName }}
</div>
<span class="count">{{ item.countNum }}</span>
</div>
</div>
<DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'getDepartmentList'">
</DepartmentList>
</el-col>
<!--用户数据-->
<el-col :span="19" :xs="24">
@ -106,22 +96,17 @@
<script>
import { listQuestion, getQuestion, delQuestion, addQuestion, updateQuestion, getDepartmentList, selectUserDepartment, diseaseList, updateclassification } from "@/api/system/question";
import DepartmentList from '../../components/DepartmentList.vue'
export default {
components: {
DepartmentList,
},
name: "Question",
data() {
return {
maxTableHeight: undefined,
classificationOpen: false,
classificationform: {},
//科室名称
departmentName: '',
defaultProps: {
children: "children",
label: "label"
},
// 部门树选项
deptOptions: undefined,
// 遮罩层
loading: true,
// 总条数
@ -155,14 +140,7 @@ export default {
}
};
},
watch: {
// 根据名称筛选部门树
departmentName(val) {
// this.getTreeselect()
}
},
created() {
this.getTreeselect();
this.getList();
},
mounted() {
@ -170,6 +148,17 @@ export default {
this.screenChange()
},
methods: {
//接收科室列表传值
clickdepartment(item) {
this.queryParams.hospitalAgencyId = item.hospitalAgencyId
this.queryParams.hospitalAgencyName = item.hospitalAgencyName
this.queryParams.departmentId = item.itemid
this.departmentName = item.itemName
if (item.hospitalAgencyId) {
this.getList();
}
this.$forceUpdate()
},
clickDepartmenitem(item) {
this.loading = true;
this.queryParams.departmentId = item.id;
@ -193,6 +182,12 @@ export default {
//分类管理
handleClassification(row) {
this.classificationform = JSON.parse(JSON.stringify(row))
let queryparam = {
hospitalAgencyId: this.queryParams.hospitalAgencyId
}
selectUserDepartment(queryparam).then(res => {
this.departmentlist = res.data
})
if (this.classificationform.departmentId) {
let query = {
departmentId: this.classificationform.departmentId
@ -261,25 +256,6 @@ export default {
this.queryParams.departmentId = data.id;
this.handleQuery();
},
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
/** 查询科室下拉树结构 */
getTreeselect() {
getDepartmentList({
departmentName: this.departmentName
}).then(response => {
// response.data.forEach(e => {
// e.label = e.departmentName
// })
this.deptOptions = response.data;
});
selectUserDepartment().then(res => {
this.departmentlist = res.data
})
},
/** 查询问卷基本信息列表 */
getList() {
this.loading = true;
@ -293,7 +269,6 @@ export default {
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.getTreeselect();
},
/** 重置按钮操作 */
resetQuery() {
@ -334,9 +309,9 @@ export default {
this.$modal.confirm('是否确认删除问卷？').then(function () {
return delQuestion(ids);
}).then(() => {
this.getTreeselect();
this.getList();
this.$modal.msgSuccess("删除成功");
this.$refs.DepartmentList.Departmentlist()
}).catch(() => { });
},
/** 导出按钮操作 */