From ab701df859cd79ae036f8cc86268137d2c8da8ee Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Thu, 22 Feb 2024 18:00:56 +0800
Subject: [PATCH] 消防自查导出、消防自查和场所检查增加场所类别字段
---
src/views/place/components/baseAllInfo.vue | 177 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 142 insertions(+), 35 deletions(-)
diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index 3017158..8531e72 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -43,7 +43,7 @@
import boxTitle from "./boxTitle"
export default {
- data () {
+ data() {
//手机号格式校验
let validatorPhone = function (rule, value, callback) {
if (value) {
@@ -82,24 +82,7 @@
],
},
- {
- width: 160,
- overHidden: true,
- slot: true,
- label: "地址",
- prop: "location",
- type: "map",
- dataType: "string",
- span: 12,
- value: [117.96646, 28.431002, ""],
- rules: [
- {
- required: true,
- message: "请选择地址",
- trigger: "blur",
- },
- ],
- },
+
{
label: "负责人",
@@ -126,6 +109,22 @@
validator: validatorPhone,
trigger: "blur",
},
+ ],
+ },
+ {
+ width: 120,
+ overHidden: true,
+ label: "身份证号",
+ prop: "principalIdCard",
+ search: true,
+ searchSpan: 4,
+ slot: true,
+ rules: [
+ {
+ required: false,
+ message: "请输身份证号",
+ trigger: "blur",
+ }
],
},
@@ -242,7 +241,6 @@
label: "九小场所",
prop: "isNine",
type: "select",
- row:true,
dicData: [
{
label: "是",
@@ -255,7 +253,52 @@
],
hide: true,
},
-
+ {
+ span: 12,
+ label: "九小分类",
+ prop: "nineType",
+ type: "select",
+ display:false,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=nineType",
+ dataType: "number",
+ hide: true,
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ span: 12,
+ label: "阵地",
+ prop: "isFront",
+ type: "select",
+ dicData: [
+ {
+ label: "是",
+ value: 1,
+ },
+ {
+ label: "否",
+ value: 2,
+ }
+ ],
+ hide: true,
+ },
+ {
+ span: 12,
+ label: "阵地类型",
+ prop: "frontType",
+ type: "select",
+ display:false,
+ row: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=frontType",
+ dataType: "number",
+ hide: true,
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
{
label: "场所照片",
prop: "imageUrls",
@@ -270,7 +313,39 @@
name: "name",
url: "link",
},
+ span: 12,
+ },
+ {
+ width: 160,
+ overHidden: true,
+ slot: true,
+ label: "地址",
+ prop: "location",
+ type: "map",
+ dataType: "string",
+ span: 12,
+ value: [117.96646, 28.431002, ""],
+ rules: [
+ {
+ required: true,
+ message: "请选择地址",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "备注",
+ prop: "remark",
+ type: 'textarea',
+ hide:true,
span: 24,
+ rules: [
+ {
+ required: true,
+ message: "请输入场所备注",
+ trigger: "blur",
+ },
+ ],
},
],
},
@@ -396,10 +471,42 @@
inject: ["placeElement"],
- watch: {},
+ watch: {
+ 'form.isNine': {
+ handler(newData) {
+ if (newData) {
+ let nineTypeColumn = this.findObject(
+ this.option.column,
+ 'nineType'
+ )
+ if (newData == 1) {
+ nineTypeColumn.display = true
+ } else {
+ nineTypeColumn.display = false
+ }
+ }
+ },
+ },
+ 'form.isFront': {
+ handler(newData) {
+ if (newData) {
+ let frontTypeColumn = this.findObject(
+ this.option.column,
+ 'frontType'
+ )
+
+ if (newData == 1) {
+ frontTypeColumn.display = true
+ } else {
+ frontTypeColumn.display = false
+ }
+ }
+ },
+ },
+ },
methods: {
- initOpen (newData) {
+ initOpen(newData) {
this.curRow = newData
this.roleBox = true
this.baseShow = false
@@ -482,7 +589,7 @@
)
},
- locationDispose (data) {
+ locationDispose(data) {
data = data.split(",")
return {
@@ -492,13 +599,13 @@
}
},
- selectionClear () {
+ selectionClear() {
this.$nextTick(() => {
this.$refs.crud && this.$refs.crud.toggleSelection()
})
},
- houseHoldRowUpdate (row, index, done, loading) {
+ houseHoldRowUpdate(row, index, done, loading) {
holdUpdate(row).then(
() => {
this.holdOnLoad(this.holdPage)
@@ -515,7 +622,7 @@
)
},
- houseHoldRowDel (row) {
+ houseHoldRowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -534,7 +641,7 @@
})
},
- houseHoldRowSave (row, done, loading) {
+ houseHoldRowSave(row, done, loading) {
holdAdd({
...row,
placeId: this.curRow.id,
@@ -555,11 +662,11 @@
)
},
- refreshHoldChange () {
+ refreshHoldChange() {
this.holdOnLoad(this.holdPage)
},
- holdOnLoad (holdPage, params = {}) {
+ holdOnLoad(holdPage, params = {}) {
if (!this.curRow.id) return
let values = {
@@ -580,15 +687,15 @@
)
},
- holdCurrentChange (currentPage) {
+ holdCurrentChange(currentPage) {
this.holdPage.currentPage = currentPage
},
- holdSizeChange (pageSize) {
+ holdSizeChange(pageSize) {
this.holdPage.pageSize = pageSize
},
- desposeImage (data) {
+ desposeImage(data) {
if (data.length > 0) {
var urls = []
var split = data.split(",").filter((item) => item != "")
@@ -602,7 +709,7 @@
return data
},
- dataUpdate () {
+ dataUpdate() {
const that = this
let imageUrls = this.desposeImage(this.form.imageUrls)
@@ -658,7 +765,7 @@
})
},
- roleBoxClose () {
+ roleBoxClose() {
this.form = {}
this.placeForm = {}
--
Gitblit v1.9.3