diff --git a/epmet-oper-web/src/views/components/editResi.vue b/epmet-oper-web/src/views/components/editResi.vue
index 933f805..6b7d007 100644
--- a/epmet-oper-web/src/views/components/editResi.vue
+++ b/epmet-oper-web/src/views/components/editResi.vue
@@ -18,7 +18,7 @@
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
-                  <el-select v-model="form.GRID_ID" placeholder="请选择网格" size="small"
+                  <el-select v-model="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -37,7 +37,7 @@
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
-                  <el-select v-model="form.VILLAGE_ID" placeholder="请选择小区" size="small"
+                  <el-select v-model="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -56,7 +56,7 @@
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
-                  <el-select v-model="form.BUILD_ID" placeholder="请选择楼号" size="small"
+                  <el-select v-model="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -75,7 +75,7 @@
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">
-                  <el-select v-model="form.HOME_ID" placeholder="请选择" size="small"
+                  <el-select v-model="form.HOME_ID" :disabled="disabled" placeholder="请选择" size="small"
                   clearable class="resi-cell-select"
                   >
                     <el-option
@@ -102,6 +102,7 @@
                       <el-input
                         v-if="n.validType"
                         v-model="form[n.columnName]"
+                        :disabled="disabled"
                         class="resi-cell-input"
                         size="small"
                         clearable
@@ -111,6 +112,7 @@
                       <el-input
                         v-else
                         v-model="form[n.columnName]"
+                        :disabled="disabled"
                         class="resi-cell-input"
                         size="small"
                         clearable
@@ -132,6 +134,7 @@
                     <el-date-picker
                       v-else-if="n.itemType === 'datepicker'"
                       v-model="form[n.columnName]"
+                      :disabled="disabled"
                       class="resi-cell-input"
                       type="date"
                       size="small"
@@ -143,6 +146,7 @@
                     <el-date-picker
                       v-else-if="n.itemType === 'dateRange'"
                       v-model="form[n.columnName]"
+                      :disabled="disabled"
                       type="daterange"
                       align="right"
                       unlink-panels
@@ -154,11 +158,13 @@
                     <el-time-picker
                       v-else-if="n.itemType === 'timepicker'"
                       v-model="form[n.columnName]"
+                      :disabled="disabled"
                       placeholder="任意时间点">
                     </el-time-picker>
                     <el-time-picker
                       v-else-if="n.itemType === 'timeRange'"
                       v-model="form[n.columnName]"
+                      :disabled="disabled"
                       is-range
                       range-separator="至"
                       start-placeholder="开始时间"
@@ -167,6 +173,7 @@
                     </el-time-picker>
                     <el-select v-else-if="n.itemType === 'select'" v-model="form[n.columnName]"
                     :multiple="n.multiSelect"
+                    :disabled="disabled"
                     placeholder="请选择" size="small" clearable class="resi-cell-select">
                       <el-option
                         v-for="item in n.options || options"
@@ -184,13 +191,14 @@
                       v-model="form[n.columnName]"
                       :options="n.options"
                       :props="{ checkStrictly: true }"
+                      :disabled="disabled"
                       clearable
                       size="small"
                       @blur="handleChange"
                       class="resi-cell-select">
                     </el-cascader>
                     <template v-else-if="n.itemType === 'radio'">
-                      <el-radio v-for="ns in n.options" :key="ns.value" v-model="form[n.columnName]"
+                      <el-radio v-for="ns in n.options" :key="ns.value" v-model="form[n.columnName]" :disabled="disabled"
                       :label="ns.value">
                         {{ ns.label }}
                       </el-radio>
@@ -198,7 +206,7 @@
                     </template>
                     <template v-else-if="n.itemType === 'checkbox'">
                       <el-checkbox-group v-model="form[n.columnName]">
-                        <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
+                        <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value" :disabled="disabled">{{ns.label}}</el-checkbox>
                         <!-- <el-checkbox label="n.la"></el-checkbox> -->
                       </el-checkbox-group>
                     </template>
@@ -256,6 +264,10 @@ export default {
     supportAdd: { // 单表多条数据
       type: Boolean,
       default: false
+    },
+    disabled: { // 单表多条数据
+      type: Boolean,
+      default: false
     }
   },
   data () {
diff --git a/epmet-oper-web/src/views/components/resiForm.vue b/epmet-oper-web/src/views/components/resiForm.vue
index c9326d6..1eaaa33 100644
--- a/epmet-oper-web/src/views/components/resiForm.vue
+++ b/epmet-oper-web/src/views/components/resiForm.vue
@@ -315,6 +315,7 @@ export default {
     }
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
+    console.log('rulessss', rules)
     let tempFormList = [ ...this.formList ]
     let constForm = {
       ...form,
@@ -556,7 +557,7 @@ export default {
             newForm.push({
               tableName: item.tableName,
               supportAdd: this.supportAdd,
-              list: [{ ..._form }]
+              list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
             })
           })
           return newForm
diff --git a/epmet-oper-web/src/views/modules/base/resi.vue b/epmet-oper-web/src/views/modules/base/resi.vue
index 2fca1a5..95a85d4 100644
--- a/epmet-oper-web/src/views/modules/base/resi.vue
+++ b/epmet-oper-web/src/views/modules/base/resi.vue
@@ -34,9 +34,14 @@
           align="center"
           width="120">
           <template slot-scope="scope">
-            <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+            <el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
             <el-button @click="handleEdit(scope.row)" type="text" size="small" class="btn-color-edit">编辑</el-button>
-            <el-button type="text" size="small" class="btn-color-del">删除</el-button>
+            <el-popconfirm
+              title="删除之后无法回复，确认删除？"
+              @onConfirm="handleDel(scope.row)"
+            >
+              <el-button slot="reference" type="text" size="small" class="btn-color-del">删除</el-button>
+            </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
@@ -86,7 +91,7 @@
       append-to-body
       :close-on-click-modal="false"
       :before-close="handlerEditCancle">
-      <edit-resi v-if="dialogEditVisible" ref="baseForm" :form-info="editForm" :fixed="true" :form-list="formList" @changegroup="handleChangeGroup" />
+      <edit-resi v-if="dialogEditVisible" ref="baseForm" :disabled="disabled" :form-info="editForm" :fixed="true" :form-list="formList" @changegroup="handleChangeGroup" />
       <div v-if="dialogEditVisible"  class="resi-other">
         <div class="resi-other-title">其他</div>
         <div class="tabs-other-info">
@@ -94,14 +99,14 @@
             <el-tab-pane v-for="item in tabsList" :key="item.columnName"
             :label="item.label" :name="'group' + item.groupId">
               <edit-resi :ref="'group' + item.groupId" :columns="3" :support-add="item.supportAdd"
-              :form-id="item.columnName" :muti-list="item.mutiList" :form-list=" item.itemList" />
+              :form-id="item.columnName" :muti-list="item.mutiList" :form-list=" item.itemList" :disabled="disabled" />
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
       <div class="resi-btns">
         <el-button size="small" @click="handlerEditCancle">取消</el-button>
-        <el-button type="primary" size="small" @click="handleEditSUbmit">提交</el-button>
+        <el-button v-if="!disabled" type="primary" size="small" @click="handleEditSUbmit">提交</el-button>
       </div>
     </el-dialog>
 
@@ -120,6 +125,7 @@ export default {
   },
   data () {
     return {
+      disabled: false,
       pageLoading: false,
       dialogEditVisible: false,
       dialogVisible: false,
@@ -224,7 +230,13 @@ export default {
     handleClick (tab, event) {
       console.log(tab, event)
     },
+    async handleLook (row) {
+      this.disabled = true
+      await this.getFormList()
+      this.getrowInfo(row.icResiUserId)
+    },
     async handleEdit (row) {
+      this.disabled = false
       await this.getFormList()
       this.getrowInfo(row.icResiUserId)
     },
@@ -262,18 +274,15 @@ export default {
         if (hasT) this.tabsList.splice(i, 1)
       }
     },
-    handleEditSUbmit () {
+    formetForm () {
       const _baseForm = this.$refs.baseForm.handleForm()
       let arr = []
-      // let arr1 = []
       if (_baseForm.length === 0) return false
       arr.push([ ..._baseForm ])
       this.tabsList.forEach(item => {
-        // console.log('groupInfo', this.$refs['group' + item.groupId][0].handleForm())
         arr.push([ ...this.$refs['group' + item.groupId][0].handleForm() ])
       })
       let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
-      // console.log('arrr555-----sub', arr2)
       let noChange = true
       arr2.forEach(item => {
         if (item.list.length !== 0) noChange = false
@@ -285,11 +294,9 @@ export default {
       let res = []
       let finalArr = []
       arr2.forEach(function (item) {
-        // console.log('arrr666-----sub', item)
         let name = item.tableName
         if (hash[name]) {
           res[hash[name] - 1].list.push(...item.list)
-          // console.log('hash[name]---', hash[name], res, res[hash[name] - 1], item)
         } else {
           hash[name] = ++i
           res.push({
@@ -297,12 +304,10 @@ export default {
             supportAdd: item.supportAdd,
             tableName: name
           })
-          // console.log('hash[name]0000---', hash[name], res)
         }
       })
       // 多个list合并成一个list子集
       res.forEach(item => {
-        // console.log('arrr777-----sub', item)
         let _form = {}
         item.list.forEach(n => {
           _form = { ..._form, ...n }
@@ -312,57 +317,34 @@ export default {
           list: item.supportAdd ? [...item.list] : [{ ..._form }]
         })
       })
-      // console.log('editInfo---', res, finalArr)
-      this.submitEdit(finalArr)
+      return finalArr
     },
-    handleSUbmit () {
-      console.log('baseform', this.$refs.baseForm.handleForm())
-      const _baseForm = this.$refs.baseForm.handleForm()
-      let arr = []
-      // let arr1 = []
-      if (_baseForm.length === 0) return false
-      arr.push([ ..._baseForm ])
-      this.tabsList.forEach(item => {
-        // console.log('groupInfo', this.$refs['group' + item.groupId][0].handleForm())
-        arr.push([ ...this.$refs['group' + item.groupId][0].handleForm() ])
-      })
-      let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
-      // console.log('arrr555-----sub', arr2)
-      // 合并相同tableName的多个数组
-      let hash = {}
-      let i = 0
-      let res = []
-      let finalArr = []
-      arr2.forEach(function (item) {
-        // console.log('arrr666-----sub', item)
-        let name = item.tableName
-        if (hash[name]) {
-          res[hash[name] - 1].list.push(...item.list)
-          // console.log('hash[name]---', hash[name], res, res[hash[name] - 1], item)
-        } else {
-          hash[name] = ++i
-          res.push({
-            list: [...item.list],
-            supportAdd: item.supportAdd,
-            tableName: name
-          })
-          // console.log('hash[name]0000---', hash[name], res)
-        }
-      })
-      // 多个list合并成一个list子集
-      res.forEach(item => {
-        // console.log('arrr777-----sub', item)
-        let _form = {}
-        item.list.forEach(n => {
-          _form = { ..._form, ...n }
+    async handleEditSUbmit () {
+      const arr = await this.formetForm()
+      this.submitEdit(arr)
+    },
+    async handleSUbmit () {
+      const arr = await this.formetForm()
+      this.submitAdd(arr)
+    },
+    handleDel (row) {
+      let params = {
+        formCode: 'resi_base_info',
+        icResiUserId: row.icResiUserId
+      }
+      this.$http
+        .post('/epmetuser/icresiuser/delete', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('删除成功')
+            this.getTableData()
+          }
         })
-        finalArr.push({
-          tableName: item.tableName,
-          list: item.supportAdd ? [...item.list] : [{ ..._form }]
+        .catch(() => {
+          return this.$message.error('网络错误')
         })
-      })
-      // console.log('arrr999-----sub', finalArr)
-      this.submitAdd(finalArr)
     },
     handleFormatUrl (url) {
       return url.includes('?')
@@ -445,7 +427,7 @@ export default {
         conditions: this.conditions
       }
       this.$http
-        .post('/data/aggregator/icresiuser/listresi', params)
+        .post('/epmetuser/icresiuser/listresi', params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -464,7 +446,7 @@ export default {
         icResiUserId: id
       }
       this.$http
-        .post('/data/aggregator/icresiuser/detail', params)
+        .post('/epmetuser/icresiuser/detail', params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -633,6 +615,7 @@ export default {
 }
 .resi-card-table {
   .btn-color-del {
+    margin-left: 10px;
     color: rgba(213, 16, 16, 1);
   }
   .btn-color-edit {