Merge branch 'dev_contract'

src/views/modules/plugins/change/changedeath.vue

@@ -84,7 +84,15 @@
         </el-table-column>
         <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gender" label="性别" header-align="center" align="center">
+          <template slot-scope="scope">
+            {{
+            scope.row.gender == '2'
+            ? "保密"
+            : scope.row.gender
+            }}
+          </template>
+        </el-table-column>
         <!--<el-table-column prop="type" label="类型" header-align="center" align="center">-->
           <!--<template slot-scope="scope">-->
             <!--{{-->

src/views/modules/plugins/change/changerelocation.vue

@@ -182,7 +182,15 @@
         <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{
+            scope.row.gender == '2'
+            ? "保密"
+            : scope.row.gender
+            }}
+          </template>
+        </el-table-column>
         <el-table-column prop="age" label="年龄" header-align="center" align="center" min-width="90" show-overflow-tooltip></el-table-column>
         <el-table-column prop="outOfTime" label="迁出时间" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="reason" label="迁出原因" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>