From d2238343abf44028e68ed21aa1648037a8befd9c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 01 Feb 2024 15:09:48 +0800
Subject: [PATCH] 场所新增身份证号码，九小和阵地拆开
---
src/views/place/index.vue | 110 +++++++++++++-------------
src/views/place/components/baseAllInfo.vue | 103 ++++++++++++-------------
2 files changed, 106 insertions(+), 107 deletions(-)
diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index c4691da..8531e72 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -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",
+ }
],
},
@@ -270,10 +269,9 @@
},
{
span: 12,
- label: "是否阵地",
+ label: "阵地",
prop: "isFront",
type: "select",
- display:false,
dicData: [
{
label: "是",
@@ -288,7 +286,7 @@
},
{
span: 12,
- label: "阵地分类",
+ label: "阵地类型",
prop: "frontType",
type: "select",
display:false,
@@ -315,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",
+ },
+ ],
},
],
},
@@ -449,42 +479,11 @@
this.option.column,
'nineType'
)
- let isFrontColumn = this.findObject(
- this.option.column,
- 'isFront'
- )
- let frontTypeColumn = this.findObject(
- this.option.column,
- 'frontType'
- )
if (newData == 1) {
nineTypeColumn.display = true
} else {
nineTypeColumn.display = false
- isFrontColumn.display = false
- frontTypeColumn.display = false
- }
- }
- },
- },
- 'form.nineType': {
- handler(newData) {
- if (newData) {
- let isFrontColumn = this.findObject(
- this.option.column,
- 'isFront'
- )
- let frontTypeColumn = this.findObject(
- this.option.column,
- 'frontType'
- )
-
- if (newData == 1) {
- isFrontColumn.display = true
- } else {
- isFrontColumn.display = false
- frontTypeColumn.display = false
}
}
},
diff --git a/src/views/place/index.vue b/src/views/place/index.vue
index 61493e8..e92a8c4 100644
--- a/src/views/place/index.vue
+++ b/src/views/place/index.vue
@@ -138,24 +138,7 @@
},],
},
- {
- 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,
@@ -183,6 +166,22 @@
{
validator: validatorPhone,
trigger: 'blur'
+ }
+ ],
+ },
+ {
+ width: 120,
+ overHidden: true,
+ label: "身份证号",
+ prop: "principalIdCard",
+ // search: true,
+ searchSpan: 4,
+ slot: true,
+ rules: [
+ {
+ required: false,
+ message: "请输身份证号",
+ trigger: "blur",
}
],
},
@@ -367,10 +366,9 @@
},
{
span: 12,
- label: "是否阵地",
+ label: "阵地",
prop: "isFront",
type: "select",
- display:false,
dicData: [
{
label: "是",
@@ -385,7 +383,7 @@
},
{
span: 12,
- label: "阵地分类",
+ label: "阵地类型",
prop: "frontType",
type: "select",
display:false,
@@ -413,10 +411,41 @@
name: 'name',
url: "link",
},
- span: 24,
+ span: 12,
},
-
-
+ {
+ width: 156,
+ overHidden: true,
+ slot: true,
+ label: "地址",
+ prop: "location",
+ type: 'map',
+ dataType: "string",
+ minWidth:250,
+ span: 12,
+ value: [117.966460, 28.431002, ""],
+ rules: [
+ {
+ required: true,
+ message: "请选择地址",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "备注",
+ prop: "remark",
+ type: 'textarea',
+ hide:true,
+ span: 24,
+ rules: [
+ {
+ required: true,
+ message: "请输入场所备注",
+ trigger: "blur",
+ },
+ ],
+ },
{
width: 96,
slot: true,
@@ -424,6 +453,7 @@
editDisplay: false,
viewDisplay: false,
label: "经度",
+ hide:true,
prop: "lng",
},
@@ -434,6 +464,7 @@
editDisplay: false,
viewDisplay: false,
label: "纬度",
+ hide:true,
prop: "lat",
},
@@ -503,42 +534,11 @@
this.option.column,
'nineType'
)
- let isFrontColumn = this.findObject(
- this.option.column,
- 'isFront'
- )
- let frontTypeColumn = this.findObject(
- this.option.column,
- 'frontType'
- )
if (newData == 1) {
nineTypeColumn.display = true
} else {
nineTypeColumn.display = false
- isFrontColumn.display = false
- frontTypeColumn.display = false
- }
- }
- },
- },
- 'form.nineType': {
- handler(newData) {
- if (newData) {
- let isFrontColumn = this.findObject(
- this.option.column,
- 'isFront'
- )
- let frontTypeColumn = this.findObject(
- this.option.column,
- 'frontType'
- )
-
- if (newData == 1) {
- isFrontColumn.display = true
- } else {
- isFrontColumn.display = false
- frontTypeColumn.display = false
}
}
},
--
Gitblit v1.9.3