diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index 788904e..71f70a0 100644
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@@ -227,12 +227,12 @@
             prop="serviceWayFrequencyList"
             :key="keyTable"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <!-- <div
                 v-for="(itemx, index) in scope.row.serviceWayFrequencyList"
                 :key="index"
               > -->
-                <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'">
+              <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'">
                   <el-select
                     size="mini"
                     @click="getSuppliers()"
@@ -250,33 +250,42 @@
                     </el-option>
                   </el-select>
                 </div> -->
-                <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'"> -->
-                  <el-select
-                    size="mini"
-                    @click="getSuppliers()"
-                    @change="blurInputs(scope.row.valuePlusMax)"
-                    v-model="scope.row.valuePlusMax"
-                    clearable
-                    placeholder="请选择"
-                  >
-                
-                     <!-- label里面就是展示的值  value是选中的  value是拼接的  这里处理一下为null的情况 为null咋显示呀以后应该不会有null 是必填的 那就先不用管了好-->
-                     <!-- :label="JSON.parse(item.serviceFrequencyStart) +
+              <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'"> -->
+              <el-select
+                size="mini"
+                @click="getSuppliers()"
+                @change="blurInputs(scope.row.valuePlusMax)"
+                v-model="scope.row.valuePlusMax"
+                clearable
+                placeholder="请选择"
+              >
+                <!-- :label="item.serviceFrequencyType == 'TEXT'?item.serviceFrequencyText:JSON.parse(item.serviceFrequencyStart) +
                         '~' +
-                        JSON.parse(item.serviceFrequencyEnd)" -->
-                    <el-option
-                      v-for="item in scope.row.serviceWayFrequencyList"
-                      :key="item.id"
-                      :label="item.serviceFrequencyType == 'TEXT'?item.serviceFrequencyText:JSON.parse(item.serviceFrequencyStart) +
+                        JSON.parse(item.serviceFrequencyEnd)" 
+                         -->
+                <!-- label里面就是展示的值  value是选中的  value是拼接的-->
+
+                <!-- :label="item.serviceFrequencyType == 'TEXT'?item.serviceFrequencyText:JSON.parse(item.serviceFrequencyStart) +
                         '~' +
-                        JSON.parse(item.serviceFrequencyEnd)"
-                      :value="
-                       item.id
-                      "
-                    >
-                    </el-option>
-                  </el-select>
-                <!-- </div> -->
+                        JSON.parse(item.serviceFrequencyEnd) : item.serviceFrequencyType == 'DIGIT'?"
+                         ==  text ？ 不变 ： ==big ？拼接的那个 ：‘ ’ -->
+                <el-option
+                  v-for="item in scope.row.serviceWayFrequencyList"
+                  :key="item.id"
+                  :label="
+                    item.serviceFrequencyType == 'TEXT'
+                      ? item.serviceFrequencyText
+                      : item.serviceFrequencyType == 'DIGIT'
+                      ? JSON.parse(item.serviceFrequencyStart) +
+                        '~' +
+                        JSON.parse(item.serviceFrequencyEnd)
+                      : ''
+                  "
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+              <!-- </div> -->
               <!-- </div> -->
             </template>
 
@@ -344,10 +353,11 @@
         <el-form-item label="服务方式编码" prop="serviceWayCode">
           <el-input v-model="form.serviceWayCode" placeholder="请输入服务方式编码" />
         </el-form-item> -->
-         <el-form-item label="所属服务方式" prop="serviceWayId">
+        <el-form-item label="所属服务方式" prop="serviceWayId">
           <el-select
             v-model="form.serviceWayId"
             clearable
+            :disabled="disableedit"
             placeholder="请选择服务方式"
             style="width: 250px"
             @change="change"
@@ -364,6 +374,7 @@
         <el-form-item label="服务内容" prop="serviceContent" label-width="80">
           <el-input
             type="textarea"
+            :disabled="disabledcontent"
             style="width: 400px"
             placeholder="请输入服务内容"
             v-model="form.serviceContent"
@@ -462,10 +473,12 @@ export default {
   data() {
     return {
       list: [],
+      disableedit:false,
       serviceFrequencyStart: "",
       serviceFrequencyEnd: "",
       serviceFrequencyType: "",
       // disabled: "",
+      disabledcontent:false,
       titles: "",
       DIGIT: true,
       TEXT: false,
@@ -521,24 +534,24 @@ export default {
         serviceFrequencyType: [
           { required: true, message: "请选中服务频次", trigger: "blur" },
         ],
-        serviceContent:[
-        { required: true, message: "请输入服务内容", trigger: "blur" },
+        serviceContent: [
+          { required: true, message: "请输入服务内容", trigger: "blur" },
         ],
         // serviceFrequencyEnd:[
         // { required: true, message: "请输入结束值", trigger: "blur" },
         // ],
       },
       itemname: null,
-      serviceWayName:null,
+      serviceWayName: null,
       querydepartmen: {
         serviceWayName: "",
       },
       disabled: true,
       disabledb: false,
       disableda: false,
-      valuePlus:'',
-      serviceFrequencyText:'',
-      keyTable:'',
+      valuePlus: "",
+      serviceFrequencyText: "",
+      keyTable: "",
     };
   },
   watch: {
@@ -556,11 +569,10 @@ export default {
       console.log(e);
     },
     blurInput(val) {
-// this.servicewaycontentList.serviceFrequencyText=val
-
+      // this.servicewaycontentList.serviceFrequencyText=val
     },
     blurInputs() {
-      this.keyTable = Math.random()
+      this.keyTable = Math.random();
     },
     textlist(e) {
       if (e == true) {
@@ -624,9 +636,9 @@ export default {
         this.loading = false;
       });
     },
-    change(e){
-console.log(e)
-// this.form.serviceWayId=e
+    change(e) {
+      console.log(e);
+      // this.form.serviceWayId=e
     },
     // 左侧科室
     itemdata(item) {
@@ -638,7 +650,7 @@ console.log(e)
         //   this.disabled=true
         // }
         this.itemname = item.id;
-        this.serviceWayName=item.serviceWayName
+        this.serviceWayName = item.serviceWayName;
         this.form.serviceWayId = item.id;
 
         // this.departmentName = item.serviceWayName;
@@ -657,30 +669,26 @@ console.log(e)
       listServicewaycontent(this.queryParams).then((response) => {
         this.servicewaycontentList = response.rows;
         // this.serviceFrequencyText= this.servicewaycontentList[0].serviceFrequencyText
-        console.log(this.servicewaycontentList,'****')
+        console.log(this.servicewaycontentList, "****");
         // if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'){
         this.servicewaycontentList.forEach((e) => {
-          e.valuePlusMax = e.serviceWayFrequencyList[0].id
+          e.valuePlusMax = e.serviceWayFrequencyList[0].id;
         });
-    
-          // }
-          // if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'){
-          //   e.serviceFrequencyText = JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyStart) +
-          //               '~' +
-          //               JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyEnd)
-          // }
 
+        // }
+        // if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'){
+        //   e.serviceFrequencyText = JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyStart) +
+        //               '~' +
+        //               JSON.parse(e.serviceWayFrequencyList[0].serviceFrequencyEnd)
+        // }
 
+        // e.serviceWayFrequencyList[0].forEach(el=>{
+        //   console.log(el)
+        //   // this.serviceFrequencyText = el.serviceFrequencyText;
 
-
-          // e.serviceWayFrequencyList[0].forEach(el=>{
-          //   console.log(el)
-          //   // this.serviceFrequencyText = el.serviceFrequencyText;
-
-          // })
+        // })
         // this.serviceFrequencyText= this.servicewaycontentList[0].serviceFrequencyText
 
-
         this.total = response.total;
         this.loading = false;
       });
@@ -732,13 +740,14 @@ console.log(e)
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      console.log(this.itemname,'itemname')
+      this.disableedit=false
+      this.disabledcontent=false
+      console.log(this.itemname, "itemname");
       if (this.itemname) {
-        this.form.serviceWayName = this.serviceWayName
-        this.form.serviceWayId = this.itemname
-        console.log( this.form,' this.form')
-        
-      } 
+        this.form.serviceWayName = this.serviceWayName;
+        this.form.serviceWayId = this.itemname;
+        console.log(this.form, " this.form");
+      }
       // else if (this.itemname == null) {
       //   this.form.serviceWayId = "请选择服务方式"
       // }
@@ -748,23 +757,29 @@ console.log(e)
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row,'99999');
+      this.disableedit=true
+      this.disabledcontent=true
+      console.log(row, "99999");
       this.reset();
       getServicewaycontent(row.valuePlusMax).then((response) => {
         this.form = response.data;
         // this.form.serviceWayId=row.serviceWayId
         this.form.id = response.data.serviceFrequencyId;
-        this.form.serviceWayId=response.data.serviceWayId
+        this.form.serviceWayId = response.data.serviceWayId;
         //  ----------
 
         if (response.data.serviceFrequencyType == "DIGIT") {
           this.DIGIT = true;
           this.TEXT = false;
-
-        }else{
-          this.TEXT=true
+          this.disableda = false;
+          this.disabledb = false;
+          this.disabled = true;
+        } else {
+          this.TEXT = true;
           this.DIGIT = false;
-
+          this.disableda = true;
+          this.disabledb = true;
+          this.disabled = false;
         }
 
         // ---------------
@@ -775,48 +790,56 @@ console.log(e)
     },
     /** 提交按钮 */
     submitForm() {
-    
-          this.$refs["form"].validate((valid) => {
+      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{
-          console.log(this.form, "555555");
-      console.log(this.form.serviceWayId)
-
-          if (this.form.serviceContentId != null) {
-            updateServicewaycontent(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-              this.mentlist();
-
-            });
+          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 {
-            addServicewaycontent(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              this.mentlist();
-              
+            console.log(this.form, "555555");
+            console.log(this.form.serviceWayId);
 
-            });
+            if (this.form.serviceContentId != null) {
+              updateServicewaycontent(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+                this.mentlist();
+              });
+            } else {
+              addServicewaycontent(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+                this.mentlist();
+              });
+            }
           }
         }
-      }
-
       });
-    
     },
     // 修改服务方式
     handleedit() {