From 4500939361fca1e2d06e608744ba2ab1bdb171ee Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 05 Jan 2024 18:04:53 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/cGovernance/gridWorkLog.vue | 216 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 192 insertions(+), 24 deletions(-)
diff --git a/src/views/cGovernance/gridWorkLog.vue b/src/views/cGovernance/gridWorkLog.vue
index 8bd1d8a..49dc306 100644
--- a/src/views/cGovernance/gridWorkLog.vue
+++ b/src/views/cGovernance/gridWorkLog.vue
@@ -17,6 +17,7 @@
<script>
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"
import website from '@/config/website'
@@ -40,7 +41,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 3,
- menuWidth: 350,
+ menuWidth: 280,
border: false,
//stripe:true,
index: true,
@@ -50,9 +51,38 @@
dialogClickModal: false,
column: [
{
- label: "走访人员姓名",
- prop: "name",
+ label: "走访类型",
+ prop: "type",
span: 12,
+ labelWidth: 120,
+ searchLabelWidth: 120,
+ searchSpan: 4,
+ search: true,
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=haveType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ rules: [
+ {
+ required: true,
+ message: "请选择走访类型",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "重点人员类型",
+ prop: "personType",
+ span: 12,
+ type: "tree",
+ dicUrl: "/api/blade-label/label/getLabelList?parentId=100",
+ props: {
+ label: "name",
+ value: "id"
+ },
labelWidth: 120,
searchLabelWidth: 120,
searchSpan: 5,
@@ -60,19 +90,157 @@
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: "phone",
+ label: "人员姓名",
+ prop: "householdId",
+ hide: true,
+ type: "table",
span: 12,
labelWidth: 120,
- searchLabelWidth: 120,
- searchSpan: 5,
+ searchSpan: 4,
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
+ })
+ })
+ }
+ },
+ props: {
+ label: 'name',
+ value: 'id'
+ }
+ },
+ {
+ label: "联系方式",
+ prop: "phone",
+ span: 12,
+ disabled: true,
+ labelWidth: 120,
+ searchSpan: 4,
+ search: true,
+ },
+ {
+ label: "走访地址",
+ prop: "address",
+ span: 24,
+ labelWidth: 120,
+ disabled: true,
+ },
+ {
+ label: "走访时间",
+ prop: "workTime",
+ width: 160,
+ labelWidth: 120,
+ searchLabelWidth: 120,
+ type: "date",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ rules: [
+ {
+ required: true,
+ message: "请输入走访时间",
+ trigger: "blur",
+ },
+ ],
},
{
label: "内容",
@@ -83,7 +251,7 @@
},
{
width: 110,
- label: "图片",
+ label: "走访取证",
prop: "url",
type: "upload",
labelWidth: 120,
@@ -95,21 +263,6 @@
url: "link",
},
span: 24,
- },
- {
- label: "走访时间",
- prop: "workTime",
- width: 160,
- type: "date",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- rules: [
- {
- required: true,
- message: "请输入走访时间",
- trigger: "blur",
- },
- ],
}
],
},
@@ -117,6 +270,21 @@
}
},
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
+ })
+ })
+
+ },
+ immediate: true,
+ },
},
computed: {
...mapGetters(["permission", "userInfo"]),
--
Gitblit v1.9.3