From 6ad9528f48ad50d6a73a32f967fdf88b0e6b025a Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 18 Jan 2024 17:48:58 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/propertySupervision/houseHoldSupervision.vue | 14
src/views/userHouse/houseList.vue | 33
src/views/article/components/discussionManageChild.vue | 89
src/views/article/components/deitDiscussion.vue | 116 +
src/util/util.js | 15
src/views/work/process/maintenanceFundApply/handle.vue | 739 +++++-----
src/views/property/propertyCompany.vue | 6
src/api/system/email.js | 70
src/views/place/components/baseAllInfo.vue | 317 ++-
src/views/article/components/publicSignUpChild.vue | 43
src/views/userHouse/components/householdManager.vue | 8
src/views/place/index.vue | 139 +
src/views/userHouse/houseHoldList.vue | 2113 ++++++++++++++--------------
src/api/answerRecord/answerRecord.js | 49
src/views/property/components/propertyEdit.vue | 143 +
src/views/system/email.vue | 339 ++++
16 files changed, 2,502 insertions(+), 1,731 deletions(-)
diff --git a/src/api/answerRecord/answerRecord.js b/src/api/answerRecord/answerRecord.js
new file mode 100644
index 0000000..c81970b
--- /dev/null
+++ b/src/api/answerRecord/answerRecord.js
@@ -0,0 +1,49 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/blade-answerRecord/answerRecord/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id) => {
+ return request({
+ url: '/api/blade-answerRecord/answerRecord/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-answerRecord/answerRecord/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const save = (row) => {
+ return request({
+ url: '/api/blade-answerRecord/answerRecord/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-answerRecord/answerRecord/submit',
+ method: 'post',
+ data: row
+ })
+}
\ No newline at end of file
diff --git a/src/api/system/email.js b/src/api/system/email.js
new file mode 100644
index 0000000..e5b1e2b
--- /dev/null
+++ b/src/api/system/email.js
@@ -0,0 +1,70 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/blade-email/email/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id) => {
+ return request({
+ url: '/api/blade-email/email/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-email/email/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/blade-email/email/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-email/email/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const enable = (id) => {
+ return request({
+ url: '/api/blade-email/email/enable',
+ method: 'post',
+ params: {
+ id
+ }
+ })
+}
+
+export const sendEmail = (params) => {
+ return request({
+ url: '/api/blade-email/email/sendEmail',
+ method: 'post',
+ params: {
+ ...params
+ }
+ })
+}
+
diff --git a/src/util/util.js b/src/util/util.js
index 83cd2f7..7510d0a 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -458,3 +458,18 @@
return null; // 如果找不到目标id，返回null
};
+
+//转换标签颜色
+export const setLabelColor = (color) => {
+ let obj = {
+ red: "#EA1F1F",
+ yellow: "#FFB42B",
+ green: "#30D17C",
+ };
+
+ for (let i in obj) {
+ if (color == i) {
+ return obj[i];
+ }
+ }
+};
diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index 8d81e53..3f399a0 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -40,8 +40,9 @@
</div>
</el-dialog>
- <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="50%" :before-close="userHandleClose">
- <avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
+ <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
+ <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
+ @search-reset="searchReset"></avue-crud>
</el-dialog>
</div>
</template>
@@ -58,6 +59,8 @@
import {
getPage
} from "@/api/discuss/userTopics"
+
+ import website from '@/config/website'
import {
@@ -112,11 +115,17 @@
prop: 'discussContent',
type: 'input',
row: true,
+ rules: [{
+ required: true,
+ message: '请输入议题',
+ trigger: 'blur'
+ }],
},
{
label: '选项范围',
prop: 'optionRange',
type: 'radio',
+ value: 0,
button: true,
row: true,
dicData: [{
@@ -125,14 +134,19 @@
}, {
label: '单选',
value: 0
- }]
+ }],
+ rules: [{
+ required: true,
+ message: '请选项范围',
+ trigger: 'blur'
+ }],
},
- {
- label: '排序',
- prop: 'sort',
- controlsPosition: '',
- type: 'number'
- },
+ // {
+ // label: '排序',
+ // prop: 'sort',
+ // controlsPosition: '',
+ // type: 'number'
+ // },
{
label: '选项内容',
prop: 'children',
@@ -186,23 +200,53 @@
userData: [],
userOption: {
- addBtn: false,
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ // menuWidth: 500,
menu: false,
+
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ border: false,
+ //stripe:true,
+ index: true,
+ editBtn: false,
+ addBtn: false,
+ viewBtn: false,
+ selection: true,
+ delBtn: false,
+ excelBtn: true,
+ dialogClickModal: false,
column: [{
label: '姓名',
- prop: 'name'
+ prop: 'name',
+ searchSpan: 4,
+ search: true,
}, {
label: '头像',
+ type: 'upload',
+ listType: "picture-img",
prop: 'avatar'
}, {
label: '手机',
- prop: 'phone'
+ prop: 'phone',
+ searchSpan: 4,
+ search: true,
}, {
label: '小区',
prop: 'aoiName'
}, {
label: '地址',
prop: 'addressName'
+ }, {
+ label: '签名',
+ type: 'upload',
+ listType: "picture-img",
+ prop: 'signaturePath'
}, {
label: '时间',
prop: 'createTime'
@@ -215,19 +259,45 @@
currentPage: 1,
total: 0
},
+ query: {},
}
},
watch: {},
methods: {
+
+ userHandleClose() {
+
+ this.popupTableUserShow = false
+ },
+
+ searchReset() {
+ this.query = {}
+ this.getUserPage(this.userPage)
+ },
+
+ searchChange(params, done) {
+ this.query = params
+ this.userPage.currentPage = 1
+ this.getUserPage(this.userPage, params)
+ done()
+ },
initData(newData) {
this.editFlag = false
this.popupTableShow = true
this.articleId = newData.id
-
- this.onLoad()
+ this.query.level = 1
+ this.query.articleId = this.articleId
+ this.onLoad(this.userPage, this.query)
},
+ // initData(newData) {
+ // this.editFlag = false
+ // this.popupTableShow = true
+ // this.articleId = newData.id
+
+ // this.onLoad()
+ // },
handleClose() {
this.popupTableShow = false
@@ -301,7 +371,7 @@
return remove(row.id)
})
.then(() => {
- this.onLoad()
+ this.getUserPage(this.userPage)
this.$message({
type: "success",
@@ -340,7 +410,7 @@
openUser(row, type = 0) {
this.popupTableUserShow = true
-
+ this.query = {}
if (type == 0) {
this.userParams = {
articleId: row.id
@@ -362,19 +432,17 @@
if (item.avatar.length > 0) {
item.avatar = website.minioUrl + item.avatar
}
+ if (item.signaturePath && item.signaturePath.length > 0) {
+ item.signaturePath = website.minioUrl + item.signaturePath
+ // console.log("=====>", item.signaturePath)
+ }
})
})
},
- onLoad() {
+ onLoad(page, params = {}) {
this.loading = true
-
- let params = {
- level: 1,
- articleId: this.articleId
- }
-
- getLists(1, 100, Object.assign(params, this.query)).then(res => {
+ getLists(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data
this.data = data
this.loading = false
diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index 5301181..e79288a 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
+ <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
<avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
</el-dialog>
</div>
@@ -86,26 +86,14 @@
addBtn: false,
searchMenuSpan: 3,
menuWidth: 500,
- column: [
- // {
- // label: '标题',
- // prop: 'title',
- // searchSpan: 4,
- // span: 6,
- // },
- {
- label: '参与人数',
- prop: 'topsCount',
- searchSpan: 4,
- display: false,
- span: 6,
- },
- {
+ column: [{
label: '开启投票',
prop: 'openFlag',
type: 'radio',
button: true,
+ row: true,
span: 6,
+ offset: 8,
value: 0,
dicData: [{
label: '开启',
@@ -124,7 +112,9 @@
prop: 'voteRestrictions',
type: 'radio',
button: true,
- span: 6,
+ row: true,
+ span: 12,
+ offset: 8,
dicData: [{
label: '一人一票',
value: 0
@@ -143,7 +133,9 @@
prop: 'signatureFlag',
type: 'radio',
button: true,
+ row: true,
span: 6,
+ offset: 8,
dicData: [{
label: '不需要',
value: 0
@@ -157,26 +149,29 @@
trigger: "blur",
}, ],
value: 0
- }, {
- label: '指定用户',
- prop: 'appointUser',
- type: 'radio',
- button: true,
- span: 6,
- dicData: [{
- label: '不限制',
- value: 0
- }, {
- label: '指定用户',
- value: 1
- }],
- rules: [{
- required: true,
- message: "请选择是否指定用户",
- trigger: "blur",
- }, ],
- value: 0
},
+ // {
+ // label: '指定用户',
+ // prop: 'appointUser',
+ // type: 'radio',
+ // button: true,
+ // row: true,
+ // span: 12,
+ // offset: 8,
+ // dicData: [{
+ // label: '不限制',
+ // value: 0
+ // }, {
+ // label: '指定用户',
+ // value: 1
+ // }],
+ // rules: [{
+ // required: true,
+ // message: "请选择是否指定用户",
+ // trigger: "blur",
+ // }, ],
+ // value: 0
+ // },
{
display: false,
@@ -184,8 +179,10 @@
prop: "userIds",
type: 'select',
span: 6,
+ offset: 8,
remote: true,
hide: true,
+ row: true,
dicUrl: "",
props: {
label: 'name',
@@ -202,6 +199,8 @@
{
label: "截止时间",
span: 6,
+ offset: 8,
+ row: true,
prop: "endTime",
type: "datetime",
format: "yyyy-MM-dd hh:mm:ss",
@@ -303,15 +302,15 @@
const data = res.data.data
this.page.total = data.total
this.disCussFrom = data.records[0]
-
- getPersonPublicSelect({
- id: this.disCussFrom.userIds
- }).then(res => {
- const column = this.findObject(this.option.column, "userIds")
- column.dicData = res.data.data
-
- this.loading = false
- })
+ if (this.disCussFrom.userIds) {
+ getPersonPublicSelect({
+ id: this.disCussFrom.userIds
+ }).then(res => {
+ const column = this.findObject(this.option.column, "userIds")
+ column.dicData = res.data.data
+ this.loading = false
+ })
+ }
})
}
}
diff --git a/src/views/article/components/publicSignUpChild.vue b/src/views/article/components/publicSignUpChild.vue
index 3c68b2b..e54a0de 100644
--- a/src/views/article/components/publicSignUpChild.vue
+++ b/src/views/article/components/publicSignUpChild.vue
@@ -1,8 +1,9 @@
<template>
<div>
- <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
- <avue-crud ref="DataUser" :option="userOption" :data="dataUser" v-model="dataUser" :page="pageUser"></avue-crud>
+ <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="80%" :before-close="userHandleClose">
+ <avue-crud ref="DataUser" :option="userOption" :data="dataUser" v-model="dataUser" :page="pageUser"
+ @search-change="searchChange" @search-reset="searchReset"></avue-crud>
</el-dialog>
</div>
@@ -112,11 +113,31 @@
// 选择行
selectionList: [],
userOption: {
- addBtn: false,
+ labelWidth: 96,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ // menuWidth: 500,
menu: false,
+
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 950,
+ tip: false,
+ border: false,
+ //stripe:true,
+ index: true,
+ editBtn: false,
+ addBtn: false,
+ viewBtn: false,
+ selection: true,
+ delBtn: false,
+ excelBtn: true,
+ dialogClickModal: false,
column: [{
label: '姓名',
- prop: 'name'
+ prop: 'name',
+ search: true,
}, {
label: '头像',
type: 'upload',
@@ -131,7 +152,8 @@
},
{
label: '手机',
- prop: 'phone'
+ prop: 'phone',
+ search: true,
}, {
label: '小区',
prop: 'aoiName'
@@ -164,6 +186,17 @@
}
},
methods: {
+ searchReset() {
+ this.query = {}
+ this.getUser(this.userPage)
+ },
+
+ searchChange(params, done) {
+ this.query = params
+ this.userPage.currentPage = 1
+ this.getUser(this.userPage, params)
+ done()
+ },
init(data) {
this.houseCode = data.houseCode
this.onLoad(this.page)
diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index 1faa0fb..88930ba 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -1,26 +1,35 @@
<template>
- <div class="cur-container-box">
- <div class="content-box">
- <box-title class="m10" :classVal="9" :title="'基本信息'"></box-title>
- <avue-form ref="baseForm" :option="option" v-model="form"></avue-form>
+ <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
- <box-title class="m10" :classVal="9" :title="'其他信息'"></box-title>
- <avue-form ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>
+ <div class="cur-container-box" v-if="roleBox">
- <box-title class="m10" :classVal="9" :title="'从业人员'"></box-title>
- <avue-crud :option="placeOption" :table-loading="loading" :data="placeExt" ref="crud" v-model="houseHoldForm"
- :permission="permissionList" @row-del="houseHoldRowDel" @row-update="houseHoldRowUpdate"
- @row-save="houseHoldRowSave" :page.sync="holdPage" @current-change="holdCurrentChange"
- @size-change="holdSizeChange" @refresh-change="refreshHoldChange" @on-load="holdOnLoad">
- </avue-crud>
+ <div class="content-box">
+
+ <box-title class="m10" :classVal="9" :title="'基本信息'"></box-title>
+ <avue-form ref="baseForm" :option="option" v-model="form" :key="reload"></avue-form>
+
+ <box-title class="m10" :classVal="9" :title="'其他信息'"></box-title>
+ <avue-form ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>
+
+ <box-title class="m10" :classVal="9" :title="'从业人员'"></box-title>
+ <avue-crud :option="placeOption" :table-loading="loading" :data="placeExt" ref="crud"
+ v-model="houseHoldForm" :permission="permissionList" @row-del="houseHoldRowDel"
+ @row-update="houseHoldRowUpdate" @row-save="houseHoldRowSave" :page.sync="holdPage"
+ @current-change="holdCurrentChange" @size-change="holdSizeChange" @refresh-change="refreshHoldChange"
+ @on-load="holdOnLoad">
+ </avue-crud>
+
+ </div>
+
+ <div class="footer-btn-box">
+ <el-button size="small" type="primary" @click="dataUpdate">保 存</el-button>
+
+ <el-button size="small" @click="roleBoxClose">关 闭</el-button>
+ </div>
+
</div>
- <div class="footer-btn-box">
- <el-button size="small" type="primary" @click="dataUpdate">保 存</el-button>
-
- <el-button size="small" @click="closeRowDetails">关 闭</el-button>
- </div>
- </div>
+ </el-dialog>
</template>
<script>
@@ -57,6 +66,9 @@
}
return {
+ reload: Math.random(),
+ roleBox: false,
+
placeExt: [],
form: {},
@@ -76,38 +88,24 @@
}],
},
+
{
- span: 7,
- label: "场所标签",
- prop: "label",
- type: "cascader",
- dicUrl: "/api/blade-category/category/getCategory?level=2",
- cascader: ["smallLabel"],
- props: {
- label: "categoryName",
- value: "categoryNo"
- },
+ width: 160,
+ overHidden: true,
+ slot: true,
+ label: "地址",
+ prop: "location",
+ type: 'map',
dataType: "string",
- hide: true,
- rules: [{
- required: true,
- message: "请输入场所标签",
- trigger: "blur",
- },],
- },
- {
- span: 5,
- label: "",
- labelWidth: 20,
- prop: "smallLabel",
- type: "cascader",
- dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
- props: {
- label: "categoryName",
- value: "categoryNo"
- },
- dataType: "string",
- hide: true,
+ span: 12,
+ value: [117.966460, 28.431002, ""],
+ rules: [
+ {
+ required: true,
+ message: "请选择地址",
+ trigger: "blur",
+ },
+ ],
},
{
@@ -143,6 +141,7 @@
prop: "neiCode",
search: false,
type: "tree",
+ dataType: 'string',
dicUrl: "/api/blade-system/region/tree",
props: {
label: "name",
@@ -167,6 +166,7 @@
label: "gridName",
value: "id",
},
+ dataType: 'string',
dicUrl:
"/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
rules: [
@@ -176,6 +176,65 @@
trigger: "blur",
},
],
+ },
+
+
+ {
+ span: 7,
+ label: "场所标签",
+ prop: "label",
+ type: "select",
+ dicUrl: "/api/blade-category/category/getCategory?level=2",
+ cascader: ["smallLabel"],
+ props: {
+ label: "categoryName",
+ value: "categoryNo"
+ },
+ dataType: "string",
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请输入场所标签",
+ trigger: "blur",
+ },],
+ },
+ {
+ span: 5,
+ label: "",
+ labelWidth: 20,
+ prop: "smallLabel",
+ type: "select",
+ dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
+ props: {
+ label: "categoryName",
+ value: "categoryNo"
+ },
+ dataType: "string",
+ hide: true,
+ },
+
+ {
+ span: 12,
+ label: "标签颜色",
+ prop: "color",
+ type: "select",
+ dicData: [
+ {
+ label: '绿',
+ value: 'green'
+ }, {
+ label: '黄',
+ value: 'yellow'
+ }, {
+ label: '红',
+ value: 'red'
+ }
+ ],
+ props: {
+ label: "label",
+ value: "value"
+ },
+ hide: true,
},
{
@@ -193,25 +252,6 @@
url: "link",
},
span: 24,
- },
-
- {
- width: 160,
- overHidden: true,
- slot: true,
- label: "位置",
- prop: "location",
- type: 'map',
- dataType: "string",
- span: 24,
- value: [117.966460, 28.431002, ""],
- rules: [
- {
- required: true,
- message: "请选择位置",
- trigger: "blur",
- },
- ],
},
]
},
@@ -330,6 +370,7 @@
total: 0,
},
houseHoldForm: {},
+
}
},
@@ -337,69 +378,73 @@
inject: ["placeElement"],
- watch: {
- 'placeElement.curRow': {
- handler (newData) {
- const that = this
- if (newData && 'id' in newData && newData['id'] != null && newData['id'] != '') {
-
- that.$axios.all([
- getPlace(newData['id']),
- getPlaceExt({ placeId: newData['id'] }),
- ]).then(that.$axios.spread(function (baseInfo, restInfo) {
- that.form = baseInfo.data.data
-
- that.form.location = [that.form.lng, that.form.lat, that.form.location].join(',')
-
- if (that.form.imageUrls && that.form.imageUrls.length) {
- that.form.imageUrls = that.form.imageUrls.split(",").filter(item => item != '').map(item => website.minioUrl + item).join(',')
- }
-
- if (that.form.placePoiLabelVOList && that.form.placePoiLabelVOList.length) {
- let lebelTwo = that.form.placePoiLabelVOList.find(item => {
- return item.type == 2
- })
-
- if (lebelTwo) that.form.label = String(lebelTwo.poiCode)
-
- let lebelThree = that.form.placePoiLabelVOList.find(item => {
- return item.type == 3
- })
-
- if (lebelThree) that.form.smallLabel = String(lebelThree.poiCode)
- }
-
- const data = restInfo.data.data
-
- if (data) {
- let imageUrls = data.imageUrls
- let planImageUrls = data.planImageUrls
-
- if (imageUrls && imageUrls.length) {
- imageUrls = imageUrls.split(',').filter(item => item != '').map(item => website.minioUrl + item).join(",")
- }
-
- if (planImageUrls && planImageUrls.length) {
- planImageUrls = planImageUrls.split(',').filter(item => item != '').map(item => website.minioUrl + item).join(",")
- }
-
- that.placeForm = {
- ...data,
- imageUrls,
- planImageUrls
- }
- }
-
- }))
-
- that.holdOnLoad(this.holdPage)
- }
- },
- immediate: true
- }
- },
+ watch: {},
methods: {
+ initOpen (newData) {
+ this.curRow = newData
+ this.roleBox = true
+
+ const that = this
+
+ that.$axios.all([
+ getPlace(newData['id']),
+ getPlaceExt({ placeId: newData['id'] }),
+ ]).then(that.$axios.spread(function (baseInfo, restInfo) {
+ that.form = baseInfo.data.data
+ console.log(that.form, 90999)
+
+ // that.$nextTick(() => that.$refs.baseForm.dicInit('cascader'))
+
+ that.form.location = [that.form.lng, that.form.lat, that.form.location].join(',')
+
+ if (that.form.imageUrls && that.form.imageUrls.length) {
+ that.form.imageUrls = that.form.imageUrls.split(",").filter(item => item != '').map(item => website.minioUrl + item).join(',')
+ }
+
+ if (that.form.placePoiLabelVOList && that.form.placePoiLabelVOList.length) {
+ let lebelTwo = that.form.placePoiLabelVOList.find(item => {
+ return item.type == 2
+ })
+
+ if (lebelTwo) that.form.label = String(lebelTwo.poiCode)
+
+ let lebelThree = that.form.placePoiLabelVOList.find(item => {
+ return item.type == 3
+ })
+
+ if (lebelThree) that.form.smallLabel = String(lebelThree.poiCode)
+ }
+
+ const data = restInfo.data.data
+
+ if (data) {
+ let imageUrls = data.imageUrls
+ let planImageUrls = data.planImageUrls
+
+ if (imageUrls && imageUrls.length) {
+ imageUrls = imageUrls.split(',').filter(item => item != '').map(item => website.minioUrl + item).join(",")
+ }
+
+ if (planImageUrls && planImageUrls.length) {
+ planImageUrls = planImageUrls.split(',').filter(item => item != '').map(item => website.minioUrl + item).join(",")
+ }
+
+ that.placeForm = {
+ ...data,
+ imageUrls,
+ planImageUrls
+ }
+ }
+
+ // that.$nextTick(() => {
+ // that.$refs.baseForm.dicInit('select')
+ // })
+ }))
+
+ that.holdOnLoad(this.holdPage)
+ },
+
locationDispose (data) {
data = data.split(',')
@@ -455,7 +500,7 @@
houseHoldRowSave (row, done, loading) {
holdAdd({
...row,
- placeId: this.placeElement.curRow.id
+ placeId: this.curRow.id
}).then(
() => {
this.holdOnLoad(this.holdPage)
@@ -478,11 +523,11 @@
},
holdOnLoad (holdPage, params = {}) {
- if (!this.placeElement.curRow.id) return
+ if (!this.curRow.id) return
let values = {
...params,
- placeId: this.placeElement.curRow.id
+ placeId: this.curRow.id
}
getHoldList(holdPage.currentPage, holdPage.pageSize, values).then((res) => {
@@ -557,8 +602,14 @@
})
},
- closeRowDetails () {
- this.placeElement.roleBox = false
+ roleBoxClose () {
+ this.form = {}
+ this.placeForm = {}
+
+ this.$refs.baseForm && this.$refs.baseForm.resetForm()
+ this.$refs.restForm && this.$refs.restForm.resetForm()
+
+ this.roleBox = false
}
},
}
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 2c3b273..e453047 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -48,9 +48,7 @@
</template>
</avue-crud>
- <el-dialog class="place-info-box" title="场所维护" append-to-body :visible.sync="roleBox" center @close="roleBoxClose">
- <baseAllInfo></baseAllInfo>
- </el-dialog>
+ <baseAllInfo ref="BaseAllInfo"></baseAllInfo>
<el-dialog class="place-info-box audit-info-box" title="审核" append-to-body :visible.sync="auditBasePopup"
width="30%">
@@ -93,9 +91,6 @@
}
return {
- curRow: {},
- roleBox: false,
-
form: {},
query: {},
loading: true,
@@ -143,38 +138,22 @@
},
{
- span: 7,
- label: "场所标签",
- prop: "label",
- type: "cascader",
- dicUrl: "/api/blade-category/category/getCategory?level=2",
- cascader: ["smallLabel"],
- props: {
- label: "categoryName",
- value: "categoryNo"
- },
+ width: 156,
+ overHidden: true,
+ slot: true,
+ label: "地址",
+ prop: "location",
+ type: 'map',
dataType: "string",
- hide: true,
- rules: [{
- required: true,
- message: "请输入场所标签",
- trigger: "blur",
- },],
- },
-
- {
- span: 5,
- label: "",
- labelWidth: 20,
- prop: "smallLabel",
- type: "cascader",
- dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
- props: {
- label: "categoryName",
- value: "categoryNo"
- },
- dataType: "string",
- hide: true,
+ span: 12,
+ value: [117.966460, 28.431002, ""],
+ rules: [
+ {
+ required: true,
+ message: "请选择地址",
+ trigger: "blur",
+ },
+ ],
},
{
@@ -294,6 +273,67 @@
},
],
},
+
+
+ {
+ span: 7,
+ label: "场所标签",
+ prop: "label",
+ type: "select",
+ dicUrl: "/api/blade-category/category/getCategory?level=2",
+ cascader: ["smallLabel"],
+ props: {
+ label: "categoryName",
+ value: "categoryNo"
+ },
+ dataType: "string",
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请输入场所标签",
+ trigger: "blur",
+ },],
+ },
+
+ {
+ span: 5,
+ label: "",
+ labelWidth: 20,
+ prop: "smallLabel",
+ type: "select",
+ dicUrl: "/api/blade-category/category/getCategory?parentNo={{label}}",
+ props: {
+ label: "categoryName",
+ value: "categoryNo"
+ },
+ dataType: "string",
+ hide: true,
+ },
+
+ {
+ span: 12,
+ label: "标签颜色",
+ prop: "color",
+ type: "select",
+ dicData: [
+ {
+ label: '绿',
+ value: 'green'
+ }, {
+ label: '黄',
+ value: 'yellow'
+ }, {
+ label: '红',
+ value: 'red'
+ }
+ ],
+ props: {
+ label: "label",
+ value: "value"
+ },
+ hide: true,
+ },
+
{
width: 110,
label: "场所照片",
@@ -311,24 +351,6 @@
span: 24,
},
- {
- width: 156,
- overHidden: true,
- slot: true,
- label: "位置",
- prop: "location",
- type: 'map',
- dataType: "string",
- span: 24,
- value: [117.966460, 28.431002, ""],
- rules: [
- {
- required: true,
- message: "请选择位置",
- trigger: "blur",
- },
- ],
- },
{
width: 96,
@@ -521,13 +543,8 @@
this.auditBasePopup = true
},
- roleBoxClose () {
- this.curRow = {}
- },
-
ManageTenants (item) {
- this.curRow = item
- this.roleBox = true
+ this.$refs.BaseAllInfo.initOpen(item)
},
rowSave (row, done, loading) {
diff --git a/src/views/property/components/propertyEdit.vue b/src/views/property/components/propertyEdit.vue
index 3c66d15..44d3b6e 100644
--- a/src/views/property/components/propertyEdit.vue
+++ b/src/views/property/components/propertyEdit.vue
@@ -1,34 +1,59 @@
<template>
- <el-dialog title="" append-to-body :visible.sync="infoVisible" top="10vh" width="70%">
+ <el-dialog title="" append-to-body :visible.sync="infoVisible" top="10vh" width="70%" :before-close="handleClose">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="基础信息" name="first"></el-tab-pane>
- <el-tab-pane label="基础信息" name="second"></el-tab-pane>
- <el-tab-pane label="良好行为信息" name="third"></el-tab-pane>
- <el-tab-pane label="不良行为信息" name="fourth"></el-tab-pane>
+ <!-- <el-tab-pane label="物业信息" name="first"></el-tab-pane> -->
+ <el-tab-pane label="基础信息" name="info1"></el-tab-pane>
+ <el-tab-pane label="经营信息" name="info2"></el-tab-pane>
+ <el-tab-pane label="纳税信息" name="info3"></el-tab-pane>
+ <el-tab-pane label="党建信息" name="info4"></el-tab-pane>
+ <el-tab-pane label="企业良好行为" name="info5"></el-tab-pane>
+ <el-tab-pane label="项目良好行为" name="info6"></el-tab-pane>
+ <el-tab-pane label="违法违规行为惩戒" name="info7"></el-tab-pane>
+
</el-tabs>
- <avue-form :option="option" v-model="first" v-if="activeName == 'first'"></avue-form>
+ <!-- <avue-form :option="option" v-model="first" v-if="activeName == 'first'" @submit="rowSave"></avue-form> -->
<!-- <avue-form :option="option" v-model="second" v-if="activeName == 'second'"></avue-form> -->
- <div>
-
+ <div v-if="activeName != 'first'">
<div v-for="(item, index) in questionBankData" :key="index">
<div>
- {{ item.subjectName }}
+ {{index+1}} .{{ item.subjectName }}
</div>
- <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
- <!-- <div>
+ <!-- <div v-for="(item1, index1) in item.subjectOptionList" :key="index1"> -->
+ <!-- <div>
{{ item1.optionName }}
</div> -->
- <el-radio-group>
- <el-radio :label="item1.id">{{item1.optionName}}</el-radio>
- </el-radio-group>
+ <!-- <el-radio-group v-model="item.ids" v-if="item.choicesType == 0"> -->
+ <div v-if="item.choicesType == 0">
+ <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
+ <el-radio v-model="item1.ids" :label="item1.id">{{item1.optionName}}-----------{{item1.score}}</el-radio>
+ </div>
</div>
+
+ <!-- </el-radio-group> -->
+
+ <div v-if="item.choicesType == 3">
+ <!-- <div>{{item1.optionName}}</div> -->
+ <div v-for="(item1, index1) in item.subjectOptionList" :key="index1">
+ <el-input-number v-model="item1.numbers" @change="handleChange" :min="0" :max="25"
+ :label="item1.optionName"></el-input-number>
+ </div>
+
+ <!-- <el-input v-model="item1.numbers" type="number" :placeholder="item1.optionName"></el-input> -->
+ </div>
+
+ <!-- </div> -->
</div>
+ </div>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="infoVisible = false">取 消</el-button>
+ <el-button type="primary" @click="submit">提 交</el-button>
</div>
@@ -40,10 +65,21 @@
getList,
remove
} from "@/api/subjectChoices/subjectChoices";
+
+ import {
+ save
+ } from "@/api/answerRecord/answerRecord";
+ import {
+ add
+ } from "@/api/property/propertyCompany"
+ import {
+ mapGetters
+ } from "vuex"
export default {
data() {
return {
- activeName: 'first',
+ property: {},
+ activeName: 'info1',
infoVisible: false,
page: {
pageSize: 20,
@@ -170,7 +206,55 @@
},
};
},
+ computed: {
+ ...mapGetters(["permission", "userInfo"]),
+ },
methods: {
+
+ handleClose() {
+ this.infoVisible = false
+ // this.$refs.DisCussFrom && this.$refs.DisCussFrom.resetForm()
+ },
+
+ submit() {
+ console.log("============>", this.questionBankData)
+ save(this.questionBankData).then(
+ () => {
+ // this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ handleChange(value) {
+ console.log(value);
+ },
+
+ rowSave(form, done) {
+ console.log('==========>', JSON.stringify(form))
+ form.userid = this.userInfo.user_id
+ add(form).then(
+ () => {
+ // this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
questionBankOnLoad(page, params = {}) {
// params = {}
@@ -183,18 +267,41 @@
const data = res.data.data;
this.page.total = data.total;
this.questionBankData = data.records;
- // this.questionBankLoading = false;
+ this.questionBankData.forEach(item => {
+ item.propertyId = this.property.id
+ })
});
},
init(row) {
this.infoVisible = true
+ let param = {
+ subclassName: '基础信息'
+ }
+ this.property = row
+ this.questionBankOnLoad(this.page, param)
},
handleClick(tab, event) {
- console.log(tab, event);
+ // this.$confirm("确定将选择数据删除?", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(() => {
+ // return remove(row.id)
+ // })
+ // .then(() => {
+ // this.onLoad(this.page)
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // })
+ // })
+ // console.log(tab, event);
+ console.log('============>', JSON.stringify(this.questionBankData))
let param = {
- categoryName: tab.label
+ subclassName: tab.label
}
this.questionBankOnLoad(this.page, param)
}
diff --git a/src/views/property/propertyCompany.vue b/src/views/property/propertyCompany.vue
index 63fe3f4..3583278 100644
--- a/src/views/property/propertyCompany.vue
+++ b/src/views/property/propertyCompany.vue
@@ -18,7 +18,7 @@
@click="openPayConfig(row)">商户配置
</el-button>
- <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty()">新 增
+ <el-button :size="size" icon="el-icon-circle-plus-outline" type="text" @click="addProperty(row)">物业评定
</el-button>
</template>
</avue-crud>
@@ -350,8 +350,8 @@
methods: {
- addProperty() {
- this.$refs.propertyEdit.init();
+ addProperty(row) {
+ this.$refs.propertyEdit.init(row);
},
aliSubmit(form, done) {
diff --git a/src/views/propertySupervision/houseHoldSupervision.vue b/src/views/propertySupervision/houseHoldSupervision.vue
index a54c951..0d7e7e8 100644
--- a/src/views/propertySupervision/houseHoldSupervision.vue
+++ b/src/views/propertySupervision/houseHoldSupervision.vue
@@ -236,13 +236,13 @@
hide: true,
display: false
},
- {
- width: 156,
- overHidden: true,
- label: "地址",
- prop: "address",
- display: false,
- },
+ // {
+ // width: 156,
+ // overHidden: true,
+ // label: "地址",
+ // prop: "address",
+ // display: false,
+ // },
{
// hide: true,
width: 220,
diff --git a/src/views/system/email.vue b/src/views/system/email.vue
new file mode 100644
index 0000000..1a40c96
--- /dev/null
+++ b/src/views/system/email.vue
@@ -0,0 +1,339 @@
+<template>
+ <basic-container>
+ <avue-crud :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.email_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ </template>
+
+ <template slot-scope="{row, size}" slot="status">
+ <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
+ </template>
+
+
+
+
+ <template slot-scope="{ row, size, index }" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.email_enable"
+ @click.stop="handleEnable(row)">启用
+ </el-button>
+ <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
+ @click="handleDebug(row)">调试
+ </el-button>
+ </template>
+
+ </avue-crud>
+
+ <el-dialog title="短信发送调试" append-to-body :visible.sync="box" width="550px">
+ <avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
+ </el-dialog>
+
+ </basic-container>
+</template>
+
+<script>
+import {getList, getDetail, add, update, remove, enable, sendEmail} from "@/api/system/email";
+ import {mapGetters} from "vuex";
+
+ export default {
+ data() {
+ return {
+ box:false,
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ selectionList: [],
+ option: {height:'auto',
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ menuWidth: 350,
+ column: [
+ {
+ label: "主键",
+ prop: "id",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "发送者邮箱",
+ prop: "username",
+ type: "input",
+ },
+ {
+ label: "授权码",
+ prop: "password",
+ type: "input",
+ },
+ {
+ label: "服务器地址",
+ prop: "host",
+ type: "input",
+ },
+ {
+ label: "端口号",
+ prop: "port",
+ type: "input",
+ value:465
+ },
+ {
+ label: "默认编码",
+ prop: "defaultEncoding",
+ type: "input",
+ value:"UTF-8"
+ },
+ {
+ label: "协议",
+ prop: "protocol",
+ type: "input",
+ value: "smtps"
+ },
+ {
+ label: "备注",
+ prop: "remark",
+ type: "input",
+ },
+ {
+ label: "是否启用",
+ prop: "status",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ },
+ ]},
+ data: [],
+
+
+ debugForm: {},
+ debugOption: {
+ submitText: "提交",
+ column: [
+ {
+ label: "收件人",
+ prop: "emails",
+ placeholder:"多个收件人请用英文逗号进行分隔",
+ span: 24,
+ },
+ {
+ label: "主题",
+ prop: "subject",
+ span: 24,
+ },
+ {
+ label: "内容",
+ prop: "content",
+ type:"textarea",
+ minRow:5,
+ span: 24,
+ },
+ ]
+ }
+
+ };
+ },
+ computed: {
+ ...mapGetters(["permission","userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.email_add, false),
+ viewBtn: this.vaildData(this.permission.email_view, false),
+ delBtn: this.vaildData(this.permission.email_delete, false),
+ editBtn: this.vaildData(this.permission.email_edit, false)
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ }
+ },
+ methods: {
+ handleSubmit (form, done) {
+ console.log(form,"+++++++++")
+
+ form.emails = form.emails.split(",")
+
+ sendEmail(form).then(res=>{
+ this.$message({
+ type: "success",
+ message: "发送成功!"
+ });
+ })
+ done()
+ },
+ rowSave(row, done, loading) {
+ add(row).then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ loading();
+ window.console.log(error);
+ });
+ },
+ rowUpdate(row, index, done, loading) {
+ update(row).then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ loading();
+ console.log(error);
+ });
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
+ handleDebug (row) {
+ console.log(row,"++++++++++")
+ this.box = true
+ },
+ handleEnable (row) {
+ this.$confirm("是否确定启用这条配置?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return enable(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then(res => {
+ this.form = res.data.data;
+ });
+ }
+ done();
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage){
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize){
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ }
+ }
+ };
+</script>
+
+<style>
+</style>
diff --git a/src/views/userHouse/components/householdManager.vue b/src/views/userHouse/components/householdManager.vue
index 5c5b710..ee5ba04 100644
--- a/src/views/userHouse/components/householdManager.vue
+++ b/src/views/userHouse/components/householdManager.vue
@@ -53,7 +53,7 @@
var regIdCard = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
// 如果通过该验证，说明身份证格式正确，但准确性还需计算
- if (regIdCard.test(value)) {
+ if (regIdCard.test(value) || value == '') {
if (value.length == 18) {
var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
5, 8, 4, 2) // 将前17位加权因子保存在数组里
@@ -527,6 +527,12 @@
prop: "cardNumber",
hide: true,
},
+
+ {
+ label: "备注",
+ prop: "remark",
+ hide: true,
+ },
]
},
houseCode: "",
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index dc0082b..b6624ee 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -1,1144 +1,1155 @@
<template>
- <el-row>
- <el-col :span="24">
- <basic-container>
- <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
- v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
- :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
- @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
- @refresh-change="refreshChange" @on-load="onLoad">
- <template slot="menuLeft">
- <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
- @click="handleDelete">删 除
- </el-button>
- <el-button type="success" size="small" plain v-if="this.permission.household_import" icon="el-icon-upload2"
- @click="handleImport">导入
- </el-button>
- <el-button type="warning" size="small" plain v-if="this.permission.household_export" icon="el-icon-download"
- @click="handleExport">导出
- </el-button>
- </template>
+ <el-row>
+ <el-col :span="24">
+ <basic-container>
+ <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+ v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate"
+ @row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
+ @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ <el-button type="success" size="small" plain v-if="this.permission.household_import"
+ icon="el-icon-upload2" @click="handleImport">导入
+ </el-button>
+ <el-button type="warning" size="small" plain v-if="this.permission.household_export"
+ icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
- <template slot-scope="{row, size}" slot="menu">
- <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" v-if="permission.househould_manager"
- @click="manageLabel(row)">标签
- </el-button>
- </template>
- <template slot-scope="{row, size}" slot="phoneNumber">
- <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
- {{ textDispose(row, 'phoneNumberflag', 'phoneNumber') }}
- </el-button>
- </template>
- <template slot-scope="{row, size}" slot="idCard">
- <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardflag')"
- v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
- </template>
- <template slot-scope="{row, size}" slot="householdLabelList">
- {{ labelDispose(row.householdLabelList) }}
- </template>
- </avue-crud>
- <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
+ v-if="permission.househould_manager" @click="manageLabel(row)">标签
+ </el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="phoneNumber">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneNumberflag')">
+ {{ textDispose(row, 'phoneNumberflag', 'phoneNumber') }}
+ </el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="idCard">
+ <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardflag')"
+ v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
+ </template>
+ <template slot-scope="{row, size}" slot="householdLabelList">
+ {{ labelDispose(row.householdLabelList) }}
+ </template>
+ </avue-crud>
+ <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
- <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
- :default-checked-keys="roleTreeObj" :props="props">
- </el-tree>
+ <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id"
+ ref="treeRole" :default-checked-keys="roleTreeObj" :props="props">
+ </el-tree>
- <span slot="footer" class="dialog-footer">
- <el-button size="small" @click="roleBox = false">取 消</el-button>
- <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
- </span>
- </el-dialog>
+ <span slot="footer" class="dialog-footer">
+ <el-button size="small" @click="roleBox = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
- <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
- <div v-for="(item, index) in labelData" :key="index">
- <el-row>
- <el-col :span="24">
- <div>
- <el-divider content-position="left">{{ item.name }}</el-divider>
- </div>
- </el-col>
- </el-row>
- <div class="grid-container2" v-if="item.children">
- <div class="grid-item" :style="{ backgroundColor: item2.color }" v-for="(item2, index2) in item.children"
- @click="changLabel(item2)" :key="index2">
- {{ item2.name }}
- </div>
- </div>
- </div>
+ <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
+ <div v-for="(item, index) in labelData" :key="index">
+ <el-row>
+ <el-col :span="24">
+ <div>
+ <el-divider content-position="left">{{ item.name }}</el-divider>
+ </div>
+ </el-col>
+ </el-row>
+ <div class="grid-container2" v-if="item.children">
+ <div class="grid-item" :style="{ backgroundColor: getColor(item2.color) }"
+ v-for="(item2, index2) in item.children" @click="changLabel(item2)" :key="index2">
+ {{ item2.name }}
+ </div>
+ </div>
+ </div>
- <!-- <span slot="footer" class="dialog-footer">
+ <!-- <span slot="footer" class="dialog-footer">
<el-button @click="labelFlag = false">取 消</el-button>
<el-button type="primary" @click="submitRole">确 定</el-button>
</span> -->
- </el-dialog>
+ </el-dialog>
- <el-dialog :title="'编辑标签 ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
- <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
- </avue-form>
- <span slot="footer" class="dialog-footer">
- <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
- <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
- </span>
- </el-dialog>
+ <el-dialog :title="'编辑标签 ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge"
+ width="655px">
+ <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
+ </avue-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
+ <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
+ </span>
+ </el-dialog>
- <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
- <template slot="excelTemplate">
- <el-button size="small" type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- </basic-container>
- </el-col>
- </el-row>
+ <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <template slot="excelTemplate">
+ <el-button size="small" type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
+ </basic-container>
+ </el-col>
+ </el-row>
</template>
<script>
- import {
+import { setLabelColor } from '@/util/util'
+import {
getList,
remove,
add,
update,
getDetatil,
getDetatils
- } from "@/api/userHouse/list/houseHold.js"
- import {
+} from "@/api/userHouse/list/houseHold.js"
+import {
removeHouseholdLabel,
saveOrUpdateHouseholdLabel
- } from "@/api/userHouse/list/userHouseList.js"
- import {
+} from "@/api/userHouse/list/userHouseList.js"
+import {
getLabelList,
- } from '@/api/label/label'
- import {
+} from '@/api/label/label'
+import {
exportBlob
- } from "@/api/common"
- import {
+} from "@/api/common"
+import {
mapGetters
- } from "vuex"
- import {
+} from "vuex"
+import {
getToken
- } from '@/util/auth'
- import {
+} from '@/util/auth'
+import {
downloadXls,
findParentOrCur,
- } from "@/util/util"
- import {
+} from "@/util/util"
+import {
dateNow
- } from "@/util/date"
- import NProgress from 'nprogress'
- import 'nprogress/nprogress.css'
- import Qs from "qs"
- import {
+} from "@/util/date"
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import Qs from "qs"
+import {
lintOnSave
- } from "../../../vue.config"
+} from "../../../vue.config"
- export default {
- data() {
- let isCardId = function(rule, value, callback) {
- // 15位和18位身份证号码的正则表达式
- var regIdCard =
- /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
+export default {
+ data () {
+ let isCardId = function (rule, value, callback) {
+ // 15位和18位身份证号码的正则表达式
+ var regIdCard =
+ /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
- // 如果通过该验证，说明身份证格式正确，但准确性还需计算
- if (regIdCard.test(value)) {
- if (value.length == 18) {
- var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
- 5, 8, 4, 2) // 将前17位加权因子保存在数组里
- var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2) // 这是除以11后，可能产生的11位余数、验证码，也保存成数组
- var idCardWiSum = 0 // 用来保存前17位各自乖以加权因子后的总和
- for (var i = 0; i < 17; i++) {
- idCardWiSum += value.substring(i, i + 1) * idCardWi[i]
- }
+ // 如果通过该验证，说明身份证格式正确，但准确性还需计算
+ if (regIdCard.test(value) || value == '') {
+ if (value.length == 18) {
+ var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
+ 5, 8, 4, 2) // 将前17位加权因子保存在数组里
+ var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2) // 这是除以11后，可能产生的11位余数、验证码，也保存成数组
+ var idCardWiSum = 0 // 用来保存前17位各自乖以加权因子后的总和
+ for (var i = 0; i < 17; i++) {
+ idCardWiSum += value.substring(i, i + 1) * idCardWi[i]
+ }
- var idCardMod = idCardWiSum % 11 // 计算出校验码所在数组的位置
- var idCardLast = value.substring(17) // 得到最后一位身份证号码
+ var idCardMod = idCardWiSum % 11 // 计算出校验码所在数组的位置
+ var idCardLast = value.substring(17) // 得到最后一位身份证号码
- // 如果等于2，则说明校验码是10，身份证号码最后一位应该是X
- if (idCardMod == 2) {
- if (idCardLast == "X" || idCardLast == "x") {
- callback()
- } else {
- callback(new Error("身份证号格式有误！"))
- }
+ // 如果等于2，则说明校验码是10，身份证号码最后一位应该是X
+ if (idCardMod == 2) {
+ if (idCardLast == "X" || idCardLast == "x") {
+ callback()
+ } else {
+ callback(new Error("身份证号格式有误！"))
+ }
+ } else {
+ // 用计算出的验证码与最后一位身份证号码匹配，如果一致，说明通过，否则是无效的身份证号码
+ if (idCardLast == idCardY[idCardMod]) {
+ callback()
+ } else {
+ callback(new Error("身份证号格式有误！"))
+ }
+ }
+ } else {
+ callback()
+ }
} else {
- // 用计算出的验证码与最后一位身份证号码匹配，如果一致，说明通过，否则是无效的身份证号码
- if (idCardLast == idCardY[idCardMod]) {
- callback()
- } else {
+ //alert("身份证格式不正确!");
callback(new Error("身份证号格式有误！"))
- }
}
- } else {
+
callback()
- }
- } else {
- //alert("身份证格式不正确!");
- callback(new Error("身份证号格式有误！"))
}
- callback()
- }
-
- //手机号格式校验
- let validatorPhone = function(rule, value, callback) {
- if (value) {
- if (!/^1[3456789]\d{9}$/.test(value)) {
- callback(new Error('手机号格式有误！'))
- } else {
- callback()
- }
- }
- callback()
- }
-
- return {
- labelData: [],
- form: {},
- search: {},
- excelBox: false,
- selectionList: [],
- labelFlag: false,
- editLabelFlge: false,
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- option: {
- labelWidth: 144,
- searchLabelWidth: 96,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 280,
-
- height: 'auto',
- calcHeight: 80,
- tip: false,
- border: true,
- index: true,
- selection: true,
- viewBtn: true,
- addBtn: true,
- dialogType: 'drawer',
- dialogClickModal: false,
- menuFixed: 'right',
- column: [{
- label: "与业主关系",
- prop: "relationship",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
- dataType: "number",
- hide: true,
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- rules: [{
- required: true,
- message: "请选择与业主关系",
- trigger: "blur",
- }],
- },
-
- {
- width: 110,
- label: "姓名",
- prop: "name",
- searchSpan: 3,
- searchLabelWidth: 66,
- search: true,
- rules: [{
- required: true,
- message: "请输入姓名",
- trigger: "blur",
- }],
- },
-
- {
- hide: true,
- label: "证件类型",
- prop: "cardType",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=cardType",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- width: 160,
- display: true,
- label: "身份证号",
- prop: "idCard",
- search: true,
- searchSpan: 4,
- slot: true,
- rules: [{
- validator: isCardId,
- trigger: 'blur'
- }],
- },
-
- {
- hide: true,
- display: false,
- width: 160,
- label: "证件号码",
- prop: "cardNo",
- },
-
- {
- label: "出生日期",
- prop: "birthday",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- hide: true,
- },
-
-
- {
- width: 60,
- label: "性别",
- prop: "gender",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
- },
- {
- label: "女",
- value: 0
- },
- {
- label: "未知",
- value: "3"
+ //手机号格式校验
+ let validatorPhone = function (rule, value, callback) {
+ if (value) {
+ if (!/^1[3456789]\d{9}$/.test(value)) {
+ callback(new Error('手机号格式有误！'))
+ } else {
+ callback()
}
- ],
- },
-
- {
- width: 120,
- label: "手机号码",
- prop: "phoneNumber",
- search: true,
- searchSpan: 4,
- slot: true,
- rules: [{
- required: true,
- message: "请输入手机号码",
- trigger: "blur",
- },
- {
- validator: validatorPhone,
- trigger: 'blur'
- }
- ],
- },
-
- {
- label: "居住情况",
- prop: "residentialStatus",
- type: "select",
- hide: true,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentialStatusType",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- label: "其他联系方式",
- prop: "otherContact",
- hide: true,
- rules: [{
- validator: validatorPhone,
- trigger: 'blur'
- }],
- },
-
- {
- label: "是否主要联系人",
- prop: "isPrimaryContact",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=primaryContactType",
- dataType: "number",
- hide: true,
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- // {
- // label: "关系",
- // prop: "roleType",
- // type: "select",
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
- // dataType: "number",
- // props: {
- // label: "dictValue",
- // value: "dictKey",
- // },
- // },
-
- {
- width: 220,
- overHidden: true,
- label: '小区名称',
- prop: "aoiName",
- search: true,
- searchSpan: 4,
- display: false
- },
-
- {
- width: 110,
- label: "所属街道",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- prop: "townStreetName",
- search: true,
- searchSpan: 4
- },
-
- {
- width: 156,
- overHidden: true,
- label: "所属社区",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- prop: "neiName",
- search: true,
- searchSpan: 4
- },
-
- {
- width: 110,
- overHidden: true,
- label: "所属网格",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- prop: "gridName",
- },
-
- {
- width: 156,
- overHidden: true,
- label: "地址",
- prop: "address",
- display: false
- },
-
-
- {
- hide: true,
- parent: false,
- width: 160,
- label: "籍贯地区",
- prop: "nativePlaceAdcode",
- type: "tree",
- typeformat(item, label, value) {
- return item.addressDetail
- },
- change: ({
- value,
- column,
- item,
- dic
- }) => {
- item.addressDetail = findParentOrCur(dic, item.id)
- },
- props: {
- label: 'name',
- value: 'id'
- },
- dicUrl: `/api/blade-system/region/getBaseTree`,
- },
-
- {
- hide: true,
- label: "户籍类型",
- prop: "residentType",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentType",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- hide: true,
- parent: false,
- width: 160,
- label: "户籍地区",
- prop: "residentAdcode",
- type: "tree",
- typeformat(item, label, value) {
- return item.addressDetail
- },
- change: ({
- value,
- column,
- item,
- dic
- }) => {
- item.addressDetail = findParentOrCur(dic, item.id)
- },
- props: {
- label: 'name',
- value: 'id'
- },
- dicUrl: `/api/blade-system/region/getBaseTree`,
- },
-
- {
- label: "户籍地址",
- prop: "hukouRegistration",
- hide: true,
- },
-
- {
- disabled: false,
- label: "居住地区",
- prop: "homeAdcode",
- hide: true,
- type: 'select',
- props: {
- label: 'name',
- value: 'code'
- },
- dicUrl: `/api/blade-system/region/select?code=361102`,
- },
-
- {
- disabled: false,
- label: "现居住地",
- prop: "currentAddress",
- hide: true,
- },
-
- {
- width: 210,
- overHidden: true,
- label: "标签",
- prop: "householdLabelList",
- display: false
- },
-
- {
- label: "民族",
- prop: "ethnicity",
- type: "select",
- hide: true,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationType",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- label: "学历",
- prop: "education",
- type: "select",
- hide: true,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- hide: true,
- width: 160,
- label: "职业类别",
- prop: "occupation"
- },
-
- {
- label: "工作单位",
- prop: "employer",
- hide: true,
- },
-
- {
- hide: true,
- width: 160,
- label: "工作单位地址",
- prop: "cmpyRegAddr"
- },
-
- {
- label: "工作状态",
- prop: "workStatus",
- type: "select",
- hide: true,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workStatusType",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- label: "婚姻状态",
- prop: "maritalStatus",
- type: "select",
- hide: true,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- hide: true,
- width: 160,
- label: "宗教信仰",
- prop: "religiousBelief",
- },
-
- {
- hide: true,
- label: "健康状态",
- prop: "healthStatus",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
- dataType: "number",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- },
-
- {
- disabled: true,
- hide: true,
- width: 160,
- label: "疾病名称",
- prop: "diseaseName"
- },
-
- {
- hide: true,
- width: 160,
- label: "外出去向",
- prop: "goOutWhere"
- },
-
- {
- hide: true,
- width: 160,
- label: "外出原因",
- prop: "goOutReason"
- },
-
- {
- hide: true,
- label: "外出时间",
- prop: "goOutTime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- width: 160,
- },
-
- {
- hide: true,
- width: 160,
- label: "外出详址",
- prop: "goOutAddr"
- },
-
- {
- label: "车牌号",
- prop: "cardNumber",
- hide: true,
- },
- ]
- },
- data: [],
-
- excelForm: {},
- labelForm: {},
- labelOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [{
- label: '级别',
- prop: 'color',
- type: 'radio',
- button: true,
- row: true,
- dicData: [{
- label: '撤销',
- value: '#EBEDF0'
- }, {
- label: '绿',
- // value: '#30D17C'
- value:'green'
- }, {
- label: '黄',
- // value: '#FFB42B'
- value:'yellow'
- }, {
- label: '红',
- // value: '#EA1F1F'
- value:'red'
- }],
- rules: [{
- required: true,
- message: "请选择",
- trigger: "blur"
- }]
- }, {
- row: true,
- label: '备注',
- prop: 'remark',
- type: 'input'
- }]
- },
- excelOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [{
- label: '模板上传',
- prop: 'excelFile',
- type: 'upload',
- drag: true,
- loadText: '模板上传中，请稍等',
- span: 24,
- propsHttp: {
- res: 'data'
- },
- tip: '请上传 .xls,.xlsx 标准格式文件',
- action: "/api/blade-system/user/import-user"
- },
- {
- label: "数据覆盖",
- prop: "isCovered",
- type: "switch",
- align: "center",
- width: 80,
- dicData: [{
- label: "否",
- value: 0
- },
- {
- label: "是",
- value: 1
- }
- ],
- value: 0,
- slot: true,
- rules: [{
- required: true,
- message: "请选择是否覆盖",
- trigger: "blur"
- }]
- },
- {
- label: '模板下载',
- prop: 'excelTemplate',
- formslot: true,
- span: 24,
}
- ]
- },
- currentLabel: {},
- currentRow: {},
- householdLabelList: [],
- }
+ callback()
+ }
+
+ return {
+ labelData: [],
+ form: {},
+ search: {},
+ excelBox: false,
+ selectionList: [],
+ labelFlag: false,
+ editLabelFlge: false,
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ option: {
+ labelWidth: 144,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 280,
+
+ height: 'auto',
+ calcHeight: 80,
+ tip: false,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ addBtn: true,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ menuFixed: 'right',
+ column: [{
+ label: "与业主关系",
+ prop: "relationship",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+ dataType: "number",
+ hide: true,
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ rules: [{
+ required: true,
+ message: "请选择与业主关系",
+ trigger: "blur",
+ }],
+ },
+
+ {
+ width: 110,
+ label: "姓名",
+ prop: "name",
+ searchSpan: 3,
+ searchLabelWidth: 66,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请输入姓名",
+ trigger: "blur",
+ }],
+ },
+
+ {
+ hide: true,
+ label: "证件类型",
+ prop: "cardType",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=cardType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ width: 160,
+ display: true,
+ label: "身份证号",
+ prop: "idCard",
+ search: true,
+ searchSpan: 4,
+ slot: true,
+ rules: [{
+ validator: isCardId,
+ trigger: 'blur'
+ }],
+ },
+
+ {
+ hide: true,
+ display: false,
+ width: 160,
+ label: "证件号码",
+ prop: "cardNo",
+ },
+
+ {
+ label: "出生日期",
+ prop: "birthday",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ },
+
+
+ {
+ width: 60,
+ label: "性别",
+ prop: "gender",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 0
+ },
+ {
+ label: "未知",
+ value: "3"
+ }
+ ],
+ },
+
+ {
+ width: 120,
+ label: "手机号码",
+ prop: "phoneNumber",
+ search: true,
+ searchSpan: 4,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请输入手机号码",
+ trigger: "blur",
+ },
+ {
+ validator: validatorPhone,
+ trigger: 'blur'
+ }
+ ],
+ },
+
+ {
+ label: "居住情况",
+ prop: "residentialStatus",
+ type: "select",
+ hide: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentialStatusType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ label: "其他联系方式",
+ prop: "otherContact",
+ hide: true,
+ rules: [{
+ validator: validatorPhone,
+ trigger: 'blur'
+ }],
+ },
+
+ {
+ label: "是否主要联系人",
+ prop: "isPrimaryContact",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=primaryContactType",
+ dataType: "number",
+ hide: true,
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ // {
+ // label: "关系",
+ // prop: "roleType",
+ // type: "select",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
+ // dataType: "number",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey",
+ // },
+ // },
+
+ {
+ width: 220,
+ overHidden: true,
+ label: '小区名称',
+ prop: "aoiName",
+ search: true,
+ searchSpan: 4,
+ display: false
+ },
+
+ {
+ width: 110,
+ label: "所属街道",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "townStreetName",
+ search: true,
+ searchSpan: 4
+ },
+
+ {
+ width: 156,
+ overHidden: true,
+ label: "所属社区",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "neiName",
+ search: true,
+ searchSpan: 4
+ },
+
+ {
+ width: 110,
+ overHidden: true,
+ label: "所属网格",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "gridName",
+ },
+
+ {
+ width: 156,
+ overHidden: true,
+ label: "地址",
+ prop: "address",
+ display: false
+ },
+
+
+ {
+ hide: true,
+ parent: false,
+ width: 160,
+ label: "籍贯地区",
+ prop: "nativePlaceAdcode",
+ type: "tree",
+ typeformat (item, label, value) {
+ return item.addressDetail
+ },
+ change: ({
+ value,
+ column,
+ item,
+ dic
+ }) => {
+ item.addressDetail = findParentOrCur(dic, item.id)
+ },
+ props: {
+ label: 'name',
+ value: 'id'
+ },
+ dicUrl: `/api/blade-system/region/getBaseTree`,
+ },
+
+ {
+ hide: true,
+ label: "户籍类型",
+ prop: "residentType",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ hide: true,
+ parent: false,
+ width: 160,
+ label: "户籍地区",
+ prop: "residentAdcode",
+ type: "tree",
+ typeformat (item, label, value) {
+ return item.addressDetail
+ },
+ change: ({
+ value,
+ column,
+ item,
+ dic
+ }) => {
+ item.addressDetail = findParentOrCur(dic, item.id)
+ },
+ props: {
+ label: 'name',
+ value: 'id'
+ },
+ dicUrl: `/api/blade-system/region/getBaseTree`,
+ },
+
+ {
+ label: "户籍地址",
+ prop: "hukouRegistration",
+ hide: true,
+ },
+
+ {
+ disabled: false,
+ label: "居住地区",
+ prop: "homeAdcode",
+ hide: true,
+ type: 'select',
+ props: {
+ label: 'name',
+ value: 'code'
+ },
+ dicUrl: `/api/blade-system/region/select?code=361102`,
+ },
+
+ {
+ disabled: false,
+ label: "现居住地",
+ prop: "currentAddress",
+ hide: true,
+ },
+
+ {
+ width: 210,
+ overHidden: true,
+ label: "标签",
+ prop: "householdLabelList",
+ display: false
+ },
+
+ {
+ label: "民族",
+ prop: "ethnicity",
+ type: "select",
+ hide: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ label: "学历",
+ prop: "education",
+ type: "select",
+ hide: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ hide: true,
+ width: 160,
+ label: "职业类别",
+ prop: "occupation"
+ },
+
+ {
+ label: "工作单位",
+ prop: "employer",
+ hide: true,
+ },
+
+ {
+ hide: true,
+ width: 160,
+ label: "工作单位地址",
+ prop: "cmpyRegAddr"
+ },
+
+ {
+ label: "工作状态",
+ prop: "workStatus",
+ type: "select",
+ hide: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workStatusType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ label: "婚姻状态",
+ prop: "maritalStatus",
+ type: "select",
+ hide: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ hide: true,
+ width: 160,
+ label: "宗教信仰",
+ prop: "religiousBelief",
+ },
+
+ {
+ hide: true,
+ label: "健康状态",
+ prop: "healthStatus",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+
+ {
+ disabled: true,
+ hide: true,
+ width: 160,
+ label: "疾病名称",
+ prop: "diseaseName"
+ },
+
+ {
+ hide: true,
+ width: 160,
+ label: "外出去向",
+ prop: "goOutWhere"
+ },
+
+ {
+ hide: true,
+ width: 160,
+ label: "外出原因",
+ prop: "goOutReason"
+ },
+
+ {
+ hide: true,
+ label: "外出时间",
+ prop: "goOutTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ width: 160,
+ },
+
+ {
+ hide: true,
+ width: 160,
+ label: "外出详址",
+ prop: "goOutAddr"
+ },
+
+ {
+ label: "车牌号",
+ prop: "cardNumber",
+ hide: true,
+ },
+
+ {
+ label: "备注",
+ prop: "remark",
+ hide: true,
+ },
+ ]
+ },
+ data: [],
+
+ excelForm: {},
+ labelForm: {},
+ labelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '级别',
+ prop: 'color',
+ type: 'radio',
+ button: true,
+ row: true,
+ dicData: [{
+ label: '撤销',
+ value: '#999'
+ }, {
+ label: '绿',
+ value: 'green'
+ }, {
+ label: '黄',
+ value: 'yellow'
+ }, {
+ label: '红',
+ value: 'red'
+ }],
+ rules: [{
+ required: true,
+ message: "请选择",
+ trigger: "blur"
+ }]
+ }, {
+ row: true,
+ label: '备注',
+ prop: 'remark',
+ type: 'input'
+ }]
+ },
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '模板上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '模板上传中，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data'
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: "/api/blade-system/user/import-user"
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [{
+ label: "否",
+ value: 0
+ },
+ {
+ label: "是",
+ value: 1
+ }
+ ],
+ value: 0,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
+ }
+ ]
+ },
+ currentLabel: {},
+ currentRow: {},
+ householdLabelList: [],
+ }
},
watch: {
- 'form.source': {
- handler(newData) {
- let currentAddressColumn = this.findObject(
- this.option.column,
- 'currentAddress'
- )
+ 'form.source': {
+ handler (newData) {
+ let currentAddressColumn = this.findObject(
+ this.option.column,
+ 'currentAddress'
+ )
- let homeAdcodeColumn = this.findObject(
- this.option.column,
- 'homeAdcode'
- )
+ let homeAdcodeColumn = this.findObject(
+ this.option.column,
+ 'homeAdcode'
+ )
- if (newData == 1) {
- currentAddressColumn.disabled = true
- homeAdcodeColumn.disabled = true
- } else {
- currentAddressColumn.disabled = false
- homeAdcodeColumn.disabled = false
- }
+ if (newData == 1) {
+ currentAddressColumn.disabled = true
+ homeAdcodeColumn.disabled = true
+ } else {
+ currentAddressColumn.disabled = false
+ homeAdcodeColumn.disabled = false
+ }
+ },
},
- },
- 'form.cardType': {
- handler(newData) {
- let idCardColumn = this.findObject(
- this.option.column,
- 'idCard'
- )
+ 'form.cardType': {
+ handler (newData) {
+ let idCardColumn = this.findObject(
+ this.option.column,
+ 'idCard'
+ )
- let cardNoColumn = this.findObject(
- this.option.column,
- 'cardNo'
- )
+ let cardNoColumn = this.findObject(
+ this.option.column,
+ 'cardNo'
+ )
- if (newData == 111) {
- idCardColumn.display = true
- cardNoColumn.display = false
- } else {
- idCardColumn.display = false
- cardNoColumn.display = true
- }
+ if (newData == 111) {
+ idCardColumn.display = true
+ cardNoColumn.display = false
+ } else {
+ idCardColumn.display = false
+ cardNoColumn.display = true
+ }
+ },
},
- },
- 'form.healthStatus': {
- handler(newData) {
- let diseaseNameColumn = this.findObject(
- this.option.column,
- 'diseaseName'
- )
+ 'form.healthStatus': {
+ handler (newData) {
+ let diseaseNameColumn = this.findObject(
+ this.option.column,
+ 'diseaseName'
+ )
- if (newData == 3) {
- diseaseNameColumn.disabled = false
- } else {
- diseaseNameColumn.disabled = true
- }
+ if (newData == 3) {
+ diseaseNameColumn.disabled = false
+ } else {
+ diseaseNameColumn.disabled = true
+ }
+ },
},
- },
},
computed: {
- ...mapGetters(["userInfo", "permission"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.household_add, false),
- viewBtn: this.vaildData(this.permission.household_view, true),
- delBtn: this.vaildData(this.permission.household_delete, true),
- editBtn: this.vaildData(this.permission.household_edit, true)
- }
- },
-
- textDispose() {
- return (row, flag, type) => {
- if (row[flag] || row[type] == null) {
- return row[type]
- } else {
- if (type == 'idCard') {
- return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
- } else {
- return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.household_add, false),
+ viewBtn: this.vaildData(this.permission.household_view, true),
+ delBtn: this.vaildData(this.permission.household_delete, true),
+ editBtn: this.vaildData(this.permission.household_edit, true)
}
- }
- }
- },
+ },
- labelDispose() {
- return (list) => {
- return list.map(item => item.labelName).join(',')
- }
- }
- },
- mounted() {},
- methods: {
- onsubmit() {
- if (this.labelForm.color === '#EBEDF0') {
- let params = {
- householdId: this.currentRow.id,
- labelId: this.currentLabel.id,
- // userId: this.currentLabel.id
- }
- removeHouseholdLabel(params).then(res => {
- this.onLoad(this.page)
-
- this.$message({
- type: "success",
- message: "操作成功!"
- })
- this.editLabelFlge = false
- this.manageLabel(this.currentRow)
- this.loading = false
- })
- } else {
- this.labelForm.houseCode = this.currentRow.houseCode
- this.labelForm.householdId = this.currentRow.id
- this.labelForm.labelId = this.currentLabel.id
- this.labelForm.userId = this.currentRow.associatedUserId
- this.labelForm.lableType = 1
-
- saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
- this.onLoad(this.page)
-
- this.$message({
- type: "success",
- message: "操作成功!"
- })
- this.editLabelFlge = false
- this.manageLabel(this.currentRow)
- this.loading = false
- })
- }
- },
-
- changLabel(item) {
- this.editLabelFlge = true
- this.currentLabel = item
- this.labelForm.color = item.color
- this.labelForm.remark = item.remark
- },
-
- manageLabel(item) {
- this.loading = true
- this.currentRow = item
- this.labelFlag = true
- let params = {
- parentId: 1000
- }
- // 查询标签
- getLabelList(Object.assign(params)).then(res => {
- const data = res.data.data
- // this.labelData = data;
- // 查询详情
- getDetatils(item.id).then(res => {
- this.householdLabelList = res.data.data.householdLabelList
- // 将细类放到一起
- data.forEach(e => {
- e.children.forEach(f => {
- if (this.householdLabelList.length > 0) {
- this.householdLabelList.forEach(h => {
- if (Number(f.id) == h.labelId) {
- f['color'] = h.color
- f['remark'] = h.remark
+ textDispose () {
+ return (row, flag, type) => {
+ if (row[flag] || row[type] == null) {
+ return row[type]
+ } else {
+ if (type == 'idCard') {
+ return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
+ } else {
+ return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
}
- })
}
- })
- })
- this.labelData = data
- this.loading = false
- })
- })
- },
- rowSave(row, done, loading) {
- add(row).then(() => {
- this.initFlag = false
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!"
- })
- done()
- }, error => {
- window.console.log(error)
- loading()
- })
- },
- rowUpdate(row, index, done, loading) {
- update(row).then(() => {
- this.initFlag = false
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!"
- })
- done()
- }, error => {
- window.console.log(error)
- loading()
- })
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!"
- })
- })
- },
- searchReset() {
- this.query = {}
- this.treeDeptId = ''
- this.onLoad(this.page)
- },
- searchChange(params, done) {
- this.query = params
- this.page.currentPage = 1
- this.onLoad(this.page, params)
- done()
- },
- selectionChange(list) {
- this.selectionList = list
- },
- selectionClear() {
- this.selectionList = []
- // this.$refs.crud.toggleSelection();
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据")
- return
+ }
+ },
+
+ labelDispose () {
+ return (list) => {
+ return list.map(item => item.labelName).join(',')
+ }
+ },
+
+ getColor () {
+ return (data) => {
+ return setLabelColor(data)
+ }
}
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(this.ids)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!"
+ },
+ mounted () { },
+ methods: {
+ onsubmit () {
+ if (this.labelForm.color === '#EBEDF0') {
+ let params = {
+ householdId: this.currentRow.id,
+ labelId: this.currentLabel.id,
+ // userId: this.currentLabel.id
+ }
+ removeHouseholdLabel(params).then(res => {
+ this.onLoad(this.page)
+
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.editLabelFlge = false
+ this.manageLabel(this.currentRow)
+ this.loading = false
+ })
+ } else {
+ this.labelForm.houseCode = this.currentRow.houseCode
+ this.labelForm.householdId = this.currentRow.id
+ this.labelForm.labelId = this.currentLabel.id
+ this.labelForm.userId = this.currentRow.associatedUserId
+ this.labelForm.lableType = 1
+
+ saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+ this.onLoad(this.page)
+
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.editLabelFlge = false
+ this.manageLabel(this.currentRow)
+ this.loading = false
+ })
+ }
+ },
+
+ changLabel (item) {
+ this.editLabelFlge = true
+ this.currentLabel = item
+ this.labelForm.color = item.color
+ this.labelForm.remark = item.remark
+ },
+
+ manageLabel (item) {
+ this.loading = true
+ this.currentRow = item
+ this.labelFlag = true
+ let params = {
+ parentId: 1000
+ }
+ // 查询标签
+ getLabelList(Object.assign(params)).then(res => {
+ const data = res.data.data
+ // this.labelData = data;
+ // 查询详情
+ getDetatils(item.id).then(res => {
+ this.householdLabelList = res.data.data.householdLabelList
+ // 将细类放到一起
+ data.forEach(e => {
+ e.children.forEach(f => {
+ if (this.householdLabelList.length > 0) {
+ this.householdLabelList.forEach(h => {
+ if (Number(f.id) == h.labelId) {
+ f['color'] = h.color
+ f['remark'] = h.remark
+ }
+ })
+ }
+ })
+ })
+ this.labelData = data
+ this.loading = false
+ })
})
- this.$refs.crud.toggleSelection()
- })
- },
- handleImport() {
- this.excelBox = true
- },
- uploadAfter(res, done, loading, column) {
- this.excelBox = false
- this.refreshChange()
- done()
- },
- handleExport() {
- this.$confirm("是否导出住户数据?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- NProgress.start()
- var data = {
- ...this.query
- }
- data = Qs.stringify(data)
- exportBlob(
- `/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
- ).then(res => {
- downloadXls(res.data, `住户数据表${dateNow()}.xlsx`)
- NProgress.done()
- })
- })
- },
- handleTemplate() {
- exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
- downloadXls(res.data, "住户数据模板.xlsx")
- })
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetatils(this.form.id).then(res => {
- this.form = res.data.data
+ },
+ rowSave (row, done, loading) {
+ add(row).then(() => {
+ this.initFlag = false
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ done()
+ }, error => {
+ window.console.log(error)
+ loading()
+ })
+ },
+ rowUpdate (row, index, done, loading) {
+ update(row).then(() => {
+ this.initFlag = false
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ done()
+ }, error => {
+ window.console.log(error)
+ loading()
+ })
+ },
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
+ searchReset () {
+ this.query = {}
+ this.treeDeptId = ''
+ this.onLoad(this.page)
+ },
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
done()
- })
- }
- this.initFlag = true
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize
- },
- refreshChange() {
- this.onLoad(this.page, this.query)
- },
-
- onLoad(page, params = {}) {
- this.loading = true
-
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
- const data = {
- ...res.data.data,
- records: res.data.data.records.map(item => {
- return {
- ...item,
- 'phoneNumberflag': false,
- 'idCardflag': false
- }
+ },
+ selectionChange (list) {
+ this.selectionList = list
+ },
+ selectionClear () {
+ this.selectionList = []
+ // this.$refs.crud.toggleSelection();
+ },
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
})
- }
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ handleImport () {
+ this.excelBox = true
+ },
+ uploadAfter (res, done, loading, column) {
+ this.excelBox = false
+ this.refreshChange()
+ done()
+ },
+ handleExport () {
+ this.$confirm("是否导出住户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ var data = {
+ ...this.query
+ }
+ data = Qs.stringify(data)
+ exportBlob(
+ `/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
+ ).then(res => {
+ downloadXls(res.data, `住户数据表${dateNow()}.xlsx`)
+ NProgress.done()
+ })
+ })
+ },
+ handleTemplate () {
+ exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+ downloadXls(res.data, "住户数据模板.xlsx")
+ })
+ },
+ beforeOpen (done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetatils(this.form.id).then(res => {
+ this.form = res.data.data
+ done()
+ })
+ }
+ this.initFlag = true
+ },
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange () {
+ this.onLoad(this.page, this.query)
+ },
- this.page.total = data.total
- this.data = data.records
- this.loading = false
- this.selectionClear()
- })
- },
+ onLoad (page, params = {}) {
+ this.loading = true
- showStringDispose(row, type) {
- row[type] = !row[type]
- }
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = {
+ ...res.data.data,
+ records: res.data.data.records.map(item => {
+ return {
+ ...item,
+ 'phoneNumberflag': false,
+ 'idCardflag': false
+ }
+ })
+ }
+
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
+ },
+
+ showStringDispose (row, type) {
+ row[type] = !row[type]
+ }
}
- }
+}
</script>
<style>
- .box {
+.box {
height: 800px;
- }
+}
- .grid-container2 {
+.grid-container2 {
/* display: grid;
grid-template-columns: auto auto auto auto;
grid-gap: 10px; */
display: flex;
flex-wrap: wrap;
padding-bottom: 20px;
- }
+}
- .grid-item {
+.grid-item {
padding: 8px 14px;
border: 1px solid #dcdfe6;
margin-right: 10px;
margin-bottom: 10px;
border-radius: 20px;
- }
+}
- .grid-item:hover {
+.grid-item:hover {
background-color: #e8f4ff;
color: #017BFC;
cursor: pointer;
- }
+}
- .el-scrollbar {
+.el-scrollbar {
height: 100%;
- }
+}
- .box .el-scrollbar__wrap {
+.box .el-scrollbar__wrap {
overflow: scroll;
- }
+}
</style>
\ No newline at end of file
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index dc511ea..69c1039 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -52,8 +52,8 @@
<el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
<div id="" class="grid-container2">
- <div class="grid-item" :style="{ backgroundColor: item.color }" v-for="(item, index) in labelData"
- :key="index" @click="changLabel(item)">
+ <div class="grid-item" v-for="(item, index) in labelData" :key="index" @click="changLabel(item)">
+ {{ item.color }}
{{ item.name }}
</div>
</div>
@@ -92,6 +92,8 @@
</template>
<script>
+import { setLabelColor } from '@/util/util'
+
import {
getList,
remove,
@@ -162,19 +164,16 @@
row: true,
dicData: [{
label: '撤销',
- // value: '#EBEDF0'
+ value: '#999'
}, {
label: '绿',
- // value: '#30D17C'
- value:'green'
+ value: 'green'
}, {
label: '黄',
- // value: '#FFB42B'
- value:'yellow'
+ value: 'yellow'
}, {
label: '红',
- // value: '#EA1F1F'
- value:'red'
+ value: 'red'
}],
rules: [{
required: true,
@@ -227,21 +226,15 @@
display: false
},
{
- width: 156,
- overHidden: true,
- label: "地址",
- prop: "address",
- display: false,
- },
- {
// hide: true,
width: 220,
overHidden: true,
label: '地址',
parent: false,
prop: "houseName",
- searchSpan: 4,
display: false,
+ searchLabelWidth: 66,
+ searchSpan: 4,
search: true,
},
{
@@ -518,6 +511,12 @@
return (list) => {
return list.map(item => item.labelName).join(',')
}
+ },
+
+ getColor () {
+ return (data) => {
+ return setLabelColor(data)
+ }
}
},
mounted () { },
diff --git a/src/views/work/process/maintenanceFundApply/handle.vue b/src/views/work/process/maintenanceFundApply/handle.vue
index d911f4d..9e1d425 100644
--- a/src/views/work/process/maintenanceFundApply/handle.vue
+++ b/src/views/work/process/maintenanceFundApply/handle.vue
@@ -1,413 +1,420 @@
<template>
- <basic-container>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-row type="flex" class="row-bg" justify="end">
- <el-form-item>
- <el-button @click="handleCancel">关闭</el-button>
- </el-form-item>
- </el-row>
+ <basic-container>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-row type="flex" class="row-bg" justify="end">
+ <el-form-item>
+ <el-button @click="handleCancel">关闭</el-button>
+ </el-form-item>
+ </el-row>
- <el-card shadow="hover">
- <div slot="header">
- <span>审批信息</span>
- </div>
- <avue-form :option="option" v-model="form"></avue-form>
- </el-card>
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>审批信息</span>
+ </div>
+ <avue-form :option="option" v-model="form"></avue-form>
+ </el-card>
- <el-card shadow="hover">
- <div slot="header">
- <span>流程信息</span>
- </div>
- <el-row type="flex" class="row-bg">
- <el-timeline>
- <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
- <el-card shadow="hover">
- <p>{{flow.assigneeName}} 在 [{{flow.createTime}}] 开始处理 [{{flow.historyActivityName}}] 环节</p>
- <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
- <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
- <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
- </el-card>
- </el-timeline-item>
- </el-timeline>
- </el-row>
- </el-card>
- <el-card shadow="hover">
- <div slot="header">
- <span>流程跟踪</span>
- </div>
- <el-row class="row-bg">
- <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
- </el-row>
- </el-card>
- </el-form>
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>流程信息</span>
+ </div>
+ <el-row type="flex" class="row-bg">
+ <el-timeline>
+ <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList"
+ placement="top">
+ <el-card shadow="hover">
+ <p>{{ flow.assigneeName }} 在 [{{ flow.createTime }}] 开始处理 [{{ flow.historyActivityName }}]
+ 环节</p>
+ <p v-if="flow.historyActivityDurationTime !== ''">任务历时 [{{ flow.historyActivityDurationTime
+ }}]
+ </p>
+ <p v-if="flow.comment !== ''">批复意见: [{{ flow.comment }}]</p>
+ <p v-if="flow.endTime !== ''">结束时间: [{{ flow.endTime }}]</p>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </el-row>
+ </el-card>
+ <el-card shadow="hover">
+ <div slot="header">
+ <span>流程跟踪</span>
+ </div>
+ <el-row class="row-bg">
+ <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
+ </el-row>
+ </el-card>
+ </el-form>
- <!-- <div style="">
+ <!-- <div style="">
<el-button type="primary" @click="handleAgree">同意</el-button>
<el-button type="danger" @click="handleDisagree">驳回</el-button>
</div> -->
- <div style="text-align: center;
+ <div style="text-align: center;
position: fixed;
left: 0;
right: 0;
bottom: 10px;">
- <el-button type="primary" @click="handleAgree">同意</el-button>
- <el-button type="danger" @click="handleDisagree">驳回</el-button>
- </div>
+ <el-button type="primary" @click="handleAgree">同意</el-button>
+ <el-button type="danger" @click="handleDisagree">驳回</el-button>
+ </div>
- </basic-container>
+ </basic-container>
</template>
<script>
- import {
+import {
historyFlowList,
leaveDetail
- } from "@/api/work/process";
+} from "@/api/work/process"
- import {
+import {
getList,
remove,
update,
add,
getPropertyCapitalApply
- } from "@/api/property/propertyCapitalApply";
- import {
+} from "@/api/property/propertyCapitalApply"
+import {
completeTask
- } from "@/api/work/work";
+} from "@/api/work/work"
+import website from '@/config/website'
- export default {
- data() {
- return {
- taskId: '',
- businessId: '',
- processInstanceId: '',
- src: '',
- flowList: [],
- form: {
- flow: {
- assigneeName: '',
- },
- startTime: '',
- endTime: '',
- reason: '',
- },
- option: {
- height: "auto",
- calcHeight: 54,
- dialogWidth: 1150,
- tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 350,
- border: true,
- //stripe:true,
- submitBtn: false,
- emptyBtn: false,
- index: true,
- viewBtn: true,
- selection: true,
- dialogClickModal: false,
- column: [{
- label: "小区",
- prop: "districtId",
- searchSpan: 5,
- search: true,
- type: 'tree',
- dicUrl: `/api/blade-district/district/getDistrictTree`,
- props: {
- label: "name",
- value: "id"
- },
- defaultExpandedKeys: ["361102003"],
- span: 12,
- labelWidth: 120,
- width: 220,
- overHidden: true,
- rules: [{
- required: true,
- message: "请选择小区",
- trigger: "blur",
- }, ],
- disabled: true
+export default {
+ data () {
+ return {
+ taskId: '',
+ businessId: '',
+ processInstanceId: '',
+ src: '',
+ flowList: [],
+ form: {
+ flow: {
+ assigneeName: '',
+ },
+ startTime: '',
+ endTime: '',
+ reason: '',
},
- {
- label: '维修项目名称',
- prop: 'name',
- searchLabelWidth: 120,
- searchSpan: 5,
- search: true,
- span: 12,
- labelWidth: 140,
- rules: [{
- required: true,
- message: "请输入维修项目名称",
- trigger: "blur",
- }, ],
- disabled: true
- },
- {
- label: "预计开工时间",
- prop: "runTime",
- span: 12,
- labelWidth: 140,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [{
- required: true,
- message: "请选择合同开始时间",
- trigger: "blur",
- }, ],
- disabled: true
- },
- {
- label: "预计竣工时间",
- prop: "completedTime",
- labelWidth: 140,
- span: 12,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [{
- required: true,
- message: "请选择合同结束时间",
- trigger: "blur",
- }, ],
- disabled: true
- },
- {
- label: "项目分摊方式",
- prop: "allocationWay",
- labelWidth: 140,
- value: '按建筑面积分摊',
- span: 14,
- row: true,
- disabled: true
- },
- {
- label: '联系人',
- prop: 'linkman',
- span: 12,
- labelWidth: 120,
- search: true,
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- }, ],
- disabled: true
- },
- {
- label: '联系方式',
- prop: 'linkPhone',
- span: 12,
- labelWidth: 140,
- rules: [{
- required: true,
- message: "请输入联系方式",
- trigger: "blur",
- }, ],
- disabled: true
- },
- {
- label: "项目预算总金额(元)",
- prop: "budgetAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00',
- disabled: true
- },
- {
- label: "实际预算金额(元)",
- prop: "actualAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00',
- disabled: true
- },
- {
- label: "自筹金额(元)",
- prop: "selfAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00',
- disabled: true
- },
- {
- label: "预算应拨付金额(元)",
- prop: "budgetAppropriateAmount",
- span: 12,
- hide: true,
- labelWidth: 140,
- type: 'number',
- precision: 2,
- value: '0.00',
- disabled: true
- },
- {
- label: "项目摘要",
- span: 24,
- hide: true,
- prop: "projectDigest",
- placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
- labelWidth: 140,
- type: "textarea",
- disabled: true
- },
- {
- label: "项目进度描述",
- span: 24,
- hide: true,
- prop: "projectDescribe",
- labelWidth: 140,
- type: "textarea",
- disabled: true
- }, {
- label: "批复意见",
- span: 24,
- hide: true,
- prop: "comment",
- labelWidth: 140,
- type: "textarea",
- rules: [{
- required: true,
- message: "请输入批复意见",
- trigger: "blur",
- }, ],
- },
- {
- label: '施工方案附件',
- prop: 'constructionSchemeUrls',
- type: 'upload',
- span: 24,
- hide: true,
- labelWidth: 140,
- multiple: true,
- // showFileList: true,
- propsHttp: {
- res: 'data',
- name: "originalName",
- url: "link"
- },
- action: '/api/blade-resource/oss/endpoint/put-file-attach',
- rules: [{
- required: true,
- message: "请上传施工方案",
- trigger: "blur",
- }, ],
+ option: {
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 1150,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 350,
+ border: true,
+ //stripe:true,
+ submitBtn: false,
+ emptyBtn: false,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [{
+ label: "小区",
+ prop: "districtId",
+ searchSpan: 5,
+ search: true,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ labelWidth: 120,
+ width: 220,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ },],
+ disabled: true
+ },
+ {
+ label: '维修项目名称',
+ prop: 'name',
+ searchLabelWidth: 120,
+ searchSpan: 5,
+ search: true,
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入维修项目名称",
+ trigger: "blur",
+ },],
+ disabled: true
+ },
+ {
+ label: "预计开工时间",
+ prop: "runTime",
+ span: 12,
+ labelWidth: 140,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同开始时间",
+ trigger: "blur",
+ },],
+ disabled: true
+ },
+ {
+ label: "预计竣工时间",
+ prop: "completedTime",
+ labelWidth: 140,
+ span: 12,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同结束时间",
+ trigger: "blur",
+ },],
+ disabled: true
+ },
+ {
+ label: "项目分摊方式",
+ prop: "allocationWay",
+ labelWidth: 140,
+ value: '按建筑面积分摊',
+ span: 14,
+ row: true,
+ disabled: true
+ },
+ {
+ label: '联系人',
+ prop: 'linkman',
+ span: 12,
+ labelWidth: 120,
+ search: true,
+ searchSpan: 4,
+ rules: [{
+ required: true,
+ message: "请输入联系人",
+ trigger: "blur",
+ },],
+ disabled: true
+ },
+ {
+ label: '联系方式',
+ prop: 'linkPhone',
+ span: 12,
+ labelWidth: 140,
+ rules: [{
+ required: true,
+ message: "请输入联系方式",
+ trigger: "blur",
+ },],
+ disabled: true
+ },
+ {
+ label: "项目预算总金额(元)",
+ prop: "budgetAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "实际预算金额(元)",
+ prop: "actualAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "自筹金额(元)",
+ prop: "selfAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "预算应拨付金额(元)",
+ prop: "budgetAppropriateAmount",
+ span: 12,
+ hide: true,
+ labelWidth: 140,
+ type: 'number',
+ precision: 2,
+ value: '0.00',
+ disabled: true
+ },
+ {
+ label: "项目摘要",
+ span: 24,
+ hide: true,
+ prop: "projectDigest",
+ placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
+ labelWidth: 140,
+ type: "textarea",
+ disabled: true
+ },
+ {
+ label: "项目进度描述",
+ span: 24,
+ hide: true,
+ prop: "projectDescribe",
+ labelWidth: 140,
+ type: "textarea",
+ disabled: true
+ }, {
+ label: "批复意见",
+ span: 24,
+ hide: true,
+ prop: "comment",
+ labelWidth: 140,
+ type: "textarea",
+ rules: [{
+ required: true,
+ message: "请输入批复意见",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: '施工方案附件',
+ prop: 'constructionSchemeUrls',
+ type: 'upload',
+ listType: 'picture-img',
+ span: 24,
+ hide: true,
+ labelWidth: 140,
+ multiple: true,
+ // showFileList: true,
+ propsHttp: {
+ res: 'data',
+ name: "originalName",
+ url: "link"
+ },
+ action: '/api/blade-resource/oss/endpoint/put-file-attach',
+ rules: [{
+ required: true,
+ message: "请上传施工方案",
+ trigger: "blur",
+ },],
+ }
+ ],
}
- ],
}
- }
},
- created() {
- this.init();
+ created () {
+ this.init()
},
- beforeRouteUpdate(to, from, next) {
- // 在当前路由改变，但是该组件被复用时调用
- // 举例来说，对于一个带有动态参数的路径 /foo/:id，在 /foo/1 和 /foo/2 之间跳转的时候
- // 由于会渲染同样的 Foo 组件，因此组件实例会被复用。而这个钩子就会在这个情况下被调用
- // 可以访问组件实例 `this`
- if (to.fullPath !== from.fullPath) {
- next();
- this.init();
- }
+ beforeRouteUpdate (to, from, next) {
+ // 在当前路由改变，但是该组件被复用时调用
+ // 举例来说，对于一个带有动态参数的路径 /foo/:id，在 /foo/1 和 /foo/2 之间跳转的时候
+ // 由于会渲染同样的 Foo 组件，因此组件实例会被复用。而这个钩子就会在这个情况下被调用
+ // 可以访问组件实例 `this`
+ if (to.fullPath !== from.fullPath) {
+ next()
+ this.init()
+ }
},
methods: {
- init() {
- this.taskId = this.$route.params.taskId;
- this.processInstanceId = this.$route.params.processInstanceId;
- this.businessId = this.$route.params.businessId;
- historyFlowList(this.processInstanceId).then(res => {
- const data = res.data;
- if (data.success) {
- this.flowList = data.data;
- }
- })
- getPropertyCapitalApply(this.businessId).then(res => {
- const data = res.data;
- if (data.success) {
- this.form = data.data;
- }
- })
- },
- handleAgree() {
- if (!this.form.comment) {
- this.$message.warning('请先填写批复意见');
- return;
- }
- const params = {
- taskId: this.taskId,
- processInstanceId: this.processInstanceId,
- flag: 'ok',
- comment: this.form.comment,
- };
- completeTask(params).then(res => {
- const data = res.data;
- if (data.success) {
- this.$message.success(data.msg);
- this.$router.$avueRouter.closeTag();
+ init () {
+ this.taskId = this.$route.params.taskId
+ this.processInstanceId = this.$route.params.processInstanceId
+ this.businessId = this.$route.params.businessId
+ historyFlowList(this.processInstanceId).then(res => {
+ const data = res.data
+ if (data.success) {
+ this.flowList = data.data
+ }
+ })
+ getPropertyCapitalApply(this.businessId).then(res => {
+ const data = res.data
+ if (data.success) {
+ data.data.constructionSchemeUrls = website.minioUrl + data.data.constructionSchemeUrls
+ this.form = data.data
+ }
+ })
+ },
+ handleAgree () {
+ if (!this.form.comment) {
+ this.$message.warning('请先填写批复意见')
+ return
+ }
+ const params = {
+ taskId: this.taskId,
+ processInstanceId: this.processInstanceId,
+ flag: 'ok',
+ comment: this.form.comment,
+ }
+ completeTask(params).then(res => {
+ const data = res.data
+ if (data.success) {
+ this.$message.success(data.msg)
+ this.$router.$avueRouter.closeTag()
+ this.$router.push({
+ path: `/work/todo`
+ })
+ } else {
+ this.$message.error(data.msg || '提交失败')
+ }
+ })
+ },
+ handleDisagree () {
+ if (!this.form.comment) {
+ this.$message.warning('请先填写批复意见')
+ return
+ }
+ const params = {
+ taskId: this.taskId,
+ processInstanceId: this.processInstanceId,
+ comment: this.form.comment,
+ }
+ completeTask(params).then(res => {
+ const data = res.data
+ if (data.success) {
+ this.$message.success(data.msg)
+ this.$router.$avueRouter.closeTag()
+ this.$router.push({
+ path: `/work/todo`
+ })
+ } else {
+ this.$message.error(data.msg || '提交失败')
+ }
+ })
+ },
+ handleCancel () {
+ this.$router.$avueRouter.closeTag()
this.$router.push({
- path: `/work/todo`
- });
- } else {
- this.$message.error(data.msg || '提交失败');
- }
- })
- },
- handleDisagree() {
- if (!this.form.comment) {
- this.$message.warning('请先填写批复意见');
- return;
+ path: `/work/todo`
+ })
}
- const params = {
- taskId: this.taskId,
- processInstanceId: this.processInstanceId,
- comment: this.form.comment,
- };
- completeTask(params).then(res => {
- const data = res.data;
- if (data.success) {
- this.$message.success(data.msg);
- this.$router.$avueRouter.closeTag();
- this.$router.push({
- path: `/work/todo`
- });
- } else {
- this.$message.error(data.msg || '提交失败');
- }
- })
- },
- handleCancel() {
- this.$router.$avueRouter.closeTag();
- this.$router.push({
- path: `/work/todo`
- });
- }
}
- }
+}
</script>
<style scoped>
- .container {
+.container {
position: relative;
/* 确保按钮相对于该元素定位 */
- }
+}
- #myButton {
+#myButton {
position: fixed;
bottom: 0;
left: 50%;
transform: translateX(-50%);
- }
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3