Merge branch 'feature/dev_zz_wgh' into shibei_master

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,233 @@
+<template>
+  <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"
+            placeholder="所属街道"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="所属社区" prop="sssqbq">
+          <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="核查意见"
+            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="wgymc"
+          label="网格员名称"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="ssjdbq"
+          label="所属街道"
+          header-align="center"
+          align="center"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column
+          prop="sssqbq"
+          label="所属社区"
+          header-align="center"
+          align="center"
+					:show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="hcyj"
+          label="核查意见"
+          header-align="center"
+          align="center"
+					:show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="hcsj"
+          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
+              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.wgymc"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="所属街道:">
+          <el-input
+            style="width:300px;margin-left:20px"
+            v-model="detailForm.ssjdbq"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="所属社区:">
+          <el-input
+            style="width:300px;margin-left:20px"
+            v-model="detailForm.sssqbq"
+            :disabled="true">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="核查意见:">
+					<el-input
+						type="textarea"
+						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.hcsj"
+						:disabled="true">
+					</el-input>
+				</el-form-item>
+        <el-form-item label="事件描述:">
+					<el-input
+						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: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/wghSjxx/todo/wghSjxxPage",
+        getDataListIsPage: true,
+        deleteURL: "",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        wgymc: "",
+        ssjdbq: "",
+        sssqbq:"",
+        hcyj:""
+      },
+      detailForm:{
+        wgymc: "",
+        ssjdbq: "",
+        sssqbq:"",
+        hcyj:"",
+        hcsj:"",
+        sjms:"",
+      },
+      optionsG:[],
+      dialogVisible: false
+    };
+  },
+  methods:{
+    getDetailById(row){
+      this.dialogVisible = true
+      this.$http.post(`/opendata/wghSjxx/getWghSjxxDetail`,{
+        recid:row.row.recid
+      }).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>