From ebfc739bdbbc0dd0fccd0bf47b7d2d5397c3c511 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 12:44:21 +0800
Subject: [PATCH] 轮播图片

---
 src/views/cGovernance/gridWorkLog.vue |  137 ++++++++++++++++++++++++++++++---------------
 1 files changed, 90 insertions(+), 47 deletions(-)

diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 3b37650..52bafe8 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -15,12 +15,19 @@
                     @click="handleDelete">删 除
                 </el-button>
             </template>
+
+            <template slot-scope="{row, size}" slot="phone">
+                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
+                    v-text="textDispose(row, 'phoneflag', 'phone')">
+                </el-button>
+            </template>
         </avue-crud>
     </basic-container>
 </template>
 
 <script>
 import { getPersonPublicSelect } from "@/api/public"
+import { getDetatils as householdDetail } from "@/api/userHouse/list/houseHold"
 import { getList, remove, update, add, getGridWorkLog } from "@/api/grid/gridWorkLog"
 import { getList as getHouseholdList, getDetatils as getHouseholdDetail } from "@/api/userHouse/list/houseHold"
 import { mapGetters } from "vuex"
@@ -42,14 +49,15 @@
             option: {
                 labelWidth: 120,
                 searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 3,
+                menuWidth: 210,
+
                 height: "auto",
                 calcHeight: 54,
                 dialogWidth: 950,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 3,
-                menuWidth: 280,
-                border: false,
+                border: true,
                 //stripe:true,
                 index: true,
                 viewBtn: true,
@@ -58,11 +66,13 @@
                 dialogClickModal: false,
                 column: [
                     {
+                        width: 120,
                         label: "走访类型",
                         prop: "type",
                         span: 12,
                         searchSpan: 4,
                         search: true,
+                        searchLabelWidth: 76,
                         type: "select",
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=haveType",
                         dataType: "number",
@@ -127,11 +137,6 @@
                             value: 'id',
                         },
                         dicData: [],
-                        formatter: (row) => {
-                            console.log(row, 1111)
-
-                            return row.name
-                        },
                         rules: [
                             {
                                 required: true,
@@ -149,7 +154,9 @@
                         disabled: true,
                         searchSpan: 4,
                         search: true,
+                        slot: true
                     },
+
                     {
                         width: 156,
                         overHidden: true,
@@ -183,6 +190,23 @@
                         display: false,
                         prop: "gridName",
                     },
+                    {
+                        width: 144,
+                        label: "走访时间",
+                        prop: "workTime",
+                        searchLabelWidth: 120,
+                        type: "date",
+                        row: true,
+                        format: "yyyy-MM-dd HH:mm:ss",
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入走访时间",
+                                trigger: "blur",
+                            },
+                        ],
+                    },
 
                     {
                         overHidden: true,
@@ -190,6 +214,13 @@
                         prop: "context",
                         type: "textarea",
                         span: 24,
+                        rules: [
+                            {
+                                required: true,
+                                message: "请输入走访内容",
+                                trigger: "blur",
+                            },
+                        ],
                     },
 
                     {
@@ -216,24 +247,10 @@
                         prop: "createUserName",
                     },
 
-                    {
-                        width: 144,
-                        label: "走访时间",
-                        prop: "workTime",
-                        searchLabelWidth: 120,
-                        type: "date",
-                        format: "yyyy-MM-dd HH:mm:ss",
-                        valueFormat: "yyyy-MM-dd HH:mm:ss",
-                        rules: [
-                            {
-                                required: true,
-                                message: "请输入走访时间",
-                                trigger: "blur",
-                            },
-                        ],
-                    },
+
 
                     {
+                        display: false,
                         width: 144,
                         label: "上报时间",
                         prop: "createTime",
@@ -260,14 +277,11 @@
             handler (val) {
                 if (val) {
 
-                    getPersonPublicSelect({
-                        id: val
-                    }).then(res => {
-                        const column = this.findObject(this.option.column, "householdId")
-                        column.dicData = res.data.data
+                    householdDetail(val).then(res => {
+                        let data = res.data.data
 
-                        this.form.phone = res.data.data[0].phoneNumber
-                        this.form.address = res.data.data[0].currentAddress
+                        this.form.phone = data.phoneNumber
+                        this.form.address = data.currentAddress
                     })
 
                 }
@@ -338,6 +352,20 @@
 
                 return data.name
             }
+        },
+
+        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")
+                    }
+                }
+            }
         }
     },
 
@@ -346,8 +374,12 @@
     },
 
     methods: {
+        showStringDispose (row, type) {
+            row[type] = !row[type]
+        },
+
         getUserList (param = '') {
-            let dicUrl = `/blade-household/household/selectHouseholdList?labelId=${param}&searchKey={{key}}&limit=20`
+            let dicUrl = `/api/blade-household/household/selectHouseholdList?labelId=${param}&searchKey={{key}}&limit=20`
             const column = this.findObject(this.option.column, "householdId")
             column.dicUrl = dicUrl
         },
@@ -462,14 +494,22 @@
             if (["edit", "view"].includes(type)) {
                 getGridWorkLog(this.form.id).then((res) => {
                     this.form = res.data.data
-                    if (this.form.url.length > 0) {
-                        var urls = []
-                        var names = this.form.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        this.form.url = urls.join(",")
+                    if (this.form.url) {
+                        if (this.form.url.length > 0) {
+                            var urls = []
+                            var names = this.form.url.split(",")
+                            names.forEach(name => {
+                                urls.push(website.minioUrl + name)
+                            })
+                            this.form.url = urls.join(",")
+                        }
                     }
+                    getPersonPublicSelect({
+                        id: this.form.householdId
+                    }).then(res => {
+                        const column = this.findObject(this.option.column, "householdId")
+                        column.dicData = res.data.data
+                    })
                 })
             }
             // con
@@ -504,13 +544,16 @@
                 this.page.total = data.total
                 this.data = data.records
                 this.data.forEach(item => {
-                    if (item.url.length > 0) {
-                        var urls = []
-                        var names = item.url.split(",")
-                        names.forEach(name => {
-                            urls.push(website.minioUrl + name)
-                        })
-                        item.url = urls.join(",")
+                    this.$set(item, 'phoneflag', false)
+                    if (item.url) {
+                        if (item.url.length > 0) {
+                            var urls = []
+                            var names = item.url.split(",")
+                            names.forEach(name => {
+                                urls.push(website.minioUrl + name)
+                            })
+                            item.url = urls.join(",")
+                        }
                     }
                 })
                 this.loading = false

--
Gitblit v1.9.3