From a4e9caeaa6831a7c1df307391b079f2483a6d10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 7 Mar 2024 10:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/servicewaycontent/index.vue | 76 ++++++++++----------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index 0811833..836cdcd 100644
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@@ -147,7 +147,7 @@
       ></right-toolbar>
     </el-row>
     <el-row :gutter="20">
-      <el-col :span="7">
+      <el-col :span="5">
         <div class="left" ref="box">
           <div class="name">
             服务方式
@@ -207,7 +207,7 @@
           </div>
         </div>
       </el-col>
-      <el-col :span="17">
+      <el-col :span="18">
         <el-table
           v-loading="loading"
           :data="servicewaycontentList"
@@ -506,9 +506,13 @@ export default {
         // serviceFrequencyType: [
         //   { required: true, message: "请选中服务频次", trigger: "blur" },
         // ],
-        // serviceContent: [
-        //   { required: true, message: "请输入服务内容", trigger: "blur" },
-        // ],
+        
+         serviceWayId: [
+          { required: true, message: "请选中所属服务方式", trigger: "blur" },
+        ],
+        serviceContent: [
+          { required: true, message: "请输入服务内容", trigger: "blur" },
+        ],
         // serviceFrequencyEnd:[
         // { required: true, message: "请输入结束值", trigger: "blur" },
         // ],
@@ -734,6 +738,7 @@ export default {
       this.reset();
       this.disableedit = false;
       this.disabledcontent = false;
+      this.form.serviceFrequencyType = "DIGIT";
       console.log(this.itemname, "itemname");
       if (this.itemname) {
         this.form.serviceWayName = this.serviceWayName;
@@ -743,7 +748,6 @@ export default {
       // else if (this.itemname == null) {
       //   this.form.serviceWayId = "请选择服务方式"
       // }
-      this.form.serviceFrequencyType = "DIGIT";
       this.open = true;
       this.title = "添加服务方式内容";
     },
@@ -791,33 +795,33 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          // if (
-          //   this.form.serviceFrequencyType == "DIGIT" &&
-          //   this.form.serviceFrequencyStart == null &&
-          //   this.form.serviceFrequencyEnd == null
-          // ) {
-          //   this.$message.error("请输入服务频次起始值和结束值");
-          // } else if (
-          //   this.form.serviceFrequencyType == "DIGIT" &&
-          //   this.form.serviceFrequencyStart == null
-          // ) {
-          //   this.$message.error("请输入服务频次起始值");
-          // } else if (
-          //   this.form.serviceFrequencyType == "DIGIT" &&
-          //   this.form.serviceFrequencyEnd == null
-          // ) {
-          //   this.$message.error("请输入服务频次结束值");
-          // } else if (
-          //   this.form.serviceFrequencyType == "TEXT" &&
-          //   this.form.serviceFrequencyText == null
-          // ) {
-          //   this.$message.error("请输入服务频次文本");
-          // } else if (
-          //   this.form.serviceFrequencyType != "TEXT" &&
-          //   this.form.serviceFrequencyType != "DIGIT"
-          // ) {
-          //   this.$message.error("请选择数字还是文本");
-          // } else {
+          if (
+            this.form.serviceFrequencyType == "DIGIT" &&
+            this.form.serviceFrequencyStart == null &&
+            this.form.serviceFrequencyEnd == null
+          ) {
+            this.$message.error("请输入服务频次起始值和结束值");
+          } else if (
+            this.form.serviceFrequencyType == "DIGIT" &&
+            this.form.serviceFrequencyStart == null
+          ) {
+            this.$message.error("请输入服务频次起始值");
+          } else if (
+            this.form.serviceFrequencyType == "DIGIT" &&
+            this.form.serviceFrequencyEnd == null
+          ) {
+            this.$message.error("请输入服务频次结束值");
+          } else if (
+            this.form.serviceFrequencyType == "TEXT" &&
+            this.form.serviceFrequencyText == null
+          ) {
+            this.$message.error("请输入服务频次文本");
+          } else if (
+            this.form.serviceFrequencyType != "TEXT" &&
+            this.form.serviceFrequencyType != "DIGIT"
+          ) {
+            this.$message.error("请选择数字还是文本");
+          } else {
             console.log(this.form, "555555");
             console.log(this.form.serviceWayId);
 
@@ -837,7 +841,7 @@ export default {
               });
             }
           }
-        // }
+        }
       });
     },
     // 修改服务方式
@@ -921,7 +925,7 @@ export default {
     left: 0;}
 .left {
   height: 530px;
-  overflow: auto;
+ overflow: scroll;
   .name {
     font-weight: 700;
     margin-bottom: 10px;
@@ -934,7 +938,7 @@ export default {
       display: inline-block;
       position: relative;
       // right: -172px;
-      left: 325px;
+      left: 216px;
       color: #a4a6aa;
       top: -35px;
       font-size: 13px;