diff --git a/project/weiyang/AppWorkOrder/components/Detail.vue b/project/weiyang/AppWorkOrder/components/Detail.vue
index 501786b8..4ab362bd 100644
--- a/project/weiyang/AppWorkOrder/components/Detail.vue
+++ b/project/weiyang/AppWorkOrder/components/Detail.vue
@@ -1,11 +1,11 @@
 <template>
-  <ai-detail class="reportAtWillDetail" v-loading="isLoading">
+  <ai-detail class="Detail" v-loading="isLoading">
     <template #title>
-      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
         <template #rightBtn>
           <div class="title-btns">
-            <el-button type="primary" icon="iconfont iconPerson_Transfered" @click="isShowForward = true" v-if="detail.eventStatus < 2">指派事件</el-button>
-            <el-button type="primary" icon="iconfont iconRegister" @click="isShowAdd = true" v-if="detail.eventStatus < 2">处理事件</el-button>
+            <el-button type="primary" icon="iconfont iconPerson_Transfered" @click="isShowForward = true" v-if="detail.powerTransmit">指派事件</el-button>
+            <el-button type="primary" icon="iconfont iconRegister" @click="isShowAdd = true" v-if="detail.powerHandle">处理事件</el-button>
           </div>
         </template>
       </ai-title>
@@ -14,28 +14,21 @@
       <div class="detail-content__wrapper">
         <div class="detail-content__wrapper--left">
           <ai-card title="基础信息">
-            <template #right>
-              <el-button type="primary" @click="editClick()" v-if="detail.eventStatus != 2 && detail.eventStatus != 3">编辑</el-button>
-            </template>
             <template #content>
               <ai-wrapper>
                 <ai-info-item label="上报人员" :value="detail.name"></ai-info-item>
                 <ai-info-item label="当前状态" :value="dict.getLabel('clapEventStatus', detail.eventStatus)"></ai-info-item>
                 <ai-info-item label="联系方式">{{ detail.phone }}</ai-info-item>
                 <ai-info-item label="上报时间">{{ detail.createTime }}</ai-info-item>
-                <!-- <ai-info-item label="事件来源">{{ dict.getLabel('residentEventSource', detail.eventSource) }}</ai-info-item> -->
-                <ai-info-item label="事件类型">{{ detail.type }}</ai-info-item>
-                <ai-info-item label="消息来源">{{ detail.groupName }}</ai-info-item>
-                <!-- <ai-info-item label="事件来源">{{ dict.getLabel('residentEventSource', detail.eventSource) }}</ai-info-item>  -->
-                <ai-info-item label="事件描述" isLine>
-                  <span v-html="detail.content"></span>
-                </ai-info-item>
+                <ai-info-item label="消息来源" v-if="listIndex == 2">{{ dict.getLabel('residentEventSource', detail.eventSource) }}</ai-info-item>
+                <ai-info-item label="事件来源" v-else>{{ dict.getLabel('residentEventSource', detail.eventSource) }}</ai-info-item>
+                <ai-info-item label="事件类型">{{ detail.groupName }}</ai-info-item>
+                <ai-info-item label="事件描述" isLine>{{ detail.content }}</ai-info-item>
                 <ai-info-item label="现场照片" isLine>
                   <ai-uploader :instance="instance" disabled v-model="detail.files"></ai-uploader>
                 </ai-info-item>
                 <ai-info-item label="所属网格">{{ detail.girdName }}</ai-info-item>
-                <ai-info-item label="事件地点" isLine>{{ detail.address }}</ai-info-item>
-                <ai-info-item label="地图位置" isLine>
+                <ai-info-item label="事件位置" isLine>
                   <div id="map" style="width: 500px; height: 280px;"></div>
                 </ai-info-item>
               </ai-wrapper>
@@ -75,17 +68,13 @@
           @closed="onClose"
           @onConfirm="handleEvent">
         <el-form class="ai-form" label-width="120px" :model="form" ref="form">
-          <!-- <el-form-item label="事件分类" prop="groupId" style="width: 100%;" :rules="[{ required: true, message: '请选择事件分类' }]">
+          <el-form-item label="事件分类" prop="groupId" style="width: 100%;" :rules="[{ required: true, message: '请选择事件分类' }]">
             <ai-select
                 v-model="form.groupId"
                 placeholder="请选择事件分类"
                 :selectList="dictList">
             </ai-select>
-          </el-form-item> -->
-          <el-form-item label="事件分类" prop="type"  :rules="[{ required: true, message: '请选择事件分类' }]" style="width: 100%;">
-            <ai-select v-model="form.type" :selectList="typeList" placeholder="请选择" />
           </el-form-item>
-
           <el-form-item label="处理结果" prop="eventStatus" style="width: 100%;" :rules="[{ required: true, message: '请选择处理结果' }]">
             <el-radio-group v-model="form.eventStatus">
               <el-radio label="1">已办结</el-radio>
@@ -112,12 +101,10 @@
           title="事件指派"
           @onConfirm="onForwardConfirm">
         <el-form class="ai-form" label-width="120px" :model="forwardForm" ref="forwardForm">
-          <el-form-item label="转交" prop="handleUserName" style="width: 100%;" :rules="[{ required: true, message: '请选择人员' }]">
-            <el-input disabled size="small" v-model="forwardForm.handleUserName" clearable placeholder="请选择人员">
+          <el-form-item label="转交" prop="name" style="width: 100%;" :rules="[{ required: true, message: '请选择网格员或网格' }]">
+            <el-input disabled size="small" v-model="forwardForm.name" clearable placeholder="请选择网格员或网格">
               <template slot="append">
-                <ai-user-selecter refs="addTags" :isMultiple="false" :instance="instance" v-model="forwardForm.user" @change="onChooseUser">
-                  <el-button size="small">选择人员</el-button>
-                </ai-user-selecter>
+                <el-button @click="getGirdList().then(()=>isShowUser=true )">选择</el-button>
               </template>
             </el-input>
           </el-form-item>
@@ -135,74 +122,36 @@
         </el-form>
       </ai-dialog>
       <ai-dialog
-          :visible.sync="isShowEdit"
+          :visible.sync="isShowUser"
           width="800px"
-          @close="onCloseEdit"
-          title="编辑事件"
-          @onConfirm="onConfirmEdit">
-        <el-form class="ai-form" label-width="120px" :model="editInfo" ref="editInfo">
-          <el-form-item label="事件描述" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入事件描述' }]">
-            <el-input type="textarea" :rows="8" :maxlength="500" v-model="editInfo.content" clearable placeholder="请输入事件描述" show-word-limit></el-input>
-          </el-form-item>
-          <el-form-item label="事件类型" prop="type"  :rules="[{ required: true, message: '请选择事件类型' }]" style="width: 100%;">
-            <ai-select v-model="editInfo.type" :selectList="typeList" placeholder="请选择" />
-          </el-form-item>
-          <el-form-item label="所属网格" style="width: 100%;">
-            <el-input disabled size="small" v-model="editInfo.girdName" clearable>
-              <template slot="append">
-                <ai-picker :ops="{label: 'girdName'}" :instance="instance" v-model="editInfo.girdIds" @pick="e => onUserChange(e)" dialogTitle="选择所属网格" action="/app/appgirdinfo/girdList">
-                  <div class="time-select">
-                    <span class="dept-name" style="color:#999;">选择所属网格</span>
-                    <i class="el-icon-arrow-down"></i>
-                  </div>
-                </ai-picker>
-              </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="联系方式" prop="phone" style="width: 100%;">
-            <el-input
-                size="small"
-                v-model="editInfo.phone"
-                placeholder="请输入..."
-                clearabel
-                :maxLength="11"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="图片" prop="files" style="width: 100%;">
-            <ai-uploader
-                :instance="instance"
-                v-model="editInfo.files"
-                isShowTip
-                :limit="9">
-            </ai-uploader>
-          </el-form-item>
-          <el-form-item label="事件地点" style="width: 100%;">
-            <el-input disabled size="small" v-model="editInfo.address"></el-input>
-          </el-form-item>
-          <el-form-item label="上报位置" prop="lat">
-            <el-button @click="showMap = true">地图标绘</el-button>
-          </el-form-item>
-        </el-form>
-      </ai-dialog>
-      <ai-dialog title="地图" :visible.sync="showMap" @opened="initMapSelect" width="800px" class="mapDialog" @onConfirm="selectMap">
-        <div id="mapDialog" style="height:400px;"></div>
-        <el-form label-width="80px" style="padding: 10px 20px 0 0;">
-          <el-row type="flex" justify="space-between">
-            <el-form-item label="经度">
-              <el-input disabled size="small" v-model="placeDetail.lng" style="width:100px;"></el-input>
-            </el-form-item>
-            <el-form-item label="纬度">
-              <el-input disabled size="small" v-model="placeDetail.lat" style="width:100px;"></el-input>
-            </el-form-item>
-            <el-form-item label="地址">
-              <el-input disabled size="small" v-model="placeDetail.address" style="width:300px;"></el-input>
-            </el-form-item>
-          </el-row>
-        </el-form>
-        <el-input id="searchPlaceInput" size="medium" class="searchPlaceInput" clearable v-model="searchPlace" autocomplete="on" @change="placeSearch.search(searchPlace)" placeholder="请输入关键字">
-          <el-button type="primary" slot="append" @click="placeSearch.search(searchPlace)">搜索</el-button>
-        </el-input>
-        <div id="searchPlaceOutput" />
+          title="选择网格员"
+          @onConfirm="onConfirm">
+        <div class="grid-wrapper">
+          <el-input
+              style="margin-bottom: 10px;"
+              size="small"
+              placeholder="请输入网格名称/网格员姓名/网格员电话"
+              v-model="name" @change="$refs.tree.filter(name)"
+              suffix-icon="iconfont iconSearch">
+          </el-input>
+          <el-tree
+              :filter-node-method="filterNode"
+              ref="tree"
+              :props="defaultProps"
+              node-key="id"
+              :data="tree"
+              highlight-current
+              @current-change="onTreeChange">
+            <div class="tree-container" slot-scope="{ data }">
+              <div class="tree-container__user">
+                <div class="tree-user__item">
+                  <span v-if="!data.isUser">{{ data.girdName }}</span>
+                  <span v-else>{{data.name}}<span v-if="data.phone">-{{data.phone}}</span></span>
+                </div>
+              </div>
+            </div>
+          </el-tree>
+        </div>
       </ai-dialog>
     </template>
   </ai-detail>
@@ -220,14 +169,16 @@ export default {
     return {
       forwardForm: {
         content: '',
-        handleUserId: '',
-        handleUserName: '',
-        files: [],
-        user: []
+        girdId: '',
+        girdName: '',
+        girdMemberId: '',
+        girdMemberName: '',
+        name: ''
       },
       isLoading: true,
       name: '',
       detail: {},
+      isShowUser: false,
       eventList: [],
       isShowAdd: false,
       userList: [],
@@ -244,21 +195,9 @@ export default {
         groupId: '',
         groupName: '',
         content: [],
-        eventStatus: '1',
-        type: ''
+        eventStatus: '1'
       },
-      evaluation: {},
-      isShowEdit: false, //编辑工单信息
-      editInfo: {},
-      placeDetail: {
-        lng: '',
-        lat: '',
-        address: ''
-      },
-      showMap: false,
-      searchPlace: '',
-      map: null,
-      typeList: []
+      evaluation: {}
     }
   },
 
@@ -273,21 +212,21 @@ export default {
 
   created() {
     this.getDict()
-    this.getTypeList()
-    this.dict.load('clapEventStatus', 'residentEventSource', 'xbotReportEventType').then(() => {
+    this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
       this.getDetail()
     })
   },
 
   methods: {
     getDetail() {
-      this.instance.post('/app/appsessionarchivereportinfo/queryDetailById', null, {
+      this.instance.post('/app/apppatrolreportinfov2/queryDetailById', null, {
         params: {id: this.$route.query.id}
       }).then(res => {
         if (res?.data) {
           this.detail = res.data
           this.processList = res.data.processList
-          this.$forceUpdate()
+          this.form.groupId = res.data.groupId
+
           this.$nextTick(() => {
             this.initMap()
           })
@@ -297,18 +236,9 @@ export default {
         this.isLoading = false
       })
     },
-    getTypeList() {
-      this.instance.post(`/app/appsessionarchivefeaturelibrary/eventTypeList`).then(res => {
-        if (res.code == 0) {
-          res.data.map((item) => {
-            var i = {dictName: item, dictValue: item}
-            this.typeList.push(i)
-          })
-        }
-      })
-    },
+
     getGirdList() {
-      return this.instance.post(`/app/appresidentreportinfo/listGirdInfoByTransfer?id=${this.$route.query.id}`).then(res => {
+      return this.instance.post(`/app/apppatrolreportinfov2/listGirdInfoByTransfer?id=${this.$route.query.id}`).then(res => {
         if (res?.data) {
           // return this.tree = this.formatList([res.data])
           this.tree = res.data
@@ -328,8 +258,11 @@ export default {
       this.form.content = ''
       this.form.eventStatus = ''
       this.forwardForm.content = ''
-      this.forwardForm.handleUserName = ''
-      this.forwardForm.user = []
+      this.forwardForm.girdId = ''
+      this.forwardForm.girdName = ''
+      this.forwardForm.girdMemberId = ''
+      this.forwardForm.girdMemberName = ''
+      this.forwardForm.name = ''
       this.forwardForm.files = []
     },
 
@@ -359,24 +292,45 @@ export default {
     onForwardConfirm() {
       this.$refs.forwardForm.validate(v => {
         if (v) {
-          this.instance.post('/app/appsessionarchivereportinfo/transfer', {
+          this.instance.post('/app/apppatrolreportinfov2/transfer', {
             ...this.forwardForm,
             id: this.$route.query.id
           }).then(res => {
             if (res?.code == 0) {
-              this.$message.success('转交成功!')
               this.isShowForward = false
-              this.processList = []
               this.onClose()
               this.getDetail()
-              
+              this.$message.success('转交成功!')
             }
           })
         }
       })
     },
+
+    onConfirm() {
+      // if (this.gridInfo.userId) {
+      //   this.forwardForm.girdId = this.gridInfo.girdId
+      //   this.forwardForm.girdName = this.gridInfo.girdName
+      //   this.forwardForm.girdMemberId = this.gridInfo.id
+      //   this.forwardForm.girdMemberName = this.gridInfo.name
+      // } else {
+      //   this.forwardForm.girdId = this.gridInfo.id
+      // }
+      // this.forwardForm.girdName = this.gridInfo.girdName
+      // this.forwardForm.name = `${this.gridInfo.girdName}${this.gridInfo.name ? '-' + this.gridInfo.name : ''}`
+      // this.isShowUser = false
+      if(!this.gridInfo.userId) {
+        return this.$message.error('请选择网格员!')
+      } 
+      this.forwardForm.girdId = this.gridInfo.girdId
+      this.forwardForm.girdName = this.gridInfo.girdName
+      this.forwardForm.girdMemberId = this.gridInfo.id
+      this.forwardForm.girdMemberName = this.gridInfo.name
+      this.forwardForm.name = `${this.gridInfo.girdName}${this.gridInfo.name ? '-' + this.gridInfo.name : ''}`
+      this.isShowUser = false
+    },
     getDict() {
-      this.instance.post(`/app/appresidentreportgroup/list?current=1&size=100000`).then(res => {
+      this.instance.post(`/app/apppatrolreportgroupv2/list?current=1&size=100000`).then(res => {
         if (res.code == 0) {
           this.dictList = res.data.records.map(v => {
             return {
@@ -390,7 +344,7 @@ export default {
 
     close() {
       this.$confirm('确定关闭该事件？').then(() => {
-        this.instance.post(`/app/appresidentreportinfo/delete?ids=${this.$route.query.id}`).then(res => {
+        this.instance.post(`/app/apppatrolreportinfov2/delete?ids=${this.$route.query.id}`).then(res => {
           if (res.code == 0) {
             this.$message.success('删除成功！')
             this.getList()
@@ -402,17 +356,7 @@ export default {
     cancel(isRefresh) {
       this.$emit('change', {
         type: 'list',
-        isRefresh: !!isRefresh,
-        listIndex: this.listIndex
-      })
-    },
-
-    onChange(e) {
-      this.instance.post(`/app/appvillagerintegralrule/list?size=1000&classification=${e}&ruleStatus=1`).then(res => {
-        if (res.code === 0) {
-          this.form.ruleId = ''
-          this.eventList = res.data.records
-        }
+        isRefresh: !!isRefresh
       })
     },
 
@@ -438,8 +382,9 @@ export default {
     handleEvent() {
       this.$refs.form.validate(v => {
         if (v) {
-          this.instance.post('/app/appsessionarchivereportinfo/finish', {
+          this.instance.post('/app/apppatrolreportinfov2/finish', {
             ...this.form,
+            groupName: this.dictList.filter(v => v.dictValue === this.form.groupId)[0].dictName,
             id: this.$route.query.id
           }).then(res => {
             if (res?.code == 0) {
@@ -450,117 +395,13 @@ export default {
           })
         }
       })
-    },
-
-    onChooseUser(v) {
-      this.forwardForm.handleUserId = v[0].id
-      this.forwardForm.handleUserName = v[0].name
-      this.forwardForm.user = v
-    },
-
-    editClick() {
-      this.isShowEdit = true
-      this.editInfo = {...this.detail}
-      this.editInfo.girdIds = []
-      if(this.editInfo.girdId) {
-        this.editInfo.girdIds.push(this.editInfo.girdId)
-      }
-    },
-
-    selectMap() {
-      this.editInfo.lng = this.placeDetail.lng
-      this.editInfo.lat = this.placeDetail.lat
-      this.editInfo.address = this.placeDetail.address
-      this.showMap = false
-    },
-    initMapSelect() {
-      AMapLoader.load({
-        key: 'b553334ba34f7ac3cd09df9bc8b539dc',
-        version: '2.0',
-        plugins: ['AMap.PlaceSearch', 'AMap.AutoComplete', 'AMap.Geocoder'],
-      }).then((AMap2) => {
-        this.map = new AMap2.Map('mapDialog', {
-          resizeEnable: true,
-          zooms: [6, 20],
-          zoom: 11,
-          center:[107.11059, 31.56618],
-        })
-        this.placeSearch = new AMap2.PlaceSearch({ map: this.map })
-        new AMap2.AutoComplete({
-          input: 'searchPlaceInput',
-          output: 'searchPlaceOutput',
-        }).on('select', (e) => {
-          if (e?.poi) {
-            this.placeSearch.setCity(e.poi.adcode)
-            this.movePosition(e.poi.location)
-          }
-        })
-        this.map.on('click', (e) => {
-          new AMap2.Geocoder().getAddress(e.lnglat, (sta, res) => {
-            if (res?.regeocode) {
-              this.placeDetail = {
-                lng: e.lnglat?.lng,
-                lat: e.lnglat?.lat,
-                address: res.regeocode.formattedAddress,
-              }
-            }
-          })
-          this.movePosition(e.lnglat)
-        })
-      })
-    },
-  
-    movePosition(center) {
-      if (this.map) {
-        this.map.clearMap()
-        this.map.panTo(center)
-        this.map.add([
-          new AMap.Marker({
-            position: center,
-            clickable: true,
-          }),
-        ])
-        this.map.setFitView()
-      }
-    },
-
-    onUserChange (e) {
-      if (e.length) {
-        this.editInfo.girdName = e[0].girdName
-      } else {
-        this.editInfo.girdIds = []
-        this.editInfo.girdName = ''
-      }
-    },
-
-    onCloseEdit() {
-      this.isShowEdit = false
-      this.editInfo = {}
-    },
-
-    onConfirmEdit() {
-      this.$refs.editInfo.validate(v => {
-        if (v) {
-          this.instance.post('/app/appsessionarchivereportinfo/update', {
-            ...this.editInfo,
-            id: this.$route.query.id,
-            girdIds: this.editInfo.girdIds.length ? this.editInfo.girdIds[0] : ''
-          }).then(res => {
-            if (res?.code == 0) {
-              this.isShowEdit = false
-              this.getDetail()
-              this.$message.success('编辑成功!')
-            }
-          })
-        }
-      })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.reportAtWillDetail {
+.Detail {
   height: 100%;
 
   .grid-wrapper {
diff --git a/project/weiyang/AppWorkOrder/components/List.vue b/project/weiyang/AppWorkOrder/components/List.vue
index 5d969d3d..73d07a7c 100644
--- a/project/weiyang/AppWorkOrder/components/List.vue
+++ b/project/weiyang/AppWorkOrder/components/List.vue
@@ -132,9 +132,10 @@ export default {
       searchDotime: [],
       typeList: [],
       tabs: [
-        {label: '舆情工单'},
-        {label: '敏感词工单'},
-        {label: '事件上报'}
+        {label: '舆情工单', value: 2},
+        {label: '敏感词工单', value: 3},
+        {label: '巡查上报', value: 1},
+        {label: '居民上报', value: 0}
       ],
       currIndex: 0,
       placeholderTextList: ['请输入内容描述/上报人员/联系方式', '敏感词、涉及对象、姓名、手机号', '请输入内容描述/上报人员/联系方式'],
@@ -148,8 +149,8 @@ export default {
     colConfigs1() {
       return [
         {prop: 'content', label: '内容描述', width: '300px'},
-        {prop: 'type', label: '事件类型', align: 'center', dict: 'xbotReportEventType'},
-        {prop: 'groupName', label: '所属群聊', align: 'center'},
+        {prop: 'groupName', label: '事件类型', align: 'center'},
+        {prop: 'wxGroupName', label: '所属群聊', align: 'center'},
         {prop: 'createTime', label: '上报时间', align: 'center'},
         {prop: 'name', label: '昵称', align: 'center'},
         // {prop: 'phone', label: '联系方式', align: 'center'},
@@ -161,8 +162,8 @@ export default {
     colConfigs2() {
       return [
         {prop: 'content', label: '内容描述', width: '300px'},
-        {prop: 'type', label: '事件类型', align: 'center', dict: 'xbotReportEventType'},
-        {prop: 'groupName', label: '所属群聊', align: 'center'},
+        {prop: 'groupName', label: '事件类型', align: 'center'},
+        {prop: 'wxGroupName', label: '所属群聊', align: 'center'},
         {prop: 'name', label: '姓名', align: 'center'},
         {prop: 'createTime', label: '上报时间', align: 'center'},
         // {prop: 'phone', label: '联系方式', align: 'center'},
@@ -174,9 +175,9 @@ export default {
     colConfigs3() {
       return [
         {prop: 'content', label: '内容描述', width: '300px'},
-        {prop: 'type', label: '事件来源', align: 'center', dict: 'xbotReportEventType'},
-        {prop: 'type', label: '事件类型', align: 'center', dict: 'xbotReportEventType'},
-        {prop: 'groupName', label: '所属网格', align: 'center'},
+        {prop: 'eventSource', label: '事件来源', align: 'center', dict: 'residentEventSource'},
+        {prop: 'groupName', label: '事件类型', align: 'center'},
+        {prop: 'girdName', label: '所属网格', align: 'center'},
         {prop: 'createTime', label: '上报时间', align: 'center'},
         {prop: 'name', label: '上报人员', align: 'center'},
         {prop: 'phone', label: '联系方式', align: 'center'},
@@ -213,9 +214,10 @@ export default {
       this.getList()
     },
     getList() {
-      this.instance.post(`/app/appsessionarchivereportinfo/list`, null, {
+      this.instance.post(`/app/apppatrolreportinfov2/list`, null, {
         params: {
-          ...this.search
+          ...this.search,
+          eventSource: this.tabs[this.currIndex].value
         }
       }).then(res => {
         if (res.code == 0) {
@@ -271,6 +273,8 @@ export default {
       }else {
         this.colConfigs = this.colConfigs3
       }
+      this.search.current = 1
+      this.getList()
     }
   },