diff --git a/src/api/manage/servicewaycontent.js b/src/api/manage/servicewaycontent.js
index 8acc16d..1030662 100644
--- a/src/api/manage/servicewaycontent.js
+++ b/src/api/manage/servicewaycontent.js
@@ -17,7 +17,7 @@ export function serviceWayList(query) {
 }
 
 
-// 查询服务方式内容详细
+// 修改
 export function getServicewaycontent(id) {
     return request({
         url: '/manage/servicewaycontent/' + id,
@@ -35,7 +35,7 @@ export function serviceWay(id) {
 // 新增服务方式内容
 export function addServicewaycontent(data) {
     return request({
-        url: '/manage/servicewaycontent',
+        url: '/manage/servicewaycontent/add',
         method: 'post',
         data: data
     })
@@ -51,7 +51,7 @@ export function addServiceWay(data) {
 // 修改服务方式内容
 export function updateServicewaycontent(data) {
     return request({
-        url: '/manage/servicewaycontent',
+        url: '/manage/servicewaycontent/edit',
         
         method: 'put',
         data: data
@@ -69,16 +69,16 @@ export function editServiceWay(data) {
 
 
 // 删除服务方式内容
-export function delServicewaycontent(serviceContentId,id) {
+export function delServicewaycontent(id) {
     return request({
-        url: `/manage/servicewaycontent/remove?serviceContentId=${serviceContentId}&id=${id}`,
+        url: '/manage/servicewaycontent/remove/' + id,
         method: 'delete'
     })
 }
 // / 删除服务方式
 export function removeServiceWay(id) {
     return request({
-        url: `/manage/servicewaycontent/removeServiceWay?id=${id}` ,
+        url: '/manage/servicewaycontent/removeServiceWay/id' ,
         method: 'delete'
     })
 }
diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index f810388..e10c3e7 100644
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@@ -118,7 +118,7 @@
           >修改</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -129,8 +129,8 @@
           v-hasPermi="['manage:servicewaycontent:remove']"
           >删除</el-button
         >
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -140,7 +140,7 @@
           v-hasPermi="['manage:servicewaycontent:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -214,33 +214,33 @@
           :data="servicewaycontentList"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" align="center" />
-          <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-          <!-- <el-table-column label="服务方式名称" align="center" prop="serviceWayName" /> -->
-          <!-- <el-table-column label="服务方式编码" align="center" prop="serviceWayCode" /> -->
-          <!-- <el-table-column label="服务标识，服务方式：SERVICE_WRY，服务内容：SERVICE_CONTENT，服务频次：SERVICE_FREQUENCY" align="center" prop="serviceType" /> -->
-          <!-- <el-table-column label="所属服务方式id" align="center" prop="serviceWayId" /> -->
+          <el-table-column width="55" align="center" />
+        
           <el-table-column
             label="服务内容"
             align="center"
             prop="serviceContent"
           />
-          <!-- <el-table-column label="所属服务内容id" align="center" prop="serviceContentId" /> -->
           <el-table-column
-            label="服务频次类型"
+            label="服务频次"
             align="center"
-            prop="serviceFrequencyType"
+            prop="serviceWayFrequencyList"
           >
             <template slot-scope="scope">
-              {{ scope.row.serviceFrequencyType == "DIGIT" ? "数字" : "" }}
-              {{ scope.row.departmentType == "TEXT" ? "文本" : "" }}
+              <div v-for="(item, index) in scope.row.serviceWayFrequencyList" :key="index">
+                <div v-if="item.serviceFrequencyType == 'DIGIT'">
+                  {{ item.serviceFrequencyStart }}~{{
+                    item.serviceFrequencyEnd
+                  }}
+                </div>
+                <div v-if="item.serviceFrequencyType == 'TEXT'">
+                  {{ item.serviceFrequencyText }}
+                </div>
+              </div>
             </template>
+           
           </el-table-column>
-          <!-- <el-table-column label="服务频次文本" align="center" prop="serviceFrequencyText" /> -->
-          <!-- <el-table-column label="服务频次数字起始值" align="center" prop="serviceFrequencyStart" />
-      <el-table-column label="服务频次数字结束值" align="center" prop="serviceFrequencyEnd" />
-      <el-table-column label="排序" align="center" prop="serviceSort" />
-      <el-table-column label="备注" align="center" prop="serviceRemark" /> -->
+         
           <el-table-column
             label="操作"
             align="center"
@@ -278,14 +278,8 @@
     </el-row>
 
     <!-- 添加或修改服务方式内容对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="70px"
-        :inline="true"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="70px">
         <!-- <el-form-item label="服务方式名称" prop="serviceWayName">
           <el-input v-model="form.serviceWayName" placeholder="请输入服务方式名称" />
         </el-form-item>
@@ -299,6 +293,7 @@
           <el-input
             type="textarea"
             style="width: 400px"
+            placeholder="请输入服务内容"
             v-model="form.serviceContent"
           />
         </el-form-item>
@@ -306,46 +301,51 @@
           <el-input v-model="form.serviceContentId" placeholder="请输入所属服务内容id" />
         </el-form-item> -->
         <el-form-item label="服务频次">
-          <el-checkbox v-model="checked">数字</el-checkbox>
+          <el-checkbox v-model="DIGIT" @change="DIGITlist">数字</el-checkbox>
+
+          <div style="display: flex; margin: -32px 34px 0 66px">
+            <el-form-item label="" prop="serviceFrequencyStart" label-width="">
+              <el-input
+                :disabled="disableda"
+                v-model="form.serviceFrequencyStart"
+                placeholder="请输入服务频次数字起始值"
+              />
+            </el-form-item>
+            <span>~</span>
+            <el-form-item label="" prop="serviceFrequencyEnd" label-width="">
+              <el-input
+                :disabled="disabledb"
+                v-model="form.serviceFrequencyEnd"
+                placeholder="请输入服务频次数字结束值"
+              />
+            </el-form-item>
+          </div>
+          <div>
+            <div style="position: relative; top: 12px">
+              <el-checkbox v-model="TEXT" @change="textlist">文本</el-checkbox>
+            </div>
+            <!-- </el-form-item> -->
+            <div style="margin: -23px 45px 0px 74px">
+              <el-form-item label="" prop="serviceFrequencyText" label-width="">
+                <el-input
+                  :disabled="disabled"
+                  v-model="form.serviceFrequencyText"
+                  placeholder="请输入服务频次文本"
+                  style="width: 250px"
+                />
+              </el-form-item>
+            </div>
+          </div>
         </el-form-item>
 
-        <el-form-item
-          label="起始值"
-          prop="serviceFrequencyStart"
-          label-width=""
-        >
-          <el-input
-            v-model="form.serviceFrequencyStart"
-            placeholder="请输入服务频次数字起始值"
-          />
-        </el-form-item>
-
-        <el-form-item
-          label="结束值"
-          prop="serviceFrequencyEnd"
-          label-width="200px"
-        >
-          <el-input
-            v-model="form.serviceFrequencyEnd"
-            placeholder="请输入服务频次数字结束值"
-          />
-        </el-form-item>
         <!-- </> -->
 
-        <el-form-item
-          label="服务频次文本"
+        <!-- <el-form-item
+          label=""
           prop="serviceFrequencyText"
           label-width="90x"
-        >
-          <el-checkbox v-model="TEXT">文本</el-checkbox>
-        </el-form-item>
+        > -->
 
-        <el-form-item label="" prop="serviceFrequencyText" label-width="90x">
-          <el-input
-            v-model="form.serviceFrequencyText"
-            placeholder="请输入服务频次文本"
-          />
-        </el-form-item>
         <!-- <el-form-item label="排序" prop="serviceSort">
           <el-input v-model="form.serviceSort" placeholder="请输入排序" />
         </el-form-item>
@@ -405,14 +405,19 @@ export default {
   name: "Servicewaycontent",
   data() {
     return {
-      disabled: "",
+      list: [],
+      serviceFrequencyStart: "",
+      serviceFrequencyEnd: "",
+      serviceFrequencyText: "",
+      serviceFrequencyType: "",
+      // disabled: "",
       titles: "",
-      checked: true,
-      TEXT: true,
+      DIGIT: true,
+      TEXT: false,
       DepartmentoList: [], //左侧数组
       format: {
         serviceWayName: "",
-        id:'',
+        id: "",
       },
       // 遮罩层
       loading: true,
@@ -453,7 +458,7 @@ export default {
         serviceRemark: null,
       },
       count: "", //全部
-
+      id: "",
       // 表单参数
       form: {},
       // 表单校验
@@ -462,6 +467,9 @@ export default {
       querydepartmen: {
         serviceWayName: "",
       },
+      disabled: true,
+      disabledb: false,
+      disableda: false,
     };
   },
   watch: {
@@ -480,13 +488,37 @@ export default {
     // });
   },
   methods: {
+    textlist(e) {
+      if (e == true) {
+        this.disableda = true;
+        this.disabledb = true;
+        this.disabled = false;
+
+        this.form.serviceFrequencyType = "TEXT";
+      }
+      this.DIGIT = false;
+    },
+    DIGITlist(e) {
+      console.log(e, "5");
+      if (e == true) {
+        this.disableda = false;
+        this.disabledb = false;
+        this.disabled = true;
+        this.form.serviceFrequencyType = "DIGIT";
+      }
+      this.TEXT = false;
+
+      // else {
+      //   this.form.serviceFrequencyType = "TEXT";
+      // }
+    },
     // 左侧服务方式提交
     submitForms() {
+      // this.form.serviceFrequencyType=this.DIGIT
       // console.log(this.itenname,'5252')
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          console.log(this.format)
-
+          console.log(this.format);
           if (this.format.id) {
             editServiceWay(this.format).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -594,16 +626,22 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.serviceFrequencyType = "DIGIT";
       this.open = true;
       this.title = "添加服务方式内容";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       // this.reset();
-      console.log(row)
-      // const id = row.serviceContentId 
-      getServicewaycontent(row.serviceContentId).then((response) => {
+      console.log(row);
+      // const id = row.id
+      row.serviceWayFrequencyList.forEach((e) => {
+        this.form.id = e.id;
+      });
+      getServicewaycontent(this.form.id).then((response) => {
         this.form = response.data;
+        this.form.id = response.data.serviceFrequencyId;
+
         this.open = true;
         this.title = "修改服务方式内容";
       });
@@ -612,7 +650,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.form.id != null) {
+          console.log(this.form.id, "555555");
+          if (this.form.serviceContentId != null) {
             updateServicewaycontent(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -631,15 +670,14 @@ export default {
     // 修改服务方式
     handleedit() {
       console.log(this.itemname);
-      this.format.id=this.itemname
+      this.format.id = this.itemname;
       if (this.itemname) {
-        
         serviceWay(this.itemname).then((res) => {
           this.format.serviceWayName = res.msg;
           this.opens = true;
           this.title = "修改服务方式内容";
         });
-      } 
+      }
       // else {
       //   this.$message.error("请先选择一种服务方式");
       // }
@@ -647,19 +685,18 @@ export default {
       this.titles = "修改服务方式";
     },
     handledelete() {
-        const id = this.itemname 
-        console.log(id,'111111111')
-        this.$modal
-          .confirm("是否确认删除此服务方式？")
-          .then(function () {
-            return removeServiceWay(id);
-          })
-          .then(() => {
-            this.mentlist();
-            this.$modal.msgSuccess("删除成功");
-          })
-          .catch(() => {});
-   
+      const id = this.itemname;
+      console.log(id, "111111111");
+      this.$modal
+        .confirm("是否确认删除此服务方式？")
+        .then(function () {
+          return removeServiceWay(id);
+        })
+        .then(() => {
+          this.mentlist();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     // },
     handleUpdateserve() {
@@ -669,14 +706,16 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row)
-      const id = row.serviceFrequencyId 
-      const serviceContentId = row.serviceContentId 
+      console.log(row);
+      row.serviceWayFrequencyList.forEach((e) => {
+        this.id = e.id;
+      });
+      const id = this.id;
 
       this.$modal
-        .confirm('是否确认删除服务方式内容编号为"' + serviceContentId + '"的数据项？')
+        .confirm("是否确认删除此该数据项？")
         .then(function () {
-          return delServicewaycontent(serviceContentId,id);
+          return delServicewaycontent(id);
         })
         .then(() => {
           this.getList();