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 | 88 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 9d46550..6b805b8 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -43,14 +43,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,
@@ -59,11 +60,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",
@@ -180,6 +183,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,
@@ -187,6 +207,13 @@
prop: "context",
type: "textarea",
span: 24,
+ rules: [
+ {
+ required: true,
+ message: "请输入走访内容",
+ trigger: "blur",
+ },
+ ],
},
{
@@ -213,24 +240,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",
@@ -341,7 +354,7 @@
methods: {
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
},
@@ -456,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 => {
@@ -505,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