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:
shidongli 2024-03-07 17:33:37 +08:00
commit 85dee7fa0a
8 changed files with 208 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,8 +47,35 @@ export function delQuestion(id) {
//科室接口
export function getDepartmentList(query) {
return request({
url: 'system/department/getDepartmentList',
url: '/system/department/getDepartmentList',
method: 'get',
params: query
})
}
//科室
export function selectUserDepartment() {
return request({
url: '/system/department/selectUserDepartment',
method: 'get',
})
}
//病种
export function diseaseList(query) {
return request({
url: '/system/departmentDisease/diseaseList',
method: 'get',
params: query
})
}
//分类管理确定
export function updateclassification(data) {
return request({
url: '/system/question/updateQuestion',
method: 'post',
data
})
}

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

@ -324,7 +324,6 @@
:disabled="disableedit"
placeholder="请选择服务方式"
style="width: 250px"
@change="change"
>
<el-option
v-for="item in DepartmentoList"
@ -501,9 +500,7 @@ export default {
form: {},
// 表单校验
rules: {
// serviceFrequencyType: [
// { required: true, message: "请选中服务频次", trigger: "blur" },
// ],
serviceFrequencyType: [{ required: true }],
serviceWayId: [
{ required: true, message: "请选中所属服务方式", trigger: "blur" },
@ -546,15 +543,16 @@ export default {
this.mentlist();
},
methods: {
getSuppliers(e) {
console.log(e);
},
blurInput(val) {
// this.servicewaycontentList.serviceFrequencyText=val
},
blurInputs() {
this.keyTable = Math.random();
},
// getSuppliers(e) {
// console.log(e);
// },
// blurInput(val) {
// // this.servicewaycontentList.serviceFrequencyText=val
// },
// blurInputs() {
// this.keyTable = Math.random();
// },
// 选择文本
textlist(e) {
if (e == true) {
this.form.serviceFrequencyStart = null;
@ -568,6 +566,7 @@ export default {
}
this.DIGIT = false;
},
// 选择数字
DIGITlist(e) {
console.log(e, "5");
if (e == true) {
@ -586,10 +585,10 @@ export default {
// 左侧服务方式提交
submitForms() {
// this.form.serviceFrequencyType=this.DIGIT
// console.log(this.itenname,'5252')
// console.log(this.format,'5252')
this.$refs["form"].validate((valid) => {
if (valid) {
console.log(this.format);
// console.log(this.format);
if (this.format.id) {
editServiceWay(this.format).then((response) => {
this.$modal.msgSuccess("修改成功");
@ -625,10 +624,6 @@ export default {
this.loading = false;
});
},
change(e) {
console.log(e);
// this.form.serviceWayId=e
},
// 左侧科室
itemdata(item) {
if (item) {
@ -668,21 +663,6 @@ export default {
);
});
});
// }
// if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'){
// e.serviceFrequencyText = JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyStart) +
// '~' +
// JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyEnd)
// }
// e.serviceWayFrequencyList[0].forEach(el=>{
// console.log(el)
// // this.serviceFrequencyText = el.serviceFrequencyText;
// })
// this.serviceFrequencyText= this.servicewaycontentList[0].serviceFrequencyText
this.total = response.total;
this.loading = false;
});
@ -736,6 +716,12 @@ export default {
this.reset();
this.disableedit = false;
this.disabledcontent = false;
this.DIGIT = true;
this.TEXT = false;
this.disableda = false;
this.disabledb = false;
this.disabled = true; //文本
this.form.serviceFrequencyType = "DIGIT";
console.log(this.itemname, "itemname");
if (this.itemname) {
@ -743,6 +729,7 @@ export default {
this.form.serviceWayId = this.itemname;
console.log(this.form, " this.form");
}
// else if (this.itemname == null) {
// this.form.serviceWayId = "请选择服务方式"
// }
@ -790,6 +777,7 @@ export default {
changeTEXT(item) {},
/** 提交按钮 */
submitForm() {
console.log(this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
if (
@ -892,6 +880,7 @@ export default {
handleUpdateserve() {
this.titles = "新增服务方式";
this.format.serviceWayName = "";
this.format.id = "";
this.opens = true;
},
/** 删除按钮操作 */

35
src/views/system/addQuestionnaire/index.vue
View File

@ -2,10 +2,10 @@
<div class="app-container">
<div class="header">
<div class="topheader">
<el-button size="medium">返回</el-button>
<el-button size="medium" type="primary" plain>预览问卷</el-button>
<el-button size="medium" @click="goback">返回</el-button>
<!-- <el-button size="medium" type="primary" plain>预览问卷</el-button> -->
<el-button size="medium" type="primary" @click="upload">保存</el-button>
<el-button size="medium" type="primary">保存并发布</el-button>
<!-- <el-button size="medium" type="primary" @click="releaseupload">保存并发布</el-button> -->
</div>
<div class="bottomheader">
<div class="questiontypes">
@ -1028,12 +1028,33 @@ export default {
this.list.questionCount = this.questionlist.length
if (this.$route.query.id) {
updateQuestion(this.list).then(res => {
this.$confirm('编辑保存成功, 是否返回上一页?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
}).catch(() => {
this.$modal.msgSuccess("编辑保存成功");
});
})
} else {
addQuestion(this.list).then(res => {
this.$confirm('新增保存成功, 是否返回上一页?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'success'
}).then(() => {
this.$router.go(-1);
}).catch(() => {
this.$modal.msgSuccess("新增保存成功");
});
})
}
},
//保存并发布
releaseupload() {
},
info() {
getQuestion(this.$route.query.id).then(res => {
@ -1067,7 +1088,7 @@ export default {
e.title = '打分题'
}
})
var data = res.data.questionSubjectList
var data = res.data.questionSubjectList.filter(e => e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_BLANKS_SUBJECT' || e.questionType == 'COMBINATION_BLANKS_SUBJECT')
var echararr = [];
for (var i = 0; i < data.length; i++) {
var arrindex = echararr.findIndex((item, index, arr) => { return item.questionDescription === data[i].questionDescription })//获取下标
@ -1086,6 +1107,9 @@ export default {
this.questionlist = [...this.questionlist, ...echararr]
})
},
goback() {
this.$router.go(-1);
},
}
};
</script>
@ -1185,6 +1209,7 @@ export default {
.title {
width: 80%;
margin: 20px auto 30px;
text-align: left;
span {
display: inline-block;

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

@ -671,18 +671,21 @@ export default {
this.infolist();
},
methods: {
// 节点类型
info() {
var dictType = "node_type";
getAgencytype(dictType).then((res) => {
this.nodeTypeoptions = res.data;
});
},
// 上级机构
infolist() {
var dictType = "agency_category_manage_level";
getAgencytype(dictType).then((res) => {
this.options = res.data;
});
},
// 删除机构
renderContent(h, { node, data, store }) {
return (
<span class="custom-tree-node">
@ -718,15 +721,7 @@ export default {
})
.catch(() => {});
},
// lazyLoad(node, resolve) {
// // 这儿过来了吗对
// // console.log(node, "children", this.treeOptions);
// // const id = node.level === 0 ? 0 : node.data.id;
// // setTimeout(() => {
// // resolve(this.treeOptions);
// // // this.$off("load-data", this.lazyLoad);
// // }, 300);
// },
// 机构树
gettreelist() {
agencyList().then((res) => {
// 接口请求
@ -743,6 +738,7 @@ export default {
console.log(res.data, "58", this.treeOptions);
});
},
// 卫生机构类别
gettreelistitem() {
agencyCategoryList().then((res) => {
// 接口请求
@ -1099,4 +1095,5 @@ export default {
.el-cascader .el-input input::-webkit-input-placeholder {
color: #686a6d;
}
</style>

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

@ -321,6 +321,7 @@ export default {
this.gettreelistitem();
},
methods: {
// 父级类别
gettreelistitem() {
agencyCategoryList().then((res) => {
// 接口请求

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

@ -738,6 +738,7 @@ export default {
this.infocompare();
},
methods: {
// 上级科室
changeparentDepartment(e) {
this.form.parentDepartmentId = e;
console.log(e);
@ -751,47 +752,52 @@ export default {
this.loading = false;
});
},
// 细分类别
getinfolist() {
listSubdivision().then((res) => {
this.optionsubdivisionCategory = res.rows;
});
},
// 上级科室
getinfo() {
getDepartmentList().then((res) => {
console.log(res, "666");
this.optionsparentDepartment = res.data;
});
},
// 节点类型
info() {
var dictType = "department_node_type";
getAgencytype(dictType).then((res) => {
this.nodeTypeoptions = res.data;
});
},
// 科室类型
infodepartment() {
var dictType = "department_type";
getAgencytype(dictType).then((res) => {
this.departmentoptions = res.data;
});
},
// 服务类别
infolist() {
var dictType = "provide_service_category";
getAgencytype(dictType).then((res) => {
this.options = res.data;
});
},
// 所属机构
change(e) {
console.log(e, "78");
this.form.agencyId = e[e.length - 1];
const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels;
this.form.agencyName = arr.slice(-1).join(",");
console.log(this.form.agencyName);
},
changeagencyCategoryId(e) {
this.form.parentDepartmentId = e[e.length - 1];
},
// changeagencyCategoryId(e) {
// this.form.parentDepartmentId = e[e.length - 1];
// },
// gettreelistitem() {
// agencyCategoryList().then((res) => {
// // 接口请求
@ -800,6 +806,7 @@ export default {
// });
// });
// },
// 所属机构
gettreelist() {
agencyList().then((res) => {
// 接口请求
@ -845,12 +852,6 @@ export default {
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
// /** 查询部门下拉树结构 */
// getTreeselect() {
// agencyList().then((response) => {
// this.deptOptions = response.data;
// });
// },
// 筛选节点
filterNode(value, data) {

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

@ -40,17 +40,21 @@
<el-table-column label="问卷模板ID" align="center" prop="questionnaireId" />
<el-table-column label="问卷状态" align="center" prop="questionnaireStatus">
<template slot-scope="scope">
<el-button size="mini" type="text" v-if="scope.row.questionnaireStatus == 'PUBLISHED'">已发布</el-button>
<el-button size="mini" type="info" v-if="scope.row.questionnaireStatus == 'UNPUBLISHED'">未发布</el-button>
<el-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949"
active-value="PUBLISHED" inactive-value="UNPUBLISHED" active-text="已发布" inactive-text="未发布"
@change="switchstatus($event, scope.row)">
</el-switch>
</template>
</el-table-column>
<el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
<el-button size="mini" type="text" @click="handleClassification(scope.row)"
v-hasPermi="['system:question:edit']">分类管理</el-button>
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:question:edit']">编辑</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
<el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:question:remove']">删除</el-button>
</template>
</el-table-column>
@ -59,16 +63,38 @@
:limit.sync="queryParams.pageSize" @pagination="getList" />
</el-col>
</el-row>
<el-dialog title="提示" :visible.sync="classificationOpen" width="30%" :before-close="classificationOpenfalse">
<el-form ref="form" :model="classificationform" label-width="80px" :rules="rules">
<el-form-item label="科室名称" prop="departmentId">
<el-select v-model="classificationform.departmentId" placeholder="请选择科室" clearable style="width:300px"
@clear="cleardepartment" @change="changedepartment">
<el-option v-for="item in departmentlist" :key="item.id" :label="item.departmentName" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="病种名称">
<el-select v-model="classificationform.diseaseTypeId" placeholder="请选择病种" clearable style="width:300px"
@change="changediseaseType">
<el-option v-for="item in diseaselist" :key="item.id" :label="item.diseaseTypeName" :value="item.id" />
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="classificationupload">确 定</el-button>
<el-button @click="classificationOpenfalse">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listQuestion, getQuestion, delQuestion, addQuestion, updateQuestion, getDepartmentList } from "@/api/system/question";
import { listQuestion, getQuestion, delQuestion, addQuestion, updateQuestion, getDepartmentList, selectUserDepartment, diseaseList, updateclassification } from "@/api/system/question";
export default {
name: "Question",
data() {
return {
classificationOpen: false,
classificationform: {},
//科室名称
departmentName: '',
defaultProps: {
@ -83,6 +109,8 @@ export default {
total: 0,
// 问卷基本信息表格数据
questionList: [],
departmentlist: [],
diseaselist: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -101,6 +129,11 @@ export default {
questionnaireSort: null,
questionnaireRemark: null,
},
rules: {
departmentId: [
{ required: true, message: '请选择科室', trigger: 'change' }
],
}
};
},
watch: {
@ -114,6 +147,57 @@ export default {
this.getList();
},
methods: {
classificationupload() {
let query = {
id: this.classificationform.id,
diseaseTypeId: this.classificationform.diseaseTypeId,
diseaseTypeName: this.classificationform.diseaseTypeName,
departmentId: this.classificationform.departmentId,
departmentName: this.classificationform.departmentName,
}
updateclassification(query).then(res => {
this.classificationform = {}
this.$modal.msgSuccess("修改成功");
this.getList();
this.classificationOpen = false
})
},
//分类管理
handleClassification(row) {
this.classificationform = row
if (this.classificationform.departmentId) {
let query = {
departmentId: this.classificationform.departmentId
}
diseaseList(query).then(res => {
this.diseaselist = res.data
})
}
this.classificationOpen = true
},
classificationOpenfalse() {
this.classificationOpen = false
this.classificationform = {}
},
cleardepartment() {
this.classificationform.diseaseTypeId = ''
},
changedepartment(e) {
this.classificationform.departmentName = this.departmentlist.find(el => el.id == e).departmentName
let query = {
departmentId: e
}
diseaseList(query).then(res => {
this.diseaselist = res.data
})
},
changediseaseType(e) {
this.classificationform.diseaseTypeName = this.diseaselist.find(el => el.id == e).diseaseTypeName
},
//切换发布状态
switchstatus(e, item) {
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.departmentId = data.id;
@ -132,6 +216,9 @@ export default {
})
this.deptOptions = response.data;
});
selectUserDepartment().then(res => {
this.departmentlist = res.data
})
},
/** 查询问卷基本信息列表 */
getList() {

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

@ -1096,7 +1096,6 @@ export default {
this.$refs.multipleTable.toggleRowSelection(selection.pop()); // 设置选择项
}
});
this.nowSelectData = selection;
if(selection.length>0){
this.formlist.agencyId = selection[0].agencyId;
@ -1172,20 +1171,20 @@ export default {
}
});
},
// 方法
handleRemoveTabList(isNeedArr, originalArr) {
if (isNeedArr.length && originalArr.length) {
for (let i = 0; i < isNeedArr.length; i++) {
for (let k = 0; k < originalArr.length; k++) {
// 注意，nickName为唯一值，如果不为唯一值那么会出错
if (isNeedArr[i]["id"] === originalArr[k]["id"]) {
console.log("-----------1111");
originalArr.splice(k, 1);
}
}
}
}
},
// // 方法
// handleRemoveTabList(isNeedArr, originalArr) {
// if (isNeedArr.length && originalArr.length) {
// for (let i = 0; i < isNeedArr.length; i++) {
// for (let k = 0; k < originalArr.length; k++) {
// // 注意，nickName为唯一值，如果不为唯一值那么会出错
// if (isNeedArr[i]["id"] === originalArr[k]["id"]) {
// console.log("-----------1111");
// originalArr.splice(k, 1);
// }
// }
// }
// }
// },
/** 查询用户列表 */
getList() {
this.loading = true;
@ -1321,6 +1320,7 @@ export default {
this.totalag = res.total;
});
},
// 科室右边
infodep2() {
getBelongDepartment(this.userName).then((res) => {
this.tableDatadep2 = res.rows;
@ -1344,6 +1344,7 @@ export default {
}
});
},
// 点击设置机构
handleinnerVisibleshow(row) {
console.log(row);
this.title = "设置机构";
@ -1366,6 +1367,7 @@ export default {
// this.belongAgencyNum = res.data.belongAgencyNum;
// });
},
// 点击设置科室
handleinnerVisibleshowdep(row) {
this.reset();
console.log(row);