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-04-10 10:30:06 +08:00
commit 0f68116e4f
10 changed files with 154 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,7 @@
/>
</el-form-item>
<el-form-item label="短信ID" prop="textMessageId">
<el-input v-model="form.textMessageId" placeholder="请输入短信ID" />
<el-input v-model="form.textMessageId" placeholder="请输入短信ID" onKeyUp="value=value.replace(/[\W]/g,'')"/>
</el-form-item>
<el-form-item label="短信排序" prop="textMessageSort">
<el-input-number v-model="form.textMessageSort" controls-position="right" :min="0" placeholder="请输入短信排序"   style="width:350px"/>

16
src/views/manage/projectgroup/index.vue
View File

@ -117,7 +117,12 @@
</template>
</el-table-column>
<el-table-column label="排序" align="center" prop="groupSort" />
<el-table-column label="备注信息" align="center" prop="groupRemark" :show-overflow-tooltip="true" />
<el-table-column
label="备注信息"
align="center"
prop="groupRemark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
@ -153,7 +158,12 @@
/>
<!-- 添加或修改检测项目分组对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-dialog
:title="title"
:visible.sync="open"
width="1000px"
append-to-body
>
<el-form
ref="form"
:model="form"
@ -180,7 +190,7 @@
:prop="`list.${index}.groupCode`"
>
<el-input
onKeyUp="value=value.replace(/[\W]/g,'')"
onKeyUp="value=value.replace(/[\W]/g,'')"
maxlength="100"
v-model="aitem.groupCode"
placeholder="请输入分组编码"

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

@ -305,7 +305,7 @@
/>
</el-form-item>
<el-form-item label="宣教ID" prop="propagandaCode">
<el-input v-model="form.propagandaCode" placeholder="请输入宣教ID" />
<el-input v-model="form.propagandaCode" placeholder="请输入宣教ID" onKeyUp="value=value.replace(/[\W]/g,'')"/>
</el-form-item>
<el-form-item label="宣教类型" prop="propagandaType">
<el-select
@ -1457,9 +1457,9 @@ export default {
this.getList();
});
} else {
if (this.diseaseTypeName = '请选择病种') {
if (this.diseaseTypeName == '请选择病种') {
this.form.diseaseTypeName = null
} else {
} else if(this.diseaseTypeName){
this.form.diseaseTypeName = this.diseaseTypeName
}
addPropaganda(this.form).then(response => {

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

@ -259,6 +259,7 @@
</el-form-item>
<el-form-item label="话术ID" prop="scriptId">
<el-input
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.scriptId"
placeholder="请输入话术ID"
maxlength="100"
@ -266,6 +267,7 @@
</el-form-item>
<el-form-item label="平台ID" prop="platformId">
<el-input
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.platformId"
placeholder="请输入平台ID"
maxlength="100"

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

@ -205,7 +205,7 @@
prop="diseaseTypeName"
/>
<el-table-column
width="180"
width="180"
label="操作"
align="center"
class-name="small-padding fixed-width"
@ -666,16 +666,25 @@
}}</span>
</el-form-item>
<el-form-item label="服务包名称:" prop="packageVersion">
<span
style="
display: inline-block;
width: 80px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
"
>{{ formdetail.packageName }}</span
>
<div class="container">
<el-tooltip class="item" effect="dark" :content="formdetail.packageName" placement="top-start">
<span >{{ formdetail.packageName }}</span>
</el-tooltip>
</div>
<!-- <span class="container" v-tooltip="formdetail.packageName">{{ formdetail.packageName }}</span> -->
<!-- <span class="container">
<el-tooltip>
<template slot="title">
{{ formdetail.packageName ? formdetail.packageName : '-' }}
</template>
{{ formdetail.packageName ? formdetail.packageName : '-' }}
</el-tooltip>
</span> -->
</el-form-item>
<!-- <el-form-item label="服务包名称:" prop="packageVersion">
<span
@ -1494,6 +1503,24 @@ export default {
::v-deep .el-input-group {
width: 204px !important;
}
.container {
display: inline-block;
width: 80px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
// text-overflow:ellipsis
// white-space: nowrap;
// overflow: hidden;
}
// .container:hover {
// text-overflow:inherit;
// overflow: visible;
// white-space: pre-line;
// }
.leftserv {
height: 857px;
overflow: auto;

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

@ -223,7 +223,7 @@
prop="serviceWayFrequencyList"
>
<!-- <template slot-scope="scope">
<el-select
size="mini"
@click="getSuppliers()"
@ -232,7 +232,7 @@
clearable
placeholder="请选择"
>
<el-option
v-for="item in scope.row.serviceWayFrequencyList"
:key="item.id"
@ -249,7 +249,7 @@
>
</el-option>
</el-select>
</template> -->
<!-- </div> -->
@ -355,7 +355,7 @@
<el-form-item label="" prop="serviceFrequencyStart" label-width="">
<el-input
:disabled="disableda"
oninput="value=value.replace(/[^\d.]/g,'')"
:change="checkPrice()"
v-model="form.serviceFrequencyStart"
placeholder="请输入服务频次数字起始值"
/>
@ -364,6 +364,7 @@
<el-form-item label="" prop="serviceFrequencyEnd" label-width="">
<el-input
:disabled="disabledb"
:change="checkPricemax()"
oninput="value=value.replace(/[^\d.]/g,'')"
v-model="form.serviceFrequencyEnd"
placeholder="请输入服务频次数字结束值"
@ -395,6 +396,7 @@
v-model="form.serviceSort"
controls-position="right"
:min="0"
@change="$forceUpdate()"
style="width: 250px"
/>
</el-form-item>
@ -553,6 +555,41 @@ export default {
this.mentlist();
},
methods: {
/**只能输入数字且有小数点最多保留两位*/
checkPrice() {
let checkPlan = "" + this.form.serviceFrequencyStart;
checkPlan = checkPlan
.replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符
.replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的
.replace(/^\./g, "") // 保证第一个为数字而不是.
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", ".");
if (checkPlan.indexOf(".") < 0 && checkPlan !== "") {
// 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
checkPlan = parseFloat(checkPlan) + "";
} else if (checkPlan.indexOf(".") >= 0) {
checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数
}
this.form.serviceFrequencyStart = checkPlan;
},
checkPricemax() {
let checkPlan = "" + this.form.serviceFrequencyEnd;
checkPlan = checkPlan
.replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符
.replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的
.replace(/^\./g, "") // 保证第一个为数字而不是.
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", ".");
if (checkPlan.indexOf(".") < 0 && checkPlan !== "") {
// 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
checkPlan = parseFloat(checkPlan) + "";
} else if (checkPlan.indexOf(".") >= 0) {
checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数
}
this.form.serviceFrequencyEnd = checkPlan;
},
// getSuppliers(e) {
// console.log(e);
// },
@ -733,7 +770,6 @@ export default {
this.disableda = false;
this.disabledb = false;
this.disabled = true; //文本
this.form.serviceFrequencyType = "DIGIT";
console.log(this.itemname, "itemname");
if (this.itemname) {
@ -741,10 +777,6 @@ export default {
this.form.serviceWayId = this.itemname;
console.log(this.form, " this.form");
}
// else if (this.itemname == null) {
// this.form.serviceWayId = "请选择服务方式"
// }
this.open = true;
this.title = "添加服务方式内容";
},
@ -757,7 +789,12 @@ export default {
this.reset();
getServicewaycontent(row.id).then((response) => {
this.form = response.data;
// this.form.serviceWayId=row.serviceWayId
if (response.data.serviceFrequencySort) {
this.form.serviceSort = response.data.serviceFrequencySort;
}
else {
this.form.serviceSort = undefined;
}
this.form.id = response.data.serviceFrequencyId;
if (response.data.serviceWayId) {
this.form.serviceWayId = response.data.serviceWayId;
@ -996,4 +1033,4 @@ export default {
.el-button--success.is-plain {
font-size: 10px;
}
</style>
</style>

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

@ -23,6 +23,7 @@
<el-form-item label="模板ID" prop="templateId">
<el-input
v-model="queryParams.templateId"
placeholder="请输入模板ID"
clearable
@ -187,7 +188,7 @@
/>
</el-form-item>
<el-form-item label="模板ID" prop="templateId">
<el-input v-model="form.templateId" placeholder="请输入模板ID" />
<el-input v-model="form.templateId" placeholder="请输入模板ID" onKeyUp="value=value.replace(/[\W]/g,'')" />
</el-form-item>
<el-form-item label="微信排序" prop="templateSort">
<el-input-number v-model="form.templateSort" controls-position="right" :min="0" placeholder="请输入微信排序"   style="width:350px"/>

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

@ -379,6 +379,7 @@
maxlength="20"
v-model="form.agencyCode"
style="width: 205px"
onKeyUp="value=value.replace(/[\W]/g,'')"
placeholder="请输入机构代码"
/>
</el-form-item>
@ -765,6 +766,7 @@ export default {
this.infolist();
},
methods: {
// 节点类型
info() {
var dictType = "node_type";

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

@ -351,6 +351,7 @@
<el-form-item label="科室代码" prop="departmentCode">
<el-input
maxlength="30"
onKeyUp="value=value.replace(/[\W]/g,'')"
v-model="form.departmentCode"
placeholder="请输入科室代码"
/>

234
src/views/system/taskExecuteRecord/index.vue
View File

@ -1,10 +1,5 @@
<template>
<div class="app-container">
<!-- <el-tabs v-model="queryParams.serviceStatus" @tab-click="handleClick">
<el-tab-pane label="未执行" name="INTENTIONAL_SIGNING"></el-tab-pane>
<el-tab-pane label="执行中" name="SERVICE_CENTER"></el-tab-pane>
<el-tab-pane label="已执行" name="SERVICE_END"></el-tab-pane>
</el-tabs> -->
<el-form
:model="queryParams"
ref="queryForm"
@ -16,49 +11,17 @@
<el-form-item label="执行时间" prop="startDate" label-width="110px">
<el-date-picker
v-model="intentionalTime"
@change="pickerChangeFn"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
style="width: 300px"
value-format="yyyy-MM-dd"
clearable
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
<!-- <el-form-item
label="出院时间"
prop="intentionalTimeStart"
label-width="110px"
v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'"
>
<el-date-picker
v-model="intentionalTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
style="width: 300px"
value-format="yyyy-MM-dd"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item> -->
<!-- <el-form-item
label="入院时间"
prop="intentionalTimeStart"
label-width="110px"
v-if="queryParams.serviceStatus == 'INTENTIONAL_SIGNING'"
>
<el-date-picker
v-model="intentionalTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
style="width: 300px"
value-format="yyyy-MM-dd"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item> -->
<el-form-item label="医院" prop="hospitalAgencyId">
<el-select
v-model="queryParams.hospitalAgencyId"
@ -66,10 +29,8 @@
placeholder="请选择医院"
style="width: 200px"
clearable
>
<!-- @clear="clearhospitalAgency" -->
<!-- @clear="clearhospitalAgency" -->
<el-option
v-for="item in hospitalAgencylist"
:key="item.id"
@ -79,69 +40,7 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item
label="院区"
prop="campusAgencyId"
v-if="queryParams.hospitalAgencyId"
>
<el-select
v-model="queryParams.campusAgencyId"
filterable
placeholder="请选择院区"
style="width: 200px"
clearable
@clear="clearcampusAgency"
@change="changecampusAgency"
>
<el-option
v-for="item in campusAgencylist"
:key="item.id"
:label="item.agencyName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="科室"
prop="departmentId"
v-if="queryParams.campusAgencyId"
>
<el-select
v-model="queryParams.departmentId"
filterable
placeholder="请选择科室"
style="width: 200px"
clearable
@clear="cleardepartment"
@change="changedepartment"
>
<el-option
v-for="item in departmentlist"
:key="item.id"
:label="item.departmentName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="病区" prop="wardId" v-if="queryParams.departmentId">
<el-select
v-model="queryParams.wardId"
filterable
placeholder="请选择病区"
style="width: 200px"
clearable
>
<el-option
v-for="item in wardlist"
:key="item.id"
:label="item.departmentName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="就诊方式" prop="visitMethod">
<el-select
v-model="queryParams.visitMethod"
@ -156,14 +55,7 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="患者表id" prop="patientId">
<el-input
v-model="queryParams.patientId"
placeholder="请输入患者表id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="就诊流水号" prop="visitSerialNumber">
<el-input
v-model="queryParams.visitSerialNumber"
@ -172,14 +64,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="签约患者管理任务节点表id" prop="manageRouteNodeId">
<el-input
v-model="queryParams.manageRouteNodeId"
placeholder="请输入签约患者管理任务节点表id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="患者姓名" prop="patientName">
<el-input
v-model="queryParams.patientName"
@ -198,43 +83,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="路径节点名称" prop="manageRouteNodeName">
<el-input
v-model="queryParams.manageRouteNodeName"
placeholder="请输入管理路径节点名称"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="任务执行时间" prop="executeTime">
<el-date-picker
clearable
style="width: 200px"
v-model="queryParams.executeTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择任务执行时间，格式：yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item> -->
<!-- <el-form-item label="执行人姓名" prop="executePerson">
<el-input
v-model="queryParams.executePerson"
placeholder="请输入执行人姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="模板名称" prop="executeRemark">
<el-input
v-model="queryParams.executeRemark"
placeholder="请输入模板名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item>
<el-button
type="primary"
@ -303,10 +151,14 @@
<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="patientId" /> -->
<el-table-column label="患者姓名" align="center" prop="patientName" />
<el-table-column label="电话" align="center" prop="patientPhone" />
<el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" />
<el-table-column
label="就诊流水号"
align="center"
prop="visitSerialNumber"
/>
<el-table-column label="医院" align="center" prop="hospitalAgencyName" />
<el-table-column label="院区" align="center" prop="campusAgencyName" />
<el-table-column label="科室名称" align="center" prop="departmentName" />
@ -314,9 +166,17 @@
<!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" />
<el-table-column label="手术名称" align="center" prop="patientName" /> -->
<el-table-column label="执行人姓名" align="center" prop="executePerson" />
<el-table-column label="签约患者管理路径节点名称" align="center" prop="manageRouteNodeName" />
<el-table-column label="签约患者管理任务名称" align="center" prop="manageRouteName" />
<el-table-column
label="签约患者管理路径节点名称"
align="center"
prop="manageRouteNodeName"
/>
<el-table-column
label="签约患者管理任务名称"
align="center"
prop="manageRouteName"
/>
<el-table-column
label="入院时间"
align="center"
@ -341,7 +201,7 @@
<template slot-scope="scope">
<span
>{{ scope.row.visitMethod == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
{{ scope.row.visitMethod == "BE_IN_HOSPITAL" ? "住院" : "" }}
{{ scope.row.visitMethod == "BE_HOSPITALIZED" ? "住院" : "" }}
</span>
</template></el-table-column
>
@ -380,16 +240,7 @@
</span>
</template></el-table-column
>
<el-table-column
label="执行时间"
align="center"
prop="executeTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="执行人姓名，手动执行时记录" align="center" prop="executePerson" /> -->
<!-- <el-table-column label="任务执行方式，人工执行：MANUAL_EXECUTE，系统自动执行：SYSTEM_AUTOMATIC_EXECUTE" align="center" prop="executeType" /> -->
<!-- <el-table-column
@ -430,8 +281,6 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
@ -444,9 +293,7 @@ import {
} from "@/api/system/taskExecuteRecord";
import { getAge } from "@/utils/age";
import {
selectAgencyList,
} from "@/api/manage/selectAgencyList";
import { selectAgencyList } from "@/api/manage/selectAgencyList";
export default {
name: "TaskExecuteRecord",
dicts: ["visit_type"],
@ -518,6 +365,18 @@ export default {
this.selectAgencyinfo();
},
methods: {
// pickerChangeFn(value){ // 日期选择器改变事件 ~ 解决日期选择器清空 值不清空的问题
pickerChangeFn() {
if (this.intentionalTime == null) {
this.intentionalTime = [];
this.queryParams.startDate = null;
this.queryParams.endDate = null;
} else {
this.queryParams.startDate = this.intentionalTime[0];
this.queryParams.endDate = this.intentionalTime[1];
}
},
// },
//获取医院list
selectAgencyinfo() {
let query = {
@ -567,19 +426,15 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
if (this.intentionalTime?.length > 0) {
this.queryParams.startDate = this.intentionalTime[0]
this.queryParams.endDate = this.intentionalTime[1]
}
this.getList();
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
this.intentionalTime = [];
this.queryParams.startDate = null;
this.queryParams.endDate = null;
this.getList();
},
// 多选框选中数据
handleSelectionChange(selection) {
@ -595,12 +450,12 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row)
console.log(row);
this.$router.push({
path: "/task/record",
query: {
patientId: row.patientId,
taskContent:row.taskContent,
taskContent: row.taskContent,
cardNo: row.cardNo,
patientName: row.patientName,
patientPhone: row.patientPhone,
@ -613,7 +468,6 @@ export default {
age: row.birthDate ? getAge(row.birthDate) : "",
},
});
},
/** 提交按钮 */
submitForm() {