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:
shidongli 2024-03-07 10:21:26 +08:00
commit fe485b2a22
2 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@
> >
全部 全部
</div> </div>
<!-- <span class="count">{{ count }}</span> --> <span class="count">{{ count }}</span>
</div> </div>
<div <div
class="listitem" class="listitem"
@ -351,7 +351,10 @@
prop="serviceFrequencyType" prop="serviceFrequencyType"
label-width="80px" label-width="80px"
> >
<el-form-item label="" prop="serviceFrequencyType" label-width="">
<el-checkbox v-model="DIGIT" @change="DIGITlist">数字</el-checkbox> <el-checkbox v-model="DIGIT" @change="DIGITlist">数字</el-checkbox>
</el-form-item>
<div style="display: flex; margin: -32px 34px 0 66px"> <div style="display: flex; margin: -32px 34px 0 66px">
<el-form-item label="" prop="serviceFrequencyStart" label-width=""> <el-form-item label="" prop="serviceFrequencyStart" label-width="">
<el-input <el-input
@ -371,7 +374,10 @@
</div> </div>
<div> <div>
<div style="position: relative; top: 12px"> <div style="position: relative; top: 12px">
<el-form-item label="" prop="serviceFrequencyType" label-width="">
<el-checkbox v-model="TEXT" @change="textlist">文本</el-checkbox> <el-checkbox v-model="TEXT" @change="textlist">文本</el-checkbox>
</el-form-item>
</div> </div>
<div style="margin: -23px 45px 0px 74px"> <div style="margin: -23px 45px 0px 74px">
<el-form-item label="" prop="serviceFrequencyText" label-width=""> <el-form-item label="" prop="serviceFrequencyText" label-width="">
@ -497,15 +503,21 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
serviceFrequencyType: [ // serviceFrequencyType: [
{ required: true, message: "请选中服务频次", trigger: "blur" }, // { required: true, message: "请选中服务频次", trigger: "blur" },
], // ],
serviceContent: [ // serviceContent: [
{ required: true, message: "请输入服务内容", trigger: "blur" }, // { required: true, message: "请输入服务内容", trigger: "blur" },
], // ],
// serviceFrequencyEnd:[ // serviceFrequencyEnd:[
// { required: true, message: "请输入结束值", trigger: "blur" }, // { required: true, message: "请输入结束值", trigger: "blur" },
// ], // ],
// serviceFrequencyStart:[
// { required: true, message: "请输入结束值", trigger: "blur" },
// ],
// serviceFrequencyText:[
// { required: true, message: "请输入结束值", trigger: "blur" },
// ],
}, },
itemname: null, itemname: null,
serviceWayName: null, serviceWayName: null,
@ -543,6 +555,9 @@ export default {
}, },
textlist(e) { textlist(e) {
if (e == true) { if (e == true) {
this.form.serviceFrequencyStart=null
this.form.serviceFrequencyEnd=null
this.disableda = true; this.disableda = true;
this.disabledb = true; this.disabledb = true;
this.disabled = false; this.disabled = false;
@ -554,6 +569,7 @@ export default {
DIGITlist(e) { DIGITlist(e) {
console.log(e, "5"); console.log(e, "5");
if (e == true) { if (e == true) {
this.form.serviceFrequencyText=null
this.disableda = false; this.disableda = false;
this.disabledb = false; this.disabledb = false;
this.disabled = true; this.disabled = true;
@ -596,10 +612,14 @@ export default {
this.loading = true; this.loading = true;
serviceWayList(this.querydepartmen).then((response) => { serviceWayList(this.querydepartmen).then((response) => {
this.DepartmentoList = response.data; this.DepartmentoList = response.data;
// this.count=this.DepartmentoList.length let sum = 0;
console.log(this.DepartmentoList); this.DepartmentoList.forEach(item=>{
// this.Option if (item.serviceContentNum) {
// this.total = response.total; console.log(item.countNum)
sum += item.serviceContentNum;
}
this.count = sum;
})
this.loading = false; this.loading = false;
}); });
}, },
@ -737,7 +757,10 @@ export default {
this.form = response.data; this.form = response.data;
// this.form.serviceWayId=row.serviceWayId // this.form.serviceWayId=row.serviceWayId
this.form.id = response.data.serviceFrequencyId; this.form.id = response.data.serviceFrequencyId;
if(response.data.serviceWayId){
this.form.serviceWayId = response.data.serviceWayId; this.form.serviceWayId = response.data.serviceWayId;
}
// ---------- // ----------
if (response.data.serviceFrequencyType == "DIGIT") { if (response.data.serviceFrequencyType == "DIGIT") {
@ -768,33 +791,33 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if ( // if (
this.form.serviceFrequencyType == "DIGIT" && // this.form.serviceFrequencyType == "DIGIT" &&
this.form.serviceFrequencyStart == null && // this.form.serviceFrequencyStart == null &&
this.form.serviceFrequencyEnd == null // this.form.serviceFrequencyEnd == null
) { // ) {
this.$message.error("请输入服务频次起始值和结束值"); // this.$message.error("请输入服务频次起始值和结束值");
} else if ( // } else if (
this.form.serviceFrequencyType == "DIGIT" && // this.form.serviceFrequencyType == "DIGIT" &&
this.form.serviceFrequencyStart == null // this.form.serviceFrequencyStart == null
) { // ) {
this.$message.error("请输入服务频次起始值"); // this.$message.error("请输入服务频次起始值");
} else if ( // } else if (
this.form.serviceFrequencyType == "DIGIT" && // this.form.serviceFrequencyType == "DIGIT" &&
this.form.serviceFrequencyEnd == null // this.form.serviceFrequencyEnd == null
) { // ) {
this.$message.error("请输入服务频次结束值"); // this.$message.error("请输入服务频次结束值");
} else if ( // } else if (
this.form.serviceFrequencyType == "TEXT" && // this.form.serviceFrequencyType == "TEXT" &&
this.form.serviceFrequencyText == null // this.form.serviceFrequencyText == null
) { // ) {
this.$message.error("请输入服务频次文本"); // this.$message.error("请输入服务频次文本");
} else if ( // } else if (
this.form.serviceFrequencyType != "TEXT" && // this.form.serviceFrequencyType != "TEXT" &&
this.form.serviceFrequencyType != "DIGIT" // this.form.serviceFrequencyType != "DIGIT"
) { // ) {
this.$message.error("请选择数字还是文本"); // this.$message.error("请选择数字还是文本");
} else { // } else {
console.log(this.form, "555555"); console.log(this.form, "555555");
console.log(this.form.serviceWayId); console.log(this.form.serviceWayId);
@ -814,7 +837,7 @@ export default {
}); });
} }
} }
} // }
}); });
}, },
// 修改服务方式 // 修改服务方式

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

@ -1097,6 +1097,6 @@ export default {
} }
.el-cascader .el-input input::-webkit-input-placeholder { .el-cascader .el-input input::-webkit-input-placeholder {
color: black; color: #686a6d;
} }
</style> </style>