Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-01-16 3e5ffb4c27ae30046bdaa4793ff623a67c407e17

 src/views/cGovernance/gridWorkLog.vue

@@ -182,6 +182,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,
@@ -189,6 +206,13 @@
                        prop: "context",
                        type: "textarea",
                        span: 24,
                        rules: [
                            {
                                required: true,
                                message: "请输入走访内容",
                                trigger: "blur",
                            },
                        ],
                    },

                    {
@@ -215,25 +239,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",
                            },
                        ],
                    },


                    {
                        dispaly: false,
                        display: false,
                        width: 144,
                        label: "上报时间",
                        prop: "createTime",
@@ -459,6 +468,7 @@
            if (["edit", "view"].includes(type)) {
                getGridWorkLog(this.form.id).then((res) => {
                    this.form = res.data.data
                    if (this.form.url) {
                    if (this.form.url.length > 0) {
                        var urls = []
                        var names = this.form.url.split(",")
@@ -467,7 +477,7 @@
                        })
                        this.form.url = urls.join(",")
                    }

                    }
                    getPersonPublicSelect({
                        id: this.form.householdId
                    }).then(res => {
@@ -508,6 +518,7 @@
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    if (item.url) {
                    if (item.url.length > 0) {
                        var urls = []
                        var names = item.url.split(",")
@@ -516,6 +527,7 @@
                        })
                        item.url = urls.join(",")
                    }
                    }
                })
                this.loading = false
                this.selectionClear()