From f100ef511bfd5cb27e553a41abcb8fbd7dcc3fe4 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 16 Jan 2024 17:41:11 +0800
Subject: [PATCH] 字段添加
---
src/views/cGovernance/gridWorkLog.vue | 357 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 204 insertions(+), 153 deletions(-)
diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 49dc306..26573fb 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -6,6 +6,10 @@
:before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="householdIdType" slot-scope="{item,value,label}">
+ <span>{{ showNamePhone(item) }}</span>
+ </template>
+
<template slot="menuLeft">
<el-button size="small" icon="el-icon-delete" plain v-if="permission.gridWorkLog_delete"
@click="handleDelete">删 除
@@ -16,6 +20,8 @@
</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"
@@ -35,13 +41,16 @@
datetime: "",
selectionList: [],
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,
//stripe:true,
index: true,
@@ -51,11 +60,10 @@
dialogClickModal: false,
column: [
{
+ width: 120,
label: "走访类型",
prop: "type",
span: 12,
- labelWidth: 120,
- searchLabelWidth: 120,
searchSpan: 4,
search: true,
type: "select",
@@ -73,8 +81,10 @@
},
],
},
+
{
- label: "重点人员类型",
+ overHidden: true,
+ label: "重点人群",
prop: "personType",
span: 12,
type: "tree",
@@ -83,153 +93,132 @@
label: "name",
value: "id"
},
- labelWidth: 120,
- searchLabelWidth: 120,
- searchSpan: 5,
+ searchSpan: 4,
search: true,
+ change: ({ value, column, item, dic }) => {
+ this.getUserList(value)
+ },
rules: [
{
required: true,
- message: "请选择重点人员类型",
+ message: "请选择重点人群",
trigger: "blur",
},
],
},
- // {
- // label: "人员姓名",
- // prop: "name",
- // span: 12,
- // labelWidth: 120,
- // searchSpan: 4,
- // search: true,
- // rules: [
- // {
- // required: true,
- // message: "请输入人员姓名",
- // trigger: "blur",
- // },
- // ],
- // },
+
{
- label: "人员姓名",
- prop: "householdId",
- hide: true,
- type: "table",
- span: 12,
- labelWidth: 120,
- searchSpan: 4,
+ width: 110,
+ display: false,
+ label: "被访人姓名",
+ prop: "name",
+ searchLabelWidth: 120,
+ searchSpan: 5,
search: true,
- children: {
- border: true,
- height: 400,
- searchShow: true,
- searchMenuSpan: 6,
- submitText: "确定",
- column: [
- {
- label: "姓名",
- prop: "name",
- search: true,
- searchSpan: 4,
- rules: [
- {
- required: true,
- message: "请输入姓名",
- trigger: "blur",
- },
- ],
- },
- {
- label: "联系方式",
- prop: "phoneNumber",
- search: true,
- searchSpan: 4,
- rules: [
- {
- required: true,
- message: "请输入联系方式",
- trigger: "blur",
- },
- ],
- },
- {
- label: "地址",
- search: true,
- searchSpan: 8,
- prop: "currentAddress",
- display: false
- },
- ],
- },
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- formatter: (row) => {
- this.form.phoneNumber = row.phoneNumber
- return row.name
- },
- onLoad: ({
- page,
- value,
- data
- }, callback) => {
- //首次加载去查询对应的值
- if (value) {
- getHouseholdDetail(value).then(res => {
- var resData = res.data.data
- // 查询对应行数据
- callback(resData)
- return
- })
- }
- if (page) {
- this.loading = true
- var params = {
- ...data,
- townStreetCode: "361102005"
- }
- getHouseholdList(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
- const resData = res.data.data
- var total = resData.total
- var data = resData.records
- this.loading = false
- this.selectionClear()
- //分页查询信息
- callback({
- total: total,
- data: data
- })
- })
- }
- },
+ },
+
+ {
+ disabled: true,
+ label: "被访人姓名",
+ prop: "householdId",
+ type: 'select',
+ remote: true,
+ hide: true,
+ dicUrl: "",
props: {
label: 'name',
- value: 'id'
- }
+ value: 'id',
+ },
+ dicData: [],
+ rules: [
+ {
+ required: true,
+ message: '请输入姓名',
+ trigger: 'blur'
+ }
+ ],
},
+
{
+ width: 120,
label: "联系方式",
prop: "phone",
span: 12,
disabled: true,
- labelWidth: 120,
searchSpan: 4,
search: true,
},
+
{
+ width: 156,
+ overHidden: true,
label: "走访地址",
prop: "address",
span: 24,
- labelWidth: 120,
disabled: true,
},
+
{
+ width: 110,
+ label: "所属街道",
+ display: false,
+ prop: "townName",
+ },
+
+ {
+ width: 156,
+ overHidden: true,
+ label: "所属社区",
+ display: false,
+ prop: "neiName",
+ search: true,
+ searchSpan: 4
+ },
+
+ {
+ width: 110,
+ overHidden: true,
+ label: "所属网格",
+ display: false,
+ prop: "gridName",
+ },
+
+ {
+ overHidden: true,
+ label: "走访内容",
+ prop: "context",
+ type: "textarea",
+ span: 24,
+ },
+
+ {
+ width: 110,
+ label: "走访取证",
+ prop: "url",
+ type: "upload",
+ listType: "picture-card",
+ dataType: "string",
+ multiple: true,
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ propsHttp: {
+ res: "data",
+ name: 'name',
+ url: "link",
+ },
+ span: 24,
+ },
+
+ {
+ width: 110,
+ label: "录入人",
+ display: false,
+ prop: "createUserName",
+ },
+
+ {
+ width: 144,
label: "走访时间",
prop: "workTime",
- width: 160,
- labelWidth: 120,
searchLabelWidth: 120,
type: "date",
format: "yyyy-MM-dd HH:mm:ss",
@@ -242,50 +231,84 @@
},
],
},
+
{
- label: "内容",
- labelWidth: 120,
- prop: "context",
- type: "textarea",
- span: 24,
+ dispaly: false,
+ width: 144,
+ label: "上报时间",
+ prop: "createTime",
+ searchLabelWidth: 120,
+ type: "date",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ rules: [
+ {
+ required: true,
+ message: "请输入上报时间",
+ trigger: "blur",
+ },
+ ],
},
- {
- width: 110,
- label: "走访取证",
- prop: "url",
- type: "upload",
- labelWidth: 120,
- listType: "picture-img",
- action: "/api/blade-resource/oss/endpoint/put-file",
- propsHttp: {
- res: "data",
- name: 'name',
- url: "link",
- },
- span: 24,
- }
],
},
data: [],
}
},
+
watch: {
"form.householdId": {
- // form是表单或者表格绑定的数据集，v-model='form'
handler (val) {
- this.$nextTick(() => {
- console.log(this.$refs, 66666)
- getHouseholdDetail(val).then(res => {
- const data = res.data.data
- this.form.phoneNumber = data.phoneNumber
- this.form.currentAddress = data.currentAddress
- })
- })
+ if (val) {
+ householdDetail(val).then(res => {
+ let data = res.data.data
+
+ this.form.phone = data.phoneNumber
+ this.form.address = data.currentAddress
+ })
+
+ }
+ }
+ },
+
+ 'form.personType': {
+ handler (newData) {
+ let householdIdColumn = this.findObject(
+ this.option.column,
+ 'householdId'
+ )
+
+ if (newData) {
+ householdIdColumn.disabled = false
+ } else {
+ householdIdColumn.disabled = true
+ }
},
- immediate: true,
+ },
+
+ 'form.type': {
+ handler (newData) {
+ let householdIdColumn = this.findObject(
+ this.option.column,
+ 'householdId'
+ )
+
+ let personTypeColumn = this.findObject(
+ this.option.column,
+ 'personType'
+ )
+
+ if (newData == 1) {
+ householdIdColumn.disabled = false
+ personTypeColumn.display = false
+ } else {
+ householdIdColumn.disabled = true
+ personTypeColumn.display = true
+ }
+ },
},
},
+
computed: {
...mapGetters(["permission", "userInfo"]),
permissionList () {
@@ -303,8 +326,29 @@
})
return ids.join(",")
},
+
+ showNamePhone () {
+ return (data) => {
+ if (data.phoneNumber && data.phoneNumber.trim() != '') {
+ return `${data.name}(${data.phoneNumber})`
+ }
+
+ return data.name
+ }
+ }
},
+
+ created () {
+ this.getUserList()
+ },
+
methods: {
+ 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) {
if (row.url.length > 0) {
var urls = []
@@ -423,6 +467,13 @@
})
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
--
Gitblit v1.9.3