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

This commit is contained in:
shidongli 2024-07-12 11:14:40 +08:00
commit 5200769be2
5 changed files with 77 additions and 213 deletions

View File

@ -55,6 +55,7 @@ export default {
}
},
created() {
localStorage.removeItem('questionquery')
localStorage.removeItem('manualReviewquery')
localStorage.removeItem('signRecordquery')
localStorage.removeItem('followupquery')

View File

@ -112,6 +112,9 @@ const actions = {
},
delView({ dispatch, state }, view) {
if (view.fullPath == "/knowledge/question") {
localStorage.removeItem('questionquery')
}
if (view.fullPath == '/task/manualReview') {
localStorage.removeItem('manualReviewquery')
}
@ -144,6 +147,9 @@ const actions = {
},
delOthersViews({ dispatch, state }, view) {
if (view.fullPath == "/knowledge/question") {
localStorage.removeItem('questionquery')
}
if (view.fullPath != '/task/manualReview') {
localStorage.removeItem('manualReviewquery')
}

View File

@ -79,6 +79,7 @@ export default {
switchvalue: true,
//
itemid: null,
departmentName: '',
//
DepartmentoList: [],
count: '',
@ -236,6 +237,11 @@ export default {
this.count += item.countNum;
}
});
if (localStorage.getItem('questionquery')) {
this.itemid = JSON.parse(localStorage.getItem('questionquery')).departmentId
this.departmentName = JSON.parse(localStorage.getItem('questionquery')).departmentName
}
if (this.methods != 'getDepartmentList') {
this.$emit("clickdepartment", {
hospitalAgencyId: this.querydepartmen.hospitalAgencyId,
itemid: this.itemid,
@ -243,6 +249,7 @@ export default {
hospitalAgencyName: this.hospitalAgencyName
});
}
}
});
},
}

View File

@ -286,14 +286,6 @@
<div class="lefttext">
文字提醒
</div>
<div class="righttextarea">
{{ item.textRemindContent }}
</div>
</div>
<div class="tabtext" v-else>
<div class="lefttext">
内容
</div>
<div class="righttextarea" v-html="item.nodeContent">
</div>
</div>

View File

@ -3,256 +3,105 @@
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="5" :xs="24">
<DepartmentList
ref="DepartmentList"
@clickdepartment="clickdepartment"
:methods="'getDepartmentList'"
>
<DepartmentList ref="DepartmentList" @clickdepartment="clickdepartment" :methods="'getDepartmentList'">
</DepartmentList>
</el-col>
<!--用户数据-->
<el-col :span="19" :xs="24">
<div ref="topform" class="form">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
label-width="70px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item label="问卷标题" prop="questionnaireName">
<el-input
v-model="queryParams.questionnaireName"
placeholder="请输入问卷标题"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.questionnaireName" placeholder="请输入问卷标题" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="病种名称" prop="diseaseTypeName">
<el-input
v-model="queryParams.diseaseTypeName"
placeholder="请输入病种名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
<div ref="mb8" class="mb8">
<el-row :gutter="10" class="">
<el-col :span="1.5">
<el-button
type="primary"
size="mini"
@click="handleAdd"
v-hasPermi="['system:question:add']"
>新增问卷模板</el-button
>
<el-button
type="warning"
plain
icon="el-icon-upload2"
size="mini"
@click="handleUpload"
>导入</el-button
>
<el-button type="primary" size="mini" @click="handleAdd"
v-hasPermi="['system:question:add']">新增问卷模板</el-button>
<el-button type="warning" plain icon="el-icon-upload2" size="mini" @click="handleUpload">导入</el-button>
</el-col>
</el-row>
</div>
<div ref="table">
<el-table
:max-height="maxTableHeight"
v-loading="loading"
:data="questionList"
>
<el-table-column
label="序号"
type="index"
width="55"
align="center"
/>
<el-table-column
label="问卷模板名称"
align="center"
prop="questionnaireName"
/>
<el-table-column
label="问题个数"
align="center"
prop="questionCount"
/>
<el-table-column
label="问卷模板ID"
align="center"
prop="questionnaireId"
/>
<el-table-column
label="问卷类型"
align="center"
prop="questionType"
>
<el-table :max-height="maxTableHeight" v-loading="loading" :data="questionList">
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="问卷模板名称" align="center" prop="questionnaireName" />
<el-table-column label="问题个数" align="center" prop="questionCount" />
<el-table-column label="问卷模板ID" align="center" prop="questionnaireId" />
<el-table-column label="问卷类型" align="center" prop="questionType">
<template slot-scope="scope">
<div v-if="scope.row.questionType == 'REGULAR_QUESTIONNAIRE'">
普通问卷
</div>
<div
v-if="scope.row.questionType == 'SATISFACTION_QUESTIONNAIRE'"
>
<div v-if="scope.row.questionType == 'SATISFACTION_QUESTIONNAIRE'">
满意度问卷
</div>
</template>
</el-table-column>
<el-table-column
label="问卷状态"
align="center"
prop="questionnaireStatus"
>
<el-table-column label="问卷状态" align="center" prop="questionnaireStatus">
<template slot-scope="scope">
<el-tag
type="success"
v-if="scope.row.questionnaireStatus == 'PUBLISHED'"
>已发布</el-tag
>
<el-tag type="success" v-if="scope.row.questionnaireStatus == 'PUBLISHED'">已发布</el-tag>
<el-tag type="warning" v-else>未发布</el-tag>
</template>
</el-table-column>
<el-table-column
label="病种名称"
align="center"
prop="diseaseTypeName"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<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-switch v-model="scope.row.questionnaireStatus" active-color="#13ce66" inactive-color="#ff4949"
active-value="PUBLISHED" inactive-value="UNPUBLISHED" @change="switchstatus($event, scope.row)">
</el-switch> -->
<el-button
size="mini"
type="text"
@click="switchstatus('UNPUBLISHED', scope.row)"
v-if="scope.row.questionnaireStatus == 'PUBLISHED'"
>取消发布</el-button
>
<el-button
size="mini"
type="text"
@click="switchstatus('PUBLISHED', scope.row)"
v-else
>发布</el-button
>
<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"
@click="handleDelete(scope.row)"
v-hasPermi="['system:question:remove']"
>删除</el-button
>
<el-button size="mini" type="text" @click="switchstatus('UNPUBLISHED', scope.row)"
v-if="scope.row.questionnaireStatus == 'PUBLISHED'">取消发布</el-button>
<el-button size="mini" type="text" @click="switchstatus('PUBLISHED', scope.row)" v-else>发布</el-button>
<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" @click="handleDelete(scope.row)"
v-hasPermi="['system:question:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> -->
<myPagination
v-show="total > 0"
:total="total"
:pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum"
@updateCPage="updateCPage"
></myPagination>
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
</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-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 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 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 type="primary" @click="classificationupload"> </el-button>
<el-button @click="classificationOpenfalse"> </el-button>
</div>
</el-dialog>
<!-- 导入弹框 -->
<el-dialog
title=""
:visible.sync="innerexport"
width="1000px"
append-to-body
:before-close="exportcancel"
>
<el-dialog title="" :visible.sync="innerexport" width="1000px" append-to-body :before-close="exportcancel">
<questionexport @submit="submit" ref="childComponent"></questionexport>
<div slot="footer" class="dialog-footer footerlist">
<el-button type="primary" @click="submitexport"> </el-button>
@ -317,7 +166,12 @@ export default {
};
},
created() {
// this.getList();
if (localStorage.getItem('questionquery')) {
this.queryParams = JSON.parse(localStorage.getItem('questionquery'))
} else {
this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId
}
this.getList();
},
mounted() {
this.getMaxTableHeight()
@ -351,7 +205,6 @@ export default {
}
} else {
this.$modal.msgError("请先选择左侧科室");
}
},
//
@ -363,6 +216,7 @@ export default {
this.queryParams.hospitalAgencyId = item.hospitalAgencyId
this.queryParams.hospitalAgencyName = item.hospitalAgencyName
this.queryParams.departmentId = item.itemid
this.queryParams.departmentName = item.itemName
this.departmentName = item.itemName
if (item.hospitalAgencyId) {
this.handleQuery();
@ -469,6 +323,8 @@ export default {
/** 查询问卷基本信息列表 */
getList() {
this.loading = true;
console.log(this.queryParams)
localStorage.setItem('questionquery', JSON.stringify(this.queryParams))
listQuestion(this.queryParams).then(response => {
this.questionList = response.rows;
this.total = response.total;
@ -606,10 +462,12 @@ export default {
.app-container {
padding: 20px 0 0 20px !important;
}
::v-deep .el-dialog__footer {
padding-top: 33px !important;
}
::v-deep .el-row {
height: 100% !important;
}