From fa4381ad57ab417bbe0c0ab14f5c5ddaea935cef Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 29 Feb 2024 17:47:51 +0800
Subject: [PATCH] 首页调整、九小分类组件修改
---
subPackage/house/member/add.vue | 1042 +++++++++++++++++++++++++++++++++++++++++++++
pages/home/index5.vue | 260 ++++++++--
pages.json | 9
subPackage/workbench/components/cateSelector.vue | 19
4 files changed, 1,267 insertions(+), 63 deletions(-)
diff --git a/pages.json b/pages.json
index 4000c69..0ad1ff3 100644
--- a/pages.json
+++ b/pages.json
@@ -789,6 +789,15 @@
}
},
{
+ "path": "member/add",
+ "style": {
+ "navigationBarTitleText": "人口采集",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
"path": "roomControl/index",
"style": {
"navigationBarTitleText": "房屋管理",
diff --git a/pages/home/index5.vue b/pages/home/index5.vue
index 5a3978f..7d96250 100644
--- a/pages/home/index5.vue
+++ b/pages/home/index5.vue
@@ -91,14 +91,79 @@
</u-grid>
</view> -->
- <view class="nav bgc-ff">
- <u-tabs :list="tabs" @click="changeTabs"></u-tabs>
- <!-- <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in communityList" :key="k">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">{{i.title}}</text>
- </view>
- </u-grid-item> -->
+ <view class="nav bgc-ff" v-if="roleType == 2 && curSelectSite.addressType == 1">
+ <view class="mb-20">
+ <u-tabs :list="tabs" @click="changeTabs" :current="tabIndex" lineColor="#ecf4ff" :activeStyle="{
+ color: '#017BFC',
+ fontWeight: 'bold',
+ backgroundColor:'#ecf4ff',
+ borderRadius:'14rpx',
+ padding:'14rpx 28rpx',
+ transition:'background .2s'
+ }" :itemStyle="{fontSize:'28rpx'}"></u-tabs>
+ </view>
+ <u-grid :border="false" col="4">
+ <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in tabs[tabIndex].list" :key="k">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">{{i.text}}</text>
+ </view>
+ </u-grid-item>
+ </u-grid>
+ </view>
+
+ <view class="nav bgc-ff" v-if="roleType == 2 && curSelectSite.addressType == 2">
+ <view class="mb-20">
+ <u-tabs :list="tabs2" @click="changeTabs" :current="tabIndex" lineColor="#ecf4ff" :activeStyle="{
+ color: '#017BFC',
+ fontWeight: 'bold',
+ backgroundColor:'#ecf4ff',
+ borderRadius:'14rpx',
+ padding:'14rpx 28rpx',
+ transition:'background .2s'
+ }" :itemStyle="{fontSize:'28rpx'}"></u-tabs>
+ </view>
+ <u-grid :border="false" col="4">
+ <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in tabs2[tabIndex].list" :key="k">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">{{i.text}}</text>
+ </view>
+ </u-grid-item>
+
+ <block v-if="tabIndex == 1">
+ <u-grid-item @click="navigatorPage('/subPackage/label/form')"
+ v-if="curSelectSite.isFront == 1">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">二手交易</text>
+ </view>
+ </u-grid-item>
+ <u-grid-item @click="navigatorPage('/subPackage/label/check')"
+ v-if="curSelectSite.isNine == 1">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">消防自查</text>
+ </view>
+ </u-grid-item>
+ </block>
+
+ <block v-if="tabIndex == 2">
+ <u-grid-item @click="navToAddRepair()">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">企业商户上报</text>
+ </view>
+ </u-grid-item>
+ <u-grid-item @click="navToSiteList()">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">场所任务</text>
+ </view>
+ </u-grid-item>
+ </block>
+
+ </u-grid>
</view>
@@ -265,73 +330,100 @@
tabs: [{
name: '公众服务',
list: [{
- name: "公共报事"
+ icon: "/static/icon/nav-02.png",
+ text: "公共报事",
+ path: '/subPackage/bs/views/repair'
},
{
- name: "便民服务"
+ icon: "/static/icon/nav-03.png",
+ text: "便民热线",
+ path: '/subPackage/hotLine/index'
},
]
- }, {
- name: '警务服务',
- hasPlaceMenu: true,
- list: [{
- name: "取保候审"
- },
- {
- name: "二手交易"
- },
- {
- name: "消防自查"
- }
-
- ]
- }, {
+ },
+ {
name: '生活服务',
list: [{
- name: "物业缴费"
- },
- {
- name: "租客上报"
- }
- ]
- }, {
- name: '企业服务',
- list: [{
- name: "场所维护"
- },
- {
- name: "企业商户上报"
- },
- {
- name: "场所任务"
- }
-
- ]
+ text: "租客上报",
+ path: "/subPackage/bs/views/zhsb",
+ icon: "/static/icon/nav-04.png"
+ }]
},
{
name: '社区服务',
list: [{
- title: "选举调查",
+ text: "选举调查",
icon: "/static/icon/nav-14.png",
path: "/subPackage/article/communityList?type=1"
},
{
- title: "公益报名",
+ text: "公益报名",
icon: "/static/icon/nav-13.png",
path: "/subPackage/article/signUpList?type=0"
},
{
- title: "公共收益",
+ text: "公共收益",
icon: "/static/icon/nav-15.png",
path: "/subPackage/article/list?type=1"
}
-
]
}
- ]
+ ],
+
+ tabs2: [{
+ name: '公众服务',
+ list: [{
+ icon: "/static/icon/nav-02.png",
+ text: "公共报事",
+ path: '/subPackage/bs/views/repair'
+ },
+ {
+ icon: "/static/icon/nav-03.png",
+ text: "便民热线",
+ path: '/subPackage/hotLine/index'
+ },
+ ]
+ }, {
+ name: '警务服务',
+ list: []
+ },
+ {
+ name: '企业服务',
+ list: [{
+ text: "场所维护",
+ icon: "",
+ path: "/subPackage/workbench/views/editExamine"
+ }]
+ },
+ {
+ name: '社区服务',
+ list: [{
+ text: "选举调查",
+ icon: "/static/icon/nav-14.png",
+ path: "/subPackage/article/communityList?type=1"
+
+ },
+ {
+ text: "公益报名",
+ icon: "/static/icon/nav-13.png",
+ path: "/subPackage/article/signUpList?type=0"
+
+ },
+ {
+ text: "公共收益",
+ icon: "/static/icon/nav-15.png",
+ path: "/subPackage/article/list?type=1"
+
+ }
+ ]
+ }
+ ],
+
+ tabIndex: 0,
+ isBailer: false //是否取保候审人员
}
},
@@ -391,10 +483,31 @@
this.getMenuList()
});
}
+
+
},
deep: true,
// immediate: true
+ },
+
+ isBailer(newVal, oldVal) {
+
+ if (newVal) {
+ this.tabs.splice(1, 0, {
+ name: '警务服务',
+ list: [{
+ icon: "/static/icon/nav-11.png",
+ text: "取保候审",
+ path: '/subPackage/label/bail'
+ }]
+ })
+
+ }
+
+ immediate: true
}
+
+
},
// onPullDownRefresh() {
// this.$store.dispatch("getMenuList").then(res => {
@@ -408,12 +521,11 @@
methods: {
- changeTabs(item) {
- console.log(item);
- // let list = item.list;
- // for (let i of list) {
+ changeTabs(e) {
+ // console.log(item);
+ this.tabIndex = e.index
- // }
+
},
//初始化
@@ -637,6 +749,23 @@
setLiveMenu(arr) {
if (arr.length) {
+
+ let index3 = arr.findIndex(item => item.name.trim() == "取保候审")
+ if (index != -1) {
+ this.isBailer = true;
+
+ // this.tabs.splice(1, 0, {
+ // name: '警务服务',
+ // list: [{
+ // icon: "/static/icon/nav-11.png",
+ // text: "取保候审",
+ // path: '/subPackage/label/bail'
+ // }]
+ // })
+
+ }
+ return;
+
let index = this.getLiveMenuItem(arr, 1)
let index2 = this.getLiveMenuItem(arr, 2)
if (this.curSelectSite.addressType == 1) {
@@ -748,7 +877,6 @@
`/subPackage/bs/views/danger?id=${obj.stdId}`, "navTo")
return
}
-
if (obj.stdId == "3C77B40EFC5F4C899AA74BEE747D9DF1") {
eventType = 1;
that.$u.func.globalNavigator(
@@ -859,7 +987,14 @@
uni.navigateTo({
url: `/subPackage/workbench/views/audit?code=${houseCode}&from=index`
})
+ },
+
+ //企业商户上报
+ navToAddRepair() {
+ let url = `/subPackage/bs/views/addRepair?title=企业商户上报&type="5`
+ this.$u.func.globalNavigator(url, "navTo")
}
+
}
}
</script>
@@ -1020,4 +1155,19 @@
.pb-20 {
padding-bottom: 20rpx;
}
+
+ .tabs {
+ padding: 20rpx;
+
+ .tabs-item {
+ padding: 10rpx 30rpx;
+ }
+
+ .tabs-active {
+ border-radius: 10rpx;
+ background-color: rgb(236, 244, 255);
+ color: #017BFC;
+ font-weight: bold;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/house/member/add.vue b/subPackage/house/member/add.vue
new file mode 100644
index 0000000..d607b52
--- /dev/null
+++ b/subPackage/house/member/add.vue
@@ -0,0 +1,1042 @@
+<template>
+ <view class="container">
+ <view class="main">
+ <view class="content">
+ <u-form labelWidth="70" :model="form" :rules="rules" ref="form">
+ <view class="event-info">
+ <view class="box-title">
+ <box-title title="基础信息"></box-title>
+ </view>
+ <!-- <u-form-item @click="showSelectBus('角色','roleType')" class="form-item" labelWidth="100"
+ label="角色" required prop="roleType">
+ <u--input border="none" v-model="selectDefaultName.roleType" disabled
+ disabledColor="#ffffff" placeholder="请选择">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item> -->
+ <u-form-item @click="showSelectBus('与业主关系','relationship')" class="form-item" labelWidth="100"
+ label="与业主关系" required prop="relationship">
+ <u--input border="none" v-model="selectDefaultName.relationship" disabled
+ disabledColor="#ffffff" placeholder="请选择与业主关系">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="姓名" required prop="name">
+ <u--input border="none" v-model="form.name" placeholder="请输入姓名">
+ </u--input>
+ </u-form-item>
+ <u-form-item @click="showSelectBus('证件类型','cardType')" class="form-item" labelWidth="100"
+ label="证件类型" prop="gender">
+ <u--input border="none" v-model="selectDefaultName.cardType" disabled
+ disabledColor="#ffffff" placeholder="请选择证件类型">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item v-if="form.cardType == 111" class="form-item" labelWidth="100" label="身份证号码"
+ prop="idCard">
+ <u--input border="none" type="idcard " v-model="form.idCard" placeholder="请输入身份证号码">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item v-if="form.cardType && form.cardType != 111" class="form-item" labelWidth="100"
+ label="证件号码" prop="cardNo">
+ <u--input border="none" v-model="form.cardNo" placeholder="请输入证件号码">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item v-if="form.cardType && form.cardType != 111" class="form-item" labelWidth="100"
+ label="出生日期" prop="birthday" @click="showSelectBirthday = true">
+ <u--input border="none" v-model="form.birthday" disabled disabledColor="#ffffff"
+ placeholder="请选择出生日期">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item @click="showSelectBus('性别','gender')" class="form-item" labelWidth="100" label="性别"
+ prop="gender">
+ <u--input border="none" v-model="selectDefaultName.gender" disabled disabledColor="#ffffff"
+ placeholder="请选择性别">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+ <u-form-item class="form-item" labelWidth="100" label="手机号码" prop="phoneNumber" required>
+ <u--input border="none" type="number" v-model="form.phoneNumber" placeholder="请输入手机号码">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item class="form-item" labelWidth="100" label="其它联系方式" prop="otherContact">
+ <u--input border="none" v-model="form.otherContact" placeholder="请输入其它联系方式">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item @click="showSelectBus('是否主要联系人','isPrimaryContact')" class="form-item"
+ labelWidth="110" label="是否主要联系人" prop="isPrimaryContact">
+ <u--input border="none" v-model="selectDefaultName.isPrimaryContact" disabled
+ disabledColor="#ffffff" placeholder="请选择是否主要联系人">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+ <u-form-item @click="showSelectBus('居住情况','residentialStatus')" class="form-item"
+ labelWidth="100" label="居住情况" prop="residentialStatus">
+ <u--input border="none" v-model="selectDefaultName.residentialStatus" disabled
+ disabledColor="#ffffff" placeholder="请选择居住情况">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+ <!-- <u-form-item class="form-item" labelWidth="100" label="港澳台通行证" prop="hkmtPass">
+ <u--input border="none" v-model="form.hkmtPass" placeholder="请输入">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item class="form-item" labelWidth="100" label="护照" prop="passport">
+ <u--input border="none" v-model="form.passport" placeholder="请输入">
+ </u--input>
+ </u-form-item> -->
+
+
+ <u-form-item class="form-item" labelWidth="100" label="居住地区" prop="homeAdcode"
+ @click="showRegion = true">
+ <u--input border="none" v-model="homeRegion" disabled disabledColor="#ffffff"
+ placeholder="请选择居住地区">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item class="form-item address-row" labelWidth="100" label="现居住地" prop="currentAddress">
+ <u-textarea border="none" :disabled="form.source ==1?true:false" disabledColor="#ffffff"
+ v-model="form.currentAddress" placeholder="请输入现居住地">
+ </u-textarea>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="籍贯地区" prop="nativePlaceAdcode">
+ <view class="region">
+ <picker mode="region" :value="navtivePlaceDefault" @change="changeNativeRegion">
+ <view class="region-picker c-c0" v-if="!nativePlace">
+ 请选择籍贯地区
+ </view>
+ <view class="region-picker c-30" v-if="nativePlace">
+ {{nativePlace}}
+ </view>
+ </picker>
+ </view>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+
+ <u-form-item class="form-item" labelWidth="100" label="户籍地区" prop="residentAdcode">
+ <view class="region">
+ <picker mode="region" :value="residentadDefault" @change="changeHouseholdRegion">
+ <view class="region-picker c-c0" v-if="!residentad">
+ 请选择户籍地区
+ </view>
+ <view class="region-picker c-30" v-if="residentad">
+ {{residentad}}
+ </view>
+ </picker>
+ </view>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+
+
+ <u-form-item @click="showSelectBus('户籍类型','residentType')" class="form-item" labelWidth="100"
+ label="户籍类型" prop="residentType">
+ <u--input border="none" v-model="selectDefaultName.residentType" disabled
+ disabledColor="#ffffff" placeholder="请选择户籍类型">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="户籍地址" prop="hukouRegistration">
+ <u-textarea border="none" v-model="form.hukouRegistration" placeholder="请输入户籍地址">
+ </u-textarea>
+ </u-form-item>
+
+
+ <u-form-item v-if="from != 'family'" class="form-item" labelWidth="100" label="标签"
+ @click="navTo">
+ <view class="">
+ <text style="color: #c0c4cc;"
+ v-if="!form.householdLabelList || !form.householdLabelList.length">请选择标签</text>
+ <text class="f-28" v-else>{{showLabel()}}</text>
+ </view>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+
+ <u-form-item @click="showSelectBus('民族','ethnicity')" class="form-item" labelWidth="100"
+ label="民族" prop="ethnicity">
+ <u--input border="none" v-model="selectDefaultName.ethnicity" disabled
+ disabledColor="#ffffff" placeholder="请选择民族">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+ <u-form-item @click="showSelectBus('学历','education')" class="form-item" labelWidth="100"
+ label="学历" prop="education">
+ <u--input border="none" v-model="selectDefaultName.education" disabled
+ disabledColor="#ffffff" placeholder="请选择学历">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+ <u-form-item @click="showSelectBus('是否党员','partyEmber')" class="form-item" labelWidth="100"
+ label="是否党员" prop="partyEmber">
+ <u--input border="none" v-model="selectDefaultName.partyEmber" disabled
+ disabledColor="#ffffff" placeholder="请选择是否党员">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="职业类别" prop="occupation ">
+ <u--input border="none" v-model="form.occupation " placeholder="请输入职业类别">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="工作单位" prop="employer">
+ <u--input border="none" v-model="form.employer" placeholder="请输入工作单位">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="工作单位地址" prop="cmpyRegAddr">
+ <u-textarea border="none" v-model="form.cmpyRegAddr" placeholder="请输入工作单位地址">
+ </u-textarea>
+ </u-form-item>
+ <u-form-item @click="showSelectBus('工作状态','workStatus')" class="form-item" labelWidth="100"
+ label="工作状态" prop="workStatus">
+ <u--input border="none" v-model="selectDefaultName.workStatus" disabled
+ disabledColor="#ffffff" placeholder="请选择工作状态">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+ <u-form-item @click="showSelectBus('婚姻状态','maritalStatus')" class="form-item" labelWidth="100"
+ label="婚姻状态" prop="maritalStatus">
+ <u--input border="none" v-model="selectDefaultName.maritalStatus" disabled
+ disabledColor="#ffffff" placeholder="请选择婚姻状态">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="宗教信仰" prop="religiousBelief ">
+ <u--input border="none" v-model="form.religiousBelief" placeholder="请输入宗教信仰">
+ </u--input>
+ </u-form-item>
+ <u-form-item @click="showSelectBus('健康状态','healthStatus')" class="form-item" labelWidth="100"
+ label="健康状态" prop="healthStatus">
+ <u--input border="none" v-model="selectDefaultName.healthStatus" disabled
+ disabledColor="#ffffff" placeholder="请选择健康状态">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item v-if="selectDefaultIndex.healthStatus == 2" class="form-item" labelWidth="100"
+ label="疾病名称" prop="diseaseName">
+ <u--input border="none" v-model="form.diseaseName" placeholder="请输入疾病名称">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item class="form-item" labelWidth="100" label="外出详址" prop="goOutAddr">
+ <u-textarea border="none" v-model="form.goOutAddr" placeholder="请输入外出详址">
+ </u-textarea>
+ </u-form-item>
+
+ <u-form-item class="form-item" labelWidth="100" label="外出原因" prop="goOutReason ">
+ <u--input border="none" v-model="form.goOutReason" placeholder="请输入外出原因">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="外出时间" prop="goOutTime"
+ @click="showSelectDate = true">
+ <u--input border="none" v-model="form.goOutTime " disabled disabledColor="#ffffff"
+ placeholder="请选择外出时间">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="外出去向" prop="goOutWhere">
+ <u--input border="none" v-model="form.goOutWhere" placeholder="请输入外出去向">
+ </u--input>
+ </u-form-item>
+ <u-form-item class="form-item" labelWidth="100" label="车牌号" prop="cardNumber">
+ <u--input border="none" v-model="form.cardNumber" placeholder="多个用中划线(-)隔开">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item class="form-item" labelWidth="100" label="备注" prop="remark">
+ <u--input border="none" v-model="form.remark" placeholder="补充说明">
+ </u--input>
+ </u-form-item>
+ </view>
+ </u-form>
+ </view>
+
+ <!-- <view class="btn-group b-c-w">
+ <view>
+ <u-button @click="submit" type="primary" :text="addOrUpdateTitle" width="120px"></u-button>
+ </view>
+ <view>
+ <u-button @click="navigator" type="primary" :plain="true" text="返回首页"></u-button>
+ </view>
+ </view> -->
+
+ <view class="footer flex j-c-s-b a-i-c bgc-ff" v-if="type == 2 && from == 'family'">
+ <button class="del-btn footer-btn" @click="delAction">删除</button>
+ <button class="save-btn footer-btn" @click="submit">保存</button>
+ </view>
+
+ <footer-btn v-if="(type == 1 && from == 'family') || !from" :text="addOrUpdateTitle" @click="submit" />
+ </view>
+
+ <!-- 事件类型下拉框 -->
+ <!-- <select-bus v-if="typeShow" :show="typeShow" v-model="form[selectBusModel]" type="radio"
+ :popupTitle="selectBusTitle" :dataLists="selectBusList" @cancel="typeShow = false" @submit="typeSelect">
+ </select-bus> -->
+ <u-picker :defaultIndex="[selectDefaultIndex[selectBusKey]]" :closeOnClickOverlay="true" v-if="typeShow"
+ :show="typeShow" :columns="[selectBusList]" @close="typeShow = false" @cancel="typeShow = false"
+ keyName="name" @confirm="typeSelect"></u-picker>
+
+ <u-datetime-picker :show="showSelectDate" v-model="currentTime" mode="date" :formatter="formatter"
+ @confirm="confirmDate" @cancel="showSelectDate = false" :minDate="goOutMinDate"></u-datetime-picker>
+
+ <u-datetime-picker :show="showSelectBirthday" v-model="currentTime" mode="date" @confirm="confirmBirthday"
+ @cancel="showSelectBirthday = false" :minDate="minDate"></u-datetime-picker>
+
+ <u-picker :defaultIndex="[homeIndex]" :closeOnClickOverlay="true" :show="showRegion" :columns="[regionList]"
+ @close="showRegion = false" @cancel="showRegion = false" keyName="name" @confirm="regionSelect"></u-picker>
+
+
+ </view>
+</template>
+
+<script>
+ import {
+ getQrCodeDetail
+ } from "@/api/system/index"
+ import selectBus from "@/components/my-components/selectBus.vue"
+ import uploadMixin from "@/mixin/uploadMixin";
+ import {
+ getHouseholdDetail,
+ saveOrUpdateHousehold,
+ removeHousehold
+ } from '@/api/house/household.js'
+ import {
+ bizDictionary
+ } from '@/api/system/dict.js'
+
+ import {
+ select
+ } from "@/api/system/region.js"
+
+ import boxTitle from '../components/boxTitle/index2.vue'
+ export default {
+ components: {
+ selectBus,
+ boxTitle
+ },
+ mixins: [uploadMixin],
+ data() {
+ return {
+ addOrUpdateTitle: "添加",
+ houseCode: "",
+ form: {
+ // roleName: "",
+ // relationName: '',
+ // location: "",
+ // title: "",
+ // roleType:null,
+ // description: "",
+ },
+ rules: {
+ 'selectDefaultName.relationship': {
+ required: true,
+ message: '请选择与业主关系',
+ trigger: ['change', 'blur'],
+ },
+ 'name': {
+ type: 'string',
+ required: true,
+ message: '请填写姓名',
+ trigger: ['change', 'blur'],
+ },
+ // 'idCard': [{
+ // type: 'string',
+ // required: false,
+ // message: '请输入身份证号码',
+ // trigger: ['change', 'blur']
+ // },
+ // {
+ // validator: (rule, value, callback) => {
+ // const idCardRegex =
+ // /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+ // return idCardRegex.test(value)
+ // },
+
+ // message: '身份证号码有误',
+ // trigger: ['change', 'blur']
+ // }
+ // ],
+ 'phoneNumber': [{
+ required: true,
+ message: '请输入手机号码',
+ trigger: ['change', 'blur']
+ },
+ {
+
+ validator: (rule, value, callback) => {
+ return uni.$u.test.mobile(value);
+ },
+ message: '手机号码不正确',
+ trigger: ['change', 'blur']
+
+ }
+ ]
+ },
+ typeShow: false,
+ roleName: "",
+ dataList: {
+ roleType: [],
+ relationship: [],
+ gender: [{
+ value: 1,
+ name: '男',
+ },
+ {
+ value: 0,
+ name: '女',
+ },
+ {
+ value: 2,
+ name: '未知',
+ }
+ ],
+ isPrimaryContact: [{
+ value: 1,
+ name: '是',
+ },
+ {
+ value: 0,
+ name: '否',
+ }
+ ],
+ residentialStatus: [{
+ value: 1,
+ name: '是',
+ },
+ {
+ value: 0,
+ name: '否',
+ }
+ ],
+ ethnicity: [],
+ education: [],
+ partyEmber: [{
+ value: 1,
+ name: '是',
+ },
+ {
+ value: 2,
+ name: '否',
+ }
+ ],
+ workStatus: [],
+ maritalStatus: [],
+ residentType: [],
+ healthStatus: [],
+ cardType: []
+ },
+ // 下拉变量
+ selectBusList: [],
+ selectBusVal: '',
+ selectBusTitle: '',
+ selectBusModel: '',
+ selectBusKey: "",
+ selectDefaultIndex: {
+ roleType: 0,
+ relationship: 0,
+ gender: 0,
+ isPrimaryContact: 0,
+ ethnicity: 0,
+ education: 0,
+ partyEmber: 0,
+ workStatus: 0,
+ maritalStatus: 0,
+ cardType: 0,
+ healthStatus: 0,
+ residentType: 0,
+ residentialStatus: 0
+ },
+ selectDefaultName: {
+ roleType: "",
+ relationship: "",
+ gender: "",
+ isPrimaryContact: "",
+ ethnicity: "",
+ education: "",
+ partyEmber: "",
+ workStatus: "",
+ maritalStatus: "",
+ cardType: "",
+ healthStatus: "",
+ residentType: "",
+ residentialStatus: ""
+ },
+ showSelectDate: false,
+ regionList: [],
+ nativePlace: "", //籍贯
+ residentad: "", //户籍
+ homeRegion: "", //居住地
+ homeIndex: 0,
+ showRegion: false,
+ navtivePlaceDefault: [],
+ residentadDefault: [],
+ isEdit: false,
+ from: "",
+ type: "",
+ id: "",
+ showSelectBirthday: false,
+ currentTime: Number(new Date()),
+ minDate: "",
+ goOutMinDate: ""
+ }
+ },
+ created() {
+ this.getHeader()
+ },
+ onReady() {
+ this.$refs.form.setRules(this.rules)
+ },
+ async onLoad(option) {
+ this.minDate = Number(new Date('1900-01-01')); //设置出生日期选择器最小值
+ this.goOutMinDate = Number(new Date('1970-01-01')); //设置外出时间选择器最小值
+ const data = JSON.parse(option.data)
+ console.log("data==>", data)
+ this.houseCode = data.houseCode;
+ this.getRegionList()
+ this.type = data.type;
+ if (data.id) {
+ this.id = data.id;
+ }
+ if (data.type == 1) {
+ uni.setNavigationBarTitle({
+ title: "添加成员"
+ })
+ this.isEdit = false;
+ this.addOrUpdateTitle = "保存"
+ await this.getAllBizDict()
+ this.setCardTypeDefault()
+ this.getHouseDetail();
+ }
+ if (data.type == 2) {
+ this.isEdit = true;
+ this.addOrUpdateTitle = "修改"
+ uni.setNavigationBarTitle({
+ title: "编辑成员资料"
+ })
+ this.getHouseholdInfo(data)
+ }
+ if (option.from) {
+ this.from = option.from;
+ if (data.type == 1) {
+ this.houseCode = uni.getStorageSync("siteInfo").houseCode
+ }
+ }
+ this.form.roleName = uni.getStorageSync("activeRole").roleName;
+ },
+
+ onShow() {
+ console.log(this.form);
+ if (this.id) {
+ // this.getHouseholdInfo()
+ this.getHoldLabel();
+ }
+ },
+
+ methods: {
+
+ getHouseDetail() {
+ getQrCodeDetail({
+ roleName: uni.getStorageSync("activeRole").roleName,
+ addressCode: this.houseCode || uni.getStorageSync("siteInfo").houseCode,
+ }).then(res => {
+ console.log(res);
+ this.homeRegion = res.data.townStreetName;
+ this.form.currentAddress = res.data.addressName;
+ console.log("===>", this.getHouseRegion(res.data.townStreetName));
+ this.form.homeAdcode = this.getHouseRegion(res.data.townStreetName).code;
+ this.homeIndex = this.getHouseRegion(res.data.townStreetName).index;
+
+ })
+ },
+
+ setRegionDefault() {
+ getQrCodeDetail({
+ roleName: uni.getStorageSync("activeRole").roleName,
+ addressCode: this.houseCode || uni.getStorageSync("siteInfo").houseCode,
+ }).then(res => {
+ this.homeRegion = res.townStreetName;
+ this.form.homeAdcode = this.getHouseRegion(res.townStreetName).code;
+ this.homeIndex = this.getHouseRegion(res.townStreetName).index;
+
+ })
+ },
+
+
+
+ getHouseRegion(name) {
+ for (let i = 0, ii = this.regionList.length; i < ii; i++) {
+ if (this.regionList[i].name == name) {
+ return {
+ index: i,
+ code: this.regionList[i].code
+ }
+ }
+ }
+ },
+
+
+ showLabel() {
+ let arr = []
+ for (let i of this.form.householdLabelList) {
+ arr.push(i.labelName)
+ }
+ return arr.join(",")
+ },
+
+
+ //选择籍贯
+ changeNativeRegion(e) {
+ let {
+ code,
+ value
+ } = e.detail;
+ this.nativePlace = `${value[0]}-${value[1]}-${value[2]}`
+ this.form.nativePlaceAdcode = code[2];
+
+ },
+
+ //选择户籍
+ changeHouseholdRegion(e) {
+ let {
+ code,
+ value
+ } = e.detail;
+ this.residentad = `${value[0]}-${value[1]}-${value[2]}`
+ this.form.residentAdcode = code[2];
+ },
+
+
+ getRegionList() {
+ select(361102).then(res => {
+ console.log(res);
+ if (res.code == 200) {
+ this.regionList = res.data;
+ }
+
+ })
+ },
+
+ regionSelect(e) {
+ console.log(e);
+ const [result] = e.value;
+ this.homeIndex = e.indexs[0];
+ this.homeRegion = result.name;
+ this.form.homeAdcode = result.code;
+ this.showRegion = false;
+ },
+
+ setCardTypeDefault() {
+ this.$set(this.form, "cardType", 111)
+ this.$set(this.selectDefaultIndex, "cardType", 0)
+ this.$set(this.selectDefaultName, "cardType", "居民身份证")
+ },
+
+ //获取身份证中的出生日期
+ getBirthday(idCard) {
+ // 提取出生年月日的部分
+ let birthday = idCard.substring(6, 14);
+
+ // 将八位数字转换为年月日格式
+ let year = birthday.substring(0, 4);
+ let month = birthday.substring(4, 6);
+ let day = birthday.substring(6);
+
+ // 返回出生日期
+ return `${year}-${month}-${day}`;
+ },
+
+ async getAllBizDict() {
+ // 获取角色关系字典
+ await this.getBizDict('roleRelation', this.dataList.relationship)
+ // 获取角色字典
+ await this.getBizDict('roleType', this.dataList.roleType)
+ // 获取民族字典
+ await this.getBizDict('nationType', this.dataList.ethnicity)
+ // 获取学历字典
+ await this.getBizDict('educationType', this.dataList.education)
+ // 获取工作状态字典
+ await this.getBizDict('workStatusType', this.dataList.workStatus)
+ // 获取婚姻状态字典
+ await this.getBizDict('marriageStatusType', this.dataList.maritalStatus)
+ // 户籍类别的字典
+ await this.getBizDict('residentType', this.dataList.residentType)
+ // 健康状况的字典
+ await this.getBizDict('healthStatus', this.dataList.healthStatus)
+ //证件类型字典
+ await this.getBizDict('cardType', this.dataList.cardType)
+
+ },
+ // 获取业务字典
+ async getBizDict(code, list) {
+ const param = {
+ code: code
+ }
+ const res = await bizDictionary(param)
+ res.data.forEach(e => {
+ list.push({
+ name: e.dictValue,
+ value: Number(e.dictKey)
+ })
+ })
+ },
+ // 获取住户信息
+ async getHouseholdInfo() {
+ // 获取所有字典
+ await this.getAllBizDict()
+ // this.form = data
+ getHouseholdDetail({
+ id: this.id
+ }).then(res => {
+ if (res.code == 200) {
+ this.form = res.data;
+ let data = res.data;
+ for (let i in this.selectDefaultIndex) {
+ let {
+ index,
+ name
+ } = this.findObjValue(data[i], this.dataList[i])
+ this.selectDefaultIndex[i] = index || 0;
+ this.selectDefaultName[i] = name;
+ }
+
+ if ((data.idCard && !data.cardType) || (!data.idCard && !data.cardType)) {
+ this.setCardTypeDefault()
+ }
+
+ if (data.idCard && !data.birthday) {
+ this.form.birthday = this.getBirthday(data.idCard)
+ }
+ if (data.nativePlaceAdName) {
+ this.nativePlace =
+ `${data.nativePlaceProvinceAdName}-${data.nativePlaceCityAdName}-${data.nativePlaceAdName}`
+ this.navtivePlaceDefault = [data.nativePlaceProvinceAdName, data
+ .nativePlaceCityAdName, data.nativePlaceAdName
+ ]
+ }
+ if (data.residentAdName) {
+ this.residentad =
+ `${data.residentProvinceAdName}-${data.residentCityAdName}-${data.residentAdName}`
+ this.residentadDefault = [data.residentProvinceAdName, data
+ .residentCityAdName,
+ data.residentAdName
+ ]
+ }
+
+ if (data.homeAdcode) {
+ let {
+ index,
+ name
+ } = this.findObjValue(data.homeAdcode, this.regionList, "code")
+ this.homeIndex = index;
+ this.homeRegion = name;
+ } else {
+ this.setRegionDefault();
+ }
+ }
+ })
+ },
+
+ getHoldLabel() {
+ getHouseholdDetail({
+ id: this.id
+ }).then(res => {
+ if (res.code == 200) {
+ this.$set(this.form, "householdLabelList", res.data.householdLabelList)
+ }
+ })
+ },
+
+ // 显示选择弹框
+ showSelectBus(title, key) {
+ this.selectBusList = this.dataList[key]
+ this.selectBusTitle = title
+ // this.selectBusModel = model
+ this.selectBusKey = key
+ this.typeShow = true
+ },
+ //类型选择确认
+ typeSelect(item) {
+ const [result] = item.value
+ // this[this.selectBusModel] = result.name
+ this.form[this.selectBusKey] = result.value
+ this.selectDefaultName[this.selectBusKey] = result.name;
+ this.selectDefaultIndex[this.selectBusKey] = item.indexs[0];
+ this.typeShow = !this.typeShow
+ },
+ //表单提交
+ submit() {
+ this.$refs.form.validate().then(res => {
+ this.saveOrUpdate();
+ })
+ },
+ // 新增更新操作
+ async saveOrUpdate() {
+ this.form['houseCode'] = this.houseCode
+ this.form.roleName = uni.getStorageSync("activeRole").roleName;
+ if (this.form.cardType) {
+ if (this.form.cardType == 111) {
+ if (!this.form.idCard) {
+ // uni.showToast({
+ // title: "请输入身份证号",
+ // icon: "none"
+ // })
+ // return;
+ } else {
+
+ if (this.form.cardNo) {
+ this.form.cardNo = "";
+ }
+
+ const idCardRegex =
+ /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+
+ if (!idCardRegex.test(this.form.idCard)) {
+ this.$showTips("身份证号有误")
+ return
+ }
+ }
+ if (this.form.idCard && !this.form.birthday) {
+ this.form.birthday = this.getBirthday(this.form.idCard)
+ }
+ } else {
+ if (!this.form.cardNo) {
+ uni.showToast({
+ title: "请输入证件号",
+ icon: "none"
+ })
+ return;
+ } else {
+ if (this.form.idCard) {
+ this.form.idCard = "";
+ }
+ }
+ }
+ }
+ const res = await saveOrUpdateHousehold(this.form)
+ if (res.code !== 200) {
+ uni.showToast({
+ title: "保存失败",
+ icon: "error",
+ duration: 1500
+ })
+ return
+ }
+ uni.showToast({
+ title: "保存成功",
+ icon: "success",
+ duration: 1500,
+ success: () => {
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 1500)
+ }
+ })
+ },
+
+ confirmDate(e) {
+ this.form.goOutTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
+ this.showSelectDate = false;
+ },
+
+ confirmBirthday(e) {
+ this.form.birthday = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
+ this.showSelectBirthday = false;
+ },
+
+ findObjValue(value, obj, key = "value") {
+ let data = {
+ index: "",
+ name: ""
+ }
+ for (let i = 0, ii = obj.length; i < ii; i++) {
+ if (value == obj[i][key]) {
+ data.index = i;
+ data.name = obj[i].name;
+ }
+ }
+ return data;
+ },
+ // 跳转到首页
+ navigator() {
+ this.$u.func.globalNavigator("/subPackage/bs/views/bsList")
+ },
+
+ navTo() {
+ let data = JSON.parse(JSON.stringify(this.form));
+ // this.$u.func.globalNavigator(
+ // `householdLabel?data=${JSON.stringify(data)}&from=add`)
+ if (!this.isEdit) {
+ this.$u.func.globalNavigator(
+ `householdLabel?data=${JSON.stringify(data)}&from=add`)
+ } else {
+ this.$u.func.globalNavigator(
+ `householdLabel?data=${JSON.stringify(data)}`)
+ }
+ },
+
+ delAction() {
+ uni.showModal({
+ title: "提示！",
+ content: "是否要删除该家人信息？",
+ success: (res) => {
+ if (res.confirm) {
+ this.ddelActionRequest()
+ }
+ }
+ })
+ },
+ ddelActionRequest() {
+ removeHousehold(this.form.id).then(res => {
+ if (res.code == 200) {
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1000)
+ } else {
+ uni.showToast({
+ title: "删除失败",
+ icon: "error",
+ duration: 1500
+ })
+ }
+ })
+ }
+
+ }
+ }
+</script>
+
+<style scoped lang="scss">
+ .container {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ background: #F5F5F5;
+
+
+ .main {
+ // position: relative;
+ // flex: 1;
+ display: flex;
+ flex-direction: column;
+
+ .content {
+ // height: 0;
+ // flex: 1;
+ // overflow-y: auto;
+ padding-bottom: 160rpx;
+ // padding-bottom: 36rpx;
+ }
+
+
+ .btn-group {
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ height: 116rpx;
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ }
+ }
+
+ // .box-title {
+ // padding: 10rpx 10rpx;
+ // }
+
+ .event-info {
+ background-color: #ffffff;
+ margin: 20rpx 30rpx;
+ padding: 30rpx;
+ border-radius: 8rpx;
+
+ /deep/ .u-form-item {
+ background-color: #ffffff;
+ padding: 5px 20px;
+ border-bottom: 1rpx solid #eff1f3;
+ }
+
+ /deep/ .u-input__content__field-wrapper__field {
+ height: auto;
+ white-space: pre-wrap;
+ }
+
+ }
+
+
+
+ .event-pic {
+ background-color: #ffffff;
+ padding: 40rpx 30rpx;
+ }
+
+ }
+
+ .region {
+ width: 100%;
+ height: 100%;
+
+ .region-picker {
+ width: 100%;
+ heght: 100%;
+ }
+
+ .c-c0 {
+ color: #c0c4cc
+ }
+
+ .c-30 {
+ color: #303133;
+ }
+ }
+
+ .footer {
+ width: 100%;
+ padding: 20rpx 30rpx;
+ box-sizing: border-box;
+ z-index: 999;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ backgroun-color: #fff;
+ padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+ box-shadow: 0rpx 0rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+
+ .footer-btn {
+ width: 48%;
+ height: 78rpx;
+ line-height: 78rpx;
+ border-radius: 8rpx 8rpx 8rpx 8rpx;
+ font-size: 32rpx;
+ color: #fff;
+ }
+
+ .add-btn {
+ width: 100%;
+ background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
+ }
+
+ .del-btn {
+ background: linear-gradient(163deg, #FE6C5C 0%, #EA1F1F 99%);
+
+ }
+
+ .save-btn {
+ background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/workbench/components/cateSelector.vue b/subPackage/workbench/components/cateSelector.vue
index 6faaf56..79d7442 100644
--- a/subPackage/workbench/components/cateSelector.vue
+++ b/subPackage/workbench/components/cateSelector.vue
@@ -77,8 +77,8 @@
parentName: "",
childrenName: ""
},
- index: "",
- tempIndex: ""
+ index: null,
+ tempIndex: null
}
},
@@ -131,13 +131,16 @@
this.$set(this.selectedTemp, "parentName", this.selectedItem.parentName);
this.$set(this.selectedTemp, "childrenId", this.selectedItem.childrenId);
this.$set(this.selectedTemp, "childrenName", this.selectedItem.childrenName);
- this.tempIndex = this.index;
- if (this.index != "" && this.categoryList[this.index].hasChildren) {
- this.childList = this.categoryList[this.index].children;
+ if (this.index != null) {
+ this.tempIndex = this.index;
+ if ((this.index != "" || this.index != null) && this.categoryList[this.index].hasChildren) {
+ this.childList = this.categoryList[this.index].children;
+ }
+ if (this.index == "" || this.index == null) {
+ this.childList = [];
+ }
}
- if (this.index == "") {
- this.childList = [];
- }
+
}
this.isShow = false;
},
--
Gitblit v1.9.3