From 3aceaa16063d39b6f1ff7dc11d268fde85ee63a9 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 08 Apr 2024 17:43:09 +0800
Subject: [PATCH] 场所维护、入户宣传新增字段
---
vue.config.js | 4
src/views/property/propertyCapitalApply.vue | 1
src/views/backblask/BackblastPubRecord.vue | 95 +++++++++++++-----
src/views/place/components/baseAllInfo.vue | 151 ++++++++++++++++++++----------
4 files changed, 172 insertions(+), 79 deletions(-)
diff --git a/src/views/backblask/BackblastPubRecord.vue b/src/views/backblask/BackblastPubRecord.vue
index 57ecdef..13b4eae 100644
--- a/src/views/backblask/BackblastPubRecord.vue
+++ b/src/views/backblask/BackblastPubRecord.vue
@@ -83,47 +83,88 @@
label: "地址",
prop: "address",
// align: 'center',
- minWidth: 210,
- labelWidth:120,
+ minWidth: 180,
+ labelWidth: 120,
search: true,
searchSpan: 5,
overHidden: true,
- row:true,
- span:24,
+ row: true,
+ span: 24,
}, {
- label: "问卷调查内容",
+ label: "宣防内容",
prop: "pubContent",
- labelWidth:120,
+ labelWidth: 120,
// align: 'center',
- type:"textarea",
- row:true,
- span:24,
- overHidden:true,
+ type: "textarea",
+ row: true,
+ span: 24,
+ overHidden: true,
+ },
+
+ {
+ label: "是否下载国家反诈app",
+ prop: "isFzApp",
+ labelWidth: 120,
+ // align: 'center',
+ type: "select",
+ row: true,
+ span: 24,
+ overHidden: true,
+ hide: true,
+ dicData: [{
+ label: "是",
+ value: 1
+ },
+ {
+ label: "否",
+ value: 2
+ }
+ ],
},
{
- label: "宣传佐证照片",
+ label: "是否打开预警共能",
+ prop: "isOpenAlarm",
+ labelWidth: 120,
+ // align: 'center',
+ type: "select",
+ row: true,
+ span: 24,
+ overHidden: true,
+ hide: true,
+ dicData: [{
+ label: "是",
+ value: 1
+ },
+ {
+ label: "否",
+ value: 2
+ }
+ ],
+ },
+ {
+ label: "宣防佐证照片",
prop: "pubUrls",
// align: 'center',
fileType: 'img',
- labelWidth:120,
+ labelWidth: 120,
type: "upload",
listType: "picture-card",
dataType: "string",
width: 110,
- row:true,
- span:24,
+ row: true,
+ span: 24,
}, {
label: "时间",
prop: "createTime",
align: 'center',
- labelWidth:120,
+ labelWidth: 120,
width: 156,
- row:true,
+ row: true,
}, {
label: "民警姓名",
prop: "policeman",
align: 'center',
- labelWidth:120,
+ labelWidth: 120,
search: true,
searchSpan: 4,
// searchLabelWidth: 96,
@@ -134,31 +175,33 @@
prop: "policemanPhone",
align: 'center',
slot: true,
- labelWidth:120,
+ labelWidth: 120,
search: true,
searchLabelWidth: 110,
searchSpan: 4,
width: 120
}, {
- label: "地区",
+ label: "所属街道",
prop: "townName",
align: 'center',
search: true,
- searchSpan: 3,
+ searchSpan: 4,
searchLabelWidth: 46,
labelWidth: 120,
width: 156,
- searchPlaceholder: '请输入地区'
+ searchPlaceholder: '请输入街道'
}, {
label: "辖区派出所",
prop: "pcsName",
align: 'center',
- labelWidth:120,
- search: true,
+ labelWidth: 120,
+ search: false,
searchSpan: 4,
searchLabelWidth: 96,
- searchPlaceholder: '请输入辖区派出所'
- }],
+ searchPlaceholder: '请输入辖区派出所',
+ hide:true
+ }
+ ],
},
data: []
}
@@ -368,7 +411,7 @@
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
-
+
})
done()
} else {
diff --git a/src/views/place/components/baseAllInfo.vue b/src/views/place/components/baseAllInfo.vue
index a86cc68..19e3dae 100644
--- a/src/views/place/components/baseAllInfo.vue
+++ b/src/views/place/components/baseAllInfo.vue
@@ -5,9 +5,10 @@
<box-title class="m10" :classVal="9" :title="'基本信息'"></box-title>
<avue-form v-if="baseShow" ref="baseForm" :option="option" v-model="form">
<template slot-scope="{ row, size, index }" slot="houseCodeBinds">
- <el-select v-model="form.houseCodeBinds" filterable remote multiple :remote-method="onRemoteMethod"
- @change="onSelectChange" placeholder="请选择标准地址" reserve-keyword>
- <el-option v-for="item in standardAddressList" :key="item.addressCode" :label="item.addressName" :value="item.addressCode">
+ <el-select v-model="form.houseCodeBinds" filterable remote multiple :remote-method="onRemoteMethod"
+ @change="onSelectChange" placeholder="请选择标准地址" reserve-keyword>
+ <el-option v-for="item in standardAddressList" :key="item.addressCode" :label="item.addressName"
+ :value="item.addressCode">
</el-option>
</el-select>
</template>
@@ -518,35 +519,6 @@
searchSpan: 4,
search: true,
},
-
- {
- labelWidth: 100,
- label: "电话号码",
- prop: "telephone",
- search: true,
- searchSpan: 4,
- slot: true,
- overHidden: true,
- rules: [{
- validator: validatorPhone,
- trigger: "blur",
- },],
- },
-
- {
- labelWidth: 100,
- label: "身份证号",
- prop: "idCard",
- },
-
- {
- labelWidth: 100,
- label: "现居住地",
- prop: "tempAddress",
- searchSpan: 4,
- search: true,
- },
-
{
labelWidth: 100,
label: "性别",
@@ -566,7 +538,6 @@
}
],
},
-
{
labelWidth: 100,
span: 12,
@@ -581,7 +552,33 @@
value: "dictKey",
},
},
+ {
+ labelWidth: 100,
+ label: "身份证号",
+ prop: "idCard",
+ },
+ {
+ labelWidth: 100,
+ label: "电话号码",
+ prop: "telephone",
+ search: true,
+ searchSpan: 4,
+ slot: true,
+ overHidden: true,
+ rules: [{
+ validator: validatorPhone,
+ trigger: "blur",
+ },],
+ },
+
+ {
+ labelWidth: 100,
+ label: "现居住地",
+ prop: "tempAddress",
+ searchSpan: 4,
+ search: true,
+ },
{
labelWidth: 100,
label: "岗位",
@@ -590,11 +587,63 @@
},
{
+ label: "从业人员照片",
+ prop: "employerImg",
+ labelWidth: 100,
+ type: "upload",
+ listType: "picture-card",
+ dataType: "string",
+ multiple: true,
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ propsHttp: {
+ res: "data",
+ name: "name",
+ url: "link",
+ },
+ span: 24,
+ hide: true
+ },
+ {
+ label: "入职时间",
+ labelWidth: 100,
+ hide: true,
+ row: true,
+ prop: "resignationTime",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // format: "yyyy-MM-dd hh:mm:ss",
+ // valueFormat: "yyyy-MM-dd hh:mm:ss",
+ rules: [{
+ required: false,
+ message: "请选择入职时间",
+ trigger: "blur",
+ }]
+ },
+ {
+ label: "离职时间",
+ labelWidth: 100,
+ hide: true,
+ row: true,
+ prop: "employmentTime",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ // format: "yyyy-MM-dd hh:mm:ss",
+ // valueFormat: "yyyy-MM-dd hh:mm:ss",
+ rules: [{
+ required: false,
+ message: "请选择离职时间",
+ trigger: "blur",
+ }]
+ },
+ {
labelWidth: 100,
label: "状态",
prop: "resignationFlag",
// hide: true
type: "select",
+ display: false,
dicData: [{
label: "在职",
value: 1
@@ -709,9 +758,9 @@
],
},
- standardAddressList:[] , //标准地址数据
- standardAddress:"",
- standardAddressSearchKey:""
+ standardAddressList: [], //标准地址数据
+ standardAddress: "",
+ standardAddressSearchKey: ""
}
},
@@ -791,7 +840,7 @@
}), getPlaceList()])
.then(
that.$axios.spread(function (baseInfo, restInfo) {
- console.log("houseCodeBinds===>",baseInfo.data.data.houseCodeBinds)
+ console.log("houseCodeBinds===>", baseInfo.data.data.houseCodeBinds)
that.form = baseInfo.data.data
that.form.addressName = that.form.location;
that.form.location = [
@@ -799,8 +848,8 @@
that.form.lat,
that.form.location,
].join(",")
- if(baseInfo.data.data.houseCodeBinds){
- that.standardAddressList = baseInfo.data.data.houseBindList;
+ if (baseInfo.data.data.houseCodeBinds) {
+ that.standardAddressList = baseInfo.data.data.houseBindList;
that.form.houseCodeBinds = baseInfo.data.data.houseCodeBinds.split(",")
}
@@ -831,8 +880,8 @@
that.baseShow = true
const data = restInfo.data.data
-
-
+
+
if (data) {
@@ -866,7 +915,7 @@
})
)
- that.getPlaceAddressListRequest()
+ that.getPlaceAddressListRequest()
},
locationDispose(data) {
@@ -1061,21 +1110,21 @@
this.roleBox = false
},
- getPlaceAddressListRequest(query){
+ getPlaceAddressListRequest(query) {
getPlaceAddressList({
- addressName:query
- }).then(res=>{
- this.standardAddressList = res.data.data;
+ addressName: query
+ }).then(res => {
+ this.standardAddressList = res.data.data;
})
},
- onSelectChange(e){
- console.log("selectChange===>",e);
- // this.getPlaceAddressListRequest()
+ onSelectChange(e) {
+ console.log("selectChange===>", e);
+ // this.getPlaceAddressListRequest()
},
- onRemoteMethod(query){
- console.log("remote===>",query)
+ onRemoteMethod(query) {
+ console.log("remote===>", query)
this.getPlaceAddressListRequest(query)
},
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index 1d24143..1c4af13 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -247,6 +247,7 @@
value: '按建筑面积分摊',
span: 12,
row: true,
+
},
{
width: 110,
diff --git a/vue.config.js b/vue.config.js
index 8d63659..dd94c18 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,8 +38,8 @@
proxy: {
"/api": {
//本地服务接口地址
- target:"http://192.168.2.111:9528",
- // target: "https://srgdjczzxtpt.com:2080/api",
+ // target:"http://192.168.2.111:9528",
+ target: "https://srgdjczzxtpt.com:2080/api",
// target: "https://kt39592615.goho.co",
// target: "http://z4042833u6.wicp.vip",
// target: "http://localhost:9528",
--
Gitblit v1.9.3