Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/views/modules/base/huji/chusheng/cpts/detail.vue

@@ -66,6 +66,10 @@
             <span class="info-title-3">与户主关系：</span>
             <span>{{ fmData.householderRelationName || "--"}}</span>
           </div>
+          <div class="info-prop">
+            <span class="info-title-3">人户状况</span>
+            <span>{{ rhzkDisplay(fmData) }}</span>
+          </div>
 
         </div>
       </div>
@@ -125,7 +129,17 @@ export default {
   },
   components: {},
   computed: {
-
+    rhzkDisplay() {
+        return (fmData) => {
+            if (fmData.rhzk === 'rhyz') {
+                return '人户一致';
+            } else if (fmData.rhzk === 'rzhbz') {
+                return '人在户不在';
+            } else if (fmData.rhzk === 'hzrbz') {
+                return '户在人不在';
+            }
+        };
+    }
   },
   props: {},
   watch: {},
@@ -184,6 +198,7 @@ export default {
         loading.close();
       }
     },
+    
   },
 };
 </script>

src/views/modules/base/huji/chusheng/cpts/edit.vue

@@ -342,6 +342,23 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="rhzk"
+                        label-width="150px"
+                        style="display: block"
+                         label="人户状况">
+            <el-select v-model.trim="fmData.rhzk"
+                     placeholder="人户状况"
+                     size="small"
+                     :disabled="initCheck == 1"
+                     clearable
+                     class="item_width_1">
+                <el-option v-for="item in optionsRhzk"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
 
         <el-form-item
           v-if="false"
@@ -408,6 +425,7 @@ function iniFmData() {
     householderName: "",
     householderRelation: "",
     alreadyHaveMaster: false,
+    rhzk:""
   };
 }
 
@@ -437,6 +455,21 @@ export default {
 
       fmData: iniFmData(),
       checkResult: {},
+      // 人户状况
+      optionsRhzk: [
+        {
+            "value":"rhyz",
+            "label":"人户一致"
+        },
+        {
+            "value":"rzhbz",
+            "label":"人在户不在"
+        },
+        {
+            "value":"hzrbz",
+            "label":"户在人不在"
+        }
+      ]
     };
   },
   components: {},

src/views/modules/base/huji/chusheng/index.vue

@@ -285,6 +285,23 @@
                          :show-overflow-tooltip="true">
         </el-table-column>
 
+        <el-table-column prop="rhzk"
+                         align="center"
+                         label="人户状况"
+                         :show-overflow-tooltip="true">
+                         <template slot-scope="scope">
+                            <v-if v-if="scope.row.rhzk === 'rhyz'">
+                                人户一致
+                            </v-if>
+                            <v-if v-if="scope.row.rhzk === 'rzhbz'">
+                                人在户不在
+                            </v-if>
+                            <v-if v-if="scope.row.rhzk === 'hzrbz'">
+                                户在人不在
+                            </v-if>
+                         </template>
+        </el-table-column>
+
         <el-table-column fixed="right"
                          label="操作"
                          align="center"

src/views/modules/visual/command/cpts/map.vue

@@ -362,7 +362,7 @@ export default {
           pitch: this.pitch,
           style: styleConfig.style,
           center: iniCenter,
-          token: "fc14b42e0ca18387866d68ebd4f150c1",
+          token: "244bb4165c8ce4bcb4b67e56e84b3eb1",
           zoom: 18,
           isHotspot: false,
           resizeEnable: true,

src/views/modules/visual/cpts/map/index.vue

@@ -331,7 +331,7 @@ export default {
           pitch: this.pitch,
           style: styleConfig.style,
           center: iniCenter,
-          token: "fc14b42e0ca18387866d68ebd4f150c1",
+          token: "244bb4165c8ce4bcb4b67e56e84b3eb1",
           zoom: 18,
           isHotspot: false,
           resizeEnable: true,

src/views/modules/visual/cpts/map/index2.vue

@@ -350,7 +350,7 @@ export default {
           pitch: this.pitch,
           style: styleConfig.style,
           center: iniCenter,
-          token: "fc14b42e0ca18387866d68ebd4f150c1",
+          token: "244bb4165c8ce4bcb4b67e56e84b3eb1",
           zoom: 18,
           isHotspot: false,
           resizeEnable: true,