标准地址新增房屋，房屋人员详情，修改弹窗未对接扣

src/api/fwbzdz/fwbzdz.js

@@ -140,3 +140,15 @@ export const putfile = (row) => {
     data:row
   })
 }
+
+
+export const bzdzDetail = (dzbm) => {
+  return request({
+    url: '/api/bzdz/api/Detail',
+    method: 'get',
+    params: {
+      dzbm
+    }
+  });
+};
+

src/views/ybss/fwbzdz/bzdzxq.vue

@@ -24,8 +24,8 @@
         <div class="bzdzxq_right">
             <el-tabs v-model="activeName" type="card" @tab-click="handleClick" v-loading="tabLoading" class="tabs">
                 <el-tab-pane label="实有房屋" name="syfw">
-                    <DetailSyfw v-if="bzdztype == 'view'"></DetailSyfw>
-                    <AddSyfw v-if="bzdztype == 'add'"></AddSyfw>
+                    <DetailSyfw  @fzInfo="showEdDialog" v-if="bzdztype == 'view'"></DetailSyfw>
+                    <AddSyfw v-if="bzdztype == 'add'" @refresh="changeStatus"></AddSyfw>
                 </el-tab-pane>
                 <el-tab-pane :label="'实有单位(' + sydwNum + ')'" name="sydw">实有单位</el-tab-pane>
                 <el-tab-pane :label="'实有人口(' + syrkNum + ')'" name="syrk">
@@ -33,17 +33,20 @@
                 </el-tab-pane>
             </el-tabs>
         </div>
+
+        <addry ref="addry" :fzInfo="propInfo"/>
     </basic-container>
 </template>
 <script>
 import DetailSyfw from './components/DetailSyfw.vue'
 import SyrkJz from './components/SyrkJz.vue';           // 实有人口
 import AddSyfw from './components/AddSyfw.vue';
-
+import addry from '../syrk/components/edit'
 export default {
-    components: { DetailSyfw, SyrkJz, AddSyfw },
+    components: { DetailSyfw, SyrkJz, AddSyfw,addry},
     data() {
         return {
+            propInfo:{},
             icon_house_color_88: require('@/img/fwbzdz/icon_house_color_88.svg'),
             icon_people_white_16: require('@/img/fwbzdz/icon_people_white_16.svg'),
             icon_unit_gray_16: require('@/img/fwbzdz/icon_unit_gray_16.svg'),
@@ -68,11 +71,18 @@ export default {
         console.log('query',this.query)
     },
     methods: {
+        showEdDialog(data){
+          this.propInfo = data
+          this.$refs.addry.dialogVisible=true
+        },
+        changeStatus(){
+          this.$store.commit('SET_BZDZTYPE', 'view')
+        },
         handleClick(val) {
             console.log('handleClick', val)
         },
         addSyrk(){
-            
+
         },
         getData(method) {
             this.$options.methods[method]
@@ -153,7 +163,7 @@ export default {
             overflow-y: scroll;
         }
 
-        
+
     }
 }
-</style>
+</style>

src/views/ybss/fwbzdz/components/AddSyfw.vue

@@ -1,92 +1,165 @@
 <template>
-    <div class="form_el_styles" v-loading="fwLoading">
-        <div class="item_head">
+    <div class="form_el_styles" v-loading="fwLoading" style="width: 50%">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="small">
+        <el-row>
+          <div class="item_head">
             <div class="title">房屋信息</div>
-        </div>
-        <div class="row_body long">
-            <div class="row_label">房屋地址</div>
-            <el-input v-model="formData.fwDz"></el-input>
-        </div>
-        <div class="row_body long">
-            <div class="row_label">房屋特点</div>
-            <el-input @focus="focusFwtd" placeholder="请选中房屋特点" v-loading="fwtdLoading" v-model="fwtd"></el-input>
-        </div>
-        <div class="row_body nomal">
-            <div class="row_label">户内面积</div>
-            <el-input v-model="formData.fwMj"></el-input>
-            <div class="row_label" style="text-align: left;">㎡</div>
-        </div>
-        <div class="row_body nomal">
-            <div class="row_label">户内间数</div>
-            <el-input v-model="formData.fwJs"></el-input>
-        </div>
-        <div class="item_head">
+          </div>
+          <el-form-item label="房屋地址" prop="fwDz">
+            <el-input v-model="form.fwDz" placeholder="请填写房屋地址" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="房屋特点" prop="fwtd">
+            <el-input @focus="focusFwtd" placeholder="请选中房屋特点"  v-model="form.fwtd"></el-input>
+          </el-form-item>
+          <el-form-item label="户内面积" prop="fwMj">
+            <el-input v-model="form.fwMj" placeholder="请输入户内面积（㎡）" style="width: 90%"></el-input> ㎡
+          </el-form-item>
+          <el-form-item label="户内间数" prop="fwJs">
+            <el-input v-model="form.fwJs" placeholder="请输入户内间数"></el-input>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-form ref="fzInfo" :model="fzInfo" :rules="fzInforules" label-width="120px" size="small">
+        <el-row>
+          <div class="item_head">
             <div class="title">房主信息</div>
-        </div>
-        <div class="row_body nomal">
-            <div v-if="formData.zjlx == '身份证'" style="display: flex;">
-                <div class="row_label">房主姓名</div>
-                <el-input v-model="formData.fzXm"></el-input>
-            </div>
-            <div v-if="formData.zjlx == '护照'" style="display: flex;">
-                <div class="row_label">房主英文姓</div>
-                <el-input v-model="formData.fzYwx"></el-input>
-            </div>
-            <div v-if="formData.zjlx == '护照'" style="display: flex;">
-                <div class="row_label">房主英文名</div>
-                <el-input v-model="formData.fzYwm"></el-input>
-            </div>
-        </div>
-        <div class="row_body nomal">
-            <div style="display: flex;">
-                <div class="row_label">证件类型</div>
-                <el-select v-model="formData.zjlx" placeholder="请选择">
-                    <el-option v-for="item in zjOp" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
-            </div>
-            <div v-if="formData.zjlx == '护照'" style="display: flex;">
-                <div class="row_label">房主国籍</div>
-                <el-select v-model="formData.fzgj" placeholder="请选择">
-                    <el-option v-for="item in gjOp" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
-            </div>
-        </div>
-        <div class="row_body nomal">
-            <div class="row_label">证件号码</div>
-            <el-input v-model="formData.zjhm"></el-input>
-            <div class="btn">查询</div>
-        </div>
-        <div class="row_body long">
-            <div class="row_label">户籍地址</div>
-            <el-input v-model="formData.hjdz"></el-input>
-        </div>
-        <div>
-            <div class="row_body">
-                <div class="row_label">是否在此居住</div>
-                <el-radio-group v-model="formData.sfzcjz">
-                    <el-radio :label="1">是</el-radio>
-                    <el-radio :label="0">否</el-radio>
-                </el-radio-group>
-            </div>
-            <div class="row_body long" v-if="formData.sfzcjz == 0">
-                <div class="row_label">现居住地址</div>
-                <el-input v-model="formData.fzJzd"></el-input>
-            </div>
-        </div>
-        <div class="row_body nomal">
-            <div class="row_label">联系电话</div>
-            <el-input v-model="formData.fzDh"></el-input>
-        </div>
-        <div class="row_body nomal">
-            <div class="row_label">工作单位</div>
-            <el-input v-model="formData.fzDw"></el-input>
-        </div>
-        <div class="row_body long">
-            <div class="row_label">备注</div>
-            <el-input type="textarea" :rows="3" v-model="formData.bz"></el-input>
-        </div>
+          </div>
+          <el-col :span="12">
+            <el-form-item label="个人照片" prop="ryZp">
+              <div v-loading="photoLoading" :element-loading-text="photoLoadingText" style="width: 80px;border: 1px solid #D4D6D9;height: 80px;text-align: center;border-radius: 8px">
+                <input @change="getfile($event)" class="filebox" type="file" accept="image/*">
+                <div v-if="!fzInfo.fzZp">
+                  <i class="el-icon-plus" style="font-size: 50px;color: #D4D6D9;line-height: 80px"></i>
+                </div>
+                <img v-else :src="fzInfo.fzZp" style="width: 100%">
+
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房主姓名" prop="fzXm">
+              <el-input v-model="fzInfo.fzXm" placeholder="请输入房主姓名"></el-input>
+            </el-form-item>
+            <el-form-item label="证件类型" prop="zjlx">
+              <el-select v-model="fzInfo.zjlx" placeholder="请选择">
+                <el-option v-for="item in zjOp" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" v-if="fzInfo.zjlx == '身份证'">
+            <el-form-item label="证件号码" prop="fzSfzh">
+              <el-input v-model="fzInfo.fzSfzh" placeholder="证件号码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="fzInfo.zjlx == '护照'">
+            <el-form-item label="房主英文姓" prop="fzYwx">
+              <el-input v-model="fzInfo.fzYwx"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="fzInfo.zjlx == '护照'">
+            <el-form-item label="房主英文名" prop="fzYwm">
+              <el-input v-model="fzInfo.fzYwm"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" v-if="fzInfo.zjlx == '护照'">
+            <el-form-item label="房主国籍" prop="fzgj">
+              <el-select v-model="fzInfo.fzgj" placeholder="请选择">
+                <el-option v-for="item in gjOp" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="户籍地址" prop="hjdz">
+              <el-input v-model="fzInfo.hjdz" placeholder="请输入现住址"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+
+
+        <!--      <el-form-item label="人口类型">-->
+        <!--        <el-checkbox-group v-model="form.tsrq">-->
+        <!--          <el-checkbox label="常住人口" name="1"></el-checkbox>-->
+        <!--          <el-checkbox label="寄住人口" name="2"></el-checkbox>-->
+        <!--          <el-checkbox label="暂住人口" name="3"></el-checkbox>-->
+        <!--          <el-checkbox label="境外人员" name="4"></el-checkbox>-->
+        <!--          <el-checkbox label="未落常人口" name="5"></el-checkbox>-->
+        <!--        </el-checkbox-group>-->
+        <!--      </el-form-item>-->
+
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="是否在此居住" prop="sfzcjz">
+              <el-radio-group v-model="fzInfo.sfzcjz">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="2" :span="22" v-show="fzInfo.sfzcjz=='0'" class="iserea">
+            <el-form-item label="现居住地址" prop="fzJzd">
+              <el-input v-model="fzInfo.fzJzd" placeholder="请输入现居住地址"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="是否特殊人群" prop="istsrq">
+              <el-radio-group v-model="fzInfo.istsrq">
+                <el-radio label="是"></el-radio>
+                <el-radio label="否"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :offset="2" :span="22" v-show="fzInfo.istsrq=='是'" class="iserea">
+            <el-form-item label="" prop="ryTsLb">
+              <el-checkbox-group v-model="fzInfo.ryTsLb">
+                <el-checkbox v-for="titem in tsrq" :label="titem.label" :name="titem.value" :key="titem.value"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="具体情况" style="padding-left: 120px" prop="desc">
+              <el-input placeholder="请描述具体情况，非必填，限2000字符" type="textarea" v-model="fzInfo.desc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <!--      <el-col :span="24">-->
+        <!--        <el-form-item label="是否重点人">-->
+        <!--          <el-radio-group v-model="form.iszdr">-->
+        <!--            <el-radio label="是"></el-radio>-->
+        <!--            <el-radio label="否"></el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+
+        <el-form-item label="联系电话">
+          <el-input v-model="fzInfo.fzDh" placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+
+        <el-form-item label="工作单位">
+          <el-input v-model="fzInfo.fzDw" placeholder="请输入工作单位"></el-input>
+        </el-form-item>
+
+        <el-form-item label="备注">
+          <el-input placeholder="请添加备注信息，非必填，限200字符" type="textarea" v-model="fzInfo.bz"></el-input>
+        </el-form-item>
+
+
+
+
+      </el-form>
         <div class="footer">
             <button class="btn_nomal" @click="cancel">取消</button>
             <button class="btn_primary" @click="save">确定</button>
@@ -97,6 +170,7 @@
 <script>
 import fwtd from './fwtd.vue';
 import { dictionaryList, saveFwAndFz } from "@/api/fwbzdz/fwbzdz";
+import {putfile} from "../../../../api/fwbzdz/fwbzdz";
 
 export default {
     components: { fwtd },
@@ -125,6 +199,25 @@ export default {
                 fzDw: '',
                 bz: '',
             },
+            form:{
+              fwtd: '',
+              dzbm:'',
+              fzZp:'',
+              fwLb:'',
+              fwYt:'',
+              fwXz:'',
+              tsrq:[],
+              fwSyyt:'',
+              zjxy:[],
+              fwMj:'',
+              fwJs:'',
+              imageUrl: ''
+            },
+            photoLoading:false,
+            fzInfo:{istsrq:'',ryTsLb:'', fzXm:'',fzYwx:'',fzZp:'',fzYwm:'',fzSfzh:'',hjdz:'',sfzcjz:'',fzJzd:'',fzDh:'',fzDw:'',bz:''},
+            fzInforules:{
+              fzSfzh:[{ type: 'date', required: true, message: '请选择时间', trigger: 'change' }],
+            },
             zjOp: [
                 { label: '护照', value: '护照' },
                 { label: '身份证', value: '身份证' },
@@ -142,6 +235,7 @@ export default {
     },
     mounted() {
         this.fwloading = true
+        this.form.fwDz = this.query.level1+this.query.level2+this.query.level3+this.query.level4+this.query.lcnpmh
         dictionaryList().then(res => {
             const data = res.data.data
             console.log('dictionaryList', data)
@@ -152,28 +246,46 @@ export default {
         })
     },
     methods: {
+      getfile(e){
+        var _this = this
+        _this.photoLoading=true
+        var fileList = new FormData()
+        fileList.append('file',e.target.files[0])
+        _this.photoLoadingText='正在上传'
+        putfile(fileList).then(res=>{
+          _this.$set(_this.fzInfo,'fzZp',res.data.data.link)
+          e.target.value=''
+          _this.photoLoading=false
+          _this.photoLoadingText=''
+        }).catch(err=>{
+          _this.$message.error('上传异常')
+          _this.photoLoading=false
+          _this.photoLoadingText=''
+        })
+      },
         focusFwtd() {
             this.$refs.fwtd.show()
         },
         getfwtd(val) {
             console.log('getfwtd', val)
-            this.fwtd = val.fwlb.label + '、' + val.fwxz.label + '、' + val.fwyt.label + '、' + val.syyt.label
-            this.formData.fwlb = val.fwlb.value
-            this.formData.fwxz = val.fwxz.value
-            this.formData.fwyt = val.fwyt.value
-            this.formData.syyt = val.syyt.value
+            this.form.fwtd = val.fwlb.label + '、' + val.fwxz.label + '、' + val.fwyt.label + '、' + val.syyt.label
+            this.form.fwLb = val.fwlb.value
+            this.form.fwXz = val.fwxz.value
+            this.form.fwYt = val.fwyt.value
+            this.form.syyt = val.syyt.value
         },
         cancel(){
-            this.$emit('closeDialog')
+            this.$emit('refresh')
         },
         save() {
-            this.formData.dzbm = this.query.dzbm
+            this.form.dzbm = this.query.dzbm
             this.saveFwAndFz = true
-            saveFwAndFz(this.formData).then(res => {
+            this.form.fzInfo = this.fzInfo
+            saveFwAndFz(this.form).then(res => {
                 console.log('saveFwAndFz', res)
             }).finally(() => {
                 this.saveFwAndFz = false
-                this.$emit('closeDialog')
+                this.$emit('refresh')
             })
         }
     }

src/views/ybss/fwbzdz/components/DetailSyfw.vue

@@ -1,57 +1,61 @@
 <template>
-    <div>
+    <div v-loading="loading">
         <div class="item_head">
             <div class="title">房屋信息</div>
             <div class="btn">修改</div>
         </div>
         <div class="row_body">
             <div class="row_label">房屋地址</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.xz}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">房屋特点</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fwtd}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">户内面积</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fwMj}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">户内间数</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fwJs}}</div>
         </div>
         <div class="line"></div>
         <div class="item_head">
             <div class="title">房主信息</div>
-            <div class="btn">修改</div>
+            <div class="btn" @click="editFz">修改</div>
         </div>
-        <div class="row_body">
+        <div class="row_body" style="display: flex">
             <div class="row_label">房主照片</div>
-            <div class="row_content"></div>
+            <div class="row_content">
+              <el-image
+              style="width: 100px; height: 100px"
+              :src="fwinfo.fzZp"
+              :fit="fit"></el-image></div>
         </div>
         <div class="row_body">
             <div class="row_label">房主姓名</div>
-            <div class="row_content"></div>
-        </div>
-        <div class="row_body">
-            <div class="row_label">证件类型</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fzXm}}</div>
         </div>
+<!--        <div class="row_body">-->
+<!--            <div class="row_label">证件类型</div>-->
+<!--            <div class="row_content">{{fwinfo.fwJs}}</div>-->
+<!--        </div>-->
         <div class="row_body">
             <div class="row_label">证件号码</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fzSfzh}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">人口类型</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.ryType}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">户籍地址</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.hjdz}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">是否是特殊人群</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.ryTsJtqk}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">是否是重点人员</div>
@@ -59,19 +63,19 @@
         </div>
         <div class="row_body">
             <div class="row_label">现居住地址</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fzJzd}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">联系电话</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fzDh}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">工作单位</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.fzDw}}</div>
         </div>
         <div class="row_body">
             <div class="row_label">备注</div>
-            <div class="row_content"></div>
+            <div class="row_content">{{fwinfo.bz}}</div>
         </div>
         <div class="line"></div>
         <div class="item_head">
@@ -80,10 +84,11 @@
         </div>
         <div v-for="history in historyList" :key="history.id">
             <div class="row_body_history">
-                <div>
-                    <div class="row_label">历史房主照片</div>
-                    <div class="row_content"></div>
-                </div>
+              <div class="row_body" style="display: flex">
+                <div class="row_label">房主照片</div>
+                <div class="row_content">
+                 </div>
+              </div>
                 <div class="row_content">2024-06-12 15:30:22 注销</div>
             </div>
             <div class="row_body">
@@ -134,31 +139,39 @@
     </div>
 </template>
 <script>
-import { syfwDetail } from '@/api/fwbzdz/fwbzdz.js'         // 实有房屋详情
+import { syfwDetail } from '@/api/fwbzdz/fwbzdz.js'
+import {bzdzDetail} from "../../../../api/fwbzdz/fwbzdz";         // 实有房屋详情
 
 export default {
     name: 'DetailSyfw',
     data() {
         return {
+          loading:false,
+          fwinfo:{},
             historyList: [
                 {}
             ]
         }
     },
     computed: {
-        // query() {
-        //     return this.$route.query
-        // },
         query() {
             return this.$store.state.thirdTitle.bzdzxq
         },
     },
     mounted() {
-        console.log('bzdzxq', this)
-        syfwDetail(this.query.dzbm).then(res => {
+        this.loading=true;
+        bzdzDetail(this.query.dzbm).then(res => {
+            this.fwinfo = res.data.data
             console.log('syfwDetail', res)
+        }).finally(()=>{
+          this.loading=false
         })
     },
+    methods:{
+      editFz(){
+        this.$emit('fzInfo',this.fwinfo)
+      }
+    }
 }
 </script>
 <style lang="scss" scoped>
@@ -189,7 +202,7 @@ export default {
 
 .row_body {
     margin-bottom: 8px;
-
+    display: flex;
     .row_label {
         width: 120px;
         color: rgba(111, 124, 163, 1);
@@ -208,4 +221,4 @@ export default {
     display: flex;
     justify-content: space-between;
 }
-</style>
+</style>

src/views/ybss/fwbzdz/components/GridGroup.vue

@@ -10,9 +10,9 @@
                     :class="{ lcnpmh_active: lcnpmh.dzbm == lcnpmhSelected ? true : false }" @dblclick="toDetail(lcnpmh)">
                     <div class="has_data">{{ lcnpmh.lcnpmh }}</div>
                     <div style="display: flex;margin-top: 8px;">
-                        <img :src="icon_house_color_16" alt="" v-if="lcnpmh.times != 0">
+                        <img :src="icon_house_color_16" alt="" v-if="lcnpmh.syfwNum != 0">
                         <img :src="icon_house_gray_16" alt="" v-else>
-                        <div :class="{ has_data: lcnpmh.times != 0 ? true : false }" style="margin-left: 5px">实有房屋</div>
+                        <div :class="{ has_data: lcnpmh.syfwNum != 0 ? true : false }" style="margin-left: 5px">实有房屋</div>
                     </div>
                     <div style="display: flex;margin-top: 8px;">
                         <img :src="icon_unit_color_16" alt="" v-if="lcnpmh.sydwNum != 0">
@@ -77,7 +77,7 @@ export default {
             }
         },
         toDetail(lcnpmh) {
-            if (lcnpmh.times == 0) {
+            if (lcnpmh.syfwNum == 0) {
                 this.$store.commit('SET_BZDZTYPE', 'add')
             } else {
                 this.$store.commit('SET_BZDZTYPE', 'view')

src/views/ybss/syfw/components/add.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="add">
+    <el-dialog
+      title="新增实有房屋信息"
+      :visible.sync="dialogVisible"
+      width="50%"
+      :before-close="handleClose">
+      <add_fw ref="add_fw" @closeDialog="dialogVisible = false" v-loading="saveFwAndFz"/>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="submitok">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { dictionaryList, saveFwAndFz } from "@/api/fwbzdz/fwbzdz";
+import add_fw from "./add_fw";
+export default {
+  name: "add",
+  components:{add_fw},
+  data(){
+    return{
+      dialogVisible:false,
+      saveFwAndFz:false
+    }
+  },
+  methods:{
+    submitok(){
+      var forms = this.$refs.add_fw.form
+      forms.fzInfo = this.$refs.add_fw.fzInfo
+      console.log(forms)
+      //this.formData.dzbm = this.query.dzbm
+      this.saveFwAndFz = true
+      saveFwAndFz(forms).then(res => {
+       if(res.data.code=='200'){
+          this.$message.success('保存成功')
+       }
+
+      }).finally(() => {
+        this.saveFwAndFz = false
+        this.$emit('closeDialog')
+      })
+    },
+    handleClose(){
+      this.dialogVisible = false
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/ybss/syfw/components/add_fw.vue

@@ -0,0 +1,366 @@
+<template>
+  <div class="add_fw">
+
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" size="small">
+      <el-row>
+        <div class="item_head">
+          <div class="title">房屋信息</div>
+        </div>
+        <el-form-item label="房屋地址" prop="fwDz">
+          <el-input v-model="form.fwDz" placeholder="请填写房屋地址"></el-input>
+        </el-form-item>
+        <el-form-item label="房屋特点" prop="fwtd">
+          <el-input @focus="focusFwtd" placeholder="请选中房屋特点"  v-model="form.fwtd"></el-input>
+        </el-form-item>
+        <el-form-item label="户内面积" prop="fwMj">
+          <el-input v-model="form.fwMj" placeholder="请输入户内面积（㎡）" style="width: 90%"></el-input> ㎡
+        </el-form-item>
+        <el-form-item label="户内间数" prop="fwJs">
+          <el-input v-model="form.fwJs" placeholder="请输入户内间数"></el-input>
+        </el-form-item>
+      </el-row>
+      </el-form>
+    <el-form ref="fzInfo" :model="fzInfo" :rules="fzInforules" label-width="120px" size="small">
+      <el-row>
+        <div class="item_head">
+          <div class="title">房主信息</div>
+        </div>
+        <el-col :span="12">
+          <el-form-item label="个人照片" prop="ryZp">
+            <div v-loading="photoLoading" :element-loading-text="photoLoadingText" style="width: 80px;border: 1px solid #D4D6D9;height: 80px;text-align: center;border-radius: 8px">
+              <input @change="getfile($event)" class="filebox" type="file" accept="image/*">
+              <div v-if="!fzInfo.ryZp">
+                <i class="el-icon-plus" style="font-size: 50px;color: #D4D6D9;line-height: 80px"></i>
+              </div>
+              <img v-else :src="fzInfo.ryZp" style="width: 100%">
+
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="房主姓名" prop="fzXm">
+            <el-input v-model="fzInfo.fzXm" placeholder="请输入房主姓名"></el-input>
+          </el-form-item>
+          <el-form-item label="证件类型" prop="zjlx">
+            <el-select v-model="fzInfo.zjlx" placeholder="请选择">
+              <el-option v-for="item in zjOp" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12" v-if="fzInfo.zjlx == '身份证'">
+          <el-form-item label="证件号码" prop="fzSfzh">
+            <el-input v-model="fzInfo.fzSfzh" placeholder="证件号码"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" v-if="fzInfo.zjlx == '护照'">
+          <el-form-item label="房主英文姓" prop="fzYwx">
+            <el-input v-model="fzInfo.fzYwx"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" v-if="fzInfo.zjlx == '护照'">
+          <el-form-item label="房主英文名" prop="fzYwm">
+            <el-input v-model="fzInfo.fzYwm"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" v-if="fzInfo.zjlx == '护照'">
+          <el-form-item label="房主国籍" prop="fzgj">
+            <el-select v-model="fzInfo.fzgj" placeholder="请选择">
+              <el-option v-for="item in gjOp" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="户籍地址" prop="hjdz">
+            <el-input v-model="fzInfo.hjdz" placeholder="请输入现住址"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+
+
+<!--      <el-form-item label="人口类型">-->
+<!--        <el-checkbox-group v-model="form.tsrq">-->
+<!--          <el-checkbox label="常住人口" name="1"></el-checkbox>-->
+<!--          <el-checkbox label="寄住人口" name="2"></el-checkbox>-->
+<!--          <el-checkbox label="暂住人口" name="3"></el-checkbox>-->
+<!--          <el-checkbox label="境外人员" name="4"></el-checkbox>-->
+<!--          <el-checkbox label="未落常人口" name="5"></el-checkbox>-->
+<!--        </el-checkbox-group>-->
+<!--      </el-form-item>-->
+
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="是否在此居住" prop="sfzcjz">
+            <el-radio-group v-model="fzInfo.sfzcjz">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :offset="2" :span="22" v-show="fzInfo.sfzcjz=='0'" class="iserea">
+          <el-form-item label="现居住地址" prop="fzJzd">
+            <el-input v-model="fzInfo.fzJzd" placeholder="请输入现居住地址"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="是否特殊人群" prop="istsrq">
+            <el-radio-group v-model="fzInfo.istsrq">
+              <el-radio label="是"></el-radio>
+              <el-radio label="否"></el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :offset="2" :span="22" v-show="fzInfo.istsrq=='是'" class="iserea">
+          <el-form-item label="" prop="ryTsLb">
+            <el-checkbox-group v-model="fzInfo.ryTsLb">
+              <el-checkbox v-for="titem in tsrq" :label="titem.label" :name="titem.value" :key="titem.value"></el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item label="具体情况" style="padding-left: 120px" prop="desc">
+            <el-input placeholder="请描述具体情况，非必填，限2000字符" type="textarea" v-model="fzInfo.desc"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+<!--      <el-col :span="24">-->
+<!--        <el-form-item label="是否重点人">-->
+<!--          <el-radio-group v-model="form.iszdr">-->
+<!--            <el-radio label="是"></el-radio>-->
+<!--            <el-radio label="否"></el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="联系电话">
+          <el-input v-model="fzInfo.fzDh" placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+
+        <el-form-item label="工作单位">
+          <el-input v-model="fzInfo.fzDw" placeholder="请输入工作单位"></el-input>
+        </el-form-item>
+
+        <el-form-item label="备注">
+          <el-input placeholder="请添加备注信息，非必填，限200字符" type="textarea" v-model="fzInfo.bz"></el-input>
+        </el-form-item>
+
+
+
+
+    </el-form>
+    <fwtd ref="fwtd"   v-loading="fwloading" :options="options" @getfwtd="getfwtd"></fwtd>
+  </div>
+</template>
+
+<script>
+import { dictionaryList, saveFwAndFz} from "@/api/fwbzdz/fwbzdz";
+import fwtd from "../../fwbzdz/components/fwtd";
+import {baseUrl} from '@/config/env'
+import {putfile} from "../../../../api/fwbzdz/fwbzdz";
+export default {
+  name: "add_fw",
+  components:{fwtd},
+  data(){
+    return{
+      form:{
+        ryZp:'',
+        fwLb:'',
+        fwYt:'',
+        fwXz:'',
+        tsrq:[],
+        fwSyyt:'',
+        zjxy:[],
+        fwMj:'',
+        fwJs:'',
+        imageUrl: ''
+      },
+      photoLoading:false,
+      photoLoadingText:'',
+      fzInfo:{istsrq:'',ryTsLb:'', fzXm:'',fzYwx:'',fzYwm:'',fzSfzh:'',hjdz:'',sfzcjz:'',fzJzd:'',fzDh:'',fzDw:'',bz:''},
+      urls:baseUrl+'/blade-resource/oss/endpoint/put-file',
+      fwloading:false,
+      options: [],
+      gjOp: [],
+      tsrq:[],
+      zjOp: [
+        { label: '护照', value: '护照' },
+        { label: '身份证', value: '身份证' },
+      ],
+      fzInforules:{
+        fzSfzh:[{ type: 'date', required: true, message: '请选择时间', trigger: 'change' }],
+      }
+    }
+  },
+  computed: {
+    headerObj(){
+      return { 'Blade-Auth': "bearer "+this.$store.getters.token };
+    },
+
+    query() {
+      return this.$store.state.thirdTitle.bzdzxq
+    },
+  },
+  mounted() {
+    dictionaryList().then(res => {
+      const data = res.data.data
+      console.log('dictionaryList', data)
+      this.options = data
+      this.gjOp = data.gjdq
+      this.tsrq = data.tsrq
+    }).finally(() => {
+
+    })
+  },
+  methods:{
+    getfile(e){
+      var _this = this
+      _this.photoLoading=true
+      var fileList = new FormData()
+      fileList.append('file',e.target.files[0])
+      _this.photoLoadingText='正在上传'
+      putfile(fileList).then(res=>{
+        _this.$set(_this.form,'ryZp',res.data.data.link)
+        e.target.value=''
+        _this.photoLoading=false
+        _this.photoLoadingText=''
+      }).catch(err=>{
+        _this.$message.error('上传异常')
+        _this.photoLoading=false
+        _this.photoLoadingText=''
+      })
+    },
+    handleChange(file, fileList) {
+      const fileSize = Number(file.size / 1024 / 1024) < 10
+      if(!fileSize){
+        this.$message.error('上传附件不能大于10M！')
+        return
+      }
+      var fileList = fileList.slice(-3);
+      console.log(fileList)
+      if(fileList.length>0){this.form.ryZp=fileList[0].response.data.link}
+    },
+    getfwtd(val) {
+      var fwtd = val.fwlb.label + '、' + val.fwxz.label + '、' + val.fwyt.label + '、' + val.syyt.label
+      this.$set(this.form,'fwtd',fwtd)
+      this.$set(this.form,'fwlb',val.fwlb.value)
+      this.$set(this.form,'fwxz',val.fwxz.value)
+      this.$set(this.form,'fwyt',val.fwyt.value)
+      this.$set(this.form,'syyt',val.syyt.value)
+    },
+    focusFwtd() {
+      this.$refs.fwtd.show()
+    },
+
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+.add_fw{
+  display: table;
+  width: 100%;
+  .filebox{
+    opacity: 0;
+    width: 100%;
+    position: absolute;
+    width: 80px;
+    height: 80px;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
+}
+:deep  .el-input__inner{
+  background: #ECF2FE !important;
+  border: none;
+}
+:deep .el-textarea__inner{
+  background: #ECF2FE !important;
+  border: none;
+}
+.item_head{
+  div{
+    padding-bottom: 25px;
+    font-weight: 660;
+    font-size: 17px;
+    color: rgba(4,8,20,0.9);
+    line-height: 24px;
+    text-align: left;
+    font-style: normal;
+  }
+}
+.typediv{
+  float: left;
+  width: 102px;
+  height: 104px;
+  background: rgba(16,109,255,0.02);
+  border-radius: 8px;
+  text-align: center;
+  padding-top: 16px;
+  margin-right: 16px;
+  border: 1px solid #ECF2FE;
+  cursor: pointer;
+  //border: 1px solid #106DFF;
+}
+.isactive{
+  border: 1px solid #106DFF
+}
+.container_body .el-col{
+  margin-right: 0 !important;
+}
+.iserea{
+  background: rgba(236,242,254,.3);
+  box-sizing: border-box;
+  padding-top: 18px;
+  border-radius: 8px;
+  :deep  .el-input__inner{
+    background: #ECF2FE !important;
+    border: none;
+  }
+  :deep .el-textarea__inner{
+    background: #ECF2FE !important;
+    border: none;
+  }
+}
+:deep .avatar-uploader .el-upload {
+  width: 88px;
+  height: 88px;
+  line-height: 88px;
+  background: #ECF2FE;
+  border-radius: 8px;
+  border: 1px dashed #6F7CA3;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+:deep .avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+:deep .avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 88px;
+  height: 88px;
+  text-align: center;
+}
+:deep .avatar {
+  width: 88px;
+  height: 88px;
+  display: block;
+}
+</style>

src/views/ybss/syfw/syfw.vue

@@ -26,6 +26,10 @@
                 <el-tag>{{ row.categoryName }}</el-tag>
             </template> -->
         </avue-crud>
+
+
+        <add ref="add"/>
+
     </basic-container>
 </template>
 
@@ -33,9 +37,10 @@
 import { getsyfwList } from "@/api/fwbzdz/fwbzdz";
 import crudmixin from '@/mixins/newcrud.js';
 import defaultOptions from '@/option/defaultOption.js'
-
+import add from "./components/add";
 export default {
     mixins: [crudmixin],
+  components:{add},
     data() {
         return {
             mode: '1',
@@ -108,8 +113,9 @@ export default {
     },
     methods: {
         addsyfw(){
+            this.$refs.add.dialogVisible = true
             this.$store.commit('POST_SYFWXQ',{})
-            this.$store.commit('CHANGE_SYFW','syfwxq')
+            //this.$store.commit('CHANGE_SYFW','syfwxq')
         },
         rowDelete(row){},
         onLoad(page = this.page, params = {}) {
@@ -130,4 +136,4 @@ export default {
     color: rgba(16, 109, 255, 1);
     font-size: 14px;
 }
-</style>
+</style>

src/views/ybss/syrk/components/add.vue

@@ -5,12 +5,11 @@
       :visible.sync="dialogVisible"
       width="50%"
       :before-close="handleClose">
-
-      <el-form ref="form" :model="form" label-width="120px" size="small">
+      <el-form ref="form" :model="form"  :rules="rules"  label-width="120px" size="small">
         <el-row>
-          <el-form-item label="人员信息类型">
+          <el-form-item label="人员信息类型" >
 <!--            <el-input v-model="form.type" ></el-input>-->
-            <div @click="clickType(index)" class="typediv" :class="{'isactive':isclick==index}" v-for="(item,index) in typeList">
+            <div @click="clickType(index,item.value)" class="typediv" :class="{'isactive':isclick==index}" v-for="(item,index) in typeList">
               <img :src="item.icon" alt="">
               <span style="display: block">{{item.name}}</span>
             </div>
@@ -18,29 +17,36 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="个人照片">
-              <el-upload
-                class="avatar-uploader"
-                action="https://jsonplaceholder.typicode.com/posts/"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload">
-                <img v-if="form.imageUrl" :src="form.imageUrl" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
+            <el-form-item label="个人照片" prop="ryZp">
+              <div v-loading="photoLoading" :element-loading-text="photoLoadingText" style="width: 80px;border: 1px solid #D4D6D9;height: 80px;text-align: center;border-radius: 8px">
+                <input @change="getfile($event)" class="filebox" type="file" accept="image/*">
+                <div v-if="!form.ryZp">
+                  <i class="el-icon-plus" style="font-size: 50px;color: #D4D6D9;line-height: 80px"></i>
+                </div>
+                <img v-else :src="form.ryZp" style="width: 100%">
+
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="与房主关系">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="与房主关系" prop="ryHzgx">
+              <el-select v-model="form.ryHzgx" placeholder="与房主关系" style="width:99%">
+                <el-option
+                  v-for="item in yfzgx"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="民族">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="民族" prop="ryMzDm">
+              <el-select v-model="form.ryMzDm" placeholder="民族" style="width:99%">
+                <el-option
+                  v-for="item in mz"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -48,15 +54,19 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="姓名">
-              <el-input v-model="form.type"></el-input>
+            <el-form-item label="姓名" prop="ryXm">
+              <el-input v-model="form.ryXm"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="文化程度">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="文化程度" prop="ryWhcd">
+              <el-select v-model="form.ryWhcd" placeholder="文化程度" style="width:99%">
+                <el-option
+                  v-for="item in whcd"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -64,15 +74,19 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="公民身份号码">
-              <el-input v-model="form.type"></el-input>
+            <el-form-item label="公民身份号码" prop="rySfzh">
+              <el-input v-model="form.rySfzh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="婚姻状况">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="婚姻状况" prop="ryHyzk">
+              <el-select v-model="form.ryHyzk" placeholder="婚姻状况" style="width:99%">
+                <el-option
+                  v-for="item in hyzk"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -80,18 +94,22 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="性别">
-              <el-radio-group v-model="form.sex">
+            <el-form-item label="性别" prop="ryXb">
+              <el-radio-group v-model="form.ryXb">
                 <el-radio label="男"></el-radio>
                 <el-radio label="女"></el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="政治面貌">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="政治面貌" prop="ryZzmm">
+              <el-select v-model="form.ryZzmm" placeholder="政治面貌" style="width:99%">
+                <el-option
+                  v-for="item in zzmm"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -100,15 +118,19 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="联系电话">
-              <el-input v-model="form.type"></el-input>
+            <el-form-item label="联系电话" prop="ryDh">
+              <el-input v-model="form.ryDh"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="兵役状况">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="兵役状况" prop="ryByzk">
+              <el-select v-model="form.ryByzk" placeholder="兵役状况" style="width:99%">
+                <el-option
+                  v-for="item in byzk"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -124,8 +146,8 @@
             </el-form-item>
           </el-col>
           <el-col :offset="2" :span="22" v-show="form.isth=='否'" class="iserea">
-            <el-form-item label="微信号">
-              <el-input v-model="form.type"></el-input>
+            <el-form-item label="微信号" prop="vx">
+              <el-input v-model="form.vx"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -140,14 +162,9 @@
             </el-form-item>
           </el-col>
           <el-col :offset="2" :span="22" v-show="form.iszjxy=='是'" class="iserea">
-            <el-form-item label="">
+            <el-form-item label="" prop="zjxy">
               <el-checkbox-group v-model="form.zjxy">
-                <el-checkbox label="佛教" name="type"></el-checkbox>
-                <el-checkbox label="道教" name="type"></el-checkbox>
-                <el-checkbox label="伊斯兰教" name="type"></el-checkbox>
-                <el-checkbox label="天主教" name="type"></el-checkbox>
-                <el-checkbox label="基督教" name="type"></el-checkbox>
-                <el-checkbox label="其他" name="type"></el-checkbox>
+                <el-checkbox v-for="titem in zjxy" :label="titem.label" :name="titem.value" :key="titem.value"></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
@@ -163,23 +180,24 @@
             </el-form-item>
           </el-col>
           <el-col :offset="2" :span="22" v-show="form.isdw=='是'" class="iserea">
-            <el-form-item label="单位名称">
-              <el-input v-model="form.type"></el-input>
+            <el-form-item label="单位名称" prop="dwMc">
+              <el-input v-model="form.dwMc"></el-input>
             </el-form-item>
-            <el-form-item label="管理类别">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="管理类别" prop="dwLb">
+              <el-select v-model="form.dwLb" placeholder="管理类别" style="width:99%">
+                <el-option
+                  v-for="item in dwLb"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="单位地址">
-              <el-select v-model="form.region" placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+            <el-form-item label="单位地址" prop="dwDz">
+              <el-input v-model="form.dwDz"></el-input>
             </el-form-item>
-            <el-form-item label="详细地址">
-              <el-input v-model="form.type"></el-input>
+            <el-form-item label="详细地址" prop="dwXz">
+              <el-input v-model="form.dwXz"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -188,30 +206,20 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="是否特殊人群">
-              <el-radio-group v-model="form.isrq">
+              <el-radio-group v-model="form.istsrq">
                 <el-radio label="是"></el-radio>
                 <el-radio label="否"></el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :offset="2" :span="22" v-show="form.isrq=='是'" class="iserea">
+          <el-col :offset="2" :span="22" v-show="form.istsrq=='是'" class="iserea">
             <el-form-item label="">
-              <el-checkbox-group v-model="form.tsrq">
-                <el-checkbox label="低收入群体" name="1"></el-checkbox>
-                <el-checkbox label="失独丧偶" name="2"></el-checkbox>
-                <el-checkbox label="外来务工" name="3"></el-checkbox>
-                <el-checkbox label="孤寡老人" name="4"></el-checkbox>
-                <el-checkbox label="出国人员" name="5"></el-checkbox>
-                <el-checkbox label="利益受损" name="6"></el-checkbox>
-                <el-checkbox label="残疾人" name="7"></el-checkbox>
-                <el-checkbox label="留守儿童" name="8"></el-checkbox>
-                <el-checkbox label="遭受病灾" name="9"></el-checkbox>
-                <el-checkbox label="精神病人" name="10"></el-checkbox>
-                <el-checkbox label="其他（未落户/未注销等）" name="11"></el-checkbox>
+              <el-checkbox-group v-model="form.ryTsLb">
+                <el-checkbox v-for="(titem,index) in tsrq" :label="titem.label" :name="titem.value" :key="index"></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="具体情况" style="padding-left: 120px">
-              <el-input placeholder="请描述具体情况，非必填，限2000字符" type="textarea" v-model="form.desc"></el-input>
+              <el-input placeholder="请描述具体情况，非必填，限2000字符" type="textarea" v-model="form.ryTsJtqk"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -219,48 +227,135 @@
       </el-form>
 
 
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="submitok">确 定</el-button>
+      </span>
 
-      <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-      <el-button size="small" type="primary" @click="dialogVisible = false">确 定</el-button>
     </el-dialog>
+
+
+    <registry_sure @closeDialog="dialogVisible = false" :PostData="form" ref="registry_sure"/>
   </div>
 </template>
 
 <script>
+import registry_sure from "./registry_sure";
+import {baseUrl} from '@/config/env'
+import {putfile,dictionaryList,saveRy} from "../../../../api/fwbzdz/fwbzdz";
+
 export default {
   name: "add",
+  props:{},
+  components:{registry_sure},
   data(){
     return{
       isclick:null,
+      photoLoading:false,
+      photoLoadingText:'',
+      urls:baseUrl+'/blade-resource/oss/endpoint/put-file',
       typeList:[
-        {name:'常住人口',icon:require('../asset/icon_type_permanent.svg')},
-        {name:'寄住人口',icon:require('../asset/icon_type_lodge.svg')},
-        {name:'暂住人口',icon:require('../asset/icon_type_stay.svg')},
-        {name:'境外人口',icon:require('../asset/icon_type_foreigner.svg')},
-        {name:'未落常人口',icon:require('../asset/icon_type_not.svg')}
+        {name:'常住人口',value:'czrk',icon:require('../asset/icon_type_permanent.svg')},
+        {name:'寄住人口',value:'jzrk',icon:require('../asset/icon_type_lodge.svg')},
+        {name:'暂住人口',value:'zzrk',icon:require('../asset/icon_type_stay.svg')},
+        {name:'境外人口',value:'jwrk',icon:require('../asset/icon_type_foreigner.svg')},
+        {name:'未落常人口',value:'wlrk',icon:require('../asset/icon_type_not.svg')}
       ],
       form:{
-        tsrq:[],
-        zjxy:[],
-        imageUrl: ''
-      },
+        ryType:'',
+        ryZp:'',
+        ryTsLb:'',
+        ryXm:'',
+        rySfzh:'',
+        ryHzgx:'',
+        ryHyzk:'',
+        ryWhcd:'',
+        ryZzmm:'',
+        ryByzk:'',
+        ryDh:'',
+        vx:'',
+        zjxy:'',
+        dwMc:'',
+        dwLb:'',
+        dwDz:'',
+        dwXz:'',
+        ryTsJtqk:'',
+        ryMzDm:'',
+        ryXb:'',
+  },
+      tsrq:[],
+      gjOp:[],
+      options:[],
+      yfzgx:[],
+      whcd:[],
+      mz:[],
+      hyzk:[],
+      zzmm:[],
+      byzk:[],
+      zjxy:[],
+      dwLb:[],
       dialogVisible:false
     }
   },
+  mounted() {
+    this.inits()
+  },
+  computed:{
+
+  },
   methods:{
-    clickType(index){
+    inits(){
+      dictionaryList().then(res => {
+        const data = res.data.data
+        console.log('dictionaryList', data)
+        this.options = data
+        this.gjOp = data.gjdq
+        this.tsrq = data.tsrq
+        this.yfzgx=data.yfzgx
+        this.whcd=data.whcd
+        this.mz=data.mz
+        this.hyzk=data.hyzk
+        this.zzmm=data.zzmm
+        this.byzk=data.byzk
+        this.zjxy=data.zjxy
+        this.dwLb=data.dwLb
+
+      }).finally(() => {
+
+      })
+    },
+    getfile(e){
+      var _this = this
+      _this.photoLoading=true
+      var fileList = new FormData()
+      fileList.append('file',e.target.files[0])
+      _this.photoLoadingText='正在上传'
+      putfile(fileList).then(res=>{
+        _this.$set(_this.form,'ryZp',res.data.data.link)
+        e.target.value=''
+        _this.photoLoading=false
+        _this.photoLoadingText=''
+      }).catch(err=>{
+        _this.$message.error('上传异常')
+        _this.photoLoading=false
+        _this.photoLoadingText=''
+      })
+
+    },
+    submitok(){
+      this.$refs.registry_sure.dialogVisible=true
+    },
+    clickType(index,value){
+      this.$set(this.form,'ryType',value)
       this.isclick = index
     },
     handleAvatarSuccess(res, file) {
-      this.imageUrl = URL.createObjectURL(file.raw);
+      this.form.ryZp = URL.createObjectURL(file.raw);
     },
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg';
       const isLt2M = file.size / 1024 / 1024 < 2;
 
-      if (!isJPG) {
-        this.$message.error('上传头像图片只能是 JPG 格式!');
-      }
       if (!isLt2M) {
         this.$message.error('上传头像图片大小不能超过 2MB!');
       }
@@ -274,6 +369,25 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.filebox{
+  opacity: 0;
+  width: 100%;
+  position: absolute;
+  width: 80px;
+  height: 80px;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+:deep  .el-input__inner{
+  background: #ECF2FE !important;
+  border: none;
+}
+:deep .el-textarea__inner{
+  background: #ECF2FE !important;
+  border: none;
+}
 .typediv{
   float: left;
   width: 102px;
@@ -298,14 +412,7 @@ export default {
   box-sizing: border-box;
   padding-top: 18px;
   border-radius: 8px;
-   :deep  .el-input__inner{
-    background: #ECF2FE !important;
-     border: none;
-  }
-   :deep .el-textarea__inner{
-     background: #ECF2FE !important;
-     border: none;
-   }
+
 }
 :deep .avatar-uploader .el-upload {
   width: 88px;

src/views/ybss/syrk/components/edit.vue

@@ -0,0 +1,461 @@
+<template>
+  <div class="add">
+    <el-dialog
+      title="修改实有居住人员信息"
+      :visible.sync="dialogVisible"
+      width="50%"
+      :before-close="handleClose">
+      <el-form ref="form" :model="form"  :rules="rules"  label-width="120px" size="small">
+        <el-row>
+          <el-form-item label="人员信息类型" >
+            <!--            <el-input v-model="form.type" ></el-input>-->
+            <div @click="clickType(index,item.value)" class="typediv" :class="{'isactive':isclick==index}" v-for="(item,index) in typeList">
+              <img :src="item.icon" alt="">
+              <span style="display: block">{{item.name}}</span>
+            </div>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="个人照片" prop="ryZp">
+              <div v-loading="photoLoading" :element-loading-text="photoLoadingText" style="width: 80px;border: 1px solid #D4D6D9;height: 80px;text-align: center;border-radius: 8px">
+                <input @change="getfile($event)" class="filebox" type="file" accept="image/*">
+                <div v-if="!form.ryZp">
+                  <i class="el-icon-plus" style="font-size: 50px;color: #D4D6D9;line-height: 80px"></i>
+                </div>
+                <img v-else :src="form.ryZp" style="width: 100%">
+
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="与房主关系" prop="ryHzgx">
+              <el-select v-model="form.ryHzgx" placeholder="与房主关系" style="width:99%">
+                <el-option
+                  v-for="item in yfzgx"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="民族" prop="ryMzDm">
+              <el-select v-model="form.ryMzDm" placeholder="民族" style="width:99%">
+                <el-option
+                  v-for="item in mz"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="姓名" prop="ryXm">
+              <el-input v-model="form.ryXm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文化程度" prop="ryWhcd">
+              <el-select v-model="form.ryWhcd" placeholder="文化程度" style="width:99%">
+                <el-option
+                  v-for="item in whcd"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="公民身份号码" prop="rySfzh">
+              <el-input v-model="form.rySfzh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="婚姻状况" prop="ryHyzk">
+              <el-select v-model="form.ryHyzk" placeholder="婚姻状况" style="width:99%">
+                <el-option
+                  v-for="item in hyzk"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="性别" prop="ryXb">
+              <el-radio-group v-model="form.ryXb">
+                <el-radio label="男"></el-radio>
+                <el-radio label="女"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="政治面貌" prop="ryZzmm">
+              <el-select v-model="form.ryZzmm" placeholder="政治面貌" style="width:99%">
+                <el-option
+                  v-for="item in zzmm"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="ryDh">
+              <el-input v-model="form.ryDh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="兵役状况" prop="ryByzk">
+              <el-select v-model="form.ryByzk" placeholder="兵役状况" style="width:99%">
+                <el-option
+                  v-for="item in byzk"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="电话微信同号">
+              <el-radio-group v-model="form.isth">
+                <el-radio label="是"></el-radio>
+                <el-radio label="否"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="2" :span="22" v-show="form.isth=='否'" class="iserea">
+            <el-form-item label="微信号" prop="vx">
+              <el-input v-model="form.vx"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="宗教信仰">
+              <el-radio-group v-model="form.iszjxy">
+                <el-radio label="是"></el-radio>
+                <el-radio label="否"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="2" :span="22" v-show="form.iszjxy=='是'" class="iserea">
+            <el-form-item label="" prop="zjxy">
+              <el-checkbox-group v-model="form.zjxy">
+                <el-checkbox v-for="titem in zjxy" :label="titem.label" :name="titem.value" :key="titem.value"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="是否有单位">
+              <el-radio-group v-model="form.isdw">
+                <el-radio label="是"></el-radio>
+                <el-radio label="否"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="2" :span="22" v-show="form.isdw=='是'" class="iserea">
+            <el-form-item label="单位名称" prop="dwMc">
+              <el-input v-model="form.dwMc"></el-input>
+            </el-form-item>
+            <el-form-item label="管理类别" prop="dwLb">
+              <el-select v-model="form.dwLb" placeholder="管理类别" style="width:99%">
+                <el-option
+                  v-for="item in dwLb"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="单位地址" prop="dwDz">
+              <el-input v-model="form.dwDz"></el-input>
+            </el-form-item>
+            <el-form-item label="详细地址" prop="dwXz">
+              <el-input v-model="form.dwXz"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="是否特殊人群">
+              <el-radio-group v-model="form.istsrq">
+                <el-radio label="是"></el-radio>
+                <el-radio label="否"></el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="2" :span="22" v-show="form.istsrq=='是'" class="iserea">
+            <el-form-item label="">
+              <el-checkbox-group v-model="form.ryTsLb">
+                <el-checkbox v-for="(titem,index) in tsrq" :label="titem.label" :name="titem.value" :key="index"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="具体情况" style="padding-left: 120px">
+              <el-input placeholder="请描述具体情况，非必填，限2000字符" type="textarea" v-model="form.ryTsJtqk"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="submitok">确 定</el-button>
+      </span>
+
+    </el-dialog>
+
+
+    <registry_sure @closeDialog="dialogVisible = false" :PostData="form" ref="registry_sure"/>
+  </div>
+</template>
+
+<script>
+import registry_sure from "./registry_sure";
+import {baseUrl} from '@/config/env'
+import {putfile,dictionaryList,saveRy} from "../../../../api/fwbzdz/fwbzdz";
+
+export default {
+  name: "add",
+  props:{
+    fzInfo:{
+      type:{},
+      default:undefined
+    }
+  },
+  components:{registry_sure},
+  data(){
+    return{
+      isclick:null,
+      photoLoading:false,
+      photoLoadingText:'',
+      urls:baseUrl+'/blade-resource/oss/endpoint/put-file',
+      typeList:[
+        {name:'常住人口',value:'czrk',icon:require('../asset/icon_type_permanent.svg')},
+        {name:'寄住人口',value:'jzrk',icon:require('../asset/icon_type_lodge.svg')},
+        {name:'暂住人口',value:'zzrk',icon:require('../asset/icon_type_stay.svg')},
+        {name:'境外人口',value:'jwrk',icon:require('../asset/icon_type_foreigner.svg')},
+        {name:'未落常人口',value:'wlrk',icon:require('../asset/icon_type_not.svg')}
+      ],
+      form:{
+        ryType:'',
+        ryZp:'',
+        ryTsLb:'',
+        ryXm:'',
+        rySfzh:'',
+        ryHzgx:'',
+        ryHyzk:'',
+        ryWhcd:'',
+        ryZzmm:'',
+        ryByzk:'',
+        ryDh:'',
+        vx:'',
+        zjxy:'',
+        dwMc:'',
+        dwLb:'',
+        dwDz:'',
+        dwXz:'',
+        ryTsJtqk:'',
+        ryMzDm:'',
+        ryXb:'',
+      },
+      tsrq:[],
+      gjOp:[],
+      options:[],
+      yfzgx:[],
+      whcd:[],
+      mz:[],
+      hyzk:[],
+      zzmm:[],
+      byzk:[],
+      zjxy:[],
+      dwLb:[],
+      dialogVisible:false
+    }
+  },
+  watch:{
+    fzInfo:{
+      handler(newVal){
+        console.log(newVal,'newVal')
+        this.form.ryZp = newVal.fzZp
+        this.form.ryXm = newVal.fzXm
+        this.form.rySfzh =newVal.fzSfzh
+        this.form.ryDh = newVal.fzDh
+        this.form.dwMc =newVal.fzDw
+      },
+      immediate: true
+    },
+
+  },
+  mounted() {
+    this.inits()
+  },
+  computed:{
+
+  },
+  methods:{
+    inits(){
+      dictionaryList().then(res => {
+        const data = res.data.data
+        console.log('dictionaryList', data)
+        this.options = data
+        this.gjOp = data.gjdq
+        this.tsrq = data.tsrq
+        this.yfzgx=data.yfzgx
+        this.whcd=data.whcd
+        this.mz=data.mz
+        this.hyzk=data.hyzk
+        this.zzmm=data.zzmm
+        this.byzk=data.byzk
+        this.zjxy=data.zjxy
+        this.dwLb=data.dwLb
+      }).finally(() => {
+
+      })
+    },
+    getfile(e){
+      var _this = this
+      _this.photoLoading=true
+      var fileList = new FormData()
+      fileList.append('file',e.target.files[0])
+      _this.photoLoadingText='正在上传'
+      putfile(fileList).then(res=>{
+        _this.$set(_this.form,'ryZp',res.data.data.link)
+        e.target.value=''
+        _this.photoLoading=false
+        _this.photoLoadingText=''
+      }).catch(err=>{
+        _this.$message.error('上传异常')
+        _this.photoLoading=false
+        _this.photoLoadingText=''
+      })
+
+    },
+    submitok(){
+      this.$refs.registry_sure.dialogVisible=true
+    },
+    clickType(index,value){
+      this.$set(this.form,'ryType',value)
+      this.isclick = index
+    },
+    handleAvatarSuccess(res, file) {
+      this.form.ryZp = URL.createObjectURL(file.raw);
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === 'image/jpeg';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!');
+      }
+      return isJPG && isLt2M;
+    },
+    handleClose(){
+      this.dialogVisible=false
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.filebox{
+  opacity: 0;
+  width: 100%;
+  position: absolute;
+  width: 80px;
+  height: 80px;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+:deep  .el-input__inner{
+  background: #ECF2FE !important;
+  border: none;
+}
+:deep .el-textarea__inner{
+  background: #ECF2FE !important;
+  border: none;
+}
+.typediv{
+  float: left;
+  width: 102px;
+  height: 104px;
+  background: rgba(16,109,255,0.02);
+  border-radius: 8px;
+  text-align: center;
+  padding-top: 16px;
+  margin-right: 16px;
+  border: 1px solid #ECF2FE;
+  cursor: pointer;
+  //border: 1px solid #106DFF;
+}
+.isactive{
+  border: 1px solid #106DFF
+}
+.container_body .el-col{
+  margin-right: 0 !important;
+}
+.iserea{
+  background: rgba(236,242,254,.3);
+  box-sizing: border-box;
+  padding-top: 18px;
+  border-radius: 8px;
+
+}
+:deep .avatar-uploader .el-upload {
+  width: 88px;
+  height: 88px;
+  line-height: 88px;
+  background: #ECF2FE;
+  border-radius: 8px;
+  border: 1px dashed #6F7CA3;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+:deep .avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+:deep .avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 88px;
+  height: 88px;
+  text-align: center;
+}
+:deep .avatar {
+  width: 88px;
+  height: 88px;
+  display: block;
+}
+</style>

src/views/ybss/syrk/components/registry_sure.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="registry_sure">
+    <el-dialog v-loading="loading"
+      title="确定登记到本辖区么？"
+      :visible.sync="dialogVisible"
+      width="50%"
+      :before-close="handleClose">
+
+      <div>
+        <div class="item_head">
+          <div class="title">基本信息</div>
+        </div>
+        <div class="row_body">
+          <div class="row_label">个人照片</div>
+          <div class="row_content">
+            <el-image
+                      style="width: 100px; height: 100px"
+                      :src="PostData.ryZp"
+                      :fit="fill"></el-image>
+          </div>
+        </div>
+        <div class="row_body">
+          <div class="row_label">姓名</div>
+          <div class="row_content"><span>{{ PostData.ryXm}}</span></div>
+        </div>
+
+        <div class="row_body">
+          <div class="row_label">性别</div>
+          <div class="row_content"><span>{{ PostData.ryXb}}</span></div>
+        </div>
+
+        <div class="row_body">
+          <div class="row_label">公民身份号码</div>
+          <div class="row_content"><span>{{ PostData.rySfzh}}</span></div>
+        </div>
+
+        <div class="row_body">
+          <div class="row_label">人口类型</div>
+          <div class="row_content"><span>{{ PostData.ryType}}</span></div>
+        </div>
+
+        <div class="row_body">
+          <div class="row_label">是否是特殊人群</div>
+          <div class="row_content"><span>{{ PostData.istsrq}}</span></div>
+        </div>
+
+        <div class="row_body">
+          <div class="row_label">联系电话</div>
+          <div class="row_content"><span>{{ PostData.ryDh}}</span></div>
+        </div>
+
+        <div class="row_body">
+          <div class="row_label">现居住地址</div>
+          <div class="row_content"><span>{{ PostData.dwDz}}</span></div>
+        </div>
+        <div class="line"></div>
+
+        <div class="item_head">
+          <div class="title">登记信息</div>
+        </div>
+        <div class="row_body" v-for="item in dataLogin" :key="item.label">
+          <div class="row_label">{{ item.label }}</div>
+          <div class="row_content">{{ item.value }}</div>
+        </div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button  class="row_btn" size="small" @click="dialogVisible = false">取 消</el-button>
+        <el-button  class="row_btn" size="small" type="primary" @click="postdata">确 定</el-button>
+      </span>
+
+      <div style="color: #E65E69;padding: 20px 0"><i class="el-icon-warning-outline"></i> 人员已被登记，如需登记需原住地派出所核查后才可</div>
+
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {saveRy} from "../../../../api/fwbzdz/fwbzdz";
+export default {
+  name: "registry_sure",
+  props:['PostData'],
+  data(){
+    return{
+      loading:false,
+      dialogVisible:false,
+      formData:[],
+      dataBase: [],
+      dataLogin: [
+        { label: '所属社区', value: '南湖中街社区' },
+        { label: '所属派出所', value: '长春市朝阳区清河派出所' },
+        { label: '登记人警号', value: '104 456' },
+        { label: '登记人姓名', value: '王武' }
+      ]
+    }
+  },
+
+  methods:{
+    handleClose(){
+        this.dialogVisible = false
+    },
+    postdata(){
+      this.loading=true
+      saveRy(this.PostData).then(res => {
+        if(res.data.code=='200'){
+          this.$message.success('成功')
+        }
+      }).finally(() => {
+        this.loading=false
+        this.dialogVisible = false
+        this.$emit('closeDialog')
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.item_head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 8px 0;
+
+  .title {
+    font-size: 17px;
+    font-weight: 600;
+    color: rgba(4, 8, 20, 0.9);
+  }
+
+  .btn {
+    font-size: 14px;
+    font-weight: 400;
+    color: rgba(16, 109, 255, 1);
+  }
+}
+
+.line {
+  width: 100%;
+  margin: 16px 0;
+  border-bottom: 1px dashed rgba(231, 231, 231, 1);
+}
+
+.row_body {
+  margin-bottom: 8px;
+  display: flex;
+
+  .row_label {
+    width: 120px;
+    color: rgba(111, 124, 163, 1);
+    font-size: 14px;
+    font-weight: 400;
+  }
+
+  .row_content {
+    flex: 1;
+    color: rgba(4, 8, 20, 0.90);
+    font-weight: 400;
+    font-size: 14px;
+  }
+}
+</style>

src/views/ybss/syrk/syrk.vue

@@ -6,7 +6,7 @@
             @refresh-change="refreshChange" @on-load="onLoad">
             <template slot="menuLeft">
                 <div class="search_btn_group">
-                    <button @click="$refs.add.dialogVisible = true">新增</button>
+                    <button @click="addData">新增</button>
                     <button>导出</button>
                 </div>
             </template>
@@ -104,6 +104,11 @@ export default {
         }
     },
     methods: {
+      addData(){
+        this.$refs.add.inits()
+        this.$refs.add.dialogVisible = true
+        this.$refs.add.$refs['form'].resetFields();
+      },
         addsyrk() {
             this.$store.commit('CHANGE_SYRK', 'syrkxq')
         },