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 1/2] =?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 d22106ea5..8b654f74a 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 2/2] =?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 8b654f74a..cfbb60c3a 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(_ => {