diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue
index 71f70a0..23e6798 100644
--- a/src/views/manage/servicewaycontent/index.vue
+++ b/src/views/manage/servicewaycontent/index.vue
@@ -225,32 +225,10 @@
             label="服务频次"
             align="center"
             prop="serviceWayFrequencyList"
-            :key="keyTable"
+      
           >
-            <template slot-scope="scope">
-              <!-- <div
-                v-for="(itemx, index) in scope.row.serviceWayFrequencyList"
-                :key="index"
-              > -->
-              <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'">
-                  <el-select
-                    size="mini"
-                    @click="getSuppliers()"
-                    @change="blurInputs()"
-                    v-model="scope.row.valuePlusMax"
-                    clearable
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in scope.row.serviceWayFrequencyList"
-                      :key="item.id"
-                      :label="item.serviceFrequencyText"
-                      :value="item.id"
-                    >
-                    </el-option>
-                  </el-select>
-                </div> -->
-              <!-- <div v-if="scope.row.serviceWayFrequencyList[0].serviceFrequencyType == 'DIGIT'"> -->
+            <!-- <template slot-scope="scope">
+            
               <el-select
                 size="mini"
                 @click="getSuppliers()"
@@ -259,16 +237,7 @@
                 clearable
                 placeholder="请选择"
               >
-                <!-- :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) : item.serviceFrequencyType == 'DIGIT'?"
-                         ==  text ？ 不变 ： ==big ？拼接的那个 ：‘ ’ -->
+              
                 <el-option
                   v-for="item in scope.row.serviceWayFrequencyList"
                   :key="item.id"
@@ -285,27 +254,34 @@
                 >
                 </el-option>
               </el-select>
-              <!-- </div> -->
-              <!-- </div> -->
-            </template>
+        
+            </template> -->
 
             <!-- </div> -->
             <!-- </template>  -->
-            <!-- <template slot-scope="scope">
-              <div
-                v-for="(item, index) in scope.row.serviceWayFrequencyList"
+             <template slot-scope="scope">
+              <!-- {{ scope.row.serviceFrequencyType }} -->
+              <!-- <div
+                v-for="(item, index) in scope.row"
                 :key="index"
-              >
-                <div v-if="item.serviceFrequencyType == 'DIGIT'">
-                  {{ item.serviceFrequencyStart }}~{{
-                    item.serviceFrequencyEnd
+              > -->
+                <div
+               
+                  v-if="scope.row.serviceFrequencyType == 'DIGIT'"
+                
+                >
+                  {{ scope.row.serviceFrequencyStart }}~{{
+                    scope.row.serviceFrequencyEnd
                   }}
                 </div>
-                <div v-if="item.serviceFrequencyType == 'TEXT'">
-                  {{ item.serviceFrequencyText }}
+                <div
+                  v-if="scope.row.serviceFrequencyType == 'TEXT'"
+                 
+                >
+                  {{ scope.row.serviceFrequencyText }}
                 </div>
-              </div>
-            </template>  -->
+              <!-- </div> -->
+            </template> 
           </el-table-column>
 
           <el-table-column
@@ -374,7 +350,7 @@
         <el-form-item label="服务内容" prop="serviceContent" label-width="80">
           <el-input
             type="textarea"
-            :disabled="disabledcontent"
+         
             style="width: 400px"
             placeholder="请输入服务内容"
             v-model="form.serviceContent"
@@ -473,12 +449,12 @@ export default {
   data() {
     return {
       list: [],
-      disableedit:false,
+      disableedit: false,
       serviceFrequencyStart: "",
       serviceFrequencyEnd: "",
       serviceFrequencyType: "",
       // disabled: "",
-      disabledcontent:false,
+      disabledcontent: false,
       titles: "",
       DIGIT: true,
       TEXT: false,
@@ -552,6 +528,7 @@ export default {
       valuePlus: "",
       serviceFrequencyText: "",
       keyTable: "",
+      // list:[],
     };
   },
   watch: {
@@ -666,13 +643,16 @@ export default {
     /** 查询服务方式内容列表 */
     getList() {
       this.loading = true;
+      this.servicewaycontentList=[]
       listServicewaycontent(this.queryParams).then((response) => {
-        this.servicewaycontentList = response.rows;
-        // this.serviceFrequencyText= this.servicewaycontentList[0].serviceFrequencyText
-        console.log(this.servicewaycontentList, "****");
-        // if(e.serviceWayFrequencyList[0].serviceFrequencyType == 'TEXT'){
-        this.servicewaycontentList.forEach((e) => {
-          e.valuePlusMax = e.serviceWayFrequencyList[0].id;
+        // this.servicewaycontentList = response.rows;
+        response.rows.forEach((e) => {
+          e.serviceWayFrequencyList.forEach((el) => {
+            el.serviceContent = e.serviceContent;
+            this.servicewaycontentList.push(el)
+            console.log(this.servicewaycontentList, "this.servicewaycontentList");
+
+          });
         });
 
         // }
@@ -740,8 +720,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.disableedit=false
-      this.disabledcontent=false
+      this.disableedit = false;
+      this.disabledcontent = false;
       console.log(this.itemname, "itemname");
       if (this.itemname) {
         this.form.serviceWayName = this.serviceWayName;
@@ -757,11 +737,11 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.disableedit=true
-      this.disabledcontent=true
+      this.disableedit = true;
+      this.disabledcontent = true;
       console.log(row, "99999");
       this.reset();
-      getServicewaycontent(row.valuePlusMax).then((response) => {
+      getServicewaycontent(row.id).then((response) => {
         this.form = response.data;
         // this.form.serviceWayId=row.serviceWayId
         this.form.id = response.data.serviceFrequencyId;
@@ -788,6 +768,10 @@ export default {
       });
       // -----------
     },
+    changeDIGIT(item) {
+      console.log(item, "changeTEXT");
+    },
+    changeTEXT(item) {},
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -881,10 +865,10 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row);
-      row.serviceWayFrequencyList.forEach((e) => {
-        this.id = e.id;
-      });
-      const id = this.id;
+      // row.serviceWayFrequencyList.forEach((e) => {
+      //   this.id = e.id;
+      // });
+      const id = row.id;
 
       this.$modal
         .confirm("是否确认删除此该数据项？")
@@ -945,6 +929,10 @@ export default {
     }
   }
 }
+.changeTEXT :hover {
+  color: red;
+  border-bottom: solid 1px red;
+}
 .button {
   display: inline-block;
   position: relative;
diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue
index c61e987..e40fb5b 100644
--- a/src/views/system/agency/index.vue
+++ b/src/views/system/agency/index.vue
@@ -291,19 +291,23 @@
           />
         </el-form-item> -->
         <el-form-item label="机构名称" prop="agencyName">
-          <el-input v-model="form.agencyName" maxlength="100" placeholder="请输入机构名称" />
+          <el-input
+            v-model="form.agencyName"
+            maxlength="100"
+            placeholder="请输入机构名称"
+          />
         </el-form-item>
-       
+
         <el-form-item label="机构简称" prop="agencyAbbreviation">
           <el-input
-          maxlength="100"
+            maxlength="100"
             v-model="form.agencyAbbreviation"
             placeholder="请输入机构简称"
           />
         </el-form-item>
         <el-form-item label="机构代码" prop="agencyCode">
           <el-input
-          maxlength="20"
+            maxlength="20"
             v-model="form.agencyCode"
             style="width: 205px"
             placeholder="请输入机构代码"
@@ -314,7 +318,7 @@
             :props="{ checkStrictly: true }"
             :options="treeOptions"
             @change="change($event)"
-            style="width: 205px;"
+            style="width: 205px"
             v-model="form.parentId"
             :show-all-levels="false"
             :placeholder="
@@ -366,7 +370,7 @@
         </el-form-item>
         <el-form-item label="组织机构编码" prop="orgAgencyCode">
           <el-input
-          maxlength="30"
+            maxlength="30"
             v-model="form.orgAgencyCode"
             placeholder="请输入组织机构编码"
             style="width: 205px"
@@ -394,38 +398,46 @@
         </el-form-item>
         <el-form-item label="机构联系人" prop="agencyContacts">
           <el-input
-          maxlength="20"
+            maxlength="20"
             v-model="form.agencyContacts"
             placeholder="请输入机构联系人"
           />
         </el-form-item>
         <el-form-item label="机构联系电话" prop="agencyPhone">
           <el-input
-          maxlength="12"
+            maxlength="12"
             v-model="form.agencyPhone"
             placeholder="请输入机构联系电话"
           />
         </el-form-item>
         <el-form-item label="机构详细地址" prop="agencyAddress">
           <el-input
-          maxlength="200"
+            maxlength="200"
             v-model="form.agencyAddress"
             placeholder="请输入机构详细地址"
           />
         </el-form-item>
         <el-form-item label="机构概述" prop="agencyRemark">
-          <el-input v-model="form.agencyRemark"  maxlength="100" placeholder="请输入机构概述" />
+          <el-input
+            v-model="form.agencyRemark"
+            maxlength="100"
+            placeholder="请输入机构概述"
+          />
         </el-form-item>
         <el-form-item label="机构排序" prop="agencySort">
-          <el-input v-model="form.agencySort"  maxlength="8" placeholder="请输入机构排序" />
+          <el-input
+            v-model="form.agencySort"
+            maxlength="8"
+            placeholder="请输入机构排序"
+          />
         </el-form-item>
         <el-form-item label="机构状态" prop="agencyStatus">
           <!-- <el-form-item label="是否并发" prop="concurrent"> -->
-              <el-radio-group v-model="form.agencyStatus" size="small">
-                <el-radio   label="ON">启用</el-radio>
-                <el-radio  label="OFF">禁用</el-radio>
-              </el-radio-group>
-            <!-- </el-form-item> -->
+          <el-radio-group v-model="form.agencyStatus" size="small">
+            <el-radio label="ON">启用</el-radio>
+            <el-radio label="OFF">禁用</el-radio>
+          </el-radio-group>
+          <!-- </el-form-item> -->
           <!-- <el-radio v-model="form.agencyStatus" label="ON">启用</el-radio>
           <el-radio v-model="form.agencyStatus" label="OFF">禁用</el-radio> -->
         </el-form-item>
@@ -642,7 +654,8 @@ export default {
         agencyName: [
           { required: true, message: "机构名称能为空", trigger: "blur" },
         ],
-        areaCode:[{ required: true, message: "行政区划不能为空", trigger: "blur" },
+        areaCode: [
+          { required: true, message: "行政区划不能为空", trigger: "blur" },
         ],
       },
       treeOptionsagencyCategoryId: [],
@@ -747,7 +760,9 @@ export default {
 
     //点击街道
     clickstreet(item) {
-      this.form.communityName =''
+      this.form.communityCode = "";
+      this.form.communityName = "";
+
       getSecondaryLevelInfo(item.id).then((res) => {
         this.streetlists = res.data;
       });
@@ -758,10 +773,13 @@ export default {
     },
     //点击区县城
     clickarea(item) {
-      this.form.areaCode = "";
+      this.form.areaName = "";
       this.form.streetCode = "";
-      // this.form.streetName=''
-      this.form.communityCode =''
+      this.form.streetName = "";
+      this.form.streetCode = "";
+
+      this.form.communityCode = "";
+      this.form.communityName = "";
 
       getSecondaryLevelInfo(item.id).then((res) => {
         this.streetlist = res.data;
@@ -770,12 +788,12 @@ export default {
     //点击市
     clickcity(item) {
       this.form.regionName = "";
-      this.form.areaCode = "";
+      this.form.areaName = "";
       this.form.streetCode = "";
       this.form.streetName = "";
-      this.form.communityCode =''
+      this.form.communityCode = "";
+      this.form.communityName = "";
 
-      
       getSecondaryLevelInfo(item.id).then((res) => {
         this.arealist = res.data;
       });
@@ -791,14 +809,15 @@ export default {
       this.form.cityName = "";
       // this.form.streeName = "";
       // this.form.communityCode =''
-
+      this.form.streetCode = "";
+      this.form.streetName = "";
       this.form.areaName = "";
       this.form.communityName = "";
-
+      this.form.communityCode = "";
 
       this.form.regionName = "";
-      this.form.areaCode = "";
-      this.form.streetCode = "";
+      // this.form.areaCode = "";
+      // this.form.streetCode = "";
       getSecondaryLevelInfo(item.id).then((res) => {
         this.citylist = res.data;
       });
@@ -843,11 +862,9 @@ export default {
       console.log(e, "78");
       // console.log(this.$refs.cascader)
       // this.form.parentId = e;
-      if(e){
+      if (e) {
         this.form.parentId = e[e.length - 1];
-
       }
-
     },
     changeagencyCategoryId(e) {
       this.form.agencyCategoryId = e[e.length - 1];
@@ -987,6 +1004,9 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
+      if (this.form.provinceCode && !this.form.communityCode) {
+        this.$message("请选择到社区");
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {