From 3e5ffb4c27ae30046bdaa4793ff623a67c407e17 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 16 Jan 2024 17:41:15 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/cGovernance/gridWorkLog.vue | 120 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 66 insertions(+), 54 deletions(-)
diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 26573fb..2cb7bee 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -28,7 +28,7 @@
import website from '@/config/website'
export default {
- data () {
+ data() {
return {
form: {},
query: {},
@@ -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",
@@ -257,7 +266,7 @@
watch: {
"form.householdId": {
- handler (val) {
+ handler(val) {
if (val) {
householdDetail(val).then(res => {
@@ -272,7 +281,7 @@
},
'form.personType': {
- handler (newData) {
+ handler(newData) {
let householdIdColumn = this.findObject(
this.option.column,
'householdId'
@@ -287,7 +296,7 @@
},
'form.type': {
- handler (newData) {
+ handler(newData) {
let householdIdColumn = this.findObject(
this.option.column,
'householdId'
@@ -311,7 +320,7 @@
computed: {
...mapGetters(["permission", "userInfo"]),
- permissionList () {
+ permissionList() {
return {
addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
@@ -319,7 +328,7 @@
editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
}
},
- ids () {
+ ids() {
let ids = []
this.selectionList.forEach((ele) => {
ids.push(ele.id)
@@ -327,7 +336,7 @@
return ids.join(",")
},
- showNamePhone () {
+ showNamePhone() {
return (data) => {
if (data.phoneNumber && data.phoneNumber.trim() != '') {
return `${data.name}(${data.phoneNumber})`
@@ -338,18 +347,18 @@
}
},
- created () {
+ created() {
this.getUserList()
},
methods: {
- getUserList (param = '') {
+ getUserList(param = '') {
let dicUrl = `/api/blade-household/household/selectHouseholdList?labelId=${param}&searchKey={{key}}&limit=20`
const column = this.findObject(this.option.column, "householdId")
column.dicUrl = dicUrl
},
- rowSave (row, done, loading) {
+ rowSave(row, done, loading) {
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -374,7 +383,7 @@
}
)
},
- rowUpdate (row, index, done, loading) {
+ rowUpdate(row, index, done, loading) {
if (row.url.length > 0) {
var urls = []
var split = row.url.split(",")
@@ -399,7 +408,7 @@
}
)
},
- rowDel (row) {
+ rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -416,24 +425,24 @@
})
})
},
- searchReset () {
+ searchReset() {
this.query = {}
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange(params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
done()
},
- selectionChange (list) {
+ selectionChange(list) {
this.selectionList = list
},
- selectionClear () {
+ selectionClear() {
this.selectionList = []
this.$refs.crud.toggleSelection()
},
- handleDelete () {
+ handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据")
return
@@ -455,19 +464,20 @@
this.$refs.crud.toggleSelection()
})
},
- beforeOpen (done, type) {
+ beforeOpen(done, type) {
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 => {
@@ -479,16 +489,16 @@
// con
done()
},
- currentChange (currentPage) {
+ currentChange(currentPage) {
this.page.currentPage = currentPage
},
- sizeChange (pageSize) {
+ sizeChange(pageSize) {
this.page.pageSize = pageSize
},
- refreshChange () {
+ refreshChange() {
this.onLoad(this.page, this.query)
},
- onLoad (page, params = {}) {
+ onLoad(page, params = {}) {
const { dateTime } = this.query
let values = {
...params,
@@ -508,13 +518,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