|
|
@@ -27,100 +27,102 @@
|
|
|
@click="handleDelete">删 除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
- <template slot="buildingId" slot-scope="scope">
|
|
|
- <span v-if="scope.row.buildingId!==-1">
|
|
|
- {{scope.row.buildingName}}
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- <template slot="floorId" slot-scope="scope">
|
|
|
- <span v-if="scope.row.floorId!==-1">
|
|
|
- {{scope.row.floorName}}
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- <template slot="unitId" slot-scope="scope">
|
|
|
- <span v-if="scope.row.unitId!==-1">
|
|
|
- {{scope.row.unitName}}
|
|
|
- </span>
|
|
|
- </template>
|
|
|
- <template slot="roomId" slot-scope="scope">
|
|
|
- <span v-if="scope.row.roomId!==-1">
|
|
|
- {{scope.row.roomName}}
|
|
|
- </span>
|
|
|
- </template>
|
|
|
+<!-- <template slot="buildingId" slot-scope="scope">-->
|
|
|
+<!-- <span v-if="scope.row.buildingId!==-1">-->
|
|
|
+<!-- {{scope.row.buildingName}}-->
|
|
|
+<!-- </span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="floorId" slot-scope="scope">-->
|
|
|
+<!-- <span v-if="scope.row.floorId!==-1">-->
|
|
|
+<!-- {{scope.row.floorName}}-->
|
|
|
+<!-- </span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="unitId" slot-scope="scope">-->
|
|
|
+<!-- <span v-if="scope.row.unitId!==-1">-->
|
|
|
+<!-- {{scope.row.unitName}}-->
|
|
|
+<!-- </span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- <template slot="roomId" slot-scope="scope">-->
|
|
|
+<!-- <span v-if="scope.row.roomId!==-1">-->
|
|
|
+<!-- {{scope.row.roomName}}-->
|
|
|
+<!-- </span>-->
|
|
|
+<!-- </template>-->
|
|
|
|
|
|
- <template slot="menu" slot-scope="scope">
|
|
|
- <el-button icon="el-icon-setting" size="mini" type="text">
|
|
|
- <el-dropdown>
|
|
|
- <span class="el-dropdown-link" style="font-size: xx-small; color: #4babfe">设置标签<i class="el-icon-arrow-down el-icon--right"></i></span>
|
|
|
- <el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item type="text" @click.native="tagsFormOpen('elder', scope.row)">高龄老人</el-dropdown-item>
|
|
|
- <el-dropdown-item type="text" @click.native="tagsFormOpen('keyPerson', scope.row)">重点人员</el-dropdown-item>
|
|
|
- <el-dropdown-item type="text" @click.native="tagsFormOpen('disabler', scope.row)">残障人士</el-dropdown-item>
|
|
|
-<!-- <el-dropdown-item type="text" @click.native="tagsFormOpen('household', scope.row)">常住人员</el-dropdown-item>-->
|
|
|
-<!-- <el-dropdown-item type="text" @click.native="tagsFormOpen('enterpriseStaff', scope.row)">企业员工</el-dropdown-item>-->
|
|
|
- </el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
- </el-button>
|
|
|
- </template>
|
|
|
-<!-- 标签点击事件-->
|
|
|
- <template slot="tags" slot-scope="scope" style="display: flex">
|
|
|
- <el-button v-if="scope.row.tags.length!== 0" style="margin: auto" class="el-icon-collection-tag" v-for="item in scope.row.tags.split(',')" @click.native="tagsDetail(item,scope.row)" size="mini" type="text">
|
|
|
- {{item}}
|
|
|
- </el-button>
|
|
|
- </template>
|
|
|
+<!-- <template slot="menu" slot-scope="scope">-->
|
|
|
+<!-- <el-button icon="el-icon-setting" size="mini" type="text">-->
|
|
|
+<!-- <el-dropdown>-->
|
|
|
+<!-- <span class="el-dropdown-link" style="font-size: xx-small; color: #4babfe">设置标签<i class="el-icon-arrow-down el-icon--right"></i></span>-->
|
|
|
+<!-- <el-dropdown-menu slot="dropdown">-->
|
|
|
+<!-- <el-dropdown-item type="text" @click.native="tagsFormOpen('elder', scope.row)">高龄老人</el-dropdown-item>-->
|
|
|
+<!-- <el-dropdown-item type="text" @click.native="tagsFormOpen('keyPerson', scope.row)">重点人员</el-dropdown-item>-->
|
|
|
+<!-- <el-dropdown-item type="text" @click.native="tagsFormOpen('disabler', scope.row)">残障人士</el-dropdown-item>-->
|
|
|
+<!-- <!– <el-dropdown-item type="text" @click.native="tagsFormOpen('household', scope.row)">常住人员</el-dropdown-item>–>-->
|
|
|
+<!-- <!– <el-dropdown-item type="text" @click.native="tagsFormOpen('enterpriseStaff', scope.row)">企业员工</el-dropdown-item>–>-->
|
|
|
+<!-- </el-dropdown-menu>-->
|
|
|
+<!-- </el-dropdown>-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- </template>-->
|
|
|
+ <!-- 标签点击事件-->
|
|
|
+<!-- <template slot="tags" slot-scope="scope" style="display: flex">-->
|
|
|
+<!-- <div v-if="scope.row.tags!== null">-->
|
|
|
+<!-- <el-button style="margin: auto" class="el-icon-collection-tag" v-for="item in scope.row.tags.split(',')" @click.native="tagsDetail(item,scope.row)" size="mini" type="text">-->
|
|
|
+<!-- {{item}}-->
|
|
|
+<!-- </el-button>-->
|
|
|
+<!-- </div>-->
|
|
|
+<!-- </template>-->
|
|
|
</avue-crud>
|
|
|
-<!-- 显示标签详情组件-->
|
|
|
- <el-dialog title="残障人士【标签详情】" :visible.sync="disablerTagsdetail" :modal-append-to-body="false">
|
|
|
- <DisablerTagsDetail v-if="disablerTagsdetail" :basic-data="basicData"></DisablerTagsDetail>
|
|
|
- </el-dialog>
|
|
|
- <el-dialog title="高龄老人【标签详情】" :visible.sync="elderTagsdetail" :modal-append-to-body="false">
|
|
|
- <ElderTagsDetail v-if="elderTagsdetail" :basic-data="basicData"></ElderTagsDetail>
|
|
|
- </el-dialog>
|
|
|
- <el-dialog title="重点人员【标签详情】" :visible.sync="keyPersonTagsdetail" :modal-append-to-body="false">
|
|
|
- <KeypeopleTagsDetail v-if="keyPersonTagsdetail" :basic-data="basicData"></KeypeopleTagsDetail>
|
|
|
- </el-dialog>
|
|
|
-<!-- <el-dialog title="常住人员【标签详情】" :visible.sync="householdTagsdetail" :modal-append-to-body="false">-->
|
|
|
-<!-- <HouseholdTagsDetail v-if="householdTagsdetail" :basic-data="basicData"></HouseholdTagsDetail>-->
|
|
|
+ <!-- 显示标签详情组件-->
|
|
|
+<!-- <el-dialog title="残障人士【标签详情】" :visible.sync="disablerTagsdetail" :modal-append-to-body="false">-->
|
|
|
+<!-- <DisablerTagsDetail v-if="disablerTagsdetail" :basic-data="basicData"></DisablerTagsDetail>-->
|
|
|
+<!-- </el-dialog>-->
|
|
|
+<!-- <el-dialog title="高龄老人【标签详情】" :visible.sync="elderTagsdetail" :modal-append-to-body="false">-->
|
|
|
+<!-- <ElderTagsDetail v-if="elderTagsdetail" :basic-data="basicData"></ElderTagsDetail>-->
|
|
|
+<!-- </el-dialog>-->
|
|
|
+<!-- <el-dialog title="重点人员【标签详情】" :visible.sync="keyPersonTagsdetail" :modal-append-to-body="false">-->
|
|
|
+<!-- <KeypeopleTagsDetail v-if="keyPersonTagsdetail" :basic-data="basicData"></KeypeopleTagsDetail>-->
|
|
|
<!-- </el-dialog>-->
|
|
|
-<!-- <el-dialog title="企业员工【标签详情】" :visible.sync="enterpriseStaffTagsdetail" :modal-append-to-body="false">-->
|
|
|
-<!-- <EnterpriseStaffTagsDetail v-if="enterpriseStaffTagsdetail" :basic-data="basicData"></EnterpriseStaffTagsDetail>-->
|
|
|
+ <!-- <el-dialog title="常住人员【标签详情】" :visible.sync="householdTagsdetail" :modal-append-to-body="false">-->
|
|
|
+ <!-- <HouseholdTagsDetail v-if="householdTagsdetail" :basic-data="basicData"></HouseholdTagsDetail>-->
|
|
|
+ <!-- </el-dialog>-->
|
|
|
+ <!-- <el-dialog title="企业员工【标签详情】" :visible.sync="enterpriseStaffTagsdetail" :modal-append-to-body="false">-->
|
|
|
+ <!-- <EnterpriseStaffTagsDetail v-if="enterpriseStaffTagsdetail" :basic-data="basicData"></EnterpriseStaffTagsDetail>-->
|
|
|
+ <!-- </el-dialog>-->
|
|
|
+ <!-- 标签添加信息组件-->
|
|
|
+<!-- <el-dialog title="高龄老人【添加标签信息】" :visible.sync="elderTags" :modal-append-to-body="false">-->
|
|
|
+<!-- <ElderTagsForm v-if="elderTags" :basic-data="basicData" :close-fn="() => {elderTags = false}"></ElderTagsForm>-->
|
|
|
<!-- </el-dialog>-->
|
|
|
-<!-- 标签添加信息组件-->
|
|
|
- <el-dialog title="高龄老人【添加标签信息】" :visible.sync="elderTags" :modal-append-to-body="false">
|
|
|
- <ElderTagsForm v-if="elderTags" :basic-data="basicData" :close-fn="() => {elderTags = false}"></ElderTagsForm>
|
|
|
- </el-dialog>
|
|
|
- <el-dialog title="残障人士【添加标签信息】" :visible.sync="disablerTags" :modal-append-to-body="false">
|
|
|
- <DisablerTagsForm v-if="disablerTags" :basic-data="basicData" :close-fn="() => {disablerTags = false}"></DisablerTagsForm>
|
|
|
- </el-dialog>
|
|
|
- <el-dialog title="重点人员【添加标签信息】" :visible.sync="keyPersonTags" :modal-append-to-body="false">
|
|
|
- <KeyPersonTagsForm v-if="keyPersonTags" :basic-data="basicData" :close-fn="() => {keyPersonTags = false}"></KeyPersonTagsForm>
|
|
|
- </el-dialog>
|
|
|
-<!-- <el-dialog title="常住人员【添加标签信息】" :visible.sync="householdTags" :modal-append-to-body="false">-->
|
|
|
-<!-- <HouseholdTagsForm v-if="householdTags" :basic-data="basicData" :close-fn="() => {householdTags = false}"></HouseholdTagsForm>-->
|
|
|
+<!-- <el-dialog title="残障人士【添加标签信息】" :visible.sync="disablerTags" :modal-append-to-body="false">-->
|
|
|
+<!-- <DisablerTagsForm v-if="disablerTags" :basic-data="basicData" :close-fn="() => {disablerTags = false}"></DisablerTagsForm>-->
|
|
|
<!-- </el-dialog>-->
|
|
|
-<!-- <el-dialog title="企业人员【添加标签信息】" :visible.sync="enterpriseStaffTags" :modal-append-to-body="false">-->
|
|
|
-<!-- <EnterpriseStaffTagsForm v-if="enterpriseStaffTags" :basic-data="basicData" :close-fn="() => {enterpriseStaffTags = false}"></EnterpriseStaffTagsForm>-->
|
|
|
+<!-- <el-dialog title="重点人员【添加标签信息】" :visible.sync="keyPersonTags" :modal-append-to-body="false">-->
|
|
|
+<!-- <KeyPersonTagsForm v-if="keyPersonTags" :basic-data="basicData" :close-fn="() => {keyPersonTags = false}"></KeyPersonTagsForm>-->
|
|
|
<!-- </el-dialog>-->
|
|
|
+ <!-- <el-dialog title="常住人员【添加标签信息】" :visible.sync="householdTags" :modal-append-to-body="false">-->
|
|
|
+ <!-- <HouseholdTagsForm v-if="householdTags" :basic-data="basicData" :close-fn="() => {householdTags = false}"></HouseholdTagsForm>-->
|
|
|
+ <!-- </el-dialog>-->
|
|
|
+ <!-- <el-dialog title="企业人员【添加标签信息】" :visible.sync="enterpriseStaffTags" :modal-append-to-body="false">-->
|
|
|
+ <!-- <EnterpriseStaffTagsForm v-if="enterpriseStaffTags" :basic-data="basicData" :close-fn="() => {enterpriseStaffTags = false}"></EnterpriseStaffTagsForm>-->
|
|
|
+ <!-- </el-dialog>-->
|
|
|
</basic-container>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import {getList, getDetail, add, update, remove} from "@/api/person/basicinfo";
|
|
|
import {mapGetters} from "vuex";
|
|
|
- import ElderTagsForm from "@/components/person-tags/elderTags-form";
|
|
|
- import DisablerTagsForm from "@/components/person-tags/disablerTags-form";
|
|
|
- import KeyPersonTagsForm from "@/components/person-tags/keyPersonTags-form";
|
|
|
+ // import ElderTagsForm from "@/components/person-tags/elderTags-form";
|
|
|
+ // import DisablerTagsForm from "@/components/person-tags/disablerTags-form";
|
|
|
+ // import KeyPersonTagsForm from "@/components/person-tags/keyPersonTags-form";
|
|
|
// import EnterpriseStaffTagsForm from "@/components/person-tags/enterpriseStaffTags-form";
|
|
|
// import HouseholdTagsForm from "@/components/person-tags/householdTags-form";
|
|
|
- import ElderTagsDetail from "@/components/person-tags/elderTags-detail";
|
|
|
- import DisablerTagsDetail from "@/components/person-tags/disablerTags-detail";
|
|
|
- import KeypeopleTagsDetail from "@/components/person-tags/keyPersonTags-detail";
|
|
|
+ // import ElderTagsDetail from "@/components/person-tags/elderTags-detail";
|
|
|
+ // import DisablerTagsDetail from "@/components/person-tags/disablerTags-detail";
|
|
|
+ // import KeypeopleTagsDetail from "@/components/person-tags/keyPersonTags-detail";
|
|
|
// import HouseholdTagsDetail from "@/components/person-tags/householdTags-detail";
|
|
|
// import EnterpriseStaffTagsDetail from "@/components/person-tags/enterpriseStaffTags-detail";
|
|
|
import {DIC} from "@/api/util/nation"
|
|
|
|
|
|
export default {
|
|
|
- components: {ElderTagsForm, DisablerTagsForm,KeyPersonTagsForm,DisablerTagsDetail,ElderTagsDetail,KeypeopleTagsDetail},
|
|
|
+ // components: {ElderTagsForm, DisablerTagsForm,KeyPersonTagsForm,DisablerTagsDetail,ElderTagsDetail,KeypeopleTagsDetail},
|
|
|
data() {
|
|
|
return {
|
|
|
elderTags: false,
|
|
|
@@ -181,7 +183,7 @@
|
|
|
tip: '只能生产jpg/png图片,且不超过500kb',
|
|
|
rules: [{
|
|
|
required: false,
|
|
|
- message: "请输入入境证明url",
|
|
|
+ message: "请上传入境证明url",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
},
|
|
|
@@ -248,7 +250,7 @@
|
|
|
label: "所属楼栋",
|
|
|
prop: "buildingId",
|
|
|
type: "select",
|
|
|
- slot:true,
|
|
|
+ // slot:true,
|
|
|
search: true,
|
|
|
cascaderItem: ['unitId'],
|
|
|
dicUrl: "/api/cyzh-community/building/list?residentialId={{key}}",
|
|
|
@@ -263,7 +265,7 @@
|
|
|
},
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
- message: "请输入楼栋Id",
|
|
|
+ message: "请选择楼栋",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
},
|
|
|
@@ -271,14 +273,14 @@
|
|
|
label: "所属单元",
|
|
|
prop: "unitId",
|
|
|
type: "select",
|
|
|
- slot:true,
|
|
|
+ // slot:true,
|
|
|
search: true,
|
|
|
cascaderItem: ['floorId'],
|
|
|
dicUrl: "/api/cyzh-community/unit/list?buildingId={{key}}",
|
|
|
dicFormatter:(res)=>{
|
|
|
return res.data.records;//返回字典的层级结构
|
|
|
},
|
|
|
- dicFlag: false,
|
|
|
+ // dicFlag: false,
|
|
|
filterable: true,
|
|
|
props: {
|
|
|
label: "name",
|
|
|
@@ -286,7 +288,7 @@
|
|
|
},
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
- message: "请输入单元Id",
|
|
|
+ message: "请选择单元",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
},
|
|
|
@@ -294,7 +296,7 @@
|
|
|
label: "所属楼层",
|
|
|
prop: "floorId",
|
|
|
type: "select",
|
|
|
- slot:true,
|
|
|
+ // slot:true,
|
|
|
search: true,
|
|
|
cascaderItem: ['roomId'],
|
|
|
dicUrl: "/api/cyzh-community/floor/list?unitId={{key}}",
|
|
|
@@ -309,7 +311,7 @@
|
|
|
},
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
- message: "请输入楼层Id",
|
|
|
+ message: "请选择楼层d",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
},
|
|
|
@@ -317,7 +319,7 @@
|
|
|
label: "所属房间",
|
|
|
prop: "roomId",
|
|
|
type: "select",
|
|
|
- slot:true,
|
|
|
+ // slot:true,
|
|
|
search: true,
|
|
|
dicUrl: "/api/cyzh-community/room/list?floorId={{key}}",
|
|
|
dicFormatter:(res)=>{
|
|
|
@@ -331,14 +333,14 @@
|
|
|
},
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
- message: "请输入房间Id",
|
|
|
+ message: "请选择房间",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
},
|
|
|
{
|
|
|
label:'手机号码',
|
|
|
prop:'phone',
|
|
|
- width:100,
|
|
|
+ width:120,
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
message: "请输入手机号码",
|
|
|
@@ -362,7 +364,7 @@
|
|
|
valueFormat:"yyyy-MM-dd",
|
|
|
hide: true,
|
|
|
rules: [{
|
|
|
- required: true,
|
|
|
+ required: false,
|
|
|
message: "请输入生日",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
@@ -424,7 +426,7 @@
|
|
|
},
|
|
|
rules: [{
|
|
|
required: false,
|
|
|
- message: "请输入政治面貌",
|
|
|
+ message: "请选择政治面貌",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
},
|
|
|
@@ -511,14 +513,22 @@
|
|
|
}
|
|
|
],
|
|
|
},
|
|
|
+ {
|
|
|
+ label: "备注",
|
|
|
+ prop: "remark",
|
|
|
+ hide:true,
|
|
|
+ rules: [{
|
|
|
+ required: false,
|
|
|
+ message: "请输入备注",
|
|
|
+ trigger: "blur"
|
|
|
+ }]
|
|
|
+ },
|
|
|
{
|
|
|
label: "人员标签",
|
|
|
prop: "tags",
|
|
|
- type:'select',
|
|
|
- width:150,
|
|
|
- display:false,
|
|
|
+ type:'checkbox',
|
|
|
multiple:true,
|
|
|
- slot:true,
|
|
|
+ span: 24,
|
|
|
dataType:'string',
|
|
|
dicUrl: "/api/blade-system/dict-biz/dictionary?code=person-tag",
|
|
|
props: {
|
|
|
@@ -526,26 +536,20 @@
|
|
|
value: "dictKey"
|
|
|
},
|
|
|
rules: [{
|
|
|
- required: false,
|
|
|
+ required: true,
|
|
|
message: "请输入标签",
|
|
|
trigger: "blur"
|
|
|
}]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "备注",
|
|
|
- prop: "remark",
|
|
|
- hide:true,
|
|
|
- rules: [{
|
|
|
- required: false,
|
|
|
- message: "请输入备注",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
+ }
|
|
|
]
|
|
|
},
|
|
|
data: []
|
|
|
};
|
|
|
},
|
|
|
+ watch:{
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
computed: {
|
|
|
...mapGetters(["permission"]),
|
|
|
permissionList() {
|