From f100ef511bfd5cb27e553a41abcb8fbd7dcc3fe4 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 16 Jan 2024 17:41:11 +0800
Subject: [PATCH] 字段添加
---
src/views/place/index.vue | 413 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 249 insertions(+), 164 deletions(-)
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index fb3f85f..ec18589 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -17,8 +17,18 @@
<span v-text="decimalProcessing(row.lat)"></span>
</template>
- <template slot-scope="{row}" slot="confirmFlag">
- <el-tag size="small" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
+ <template slot-scope="{row, size}" slot="confirmFlag">
+ <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
+ }}</el-tag>
+ </template>
+
+ <template slot-scope="{row, size}" slot="confirmFlag">
+ <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
+ }}</el-tag>
+ </template>
+
+ <template slot-scope="{row, size}" slot="source">
+ <el-tag :size="size" :type="showSource(row.source).type">{{ showSource(row.source).text
}}</el-tag>
</template>
@@ -27,13 +37,13 @@
</el-button>
</template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" :disabled="scope.row.confirmFlag == 2" icon="el-icon-s-check" size="small"
- v-if="permission.place_audit_cur && scope.row.confirmFlag != 4" @click="auditCur(scope.row)">审核
+ <template slot-scope="{row, size}" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-s-check" v-if="permission.place_audit_cur"
+ @click="auditCur({ ...row, confirmFlag: 1 })">审核
</el-button>
- <el-button type="text" icon="el-icon-edit" size="small" v-if="permission.place_manage_tenants"
- @click="ManageTenants(scope.row)">场所维护
+ <el-button :size="size" type="text" icon="el-icon-edit" v-if="permission.place_manage_tenants"
+ @click="ManageTenants(row)">场所维护
</el-button>
</template>
</avue-crud>
@@ -69,6 +79,19 @@
export default {
data () {
+
+ //手机号格式校验
+ let validatorPhone = function (rule, value, callback) {
+ if (value) {
+ if (!/^1[3456789]\d{9}$/.test(value)) {
+ callback(new Error('手机号格式有误！'))
+ } else {
+ callback()
+ }
+ }
+ callback()
+ }
+
return {
curRow: {},
roleBox: false,
@@ -85,13 +108,16 @@
datetime: "",
selectionList: [],
option: {
+ labelWidth: 120,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 280,
+
height: "auto",
calcHeight: 54,
dialogWidth: 950,
tip: false,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 280,
border: true,
//stripe:true,
index: true,
@@ -102,11 +128,12 @@
menuFixed: 'right',
column: [
{
- width: 160,
- span: 12,
+ width: 156,
+ overHidden: true,
label: "场所名称",
+ span: 12,
prop: "placeName",
- searchSpan: 4,
+ searchSpan: 5,
search: true,
rules: [{
required: true,
@@ -114,6 +141,144 @@
trigger: "blur",
},],
},
+
+ {
+ width: 156,
+ overHidden: true,
+ slot: true,
+ label: "位置",
+ prop: "location",
+ type: 'map',
+ dataType: "string",
+ span: 12,
+ value: [117.966460, 28.431002, ""],
+ rules: [
+ {
+ required: true,
+ message: "请选择位置",
+ trigger: "blur",
+ },
+ ],
+ },
+
+ {
+ width: 110,
+ label: "场所负责人",
+ prop: "principal",
+ searchSpan: 5,
+ searchLabelWidth: 110,
+ search: true,
+ rules: [{
+ required: false,
+ message: "请输入负责人",
+ trigger: "blur",
+ },],
+ },
+
+ {
+ width: 120,
+ overHidden: true,
+ label: "手机号码",
+ prop: "principalPhone",
+ search: true,
+ searchSpan: 4,
+ slot: true,
+ rules: [
+ {
+ validator: validatorPhone,
+ trigger: 'blur'
+ }
+ ],
+ },
+
+ {
+ 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,
+ rules: [
+ {
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ hide: true,
+ parent: false,
+ label: "所属社区",
+ prop: "neiCode",
+ search: false,
+ width: 150,
+ type: "tree",
+ dicUrl: "/api/blade-system/region/tree",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ cascader: ["gridId"],
+ rules: [
+ {
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ },
+ ],
+ },
+
+ {
+ width: 110,
+ overHidden: true,
+ label: "所属网格",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "gridName",
+ rules: [
+ {
+ required: true,
+ message: "请选择所属网格",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ hide: true,
+ label: "所属网格",
+ prop: "gridId",
+ type: "tree",
+ cell: true,
+ props: {
+ label: "gridName",
+ value: "id",
+ },
+ dicUrl:
+ "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
+ rules: [
+ {
+ required: true,
+ message: "请选择所属网格",
+ trigger: "blur",
+ },
+ ],
+ },
+
{
span: 7,
@@ -151,115 +316,38 @@
},
{
- label: "负责人",
- prop: "principal",
- searchSpan: 4,
- search: true,
+ span: 12,
+ label: "标签颜色",
+ prop: "color",
+ type: "cascader",
+ dicData: [
+ {
+ label: '绿',
+ value: 'green'
+ }, {
+ label: '黄',
+ value: 'yellow'
+ }, {
+ label: '红',
+ value: 'red'
+ }
+ ],
+ props: {
+ label: "label",
+ value: "value"
+ },
+ hide: true,
rules: [{
- required: false,
- message: "请输入负责人",
+ required: true,
+ message: "请输入场所标签",
trigger: "blur",
},],
},
{
width: 110,
- label: "电话",
- prop: "principalPhone",
- search: true,
- searchSpan: 3,
- slot: true,
- },
-
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- width: 96,
- label: "所属街道",
- prop: "townStreetName",
- search: true,
- searchSpan: 4
- },
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- label: "所属社区",
- prop: "neiName",
- search: true,
- searchSpan: 4,
- width: 150,
- rules: [
- {
- required: true,
- message: "请选择所属社区",
- trigger: "blur",
- },
- ],
- },
- {
- hide: true,
- parent: false,
- label: "所属社区",
- prop: "neiCode",
- search: false,
- width: 150,
- type: "tree",
- dicUrl: "/api/blade-system/region/tree",
- props: {
- label: "name",
- value: "id",
- },
- cascader: ["gridId"],
- rules: [
- {
- required: true,
- message: "请选择所属社区",
- trigger: "blur",
- },
- ],
- },
-
- {
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- label: "所属网格",
- prop: "gridName",
- width: 150,
- rules: [
- {
- required: true,
- message: "请选择所属网格",
- trigger: "blur",
- },
- ],
- },
- {
- hide: true,
- label: "所属网格",
- prop: "gridId",
- type: "tree",
- cell: true,
- props: {
- label: "gridName",
- value: "id",
- },
- dicUrl:
- "/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
- rules: [
- {
- required: true,
- message: "请选择所属网格",
- trigger: "blur",
- },
- ],
- },
- {
label: "场所照片",
prop: "imageUrls",
- width: 80,
type: "upload",
listType: "picture-card",
dataType: "string",
@@ -273,24 +361,6 @@
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",
- },
- ],
- },
{
width: 96,
@@ -313,6 +383,7 @@
},
{
+ width: 100,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
@@ -320,16 +391,18 @@
prop: 'confirmFlag',
type: 'radio',
slot: true,
- dicData: [{
- label: '待审核',
- value: 1
- }, {
- label: '已审核',
- value: 2
- }, {
- label: '未通过',
- value: 3
- }]
+ dicData: [
+ {
+ label: '待审核',
+ value: 1
+ }, {
+ label: '已审核',
+ value: 2
+ }, {
+ label: '未通过',
+ value: 3
+ }
+ ]
},
{
width: 120,
@@ -339,14 +412,17 @@
prop: 'source',
type: "select",
search: true,
- searchSpan: 4,
- dicData: [{
- label: '是',
- value: 1
- }, {
- label: '否',
- value: 2
- }]
+ searchSpan: 5,
+ slot: true,
+ dicData: [
+ {
+ label: '是',
+ value: 1
+ }, {
+ label: '否',
+ value: 2
+ }
+ ]
}
],
},
@@ -408,6 +484,29 @@
} else if (data == 4) {
tags = {
text: '待完善',
+ type: 'info'
+ }
+ }
+
+ return tags
+ }
+ },
+
+ showSource () {
+ return (data) => {
+ let tags = {
+ text: '',
+ type: ''
+ }
+
+ if (data == 1) {
+ tags = {
+ text: '是',
+ type: 'success'
+ }
+ } else if (data == 2) {
+ tags = {
+ text: '否',
type: 'info'
}
}
@@ -644,23 +743,9 @@
this.onLoad(this.page, this.query)
},
onLoad (page, params = {}) {
- const { dateTime } = this.query
- let values = {
- ...params,
- }
- if (dateTime) {
- values = {
- ...params,
- startTime: dateTime[0],
- endTime: dateTime[1],
- ...this.query,
- }
- values.dateTime = null
- }
-
this.loading = true
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
const data = res.data.data
this.page.total = data.total
--
Gitblit v1.9.3