diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index 4b3373d..98b21ce 100644 --- a/src/views/manage/servicewaycontent/index.vue +++ b/src/views/manage/servicewaycontent/index.vue @@ -157,25 +157,21 @@ size="mini" @click="handleUpdateserve" > - + + > + >
- - 数字 - + + 数字 +
@@ -375,9 +371,10 @@
- 文本 - - + 文本 +
@@ -506,8 +503,8 @@ export default { // serviceFrequencyType: [ // { required: true, message: "请选中服务频次", trigger: "blur" }, // ], - - serviceWayId: [ + + serviceWayId: [ { required: true, message: "请选中所属服务方式", trigger: "blur" }, ], serviceContent: [ @@ -559,8 +556,8 @@ export default { }, textlist(e) { if (e == true) { - this.form.serviceFrequencyStart=null - this.form.serviceFrequencyEnd=null + this.form.serviceFrequencyStart = null; + this.form.serviceFrequencyEnd = null; this.disableda = true; this.disabledb = true; @@ -573,7 +570,7 @@ export default { DIGITlist(e) { console.log(e, "5"); if (e == true) { - this.form.serviceFrequencyText=null + this.form.serviceFrequencyText = null; this.disableda = false; this.disabledb = false; this.disabled = true; @@ -617,13 +614,13 @@ export default { serviceWayList(this.querydepartmen).then((response) => { this.DepartmentoList = response.data; let sum = 0; - this.DepartmentoList.forEach(item=>{ + this.DepartmentoList.forEach((item) => { if (item.serviceContentNum) { - console.log(item.countNum) + console.log(item.countNum); sum += item.serviceContentNum; } this.count = sum; - }) + }); this.loading = false; }); }, @@ -761,9 +758,8 @@ export default { this.form = response.data; // this.form.serviceWayId=row.serviceWayId this.form.id = response.data.serviceFrequencyId; - if(response.data.serviceWayId){ + if (response.data.serviceWayId) { this.form.serviceWayId = response.data.serviceWayId; - } // ---------- @@ -796,24 +792,33 @@ export default { this.$refs["form"].validate((valid) => { if (valid) { if ( - this.form.serviceFrequencyType == "DIGIT" && - this.form.serviceFrequencyStart == null && - this.form.serviceFrequencyEnd == null + (this.form.serviceFrequencyType == "DIGIT" && + this.form.serviceFrequencyStart == null && + this.form.serviceFrequencyEnd == null) || + (this.form.serviceFrequencyType == "DIGIT" && + this.form.serviceFrequencyEnd == "" && + this.form.serviceFrequencyStart == "") ) { this.$message.error("请输入服务频次起始值和结束值"); } else if ( - this.form.serviceFrequencyType == "DIGIT" && - this.form.serviceFrequencyStart == null + (this.form.serviceFrequencyType == "DIGIT" && + this.form.serviceFrequencyStart == null) || + (this.form.serviceFrequencyStart == "" && + this.form.serviceFrequencyType == "DIGIT") ) { this.$message.error("请输入服务频次起始值"); } else if ( - this.form.serviceFrequencyType == "DIGIT" && - this.form.serviceFrequencyEnd == null + (this.form.serviceFrequencyType == "DIGIT" && + this.form.serviceFrequencyEnd == null) || + (this.form.serviceFrequencyEnd == "" && + this.form.serviceFrequencyType == "DIGIT") ) { this.$message.error("请输入服务频次结束值"); } else if ( - this.form.serviceFrequencyType == "TEXT" && - this.form.serviceFrequencyText == null + (this.form.serviceFrequencyType == "TEXT" && + this.form.serviceFrequencyText == null) || + (this.form.serviceFrequencyText == "" && + this.form.serviceFrequencyType == "TEXT") ) { this.$message.error("请输入服务频次文本"); } else if ( @@ -915,17 +920,18 @@ export default {