From ec4ec8fcefc9970458ea4807f95d155e24022709 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Mon, 15 Jul 2024 15:55:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 .../base/huji/chusheng/cpts/detail.vue        |  17 ++++++++-
 .../modules/base/huji/chusheng/cpts/edit.vue  |  33 ++++++++++++++++++
 .../modules/base/huji/chusheng/index.vue      |  17 +++++++++
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/src/views/modules/base/huji/chusheng/cpts/detail.vue b/src/views/modules/base/huji/chusheng/cpts/detail.vue
index b68fae161..c01cfaba6 100644
--- a/src/views/modules/base/huji/chusheng/cpts/detail.vue
+++ b/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>
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index d1c07dc94..a875d31b3 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/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: {},
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 049b937ca..d5128b76f 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/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"

From 5925bf71b743daf0b2191c6a9bd7936c1b4e23bb Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Fri, 13 Sep 2024 14:10:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=9C=B0=E5=9B=BEkey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/command/cpts/map.vue | 2 +-
 src/views/modules/visual/cpts/map/index.vue   | 2 +-
 src/views/modules/visual/cpts/map/index2.vue  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index 216a75316..1dd4e6519 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/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,
diff --git a/src/views/modules/visual/cpts/map/index.vue b/src/views/modules/visual/cpts/map/index.vue
index 5c121d021..0859fb468 100644
--- a/src/views/modules/visual/cpts/map/index.vue
+++ b/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,
diff --git a/src/views/modules/visual/cpts/map/index2.vue b/src/views/modules/visual/cpts/map/index2.vue
index 31d865db3..9bb16e87a 100644
--- a/src/views/modules/visual/cpts/map/index2.vue
+++ b/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,