Merge remote-tracking branch 'origin/dev'

This commit is contained in:
纪寒 2023-03-16 17:06:46 +08:00
commit f51755a1fd

View File

@ -115,6 +115,7 @@
<!-- <el-table-column label="身份证号" align="center" prop="cardNo" /> -->
<el-table-column label="人员职称" align="center" prop="academicTitle">
<template slot-scope="scope">
{{ scope.row.academicTitle == "RESIDENT_PHYSICIAN" ? "住院医师" : "" }}
{{ scope.row.academicTitle == "CHIEF_PHYSICIAN" ? "主任医师" : "" }}
{{
scope.row.academicTitle == "DEPUTY_CHIEF_PHYSICIAN"
@ -221,7 +222,7 @@
<el-form-item label="人员名称" prop="personName">
<el-input v-model="form.personName" maxlength="7" placeholder="请输入人员名称" />
</el-form-item>
<el-form-item label="联系电话" prop="personPhone">
<el-form-item label="联系电话">
<el-input
maxlength="11"
v-model="form.personPhone"
@ -238,7 +239,7 @@
placeholder="请输入人员地址"
/>
</el-form-item>
<el-form-item label="身份证号" prop="cardNo">
<el-form-item label="身份证号">
<el-input
maxlength="18"
oninput="value=value.replace(/[^\d]/g,'')"
@ -290,19 +291,11 @@
:key="index"
style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
>
<el-form-item
label="证书名称"
:rules="hospitalPersonCertificateList.certificateName"
:prop="`hospitalPersonCertificateList.${index}.certificateName`"
>
<el-form-item label="证书名称">
<el-input maxlength="50" v-model="item.certificateName" placeholder="请输入证书名称" />
</el-form-item>
<el-form-item
label="证书图片"
:rules="hospitalPersonCertificateList.certificateUrl"
:prop="`hospitalPersonCertificateList.${index}.certificateUrl`"
>
<el-form-item label="证书图片">
<stationAcatar
@imgUrl="imgUrl"
@item="imgclassifyItem"
@ -311,11 +304,7 @@
:type="'certificateUrl'"
/>
</el-form-item>
<el-form-item
label="证书显示顺序"
:rules="hospitalPersonCertificateList.certificateSort"
:prop="`hospitalPersonCertificateList.${index}.certificateSort`"
>
<el-form-item label="证书显示顺序">
<el-input
oninput="value=value.replace(/[^\d]/g,'')"
maxlength="5"
@ -549,6 +538,14 @@ export default {
value: "DEPUTY_CHIEF_PHYSICIAN",
label: "副主任医师"
},
{
value: "ATTENDING_DOCTOR",
label: "主治医师"
},
{
value: "RESIDENT_PHYSICIAN",
label: "住院医师"
},
{
value: "PHYSICIAN",
label: "医师"
@ -556,11 +553,6 @@ export default {
{
value: "HEALER",
label: "医士"
},
{
value: "ATTENDING_DOCTOR",
label: "主治医师"
}
],
value: "",
@ -680,23 +672,6 @@ export default {
trigger: "blur"
}
],
personPhone: [
{
required: true,
validator: checkMobile,
message: "请输入联系电话",
trigger: "blur"
}
],
cardNo: [
{
required: true,
message: "",
validator: isCardId,
trigger: "blur"
}
],
consultingFee: [
{
required: true,
@ -704,103 +679,6 @@ export default {
trigger: "blur"
}
]
},
hospitalId: [
{
required: true,
message: "请选择所属医院",
trigger: "blur"
}
],
departmentId: [
{
required: true,
message: "请选择所属科室",
trigger: "blur"
}
],
personName: [
{
required: true,
message: "请选择科室人员名称",
trigger: "blur"
}
],
personAddress: [
{
required: true,
message: "请选择科室人员地址",
trigger: "blur"
}
],
academicTitle: [
{
required: true,
message: "请选择人员职称",
trigger: "blur"
}
],
personIntroduce: [
{
required: true,
trigger: "blur",
message: "请选择个人简介"
}
],
personSort: [
{
required: true,
message: "请选择排序",
trigger: "blur"
}
],
personPhone: [
{
required: true,
validator: checkMobile,
message: "11",
trigger: "blur"
}
],
cardNo: [
{
required: true,
message: "",
validator: isCardId,
trigger: "blur"
}
],
consultingFee: [
{
required: true,
message: "请选择咨询费用",
trigger: "blur"
}
],
hospitalPersonCertificateList: {
certificateName: [
// {
// required: true,
// message: "",
// trigger: "blur",
// },
],
certificateSort: [
// {
// required: true,
// message: "",
// trigger: "blur",
// },
],
certificateUrl: [
// {
// required: true,
// message: "",
// trigger: "blur",
// },
]
}
};
},
@ -833,7 +711,6 @@ export default {
//
this.deletNewImgs.push(imgUrlData.certificateUrl);
this.objitem.push(imgUrlData.certificateUrl);
console.log(item, "接受图片item");
let items = JSON.parse(item);
if (items.idd && !items.id) {
this.form.hospitalPersonCertificateList.forEach(e => {
@ -846,20 +723,15 @@ export default {
}
},
imgUrl(imgUrl) {
console.log(imgUrl, "新上传");
this.form.certificateUrl = imgUrl;
this.deletupdata.push(imgUrl);
console.log(this.deletupdata);
},
imgUrl2(imgUrl) {
console.log(imgUrl, "新上传");
this.form.personPictureUrl = imgUrl;
this.deletUploadImages.push(imgUrl);
console.log(this.deletUploadImages);
},
nurseclick(row) {
console.log(this.homenumber);
if (this.homenumber) {
this.queryParams.hospitalName = row.hospitalName;
this.queryParams.hospitalId = row.id;
@ -874,7 +746,6 @@ export default {
},
//
departmentclick(row) {
console.log(row);
this.departmentId = row.id;
if (this.homenumber) {
this.queryParams.departmentName = row.departmentName;
@ -926,7 +797,6 @@ export default {
},
//
clickinnerVisible(item) {
console.log(item);
this.queryParams.departmentName = "";
this.form.departmentName = "请选择所属科室";
this.info();
@ -985,7 +855,6 @@ export default {
info() {
list(this.hospitalqueryParams).then(response => {
this.infolist = response.rows;
console.log(this.infolist);
this.total2 = response.total;
this.loading = false;
});
@ -998,13 +867,11 @@ export default {
obj.pictureUrlList.push(e.certificateUrl);
});
}
console.log("2222", this.deletNewImgs);
if (this.deletUploadImages.length > 0) {
updatePicture({
pictureUrlList: this.deletUploadImages
}).then(res => {});
}
console.log("11111", this.NewImgs);
if (this.deletupdata.length > 0) {
updatePicture({ pictureUrlList: this.deletupdata }).then(res => {});
}
@ -1095,11 +962,9 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
console.log(row);
this.reset();
const id = row.id || this.ids;
getHospitalPerson(id).then(response => {
console.log(response);
this.form = response.data;
this.departmentId = response.data.departmentId;
this.hospitalId = response.data.hospitalId;