Merge branch 'feature/dev_zz_wgh'

src/views/modules/base/organization/organization.vue

@@ -2251,6 +2251,61 @@ export default {
       let params = {
         agencyId: this.judgeOrgInfoLevel.id
       }
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.modifyGridFrom.gridName = data.gridName
+                this.modifyGridFrom.code = data.code
+                this.modifyGridFrom.gridTypeName = data.gridTypeName
+                this.modifyGridFrom.contacts = data.contacts
+                this.modifyGridFrom.mobile = data.mobile
+                this.modifyGridFrom.agencyId = data.agencyId
+                this.modifyGridFrom.gridType = data.gridType
+                this.modifyGridFrom.manageDistrict = data.manageDistrict
+                this.modifyGridFrom.griId = data.grid
+            }else {
+                this.$message.error(msg)
+            }
+        },  
+
+        // 市级/街道/社区级组织修改确定按钮
+        async sunmitModifyCityOrgPop(){
+            const url = '/gov/org/agency/editagency'
+
+            let params = {
+                agencyId: this.OrgDetailsForm.agencyId,
+                agencyName: this.OrgDetailsForm.agencyName,
+                contacts: this.OrgDetailsForm.contacts,
+                mobile: this.OrgDetailsForm.mobile,
+                code: this.OrgDetailsForm.code,
+                latitude: this.latitude,
+                longitude: this.longitude
+            }
+
+            const { data, code, msg } = await requestPost(url,params)
+
+            if(code === 0){
+                this.$message.success("修改成功")
+                this.modifyCityOrgPop = false
+                this.streetOrCommunity = false
+                this.getAgencyList()
+                this.getDepartmentList()
+                this.getGridList()
+            }else{
+                this.$message.error(msg)
+            }
+        },
+        // 修改下级机关单位确定按钮
+        async sunmitOrgUnitForm(){
+            const url = '/gov/org/department/editdepartment'
+
+            let params = {
+                code: this.OrgUnitDetailsForm.code,
+                contacts: this.OrgUnitDetailsForm.contacts,
+                departmentId: this.OrgUnitDetailsForm.departmentId,
+                departmentName: this.OrgUnitDetailsForm.departmentName,
+                mobile: this.OrgUnitDetailsForm.mobile
+            }
 
       const { data, code, msg } = await requestPost(url, params)
 

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:[]

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:[]

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:[]

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>
@@ -189,7 +196,8 @@ export default {
         idCard: "",
         residentName: "",
         telephone: "",
-        gridId:""
+        gridId:"",
+        curliveAddressDetail:""
       },
       caLouDongOptions:[],
       optionsG:[]

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:[]

src/views/modules/cabaseinfo/wghSjxxb.vue

@@ -0,0 +1,301 @@
+<template>
+  <div class="mod-axis__caLoudong}">
+    <el-card>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="上报人姓名" prop="wgy">
+          <el-input
+            v-model="dataForm.wgy"
+            placeholder="上报人姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="网格名称" prop="griddingname">
+          <el-input
+            v-model="dataForm.griddingname"
+            placeholder="网格名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="事件名称" prop="eventtitle">
+          <el-input
+            v-model="dataForm.eventtitle"
+            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
+          prop="griddingname"
+          label="网格名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="eventtitle"
+          label="事件名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="wgy"
+          label="上报人"
+          header-align="center"
+          align="center"
+					:show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="eventaddrdetail"
+          label="发生地点"
+          header-align="center"
+          align="center"
+					:show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="eventdate"
+          label="发生日期"
+          header-align="center"
+          align="center"
+          :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
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="getDetailById(row)"
+              >查看</el-button>
+							<el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+							@click="jumplink">去处置</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>
+    <el-dialog
+      title="事件信息详情"
+      :visible.sync="dialogVisible"
+      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"
+            v-model="detailForm.griddingname"
+            :disabled="true">
+          </el-input>
+        </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
+            type="textarea"
+            style="width:300px;margin-left:20px"
+            v-model="detailForm.eventaddrdetail"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="事件简述:">
+					<el-input
+						type="textarea"
+            style="width:300px;margin-left:20px"
+						v-model="detailForm.eventtext"
+						: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
+						style="width:300px;margin-left:20px"
+						v-model="detailForm.curstatus"
+						:disabled="true">
+					</el-input>
+        </el-form-item>
+        <el-form-item label="是否已抽取:">
+					<el-input
+						style="width:300px;margin-left:20px"
+						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>
+      </el-form>
+</el-dialog>
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-post";
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/opendata/caKettleBaseDisputeProcess/todo/getCaKettlePage",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        wgy: "",
+        griddingname:"",
+        eventtitle:""
+      },
+      detailForm:{
+        griddingname: "",
+        eventtitle: "",
+        eventdate:"",
+        eventaddrdetail:"",
+        eventtext:"",
+        finishedmethod:"",
+        wgy:"",
+        eventsource:"",
+        curstatus:"",
+        isExtracted:"",
+      },
+      optionsG:[],
+      dialogVisible: false
+    };
+  },
+  methods:{
+    getDetailById(row){
+      this.dialogVisible = true
+      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(_ => {
+            done();
+            dialogVisible = false
+          })
+          .catch(_ => {});
+      },
+			jumplink(){
+				window.open('http://120.221.72.15:8089/sbwgh/bizsys/login.htm','_blank')
+			}
+  },
+};
+</script>