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-05-09 14:10:04 +08:00
commit 1e52e96ed5
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -508,7 +508,7 @@
<el-button
type="primary"
style="width: 15px; height: 15px"
v-if="form.diseaseTypeId == scope.row.diseaseTypeCode"
v-if="form.diseaseTypeId == scope.row.id"
circle
@click="nurseclickdisease(scope.row)"
></el-button>
@ -819,7 +819,7 @@ export default {
},
// 病种名称圆点按钮
nurseclickdisease(row) {
this.form.diseaseTypeId = row.diseaseTypeCode;
this.form.diseaseTypeId = row.id;
this.diseaseTypeName = row.diseaseTypeName;
this.diseaseshowst = false;
console.log(this.diseaseTypeName, '1121000')
@ -941,7 +941,7 @@ export default {
});
} else {
if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName == null
this.form.diseaseTypeName = null
} else {
this.form.diseaseTypeName = this.diseaseTypeName
}

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

@ -619,7 +619,7 @@
<el-button
type="primary"
style="width: 15px; height: 15px"
v-if="form.diseaseTypeId == scope.row.diseaseTypeCode"
v-if="form.diseaseTypeId == scope.row.id"
circle
@click="nurseclickdisease(scope.row)"
></el-button>
@ -1099,7 +1099,7 @@ export default {
// 科室点击事件
changeDepartment(e) {
this.form.departmentId = e
this.form.departmentName = this.Departmentdata.find(f => f.departmentCode == e).departmentName
this.form.departmentName = this.Departmentdata.find(f => f.id == e).departmentName
this.diseaseTypeName = '请选择病种'
this.form.diseaseTypeId = '';
console.log(this.form)
@ -1368,7 +1368,7 @@ export default {
},
// 病种名称圆点按钮
nurseclickdisease(row) {
this.form.diseaseTypeId = row.diseaseTypeCode;
this.form.diseaseTypeId = row.id;
this.diseaseTypeName = row.diseaseTypeName;
this.diseaseshowst = false;
},

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

@ -492,7 +492,7 @@
<el-button
type="primary"
style="width: 15px; height: 15px"
v-if="form.diseaseTypeId == scope.row.diseaseTypeCode"
v-if="form.diseaseTypeId == scope.row.id"
circle
@click="nurseclickdisease(scope.row)"
></el-button>
@ -851,7 +851,7 @@ export default {
// 病种名称圆点按钮
nurseclickdisease(row) {
// this.diseaseshowst = false;
this.form.diseaseTypeId = row.diseaseTypeCode;
this.form.diseaseTypeId = row.id;
this.diseaseTypeName = row.diseaseTypeName;
this.diseaseshowst = false;
},
@ -1048,7 +1048,7 @@ export default {
});
} else {
if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName == null
this.form.diseaseTypeName = null
} else {
this.form.diseaseTypeName = this.diseaseTypeName
@ -1061,6 +1061,8 @@ export default {
this.form.departmentName = this.departmentName
}
// console.log(this.form,'this.form')
// return
addScript(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

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

@ -619,7 +619,7 @@
<el-button
type="primary"
style="width: 15px; height: 15px"
v-if="form.diseaseTypeId == scope.row.diseaseTypeCode"
v-if="form.diseaseTypeId == scope.row.id"
circle
@click="nurseclickdisease(scope.row)"
></el-button>
@ -1214,7 +1214,7 @@ export default {
},
// 病种名称圆点按钮
nurseclickdisease(row) {
this.form.diseaseTypeId = row.diseaseTypeCode;
this.form.diseaseTypeId = row.id;
this.diseaseTypeName = row.diseaseTypeName;
this.diseaseshowst = false;
},
@ -1443,7 +1443,7 @@ export default {
} else {
if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName == null
this.form.diseaseTypeName = null
} else {
this.form.diseaseTypeName = this.diseaseTypeName
}

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

@ -435,7 +435,7 @@
<el-button
type="primary"
style="width: 15px; height: 15px"
v-if="form.diseaseTypeId == scope.row.diseaseTypeCode"
v-if="form.diseaseTypeId == scope.row.id"
circle
@click="nurseclickdisease(scope.row)"
></el-button>
@ -747,7 +747,7 @@ export default {
},
// 病种名称圆点按钮
nurseclickdisease(row) {
this.form.diseaseTypeId = row.diseaseTypeCode;
this.form.diseaseTypeId = row.id;
this.diseaseTypeName = row.diseaseTypeName;
this.diseaseshowst = false;
@ -862,16 +862,23 @@ export default {
if (this.form.id != null) {
this.form.departmentName = this.departmentName
this.form.diseaseTypeName = this.diseaseTypeName
if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName = null
} else {
this.form.diseaseTypeName = this.diseaseTypeName
}
console.log(this.form,'this.form')
// return
updateTemplate(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.Departmentlist();
});
} else {
if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName == null
this.form.diseaseTypeName = null
} else {
this.form.diseaseTypeName = this.diseaseTypeName
}
@ -887,7 +894,7 @@ export default {
this.getList();
this.Departmentlist();
});
}
}