From 9081024f205ed8c4ebee00c8731b7213acb2c6fa Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 20 Feb 2024 17:26:08 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/grid/index.vue |   51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/src/views/grid/index.vue b/src/views/grid/index.vue
index 588c31a..107fbec 100644
--- a/src/views/grid/index.vue
+++ b/src/views/grid/index.vue
@@ -9,6 +9,11 @@
                 <el-button size="small" icon="el-icon-delete" plain v-if="permission.grid_delete" @click="handleDelete">删 除
                 </el-button>
             </template>
+            <template slot-scope="{row, size}" slot="principalPhone">
+                <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
+                    v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
+                </el-button>
+            </template>
         </avue-crud>
     </basic-container>
 </template>
@@ -70,6 +75,7 @@
                         search: true,
                         searchSpan: 4,
                         searchLabelWidth: 76,
+                        row:true, 
                         rules: [{
                             required: true,
                             message: "请选择所属社区",
@@ -85,6 +91,7 @@
                         search: false,
                         type: "tree",
                         dicUrl: "/api/blade-system/region/tree",
+                        row:true,                        
                         props: {
                             label: "name",
                             value: "id",
@@ -97,7 +104,6 @@
                             },
                         ],
                     },
-
                     {
                         overHidden: true,
                         label: "网格名称",
@@ -108,6 +114,20 @@
                             {
                                 required: true,
                                 message: "请输入网格名称",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
+                    {
+                        overHidden: true,
+                        label: "网格编号",
+                        prop: "gridCode",
+                        searchSpan: 4,
+                        search: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入网格编号",
                                 trigger: "blur",
                             },
                         ],
@@ -145,6 +165,7 @@
                                 trigger: 'blur'
                             }
                         ],
+                        slot: true
                     },
                     {
                         label: "区域",
@@ -214,8 +235,26 @@
             })
             return ids.join(",")
         },
+
+        textDispose () {
+            return (row, flag, type) => {
+                if (row[flag] || row[type] == null) {
+                    return row[type]
+                } else {
+                    if (type == 'principalIdCard') {
+                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+                    } else {
+                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+                    }
+                }
+            }
+        }
     },
     methods: {
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        },
+
         rowSave (row, done, loading) {
             add(row).then(
                 () => {
@@ -326,7 +365,15 @@
             this.loading = true
 
             getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
-                const data = res.data.data
+                const data = {
+                    ...res.data.data,
+                    records: res.data.data.records.map(item => {
+                        return {
+                            ...item,
+                            'principalPhoneflag': false
+                        }
+                    })
+                }
                 this.page.total = data.total
                 this.data = data.records
                 this.loading = false

--
Gitblit v1.9.3