From 2cec09706b01d65def3f945bdcde13e620a71c2e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 29 Jan 2024 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/cGovernance/gridWorkLog.vue | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 0ad9985..6b805b8 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -51,7 +51,7 @@
calcHeight: 54,
dialogWidth: 950,
tip: false,
- border: false,
+ border: true,
//stripe:true,
index: true,
viewBtn: true,
@@ -66,6 +66,7 @@
span: 12,
searchSpan: 4,
search: true,
+ searchLabelWidth: 76,
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=haveType",
dataType: "number",
@@ -188,7 +189,7 @@
prop: "workTime",
searchLabelWidth: 120,
type: "date",
- row:true,
+ row: true,
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
rules: [
@@ -239,7 +240,7 @@
prop: "createUserName",
},
-
+
{
display: false,
@@ -468,15 +469,16 @@
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 => {
@@ -517,13 +519,15 @@
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(",")
+ 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