From 5e13a846537b3206361fd57630463053ba83e006 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 29 Jun 2022 10:03:28 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/caloudong.vue  | 10 +++++++++-
 src/views/modules/cabaseinfo/capingfang.vue | 10 +++++++++-
 src/views/modules/cabaseinfo/carental.vue   | 10 +++++++++-
 src/views/modules/cabaseinfo/caresident.vue | 10 +++++++++-
 src/views/modules/cabaseinfo/carotators.vue | 10 +++++++++-
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 3a261a3a..4e14bafe 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -26,6 +26,13 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item label="所处位置" prop="buildingAddr">
+          <el-input
+            v-model="dataForm.buildingAddr"
+            placeholder="所处位置"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
         </el-form-item>
@@ -176,7 +183,8 @@ export default {
       dataForm: {
         buildingName: "",
         communityName: "",
-         gridId:""
+         gridId:"",
+         buildingAddr:""
       },
       caLouDongOptions:[],
       optionsG:[]
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index b461b473..4416b96c 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -26,6 +26,13 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item label="所处位置" prop="buildingAddr">
+          <el-input
+            v-model="dataForm.buildingAddr"
+            placeholder="所处位置"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
         </el-form-item>
@@ -176,7 +183,8 @@ export default {
       dataForm: {
         buildingName: "",
         communityName: "",
-        gridId:""
+        gridId:"",
+        buildingAddr:""
       },
       caLouDongOptions:[],
       optionsG:[]
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index bb8ed3c3..c22dee64 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -33,6 +33,13 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item label="房屋地址" prop="houseAddress">
+          <el-input
+            v-model="dataForm.houseAddress"
+            placeholder="房屋地址"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
         </el-form-item>
@@ -177,7 +184,8 @@ export default {
         houseName: "",
         residentName: "",
         renterName: "",
-        gridId:""
+        gridId:"",
+        houseAddress:""
       },
       caLouDongOptions:[],
       optionsG:[]
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 5b199952..59c32f56 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -29,6 +29,13 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item label="现居住地址" prop="curliveAddressDetail">
+          <el-input
+            v-model="dataForm.curliveAddressDetail"
+            placeholder="现居住地址"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
         </el-form-item>
@@ -188,7 +195,8 @@ export default {
         idCard: "",
         residentName: "",
         telephone: "",
-        gridId:""
+        gridId:"",
+        curliveAddressDetail:""
       },
       caLouDongOptions:[],
       optionsG:[]
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index 8111a77b..eb4fe939 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -29,6 +29,13 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item label="现居住地址" prop="curliveAddressDetail">
+          <el-input
+            v-model="dataForm.curliveAddressDetail"
+            placeholder="现居住地址"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
         </el-form-item>
@@ -165,7 +172,8 @@ export default {
         idCard: "",
         residentName: "",
         telephone: "",
-        gridId:""
+        gridId:"",
+        curliveAddressDetail:""
       },
        caLouDongOptions:[],
        optionsG:[]

From 31c39a01671824ce8bd8ea95119d72c6a5644c9d Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 29 Jun 2022 17:49:38 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=8C=96=E4=BA=8B=E4=BB=B6=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 153 ++++++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 src/views/modules/cabaseinfo/wghSjxxb.vue

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
new file mode 100644
index 00000000..e931efe9
--- /dev/null
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="mod-axis__caLoudong}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="事件来源" prop="infosourcename">
+          <el-input
+            v-model="dataForm.infosourcename"
+            placeholder="事件来源"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="事件类别" prop="infotypename">
+          <el-input
+            v-model="dataForm.infotypename"
+            placeholder="事件类别"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="社区名称" prop="communityname">
+          <el-input
+            v-model="dataForm.communityname"
+            placeholder="社区名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="事件状态" prop="statusname">
+          <el-input
+            v-model="dataForm.statusname"
+            placeholder="事件状态"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="never" class="aui-card--fill">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+         :show-overflow-tooltip="true"
+          prop="infosourcename"
+          label="事件来源"
+          header-align="center"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="infotypename"
+          label="事件类别"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="communityname"
+          label="社区名称"
+          header-align="center"
+          align="center"
+           :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="description"
+          label="事见描述"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="address"
+          label="事见地址"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="statusname"
+          label="事见状态"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="streetname"
+          label="街道名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
+          <template >
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              >去处置</el-button
+            >
+          </template>
+        </el-table-column>
+
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-post";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/opendata/wghSjxxb/todo/page",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        infosourcename: "",
+        infotypename: "",
+        communityname:"",
+        statusname:""
+      },
+      optionsG:[]
+    };
+  },
+  methods:{
+  
+  },
+created(){
+    this.getGridList('query')
+  },
+};
+</script>

From 33c90ee0a9caa07da8f4b50c7d849d3170f5e3d7 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 30 Jun 2022 15:35:16 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 158 +++++++++++++++++-----
 1 file changed, 126 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index e931efe9..328ca57e 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -50,60 +50,67 @@
           width="50"
         ></el-table-column>
         <el-table-column
-         :show-overflow-tooltip="true"
-          prop="infosourcename"
-          label="事件来源"
-          header-align="center"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="infotypename"
-          label="事件类别"
+          prop="streetname"
+          label="街道名称"
           header-align="center"
           align="center"
-          :show-overflow-tooltip="true">
-        </el-table-column>
+          :show-overflow-tooltip="true"
+        ></el-table-column>
         <el-table-column
           prop="communityname"
           label="社区名称"
           header-align="center"
           align="center"
-           :show-overflow-tooltip="true">
+          :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="description"
-          label="事见描述"
+          prop="address"
+          label="事件地址"
           header-align="center"
           align="center"
+					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="address"
-          label="事见地址"
+          prop="description"
+          label="事件描述"
           header-align="center"
           align="center"
+					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="statusname"
-          label="事见状态"
+          prop="infotypename"
+          label="事件类别"
           header-align="center"
           align="center"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
+          :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column
-          prop="streetname"
-          label="街道名称"
+         :show-overflow-tooltip="true"
+          prop="infosourcename"
+          label="事件来源"
+          header-align="center"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="statusname"
+          label="事件状态"
           header-align="center"
           align="center"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
+          :show-overflow-tooltip="true">
+				</el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
-          <template >
+          <template slot-scope="row">
             <el-button
               type="text"
               class="div-table-button--detail"
               size="small"
-              >去处置</el-button
-            >
+              @click="getDetailById(row)"
+              >查看</el-button>
+							<el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+							@click="jumplink">去处置</el-button>
           </template>
         </el-table-column>
 
@@ -119,6 +126,66 @@
       >
       </el-pagination>
     </el-card>
+    <el-dialog
+      title="事件信息详情"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <el-form ref="form" :model="detailForm" label-width="80px">
+        <el-form-item label="街道名称">
+          <el-input
+            style="width:260px;margin-left:20px"
+            v-model="detailForm.streetname"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="社区名称">
+          <el-input
+            style="width:260px;margin-left:20px"
+            v-model="detailForm.communityname"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="事件地址:">
+          <el-input
+            style="width:260px;margin-left:20px"
+            v-model="detailForm.address"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="事件描述:">
+					<el-input
+						style="width:260px;margin-left:20px"
+						v-model="detailForm.description"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+				<el-form-item label="事件类别:">
+					<el-input
+						style="width:260px;margin-left:20px"
+						v-model="detailForm.infotypename"
+						:disabled="true">
+					</el-input>
+				</el-form-item>
+        <el-form-item label="事件来源:">
+					<el-input
+						style="width:260px;margin-left:20px"
+						v-model="detailForm.infosourcename"
+						:disabled="true">
+					</el-input>
+				</el-form-item>
+        <el-form-item label="事件状态:">
+					<el-input
+						style="width:260px;margin-left:20px"
+						v-model="detailForm.statusname"
+						:disabled="true">
+					</el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button style="margin-left:80px" @click="dialogVisible = false" type="primary">取 消</el-button>
+				</el-form-item>
+      </el-form>
+</el-dialog>
   </div>
 </template>
 
@@ -140,14 +207,41 @@ export default {
         communityname:"",
         statusname:""
       },
-      optionsG:[]
+      detailForm:{
+        infosourcename: "",
+        infotypename: "",
+        communityname:"",
+        description:"",
+        address:"",
+        statusname:"",
+        streetname:"",
+      },
+      optionsG:[],
+      dialogVisible: false
     };
   },
   methods:{
-  
-  },
-created(){
-    this.getGridList('query')
+    getDetailById(row){
+      this.dialogVisible = true
+      this.$http.post(`/opendata/wghSjxxb/sjxx/getDetailById`,{
+        taskid:row.row.taskid
+      }).then(resp => {
+        this.detailForm = resp.data.data
+      }).catch(error => {
+        this.$message.error(error)
+      })
+    },
+    handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+            dialogVisible = false
+          })
+          .catch(_ => {});
+      },
+			jumplink(){
+				window.open('http://120.221.72.15:8089/sbwgh/bizsys/login.htm','_blank')
+			}
   },
 };
 </script>

From 20b86edfa9c8881e66661b59fc8257435fdd98c0 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 30 Jun 2022 16:21:26 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=95=BF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index 328ca57e..d9721d9b 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -155,6 +155,7 @@
         </el-form-item>
         <el-form-item label="事件描述:">
 					<el-input
+						type="textarea"
 						style="width:260px;margin-left:20px"
 						v-model="detailForm.description"
 						:disabled="true">

From 6c8a9422a562fee656304d3a0c13e3527e0c0781 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 5 Jul 2022 16:41:54 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 131 ++++++++++------------
 1 file changed, 58 insertions(+), 73 deletions(-)

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index d9721d9b..d3a9c103 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -2,31 +2,31 @@
   <div class="mod-axis__caLoudong}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="事件来源" prop="infosourcename">
+        <el-form-item label="事件来源" prop="wgymc">
           <el-input
-            v-model="dataForm.infosourcename"
-            placeholder="事件来源"
+            v-model="dataForm.wgymc"
+            placeholder="网格员名称"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="事件类别" prop="infotypename">
+        <el-form-item label="所属街道" prop="ssjdbq">
           <el-input
-            v-model="dataForm.infotypename"
-            placeholder="事件类别"
+            v-model="dataForm.ssjdbq"
+            placeholder="所属街道"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="社区名称" prop="communityname">
+        <el-form-item label="所属社区" prop="sssqbq">
           <el-input
-            v-model="dataForm.communityname"
-            placeholder="社区名称"
+            v-model="dataForm.sssqbq"
+            placeholder="所属社区"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="事件状态" prop="statusname">
+        <el-form-item label="核查意见" prop="hcyj">
           <el-input
-            v-model="dataForm.statusname"
-            placeholder="事件状态"
+            v-model="dataForm.hcyj"
+            placeholder="核查意见"
             clearable
           ></el-input>
         </el-form-item>
@@ -50,54 +50,47 @@
           width="50"
         ></el-table-column>
         <el-table-column
-          prop="streetname"
-          label="街道名称"
+          prop="wgymc"
+          label="网格员名称"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="communityname"
-          label="社区名称"
+          prop="ssjdbq"
+          label="所属街道"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="address"
-          label="事件地址"
+          prop="sssqbq"
+          label="所属社区"
           header-align="center"
           align="center"
 					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="description"
-          label="事件描述"
+          prop="hcyj"
+          label="核查意见"
           header-align="center"
           align="center"
 					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="infotypename"
-          label="事件类别"
+          prop="hcsj"
+          label="核查时间"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
          :show-overflow-tooltip="true"
-          prop="infosourcename"
-          label="事件来源"
+          prop="sjms"
+          label="事件描述"
           header-align="center"
           align="center">
         </el-table-column>
-        <el-table-column
-          prop="statusname"
-          label="事件状态"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true">
-				</el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
           <template slot-scope="row">
             <el-button
@@ -129,61 +122,54 @@
     <el-dialog
       title="事件信息详情"
       :visible.sync="dialogVisible"
-      width="30%"
+      width="37%"
       :before-close="handleClose">
-      <el-form ref="form" :model="detailForm" label-width="80px">
-        <el-form-item label="街道名称">
+      <el-form ref="form" :model="detailForm" label-width="100px">
+        <el-form-item label="网格员名称:">
           <el-input
-            style="width:260px;margin-left:20px"
-            v-model="detailForm.streetname"
+            style="width:300px;margin-left:20px"
+            v-model="detailForm.wgymc"
             :disabled="true">
           </el-input>
         </el-form-item>
-        <el-form-item label="社区名称">
+        <el-form-item label="所属街道:">
           <el-input
-            style="width:260px;margin-left:20px"
-            v-model="detailForm.communityname"
+            style="width:300px;margin-left:20px"
+            v-model="detailForm.ssjdbq"
             :disabled="true">
           </el-input>
         </el-form-item>
-        <el-form-item label="事件地址:">
+        <el-form-item label="所属社区:">
           <el-input
-            style="width:260px;margin-left:20px"
-            v-model="detailForm.address"
+            style="width:300px;margin-left:20px"
+            v-model="detailForm.sssqbq"
             :disabled="true">
           </el-input>
         </el-form-item>
-        <el-form-item label="事件描述:">
+        <el-form-item label="核查意见:">
 					<el-input
 						type="textarea"
-						style="width:260px;margin-left:20px"
-						v-model="detailForm.description"
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.hcyj"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-				<el-form-item label="事件类别:">
-					<el-input
-						style="width:260px;margin-left:20px"
-						v-model="detailForm.infotypename"
-						:disabled="true">
-					</el-input>
-				</el-form-item>
-        <el-form-item label="事件来源:">
+				<el-form-item label="核查时间:">
 					<el-input
-						style="width:260px;margin-left:20px"
-						v-model="detailForm.infosourcename"
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.hcsj"
 						:disabled="true">
 					</el-input>
 				</el-form-item>
-        <el-form-item label="事件状态:">
+        <el-form-item label="事件描述:">
 					<el-input
-						style="width:260px;margin-left:20px"
-						v-model="detailForm.statusname"
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.sjms"
 						:disabled="true">
 					</el-input>
 				</el-form-item>
 				<el-form-item>
-					<el-button style="margin-left:80px" @click="dialogVisible = false" type="primary">取 消</el-button>
+					<el-button style="margin-left:100px" @click="dialogVisible = false" type="primary">取 消</el-button>
 				</el-form-item>
       </el-form>
 </el-dialog>
@@ -197,25 +183,24 @@ export default {
   data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/opendata/wghSjxxb/todo/page",
+        getDataListURL: "/opendata/wghSjxx/todo/wghSjxxPage",
         getDataListIsPage: true,
         deleteURL: "",
         deleteIsBatch: true,
       },
       dataForm: {
-        infosourcename: "",
-        infotypename: "",
-        communityname:"",
-        statusname:""
+        wgymc: "",
+        ssjdbq: "",
+        sssqbq:"",
+        hcyj:""
       },
       detailForm:{
-        infosourcename: "",
-        infotypename: "",
-        communityname:"",
-        description:"",
-        address:"",
-        statusname:"",
-        streetname:"",
+        wgymc: "",
+        ssjdbq: "",
+        sssqbq:"",
+        hcyj:"",
+        hcsj:"",
+        sjms:"",
       },
       optionsG:[],
       dialogVisible: false
@@ -224,8 +209,8 @@ export default {
   methods:{
     getDetailById(row){
       this.dialogVisible = true
-      this.$http.post(`/opendata/wghSjxxb/sjxx/getDetailById`,{
-        taskid:row.row.taskid
+      this.$http.post(`/opendata/wghSjxx/getWghSjxxDetail`,{
+        recid:row.row.recid
       }).then(resp => {
         this.detailForm = resp.data.data
       }).catch(error => {

From 10fb7c4ac2a635a5ec45df2959474cc61e1354de Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 6 Jul 2022 10:15:30 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 123 ++++++++++++++++++----
 1 file changed, 100 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index d3a9c103..08d37a95 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -2,13 +2,6 @@
   <div class="mod-axis__caLoudong}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="事件来源" prop="wgymc">
-          <el-input
-            v-model="dataForm.wgymc"
-            placeholder="网格员名称"
-            clearable
-          ></el-input>
-        </el-form-item>
         <el-form-item label="所属街道" prop="ssjdbq">
           <el-input
             v-model="dataForm.ssjdbq"
@@ -56,6 +49,13 @@
           align="center"
           :show-overflow-tooltip="true"
         ></el-table-column>
+        <el-table-column
+          prop="ssqsbq"
+          label="所属市"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column
           prop="ssjdbq"
           label="所属街道"
@@ -78,19 +78,12 @@
 					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="hcsj"
-          label="核查时间"
+          prop="createdate"
+          label="上报日期"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column
-         :show-overflow-tooltip="true"
-          prop="sjms"
-          label="事件描述"
-          header-align="center"
-          align="center">
-        </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
           <template slot-scope="row">
             <el-button
@@ -132,6 +125,13 @@
             :disabled="true">
           </el-input>
         </el-form-item>
+        <el-form-item label="所属市:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.ssqsbq"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
         <el-form-item label="所属街道:">
           <el-input
             style="width:300px;margin-left:20px"
@@ -146,28 +146,96 @@
             :disabled="true">
           </el-input>
         </el-form-item>
-        <el-form-item label="核查意见:">
+        <el-form-item label="所属部门:">
 					<el-input
-						type="textarea"
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.hcyj"
+						v-model="detailForm.ssbm"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-				<el-form-item label="核查时间:">
+        <el-form-item label="事件领域:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.hcsj"
+						v-model="detailForm.sjlyubq"
 						:disabled="true">
 					</el-input>
-				</el-form-item>
+        </el-form-item>
+
+        <el-form-item label="事件小类:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.sjdlbq"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+
+        <el-form-item label="事件细类:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.sjxlbq"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+        <el-form-item label="事件来源:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.sjlybq"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
         <el-form-item label="事件描述:">
 					<el-input
+            type="textarea"
 						style="width:300px;margin-left:20px"
 						v-model="detailForm.sjms"
 						:disabled="true">
 					</el-input>
 				</el-form-item>
+        <el-form-item label="上报时间:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.createdate"
+						:disabled="true">
+					</el-input>
+				</el-form-item>
+        <el-form-item label="核查意见:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.hcyj"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+				
+        <el-form-item label="处置单位:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.czdwbq"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+        <el-form-item label="应结办时间:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.ybjsj"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+
+        <el-form-item label="到期时间:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.dqsj"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+        <el-form-item label="处置结果:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.czjg"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+        
 				<el-form-item>
 					<el-button style="margin-left:100px" @click="dialogVisible = false" type="primary">取 消</el-button>
 				</el-form-item>
@@ -189,7 +257,6 @@ export default {
         deleteIsBatch: true,
       },
       dataForm: {
-        wgymc: "",
         ssjdbq: "",
         sssqbq:"",
         hcyj:""
@@ -201,6 +268,16 @@ export default {
         hcyj:"",
         hcsj:"",
         sjms:"",
+        ssbm:"",
+        sjlyubq:"",
+        sjdlbq:"",
+        sjxlbq:"",
+        ssqsbq:"",
+        czjg:"",
+        czdwbq:"",
+        sjlybq:"",
+        ybjsj:"",
+        dqsj:"",
       },
       optionsG:[],
       dialogVisible: false

From 583eaaf6dce70e4144ab7c2cc11bd571bc4ddee6 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 6 Jul 2022 10:47:56 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=95=BF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index 08d37a95..d22106ea 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -230,6 +230,7 @@
         </el-form-item>
         <el-form-item label="处置结果:">
 					<el-input
+            type="textarea"
 						style="width:300px;margin-left:20px"
 						v-model="detailForm.czjg"
 						:disabled="true">

From 5e5873273573e048534b889309e5d7c1d9579c89 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 6 Jul 2022 17:57:46 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 173 ++++++----------------
 1 file changed, 45 insertions(+), 128 deletions(-)

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index d22106ea..8b654f74 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -2,24 +2,24 @@
   <div class="mod-axis__caLoudong}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="所属街道" prop="ssjdbq">
+        <el-form-item label="主要当事人姓名" prop="mainpartyid">
           <el-input
-            v-model="dataForm.ssjdbq"
-            placeholder="所属街道"
+            v-model="dataForm.mainpartyid"
+            placeholder="主要当事人姓名"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属社区" prop="sssqbq">
+        <el-form-item label="网格名称" prop="griddingname">
           <el-input
-            v-model="dataForm.sssqbq"
-            placeholder="所属社区"
+            v-model="dataForm.griddingname"
+            placeholder="网格名称"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="核查意见" prop="hcyj">
+        <el-form-item label="事件名称" prop="eventtitle">
           <el-input
-            v-model="dataForm.hcyj"
-            placeholder="核查意见"
+            v-model="dataForm.eventtitle"
+            placeholder="事件名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -43,47 +43,40 @@
           width="50"
         ></el-table-column>
         <el-table-column
-          prop="wgymc"
-          label="网格员名称"
+          prop="griddingname"
+          label="网格名称"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="ssqsbq"
-          label="所属市"
+          prop="eventtitle"
+          label="事件名称"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="ssjdbq"
-          label="所属街道"
+          prop="eventdate"
+          label="发生日期"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="sssqbq"
-          label="所属社区"
+          prop="mainpartyid"
+          label="主要当事人"
           header-align="center"
           align="center"
 					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="hcyj"
-          label="核查意见"
+          prop="responsibilityUnit"
+          label="涉及单位"
           header-align="center"
           align="center"
 					:show-overflow-tooltip="true"
         ></el-table-column>
-        <el-table-column
-          prop="createdate"
-          label="上报日期"
-          header-align="center"
-          align="center"
-          :show-overflow-tooltip="true">
-        </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
           <template slot-scope="row">
             <el-button
@@ -118,124 +111,57 @@
       width="37%"
       :before-close="handleClose">
       <el-form ref="form" :model="detailForm" label-width="100px">
-        <el-form-item label="网格员名称:">
+        <el-form-item label="网格名称:">
           <el-input
             style="width:300px;margin-left:20px"
-            v-model="detailForm.wgymc"
+            v-model="detailForm.griddingname"
             :disabled="true">
           </el-input>
         </el-form-item>
-        <el-form-item label="所属市:">
+        <el-form-item label="事件名称:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.ssqsbq"
+						v-model="detailForm.eventtitle"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-        <el-form-item label="所属街道:">
+        <el-form-item label="发生日期:">
           <el-input
             style="width:300px;margin-left:20px"
-            v-model="detailForm.ssjdbq"
+            v-model="detailForm.eventdate"
             :disabled="true">
           </el-input>
         </el-form-item>
-        <el-form-item label="所属社区:">
+        <el-form-item label="发生地点:">
           <el-input
             style="width:300px;margin-left:20px"
-            v-model="detailForm.sssqbq"
+            v-model="detailForm.eventaddrdetail"
             :disabled="true">
           </el-input>
         </el-form-item>
-        <el-form-item label="所属部门:">
+        <el-form-item label="事件简述:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.ssbm"
+						v-model="detailForm.eventtext"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-        <el-form-item label="事件领域:">
+        <el-form-item label="涉及单位:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.sjlyubq"
+						v-model="detailForm.responsibilityUnit"
 						:disabled="true">
 					</el-input>
         </el-form-item>
 
-        <el-form-item label="事件小类:">
+        <el-form-item label="主要当事人姓名:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.sjdlbq"
+						v-model="detailForm.mainpartyid"
 						:disabled="true">
 					</el-input>
         </el-form-item>
 
-        <el-form-item label="事件细类:">
-					<el-input
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.sjxlbq"
-						:disabled="true">
-					</el-input>
-        </el-form-item>
-        <el-form-item label="事件来源:">
-					<el-input
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.sjlybq"
-						:disabled="true">
-					</el-input>
-        </el-form-item>
-        <el-form-item label="事件描述:">
-					<el-input
-            type="textarea"
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.sjms"
-						:disabled="true">
-					</el-input>
-				</el-form-item>
-        <el-form-item label="上报时间:">
-					<el-input
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.createdate"
-						:disabled="true">
-					</el-input>
-				</el-form-item>
-        <el-form-item label="核查意见:">
-					<el-input
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.hcyj"
-						:disabled="true">
-					</el-input>
-        </el-form-item>
-				
-        <el-form-item label="处置单位:">
-					<el-input
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.czdwbq"
-						:disabled="true">
-					</el-input>
-        </el-form-item>
-        <el-form-item label="应结办时间:">
-					<el-input
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.ybjsj"
-						:disabled="true">
-					</el-input>
-        </el-form-item>
-
-        <el-form-item label="到期时间:">
-					<el-input
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.dqsj"
-						:disabled="true">
-					</el-input>
-        </el-form-item>
-        <el-form-item label="处置结果:">
-					<el-input
-            type="textarea"
-						style="width:300px;margin-left:20px"
-						v-model="detailForm.czjg"
-						:disabled="true">
-					</el-input>
-        </el-form-item>
         
 				<el-form-item>
 					<el-button style="margin-left:100px" @click="dialogVisible = false" type="primary">取 消</el-button>
@@ -252,33 +178,24 @@ export default {
   data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/opendata/wghSjxx/todo/wghSjxxPage",
+        getDataListURL: "/opendata/caKettleBaseDisputeProcesstodo/getCaKettlePage",
         getDataListIsPage: true,
         deleteURL: "",
         deleteIsBatch: true,
       },
       dataForm: {
-        ssjdbq: "",
-        sssqbq:"",
-        hcyj:""
+        mainpartyid: "",
+        griddingname:"",
+        eventtitle:""
       },
       detailForm:{
-        wgymc: "",
-        ssjdbq: "",
-        sssqbq:"",
-        hcyj:"",
-        hcsj:"",
-        sjms:"",
-        ssbm:"",
-        sjlyubq:"",
-        sjdlbq:"",
-        sjxlbq:"",
-        ssqsbq:"",
-        czjg:"",
-        czdwbq:"",
-        sjlybq:"",
-        ybjsj:"",
-        dqsj:"",
+        mainpartyid: "",
+        responsibilityUnit: "",
+        eventtext:"",
+        eventaddrdetail:"",
+        eventdate:"",
+        eventtitle:"",
+        griddingname:"",
       },
       optionsG:[],
       dialogVisible: false
@@ -287,7 +204,7 @@ export default {
   methods:{
     getDetailById(row){
       this.dialogVisible = true
-      this.$http.post(`/opendata/wghSjxx/getWghSjxxDetail`,{
+      this.$http.post(`/opendata/caKettleBaseDisputeProcesstodo/getCaKettleDetails`,{
         recid:row.row.recid
       }).then(resp => {
         this.detailForm = resp.data.data

From c5f5c9417df89f2ebce5f4774af5390ddfbc1c5a Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 7 Jul 2022 14:12:40 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cabaseinfo/wghSjxxb.vue | 149 ++++++++++++++++------
 1 file changed, 111 insertions(+), 38 deletions(-)

diff --git a/src/views/modules/cabaseinfo/wghSjxxb.vue b/src/views/modules/cabaseinfo/wghSjxxb.vue
index 8b654f74..cfbb60c3 100644
--- a/src/views/modules/cabaseinfo/wghSjxxb.vue
+++ b/src/views/modules/cabaseinfo/wghSjxxb.vue
@@ -2,10 +2,10 @@
   <div class="mod-axis__caLoudong}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="主要当事人姓名" prop="mainpartyid">
+        <el-form-item label="上报人姓名" prop="wgy">
           <el-input
-            v-model="dataForm.mainpartyid"
-            placeholder="主要当事人姓名"
+            v-model="dataForm.wgy"
+            placeholder="上报人姓名"
             clearable
           ></el-input>
         </el-form-item>
@@ -57,26 +57,33 @@
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="eventdate"
-          label="发生日期"
+          prop="wgy"
+          label="上报人"
           header-align="center"
           align="center"
-          :show-overflow-tooltip="true">
-        </el-table-column>
+					:show-overflow-tooltip="true"
+        ></el-table-column>
         <el-table-column
-          prop="mainpartyid"
-          label="主要当事人"
+          prop="eventaddrdetail"
+          label="发生地点"
           header-align="center"
           align="center"
 					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="responsibilityUnit"
-          label="涉及单位"
+          prop="eventdate"
+          label="发生日期"
           header-align="center"
           align="center"
-					:show-overflow-tooltip="true"
-        ></el-table-column>
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="finishedmethod"
+          label="办结方式"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
           <template slot-scope="row">
             <el-button
@@ -111,6 +118,27 @@
       width="37%"
       :before-close="handleClose">
       <el-form ref="form" :model="detailForm" label-width="100px">
+        <el-form-item label="事件来源:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.eventsource"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+        <el-form-item label="上报人:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.wgy"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+        <el-form-item label="办结方式:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.finishedmethod"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
         <el-form-item label="网格名称:">
           <el-input
             style="width:300px;margin-left:20px"
@@ -120,20 +148,15 @@
         </el-form-item>
         <el-form-item label="事件名称:">
 					<el-input
+            type="textarea"
 						style="width:300px;margin-left:20px"
 						v-model="detailForm.eventtitle"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-        <el-form-item label="发生日期:">
-          <el-input
-            style="width:300px;margin-left:20px"
-            v-model="detailForm.eventdate"
-            :disabled="true">
-          </el-input>
-        </el-form-item>
         <el-form-item label="发生地点:">
           <el-input
+            type="textarea"
             style="width:300px;margin-left:20px"
             v-model="detailForm.eventaddrdetail"
             :disabled="true">
@@ -141,28 +164,33 @@
         </el-form-item>
         <el-form-item label="事件简述:">
 					<el-input
-						style="width:300px;margin-left:20px"
+						type="textarea"
+            style="width:300px;margin-left:20px"
 						v-model="detailForm.eventtext"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-        <el-form-item label="涉及单位:">
+        <el-form-item label="发生日期:">
+          <el-input
+            style="width:300px;margin-left:20px"
+            v-model="detailForm.eventdate"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="事件状态:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.responsibilityUnit"
+						v-model="detailForm.curstatus"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-
-        <el-form-item label="主要当事人姓名:">
+        <el-form-item label="是否已抽取:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.mainpartyid"
+						v-model="detailForm.isExtracted"
 						:disabled="true">
 					</el-input>
         </el-form-item>
-
-        
 				<el-form-item>
 					<el-button style="margin-left:100px" @click="dialogVisible = false" type="primary">取 消</el-button>
 				</el-form-item>
@@ -178,24 +206,27 @@ export default {
   data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/opendata/caKettleBaseDisputeProcesstodo/getCaKettlePage",
+        getDataListURL: "/opendata/caKettleBaseDisputeProcess/todo/getCaKettlePage",
         getDataListIsPage: true,
         deleteURL: "",
         deleteIsBatch: true,
       },
       dataForm: {
-        mainpartyid: "",
+        wgy: "",
         griddingname:"",
         eventtitle:""
       },
       detailForm:{
-        mainpartyid: "",
-        responsibilityUnit: "",
-        eventtext:"",
-        eventaddrdetail:"",
+        griddingname: "",
+        eventtitle: "",
         eventdate:"",
-        eventtitle:"",
-        griddingname:"",
+        eventaddrdetail:"",
+        eventtext:"",
+        finishedmethod:"",
+        wgy:"",
+        eventsource:"",
+        curstatus:"",
+        isExtracted:"",
       },
       optionsG:[],
       dialogVisible: false
@@ -204,14 +235,56 @@ export default {
   methods:{
     getDetailById(row){
       this.dialogVisible = true
-      this.$http.post(`/opendata/caKettleBaseDisputeProcesstodo/getCaKettleDetails`,{
-        recid:row.row.recid
+      this.$http.post(`/opendata/caKettleBaseDisputeProcess/getCaKettleDetails`,{
+        baseKeyId:row.row.baseKeyId
       }).then(resp => {
         this.detailForm = resp.data.data
+        this.EscapeAttribute()
       }).catch(error => {
         this.$message.error(error)
       })
     },
+    EscapeAttribute(){
+      if(this.detailForm.eventsource === "05") {
+        this.detailForm.eventsource = '网格员上报'
+      } else if(this.detailForm.eventsource === "03") {
+        this.detailForm.eventsource = '街道吹哨'
+      } else {
+        this.detailForm.eventsource = '其他'
+      }
+      switch (this.detailForm.curstatus) {
+        case 0 :
+          this.detailForm.curstatus = '待提交'
+          break
+        case 1 :
+          this.detailForm.curstatus = '提交'
+          break
+        case 2 :
+          this.detailForm.curstatus = '代派发'
+          break
+        case 3 :
+          this.detailForm.curstatus = '处理中'
+          break
+        case 4 :
+          this.detailForm.curstatus = '复核'
+          break
+        case 5 :
+          this.detailForm.curstatus = '办结'
+          break
+        case 6 :
+          this.detailForm.curstatus = '退回'
+          break
+        default :
+          this.detailForm.curstatus = '作废'
+      }
+      if(this.detailForm.isExtracted === '0') {
+        this.detailForm.isExtracted = '未抽取'
+      } else if (this.detailForm.isExtracted === '1') {
+        this.detailForm.isExtracted = '已抽取'
+      } else {
+        this.detailForm.isExtracted = '准备抽取'
+      }
+    },
     handleClose(done) {
         this.$confirm('确认关闭？')
           .then(_ => {

From 8756fb2578793c58921a00e883e9a74994ea957c Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 11:17:00 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index e6211572..a508f9c8 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2111,6 +2111,7 @@ export default {
                 this.getDepartmentList()
                 this.getGridList()
                 this.agencyPeo()
+                console.log(`111111111111111111111111111111111111111`)
             }else{
                 this.$message.error(msg)
             }

From 70e1e8cb54ee425f587417dc1d1ae494fa9f4c3a Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 13:45:40 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index a508f9c8..9f34bc39 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2110,8 +2110,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                this.agencyPeo()
-                console.log(`111111111111111111111111111111111111111`)
+                console.log('111111111111111111111111111111111111')
             }else{
                 this.$message.error(msg)
             }

From d5565cf93cabe17dbfdb4fd2cdd3ef6f1bae6881 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 13:53:25 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 9f34bc39..4df206a2 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2098,7 +2098,8 @@ export default {
                 mobile: this.OrgDetailsForm.mobile,
                 code: this.OrgDetailsForm.code,
                 latitude: this.latitude,
-                longitude: this.longitude
+                longitude: this.longitude,
+                ss:''
             }
 
             const { data, code, msg } = await requestPost(url,params)

From 8403198867b7a8e09912b7ecf712eb3c1042b7f8 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 13:55:50 +0800
Subject: [PATCH 13/18] params

---
 src/views/modules/base/organization/organization.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 4df206a2..9f34bc39 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2098,8 +2098,7 @@ export default {
                 mobile: this.OrgDetailsForm.mobile,
                 code: this.OrgDetailsForm.code,
                 latitude: this.latitude,
-                longitude: this.longitude,
-                ss:''
+                longitude: this.longitude
             }
 
             const { data, code, msg } = await requestPost(url,params)

From 815c7437a42a5f37fd45808d5e63395a703f298e Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 14:06:48 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 9f34bc39..dcaad050 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2110,7 +2110,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                console.log('111111111111111111111111111111111111')
+                console.log('22222222222222222222222222222222222222')
             }else{
                 this.$message.error(msg)
             }

From b4910e5b44299c9bd915fd6bcff05b37796a4cb7 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 14:24:03 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index dcaad050..63e85731 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2110,7 +2110,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                console.log('22222222222222222222222222222222222222')
+                console.log('33333333333333333333333333333333333333')
             }else{
                 this.$message.error(msg)
             }

From 5ae93af6a44e5fa613084b8feadb155eef1e7fc9 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 14:31:51 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 63e85731..82e74d7b 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2110,7 +2110,7 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                console.log('33333333333333333333333333333333333333')
+                console.log('000000000000000000000000000000')
             }else{
                 this.$message.error(msg)
             }

From 0bc99bd222089a3b165f393219e057025b775a13 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 14:36:54 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 82e74d7b..0b00878c 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2110,7 +2110,6 @@ export default {
                 this.getAgencyList()
                 this.getDepartmentList()
                 this.getGridList()
-                console.log('000000000000000000000000000000')
             }else{
                 this.$message.error(msg)
             }

From fd1fe3626bc9dfb17e7a74a4a89f0c7277a7be10 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 25 Jul 2022 15:26:39 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 0b00878c..147ae6bb 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2081,7 +2081,7 @@ export default {
                 this.modifyGridFrom.agencyId = data.agencyId
                 this.modifyGridFrom.gridType = data.gridType
                 this.modifyGridFrom.manageDistrict = data.manageDistrict
-                this.modifyGridFrom.griId = data.griId
+                this.modifyGridFrom.griId = data.grid
             }else {
                 this.$message.error(msg)
             }