Merge remote-tracking branch '市北/master' into 市北master

src/views/modules/base/community/buildForm.vue

@@ -416,12 +416,16 @@ export default {
         totalUnitNum: 1,//单元数	
         totalFloorNum: 0,//层数	
         totalHouseNum: 0,//总户数	
+        realPerson: 0,
         buildingLeaderName: '',//楼长姓名
         buildingLeaderMobile: '',//楼长电话
         type: '',//房屋类型
         location: '', //坐标位置
         longitude: '', //经度
-        latitude: '' //纬度
+        latitude: '', //纬度
+        coding: '',
+        sysCoding: '',
+        coordinatePosition: ''
       }
     },
     // 开启加载动画

src/views/modules/base/community/communityForm.vue

@@ -490,7 +490,10 @@ export default {
         remark: '', //备注【最大500字】
         location: '', //坐标位置
         longitude: '', //经度
-        latitude: '' //纬度
+        latitude: '', //纬度
+        realBuilding: 0,
+        coding: '',
+        sysCoding: ''
       }
       this.propertyFormShow = false
     },

src/views/modules/base/community/roomForm.vue

@@ -391,7 +391,9 @@ export default {
         ownerPhone: '', //联系方式
         ownerName: '', //房主名字
         ownerIdCard: '', //房主身份证
-        remark: '' // 备注
+        remark: '', // 备注
+        coding: '',
+        sysCoding: ''
       }
 
     },

src/views/modules/cabaseinfo/carotators-binding-house.vue

@@ -1,10 +1,10 @@
-<template>
+ <template>
   <div>
     <div v-show="currentPage == 'chaxun'">
       <div v-show="!showedFuncPanel">
         <div class="m-info">
           <div class="wrap">
-            <div class="search">
+            <div class="search house-search">
               <div class="input">
                 <!-- <el-dropdown
                   class="select"
@@ -634,6 +634,10 @@ export default {
 
 <style lang="scss" src="@/assets/scss/modules/search.scss" scoped></style>
 <style lang="scss" scoped>
+.house-search{
+  width: 100% !important;
+  // min-width: 750px;
+}
 .logo {
   font-size: 35px;
   font-weight: bold;

src/views/modules/cabaseinfo/wghSjxxb.vue

@@ -2,31 +2,24 @@
   <div class="mod-axis__caLoudong}">
     <el-card>
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="事件来源" prop="wgymc">
+        <el-form-item label="上报人姓名" prop="wgy">
           <el-input
-            v-model="dataForm.wgymc"
-            placeholder="网格员名称"
+            v-model="dataForm.wgy"
+            placeholder="上报人姓名"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属街道" prop="ssjdbq">
+        <el-form-item label="网格名称" prop="griddingname">
           <el-input
-            v-model="dataForm.ssjdbq"
-            placeholder="所属街道"
+            v-model="dataForm.griddingname"
+            placeholder="网格名称"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属社区" prop="sssqbq">
+        <el-form-item label="事件名称" prop="eventtitle">
           <el-input
-            v-model="dataForm.sssqbq"
-            placeholder="所属社区"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="核查意见" prop="hcyj">
-          <el-input
-            v-model="dataForm.hcyj"
-            placeholder="核查意见"
+            v-model="dataForm.eventtitle"
+            placeholder="事件名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -50,46 +43,46 @@
           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="ssjdbq"
-          label="所属街道"
+          prop="eventtitle"
+          label="事件名称"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-          prop="sssqbq"
-          label="所属社区"
+          prop="wgy"
+          label="上报人"
           header-align="center"
           align="center"
 					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="hcyj"
-          label="核查意见"
+          prop="eventaddrdetail"
+          label="发生地点"
           header-align="center"
           align="center"
 					:show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          prop="hcsj"
-          label="核查时间"
+          prop="eventdate"
+          label="发生日期"
           header-align="center"
           align="center"
           :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column
-         :show-overflow-tooltip="true"
-          prop="sjms"
-          label="事件描述"
+          prop="finishedmethod"
+          label="办结方式"
           header-align="center"
-          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">
@@ -125,49 +118,79 @@
       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.wgymc"
-            :disabled="true">
-          </el-input>
+        <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-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.ssjdbq"
+            v-model="detailForm.griddingname"
             :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.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.sssqbq"
+            v-model="detailForm.eventaddrdetail"
             :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"
+            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.hcsj"
+						v-model="detailForm.curstatus"
 						:disabled="true">
 					</el-input>
-				</el-form-item>
-        <el-form-item label="事件描述:">
+        </el-form-item>
+        <el-form-item label="是否已抽取:">
 					<el-input
 						style="width:300px;margin-left:20px"
-						v-model="detailForm.sjms"
+						v-model="detailForm.isExtracted"
 						:disabled="true">
 					</el-input>
-				</el-form-item>
+        </el-form-item>
 				<el-form-item>
 					<el-button style="margin-left:100px" @click="dialogVisible = false" type="primary">取 消</el-button>
 				</el-form-item>
@@ -183,24 +206,27 @@ export default {
   data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/opendata/wghSjxx/todo/wghSjxxPage",
+        getDataListURL: "/opendata/caKettleBaseDisputeProcess/todo/getCaKettlePage",
         getDataListIsPage: true,
         deleteURL: "",
         deleteIsBatch: true,
       },
       dataForm: {
-        wgymc: "",
-        ssjdbq: "",
-        sssqbq:"",
-        hcyj:""
+        wgy: "",
+        griddingname:"",
+        eventtitle:""
       },
       detailForm:{
-        wgymc: "",
-        ssjdbq: "",
-        sssqbq:"",
-        hcyj:"",
-        hcsj:"",
-        sjms:"",
+        griddingname: "",
+        eventtitle: "",
+        eventdate:"",
+        eventaddrdetail:"",
+        eventtext:"",
+        finishedmethod:"",
+        wgy:"",
+        eventsource:"",
+        curstatus:"",
+        isExtracted:"",
       },
       optionsG:[],
       dialogVisible: false
@@ -209,14 +235,56 @@ export default {
   methods:{
     getDetailById(row){
       this.dialogVisible = true
-      this.$http.post(`/opendata/wghSjxx/getWghSjxxDetail`,{
-        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(_ => {

src/views/modules/visual/plugin/power/organization.vue

@@ -10,15 +10,17 @@
       <div class="title">
         <img src="../../../../../assets/img/shuju/title-tip.png" />
         <span>动力主轴</span>
-        <div class="second-select cascader">
-          <el-cascader  class="customer_cascader"
-                        ref="myCascader"
-                        placeholder="请选择所属组织"
-                        :options="agencytree"
-                        v-model="agencyId"
-                        :show-all-levels="false"
-                        @change="handleChangeAgencytree"
-                        :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
+        <div class="search">
+          <div class="second-select cascader">
+            <el-cascader  class="customer_cascader"
+                          ref="myCascader"
+                          placeholder="请选择所属组织"
+                          :options="agencytree"
+                          v-model="agencyId"
+                          :show-all-levels="false"
+                          @change="handleChangeAgencytree"
+                          :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
+          </div>
         </div>
         <!-- <div class="second-select ">
 
@@ -448,6 +450,11 @@ export default {
   src="@/assets/scss/modules/visual/warning.scss"
   scoped
 ></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/search_1.scss"
+  scoped
+></style>
 <style lang="scss" scoped>
 .second-select {
     margin: 0 10px 0 40px !important;