From f2a74b0b28b74dc29be85ec8e6328bdd262f84b9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 14:35:58 +0800
Subject: [PATCH] 地址配置修改
---
src/views/securityGuard/securityGuardDetail.vue | 354 ++++++++--------------------------------------------------
1 files changed, 52 insertions(+), 302 deletions(-)
diff --git a/src/views/securityGuard/securityGuardDetail.vue b/src/views/securityGuard/securityGuardDetail.vue
index 7b9c055..d9ee7b4 100644
--- a/src/views/securityGuard/securityGuardDetail.vue
+++ b/src/views/securityGuard/securityGuardDetail.vue
@@ -1,8 +1,8 @@
<template>
<div class="dispatch">
<avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
- <span v-if="typeTABS.prop === 'tab1'" class="a-f-box">
- <avue-form ref="form" v-model="obj0" :option="option0"> </avue-form>
+ <span v-if="typeTABS.prop === 'tab1'">
+ <bAForm :form="obj1"></bAForm>
</span>
<span v-else-if="typeTABS.prop === 'tab2'">
<avue-crud :option="option1" :data="data1" :page.sync="page1" :table-loading="loading1" @row-save="rowSave1"
@@ -89,14 +89,18 @@
getER,
} from "@/api/performance/performance"
+import { getUser, getUserPractitionersInfo } from "@/api/system/user"
+
// import vueQr from "vue-qr";
import securityCertificate from "./securityCertificate.vue"
import baoanz from "./baoanz.vue"
+import bAForm from '@/components/bAForm/main'
export default {
components: {
securityCertificate: securityCertificate,
baoanz,
+ bAForm
},
data () {
return {
@@ -140,297 +144,7 @@
obj0: {
title: "我是头部标题",
},
- option0: {
- emptyBtn: false,
- editBtn: false,
- submitBtn: false,
- group: [
- {
- label: "基础信息",
- labelWidth: "110",
- prop: "baseInfo",
- icon: "el-icon-user-solid",
- column: [
- {
- label: "企业名称",
- prop: "deptId",
- type: "tree",
- disabled: true,
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id"
- },
- labelWidth: 120,
-
- },
- {
- label: "姓名",
- prop: "realName",
- disabled: true,
- labelWidth: 120,
-
- }
- ]
- },
- {
- label: "详细信息",
- prop: "detailInfo",
- labelWidth: "110",
- icon: "el-icon-s-order",
- column: [
- {
- label: "身份证号",
- prop: "cardid",
- hide: true,
- overHidden: true,
- disabled: true,
- labelWidth: 120,
-
- },
- {
- label: "手机号码",
- prop: "phone",
- overHidden: true,
- disabled: true,
- labelWidth: 120,
-
- },
- {
- label: "个人照片",
- type: "upload",
- listType: "picture-img",
- labelWidth: 120,
- disabled: true,
- propsHttp: {
- res: "data",
- url: "url"
- },
- canvasOption: {
- text: " ",
- ratio: 1.0
- },
- action: "/api/blade-resource/oss/endpoint/put-files",
- tip:
- "上传近期一寸彩色正面免冠图象, (358像素(宽) × 441像素(高)、分辨率350dpi)且不小于30kb,不超过500kb",
- span: 12,
- prop: "avatar"
- },
- {
- label: "是否持证",
- prop: "hold",
- type: "select",
- disabled: true,
- dicData: [
- {
- label: "是",
- value: "1"
- },
- {
- label: "否",
- value: "2"
- },
- {
- label: "已吊销",
- value: "3"
- }
- ],
-
- },
- {
- label: "保安员证编号",
- prop: "securitynumber",
- hide: true,
- disabled: true,
- display: true,
-
- },
- {
- label: "民族",
- disabled: true,
- prop: "nation"
- },
- {
- label: "最高学历",
- prop: "education1",
- disabled: true,
- type: "select",
- dicUrl:
- "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true
- },
- {
- label: "政治面貌",
- disabled: true,
- prop: "politicaloutlook"
- },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- // multiple: true,
- type: "tree",
- disabled: true,
- dicUrl: "/api/jurisdiction/lazy-tree",
- props: {
- label: "title",
- value: "id"
- },
- checkStrictly: true,
- slot: true,
-
- },
- {
- label: "从业单位",
- disabled: true,
- prop: "unitName",
-
- },
- {
- label: "性别",
- prop: "sex",
- type: "select",
- disabled: true,
- slot: true,
- dicData: [
- {
- label: "男",
- value: 1
- },
- {
- label: "女",
- value: 2
- }
- ],
-
- },
- {
- label: "婚姻状态",
- prop: "marriageStatus",
- type: "select",
- disabled: true,
- dicUrl:
- "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- hide: true,
- },
- {
- label: "户籍地址",
- prop: "permanentResidenceAddress",
- hide: true,
- disabled: true,
- },
- {
- label: "报考等级",
- prop: "signLevel",
- type: "select",
- dicUrl:
- "/api/blade-system/dict-biz/dictionary?code=signLevelType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- disabled: true,
- hide: true,
- },
- {
- label: "家庭主要成员及联系方式",
- prop: "memberOfFamily",
- type: "textarea",
- span: 24,
- hide: true,
- disabled: true,
- },
- {
- label: "教育经历",
- prop: "educationExperience",
- type: "textarea",
- span: 24,
- hide: true,
- disabled: true,
- },
- {
- label: "工作经历",
- prop: "workExperience",
- type: "textarea",
- span: 24,
- hide: true,
- disabled: true,
- },
- {
- label: "受理机关",
- prop: "acceptancePoliceUnit",
- hide: true,
- disabled: true,
- },
- {
- label: "受理人",
- prop: "acceptancePerson",
- hide: true,
- disabled: true,
- },
- {
- label: "受理时间",
- prop: "acceptanceTime",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- span: 12,
- row: true,
- hide: true,
- disabled: true,
- },
- {
- label: "健康状况图片(健康证)",
- prop: "healthCertificateUrl",
- type: "upload",
- disabled: true,
- listType: "picture-img",
- propsHttp: {
- res: "data",
- url: "url"
- },
- canvasOption: {
- text: " ",
- ratio: 1.0
- },
- action: "/api/blade-resource/oss/endpoint/put-files",
- span: 12,
- hide: true,
- labelWidth: 120,
- },
- {
- label: "无犯罪记录图片",
- prop: "noCriminalRecordProveUrl",
- type: "upload",
- disabled: true,
- listType: "picture-img",
- propsHttp: {
- res: "data",
- url: "url"
- },
- canvasOption: {
- text: " ",
- ratio: 1.0
- },
- action: "/api/blade-resource/oss/endpoint/put-files",
- span: 12,
- hide: true,
- labelWidth: 120,
- }
- ]
- }
- ]
- },
+ obj1: {},
loading1: true,
loading2: true,
selectionList1: [],
@@ -695,6 +409,48 @@
mounted () {
this.typeTABS = this.optionTABS.column[0]
var data = JSON.parse(this.$route.query.row)
+ getUser(data.id).then(res => {
+ let form = res.data.data
+ var d = {
+ education1: res.data.data.education
+ }
+ form = {
+ ...form,
+ ...d
+ }
+ if (form.userDetail) {
+ form.userDetailId = form.userDetail.id
+ form.marriageStatus = form.userDetail.marriageStatus == -1 ? '' : form.userDetail.marriageStatus
+ form.signLevel = form.userDetail.signLevel == -1 ? '' : form.userDetail.signLevel
+ form.permanentResidenceAddress = form.userDetail.permanentResidenceAddress
+ form.dwellAddress = form.userDetail.dwellAddress
+ form.memberOfFamily = form.userDetail.memberOfFamily
+ form.educationExperience = form.userDetail.educationExperience
+ form.workExperience = form.userDetail.workExperience
+ form.healthCertificateUrl = form.userDetail.healthCertificateUrl
+ form.noCriminalRecordProveUrl = form.userDetail.noCriminalRecordProveUrl
+ form.acceptancePoliceUnit = form.userDetail.acceptancePoliceUnit
+ form.acceptancePerson = form.userDetail.acceptancePerson
+ form.acceptanceTime = form.userDetail.acceptanceTime
+ form.unitName = form.userDetail.unitName
+ }
+ // this.from["education1"] = res.data.data.education;
+ if (form.hasOwnProperty("deptId")) {
+ form.deptId = form.deptId
+ }
+ if (form.hasOwnProperty("roleId")) {
+ form.roleId = form.roleId.split(",")
+ }
+ // if (form.hasOwnProperty("postId")) {
+ // form.postId = form.postId.split(",");
+ // }
+ var userInfo = res.data.data
+ //获取用户从业信息
+ getUserPractitionersInfo(data.id).then(res1 => {
+ form.UserPractitionersInfo = res1.data.data
+ })
+ this.obj1 = form
+ })
// console.log(data);
if (data) {
var row = data
@@ -713,6 +469,7 @@
let day = row.cardid.slice(12, 14)
this.obj0.birthdayData = year + '-' + mouth + '-' + day
console.log(this.obj0)
+
}
var flag = false,
@@ -748,17 +505,10 @@
padding: 0 20px;
background: #fff;
position: relative;
+
+
}
}
-
-// .el-card__body {
-// padding-bottom: 5px !important;
-// }
-// .avue-crud__tip,
-// .el-tag,
-// .el-tag--light {
-// padding: 0 !important;
-// }
.baoanzheng {
// position: fixed;
--
Gitblit v1.9.3