Merge remote-tracking branch 'origin/dev'

This commit is contained in:
纪寒 2023-03-16 09:52:24 +08:00
commit efc2548c85

View File

@ -9,14 +9,14 @@
label-width="130px"
>
<el-form-item label="所属医院" prop="hospitalId">
<el-button type class="stationbtn" @click="clickinnerVisible(true)">
{{ queryParams.hospitalName }}
</el-button>
<el-button
type
class="stationbtn"
@click="clickinnerVisible(true)"
>{{ queryParams.hospitalName }}</el-button>
</el-form-item>
<el-form-item label="所属科室" prop="departmentId" label-width="100px">
<el-button type class="stationbtn" @click="clicklist(true)">
{{ queryParams.departmentName }}
</el-button>
<el-button type class="stationbtn" @click="clicklist(true)">{{ queryParams.departmentName }}</el-button>
</el-form-item>
<el-form-item label="人员名称" prop="personName">
<el-input
@ -44,19 +44,11 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</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>
@ -69,8 +61,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:hospitalPerson:add']"
>新增</el-button
>
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -81,8 +72,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:hospitalPerson:edit']"
>修改</el-button
>
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -93,8 +83,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:hospitalPerson:remove']"
>删除</el-button
>
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@ -106,11 +95,8 @@
v-hasPermi="['system:hospitalPerson:export']"
>导出</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
@ -131,9 +117,9 @@
<template slot-scope="scope">
{{ scope.row.academicTitle == "CHIEF_PHYSICIAN" ? "主任医师" : "" }}
{{
scope.row.academicTitle == "DEPUTY_CHIEF_PHYSICIAN"
? "副主任医师"
: ""
scope.row.academicTitle == "DEPUTY_CHIEF_PHYSICIAN"
? "副主任医师"
: ""
}}
{{ scope.row.academicTitle == "ATTENDING_DOCTOR" ? "主治医师" : "" }}
{{ scope.row.academicTitle == "PHYSICIAN" ? "医师" : "" }}
@ -142,11 +128,7 @@
</el-table-column>
<el-table-column label="咨询费用" align="center" prop="consultingFee" />
<!-- <el-table-column label="显示顺序" align="center" prop="personSort" /> -->
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@ -154,16 +136,14 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:hospitalPerson:edit']"
>修改</el-button
>
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:hospitalPerson:remove']"
>删除</el-button
>
>删除</el-button>
</template>
</el-table-column>
</el-table>
@ -184,16 +164,10 @@
:before-close="cancel"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="140px"
:inline="true"
>
<el-form ref="form" :model="form" :rules="rules" label-width="140px" :inline="true">
<el-form-item label="所属医院" prop="hospitalId">
<el-button
type=""
type
v-if="form.hospitalName == '请选择所属医院'"
@click="clickinnerVisible(false)"
style="
@ -204,11 +178,10 @@
color: #c0c4cc;
overflow: hidden;
"
>{{ form.hospitalName }}</el-button
>
>{{ form.hospitalName }}</el-button>
<el-button
@click="clickinnerVisible(false)"
type=""
type
v-else
style="
width: 210px;
@ -217,12 +190,11 @@
padding-left: -10px;
overflow: hidden;
"
>{{ form.hospitalName }}</el-button
>
>{{ form.hospitalName }}</el-button>
</el-form-item>
<el-form-item label="所属科室" prop="departmentId">
<el-button
type=""
type
v-if="form.departmentName == '请选择所属科室'"
@click="clicklist(false)"
style="
@ -232,11 +204,10 @@
color: #c0c4cc;
overflow: hidden;
"
>{{ form.departmentName }}</el-button
>
>{{ form.departmentName }}</el-button>
<el-button
@click="clicklist(false)"
type=""
type
v-else
style="
width: 210px;
@ -245,15 +216,10 @@
padding-left: -10px;
overflow: hidden;
"
>{{ form.departmentName }}</el-button
>
>{{ form.departmentName }}</el-button>
</el-form-item>
<el-form-item label="人员名称" prop="personName">
<el-input
v-model="form.personName"
maxlength="7"
placeholder="请输入人员名称"
/>
<el-input v-model="form.personName" maxlength="7" placeholder="请输入人员名称" />
</el-form-item>
<el-form-item label="联系电话" prop="personPhone">
<el-input
@ -281,18 +247,13 @@
/>
</el-form-item>
<el-form-item label="人员职称" prop="academicTitle">
<el-select
v-model="form.academicTitle"
placeholder="请选择"
style="width: 210px"
>
<el-select v-model="form.academicTitle" placeholder="请选择" style="width: 210px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
></el-option>
</el-select>
</el-form-item>
<el-form-item label="咨询费用" prop="consultingFee">
@ -312,17 +273,13 @@
/>
</el-form-item>
<el-form-item label="人员头像" prop="personPictureUrl">
<stationAcatar
@imgUrl="imgUrl2"
:img="form.personPictureUrl"
:type="'personPictureUrl'"
/>
<stationAcatar @imgUrl="imgUrl2" :img="form.personPictureUrl" :type="'personPictureUrl'" />
</el-form-item>
<el-form-item label="个人简介" prop="personIntroduce">
<el-input
type="textarea"
:rows="5"
maxlength="30"
maxlength="200"
style="width: 540px"
placeholder="请输入个人简介"
v-model="form.personIntroduce"
@ -338,11 +295,7 @@
:rules="hospitalPersonCertificateList.certificateName"
:prop="`hospitalPersonCertificateList.${index}.certificateName`"
>
<el-input
maxlength="50"
v-model="item.certificateName"
placeholder="请输入证书名称"
/>
<el-input maxlength="50" v-model="item.certificateName" placeholder="请输入证书名称" />
</el-form-item>
<el-form-item
@ -351,7 +304,7 @@
:prop="`hospitalPersonCertificateList.${index}.certificateUrl`"
>
<stationAcatar
@imgUrl="imgUrl"
@imgUrl="imgUrl"
@item="imgclassifyItem"
:img="item.certificateUrl"
:item="item"
@ -410,38 +363,18 @@
:inline="true"
>
<el-form-item label="医院编码" prop="hospitalCode" label-width="120">
<el-input
v-model="hospitalqueryParams.hospitalCode"
placeholder="请输入科室编码"
clearable
/>
<el-input v-model="hospitalqueryParams.hospitalCode" placeholder="请输入科室编码" clearable />
</el-form-item>
<el-form-item label="医院名称" prop="hospitalName" label-width="120">
<el-input
v-model="hospitalqueryParams.hospitalName"
placeholder="请输入医院名称"
clearable
/>
<el-input v-model="hospitalqueryParams.hospitalName" placeholder="请输入医院名称" clearable />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="info"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="addresetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="info">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="addresetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
:data="infolist"
@cell-dblclick="nurseclick"
v-loading="loading"
>
<el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
<el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope">
<el-button
@ -459,33 +392,16 @@
></el-button>
</template>
</el-table-column>
<el-table-column
property="hospitalCode"
label="医院编码"
align="center"
>
</el-table-column>
<el-table-column property="hospitalCode" label="医院编码" align="center"></el-table-column>
<el-table-column
property="hospitalName"
label="医院名称"
align="center"
:show-overflow-tooltip="true"
>
</el-table-column>
></el-table-column>
<el-table-column
property="hospitalAddress"
label="医院地址"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
align="center"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column property="hospitalAddress" label="医院地址" align="center"></el-table-column>
<el-table-column property="phone" label="联系电话" align="center" :show-overflow-tooltip="true"></el-table-column>
</el-table>
<pagination
v-show="total2 > 0"
@ -511,41 +427,18 @@
:inline="true"
>
<el-form-item label="科室编码" prop="departmentCode" label-width="120">
<el-input
v-model="departmentqueryParams.departmentCode"
placeholder="请输入科室编码"
clearable
/>
<el-input v-model="departmentqueryParams.departmentCode" placeholder="请输入科室编码" clearable />
</el-form-item>
<el-form-item label="科室名称" prop="departmentName" label-width="120">
<el-input
v-model="departmentqueryParams.departmentName"
placeholder="请输入医院名称"
clearable
/>
<el-input v-model="departmentqueryParams.departmentName" placeholder="请输入医院名称" clearable />
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="departmentList"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="departresetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="departmentList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="departresetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
:data="hospitalDepartmentList"
@cell-dblclick="nurseclick"
v-loading="loading"
>
<el-table :data="hospitalDepartmentList" @cell-dblclick="nurseclick" v-loading="loading">
<el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope">
<el-button
@ -563,33 +456,21 @@
></el-button>
</template>
</el-table-column>
<el-table-column
property="departmentCode"
label="科室编码"
align="center"
>
</el-table-column>
<el-table-column property="departmentCode" label="科室编码" align="center"></el-table-column>
<el-table-column
property="departmentName"
label="科室名称"
align="center"
:show-overflow-tooltip="true"
>
</el-table-column>
></el-table-column>
<el-table-column
property="departmentPhone"
label="科室联系电话"
align="center"
>
</el-table-column>
<el-table-column property="departmentPhone" label="科室联系电话" align="center"></el-table-column>
<el-table-column
property="departmentAddress"
label="科室地址"
align="center"
:show-overflow-tooltip="true"
>
</el-table-column>
></el-table-column>
</el-table>
<pagination
v-show="total3 > 0"
@ -610,7 +491,7 @@ import {
delHospitalPerson,
addHospitalPerson,
listHospitalDepartment,
updateHospitalPerson,
updateHospitalPerson
} from "@/api/system/hospitalPerson";
import editor from "@/components/Editor";
import stationAcatar from "../stationAvatar/index.vue";
@ -624,8 +505,7 @@ export default {
if (!value) {
return new Error("请输入身份证号)");
} else {
const reg =
/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/;
const reg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[0-2])(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/;
const card = reg.test(value);
if (!card) {
callback(new Error("身份证号格式有误!"));
@ -663,25 +543,25 @@ export default {
options: [
{
value: "CHIEF_PHYSICIAN",
label: "主任医师",
label: "主任医师"
},
{
value: "DEPUTY_CHIEF_PHYSICIAN",
label: "副主任医师",
label: "副主任医师"
},
{
value: "PHYSICIAN",
label: "医师",
label: "医师"
},
{
value: "HEALER",
label: "医士",
label: "医士"
},
{
value: "ATTENDING_DOCTOR",
label: "主治医师",
},
label: "主治医师"
}
],
value: "",
//
@ -700,14 +580,14 @@ export default {
//
title: "",
deletNewImgs: [],
NewImgs:[],
objitempicture:[],
NewImgs: [],
objitempicture: [],
objitem: [],
//
open: false,
addopen: false,
homenumber: false,
deletupdata:[],
deletupdata: [],
//
queryParams: {
pageNum: 1,
@ -728,7 +608,7 @@ export default {
personPictureUrl: null,
certificateSort: null,
certificateName: null,
certificateUrl: null,
certificateUrl: null
},
//
form: {
@ -738,15 +618,14 @@ export default {
hospitalqueryParams: {
pageNum: 1,
pageSize: 10,
hospitalCode: "",
hospitalCode: ""
},
departmentqueryParams: {
pageNum: 1,
pageSize: 10,
hospitalId: "",
departmentCode: "",
departmentName: "",
departmentName: ""
},
infolist: [],
deletUploadImages: [],
@ -756,149 +635,149 @@ export default {
{
required: true,
message: "请选择所属医院",
trigger: "blur",
},
trigger: "blur"
}
],
departmentId: [
{
required: true,
message: "请选择所属科室",
trigger: "blur",
},
trigger: "blur"
}
],
personName: [
{
required: true,
message: "请选择科室人员名称",
trigger: "blur",
},
trigger: "blur"
}
],
personAddress: [
{
required: true,
message: "请选择科室人员地址",
trigger: "blur",
},
trigger: "blur"
}
],
academicTitle: [
{
required: true,
message: "请选择人员职称",
trigger: "blur",
},
trigger: "blur"
}
],
personIntroduce: [
{
required: true,
trigger: "blur",
message: "请输入个人简介",
},
message: "请输入个人简介"
}
],
personSort: [
{
required: true,
message: "请选择排序",
trigger: "blur",
},
trigger: "blur"
}
],
personPhone: [
{
required: true,
validator: checkMobile,
message: "请输入联系电话",
trigger: "blur",
},
trigger: "blur"
}
],
cardNo: [
{
required: true,
message: "",
validator: isCardId,
trigger: "blur",
},
trigger: "blur"
}
],
consultingFee: [
{
required: true,
message: "请选择咨询费用",
trigger: "blur",
},
],
trigger: "blur"
}
]
},
hospitalId: [
{
required: true,
message: "请选择所属医院",
trigger: "blur",
},
trigger: "blur"
}
],
departmentId: [
{
required: true,
message: "请选择所属科室",
trigger: "blur",
},
trigger: "blur"
}
],
personName: [
{
required: true,
message: "请选择科室人员名称",
trigger: "blur",
},
trigger: "blur"
}
],
personAddress: [
{
required: true,
message: "请选择科室人员地址",
trigger: "blur",
},
trigger: "blur"
}
],
academicTitle: [
{
required: true,
message: "请选择人员职称",
trigger: "blur",
},
trigger: "blur"
}
],
personIntroduce: [
{
required: true,
trigger: "blur",
message: "请选择个人简介",
},
message: "请选择个人简介"
}
],
personSort: [
{
required: true,
message: "请选择排序",
trigger: "blur",
},
trigger: "blur"
}
],
personPhone: [
{
required: true,
validator: checkMobile,
message: "11",
trigger: "blur",
},
trigger: "blur"
}
],
cardNo: [
{
required: true,
message: "",
validator: isCardId,
trigger: "blur",
},
trigger: "blur"
}
],
consultingFee: [
{
required: true,
message: "请选择咨询费用",
trigger: "blur",
},
trigger: "blur"
}
],
hospitalPersonCertificateList: {
certificateName: [
@ -921,8 +800,8 @@ export default {
// message: "",
// trigger: "blur",
// },
],
},
]
}
};
},
created() {
@ -957,7 +836,7 @@ export default {
console.log(item, "接受图片item");
let items = JSON.parse(item);
if (items.idd && !items.id) {
this.form.hospitalPersonCertificateList.forEach((e) => {
this.form.hospitalPersonCertificateList.forEach(e => {
if (e.idd == items.idd) {
e.certificateUrl = items.certificateUrl;
}
@ -967,16 +846,16 @@ export default {
}
},
imgUrl(imgUrl) {
console.log(imgUrl, "新上传");
console.log(imgUrl, "新上传");
this.form.certificateUrl = imgUrl;
this.deletupdata.push(imgUrl);
console.log(this.deletupdata)
console.log(this.deletupdata);
},
imgUrl2(imgUrl) {
console.log(imgUrl, "新上传");
this.form.personPictureUrl = imgUrl;
this.deletUploadImages.push(imgUrl);
console.log( this.deletUploadImages)
console.log(this.deletUploadImages);
},
nurseclick(row) {
@ -1007,11 +886,10 @@ export default {
}
this.innerVisibledepartment = false;
},
//
innerVisiblecancel() {
this.innerVisible = false;
},
//
innerVisiblecanceldepart() {
@ -1028,7 +906,7 @@ export default {
certificateName: null,
certificateSort: null,
certificateUrl: null,
idd: this.idd,
idd: this.idd
};
if (this.form.hospitalPersonCertificateList.length == 5) {
this.$message.error("最多只能5条");
@ -1040,7 +918,7 @@ export default {
getList() {
this.loading = true;
// this.queryParams.hospitalId = this.form.hospitalId;
listHospitalPerson(this.queryParams).then((response) => {
listHospitalPerson(this.queryParams).then(response => {
this.hospitalPersonList = response.rows;
this.total = response.total;
this.loading = false;
@ -1049,8 +927,8 @@ export default {
//
clickinnerVisible(item) {
console.log(item);
this.queryParams.departmentName="";
this.form.departmentName="请选择所属科室";
this.queryParams.departmentName = "";
this.form.departmentName = "请选择所属科室";
this.info();
this.innerVisible = true;
this.homenumber = item;
@ -1075,12 +953,11 @@ export default {
} else {
this.$message.error("请先选择所属医院");
}
},
//
departmentList() {
this.departmentqueryParams.hospitalId = this.hospitalId;
listHospitalDepartment(this.departmentqueryParams).then((response) => {
listHospitalDepartment(this.departmentqueryParams).then(response => {
this.hospitalDepartmentList = response.rows;
this.total3 = response.total;
this.loading = false;
@ -1092,7 +969,7 @@ export default {
pageNum: 1,
pageSize: 10,
hospitalCode: "",
hospitalName: "",
hospitalName: ""
};
this.info();
},
@ -1101,12 +978,12 @@ export default {
pageNum: 1,
pageSize: 10,
departmentCode: "",
departmentName: "",
departmentName: ""
};
this.departmentList();
},
info() {
list(this.hospitalqueryParams).then((response) => {
list(this.hospitalqueryParams).then(response => {
this.infolist = response.rows;
console.log(this.infolist);
this.total2 = response.total;
@ -1117,23 +994,19 @@ export default {
cancel() {
var obj = { pictureUrlList: [] };
if (this.form.hospitalPersonCertificateList) {
this.form.hospitalPersonCertificateList.forEach((e) => {
this.form.hospitalPersonCertificateList.forEach(e => {
obj.pictureUrlList.push(e.certificateUrl);
});
}
console.log("2222", this.deletNewImgs);
if (this.deletUploadImages.length > 0) {
updatePicture({ pictureUrlList: this.deletUploadImages }).then(
(res) => {
}
);
updatePicture({
pictureUrlList: this.deletUploadImages
}).then(res => {});
}
console.log("11111",this.NewImgs)
console.log("11111", this.NewImgs);
if (this.deletupdata.length > 0) {
updatePicture({ pictureUrlList: this.deletupdata }).then(
(res) => {
}
);
updatePicture({ pictureUrlList: this.deletupdata }).then(res => {});
}
this.form.hospitalId = null;
this.departmentId = null;
@ -1167,12 +1040,12 @@ export default {
{
certificateName: null,
certificateSort: null,
certificateUrl: null,
},
],
certificateUrl: null
}
]
};
this.deletUploadImages = [];
this.deletupdata = [];
this.resetForm("form");
},
@ -1183,22 +1056,22 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.departmentId="";
this.departmentId = "";
this.hospitalId = "";
this.departmentqueryParams = {
pageNum: 1,
pageSize: 10,
pageSize: 10
};
this.queryParams = {
pageNum: 1,
pageSize: 10,
pageSize: 10
};
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@ -1211,22 +1084,22 @@ export default {
certificateName: "",
certificateUrl: "",
idd: this.idd,
},
],
idd: this.idd
}
]
};
this.departmentId="";
this.departmentId = "";
this.reset();
this.addopen = true;
this.title = "添加科室人员信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row)
console.log(row);
this.reset();
const id = row.id || this.ids;
getHospitalPerson(id).then((response) => {
console.log(response)
getHospitalPerson(id).then(response => {
console.log(response);
this.form = response.data;
this.departmentId = response.data.departmentId;
this.hospitalId = response.data.hospitalId;
@ -1240,16 +1113,16 @@ export default {
if (this.form.consultingFee) {
this.form.consultingFee = Number(this.form.consultingFee);
}
this.$refs["form"].validate((valid) => {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateHospitalPerson(this.form).then((response) => {
updateHospitalPerson(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.addopen = false;
this.getList();
});
} else {
addHospitalPerson(this.form).then((response) => {
addHospitalPerson(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.addopen = false;
this.getList();
@ -1263,7 +1136,7 @@ export default {
const ids = row.id || this.ids;
this.$modal
.confirm("是否确认删除此人员信息?")
.then(function () {
.then(function() {
return delHospitalPerson(ids);
})
.then(() => {
@ -1277,12 +1150,12 @@ export default {
this.download(
"system/hospitalPerson/export",
{
...this.queryParams,
...this.queryParams
},
`hospitalPerson_${new Date().getTime()}.xlsx`
);
},
},
}
}
};
</script>
<style lang="scss" scoped>