From 03547adaf528f41282e212a320174d92ff67c4fd Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Mon, 18 Mar 2024 16:10:11 +0800
Subject: [PATCH] 更新
---
subPackage/house/member/add.vue | 8 +-
subPackage/workbench/views/editCscj.vue | 23 ++++++-
subPackage/workbench/views/editExamine.vue | 23 +++++--
subPackage/workbench/components/formItem.vue | 43 +++++++++++++
pages/home/index.vue | 31 ++++++++--
subPackage/house/member/index.vue | 4 +
subPackage/workbench/views/examine.vue | 11 +++
subPackage/workbench/views/cscj.vue | 20 +++++-
subPackage/house/roomControl/index.vue | 2
pages/home/index.scss | 2
10 files changed, 139 insertions(+), 28 deletions(-)
diff --git a/pages/home/index.scss b/pages/home/index.scss
index c2e6217..e0d0d86 100644
--- a/pages/home/index.scss
+++ b/pages/home/index.scss
@@ -25,7 +25,7 @@
.swiper {
width: 100%;
height: 340rpx;
- background: linear-gradient(180deg, #017BFC 0%, rgba(1, 123, 252, 0) 100%);
+ // background: linear-gradient(180deg, #017BFC 0%, rgba(1, 123, 252, 0) 100%);
padding: 0 30rpx;
box-sizing: border-box;
}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 7704179..1647a2d 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,14 +1,14 @@
<template>
<view class="layout">
<u-navbar height="48" :autoBack="false" safeAreaInsetTop placeholder @leftClick="navToSelectSite()"
- bgColor="#017BFC">
+ :bgColor="background.top">
<view slot="left" class="top flex">
<view class="top-text f-30 fw c-ff">{{curSelectSite.name?curSelectSite.name:'暂无绑定' +roleTypeName+'信息'}}
</view>
<u-icon name="arrow-right" color="#fff"></u-icon>
</view>
</u-navbar>
- <view class="swiper">
+ <view class="swiper" :style="{background:background.banner}">
<u-swiper :list="bannerList" height="320rpx" radius="10"></u-swiper>
</view>
<view class="content">
@@ -166,7 +166,7 @@
<view class="bgc-ff p-20 mb-20" v-if="isShowHouse">
- <u-collapse accordion :border="false">
+ <u-collapse accordion :border="false" ref="myCollapse">
<u-collapse-item name="1" title="楼盘表"></uni-title>
<view class="flex flex-wrap">
<view class="cell bgc-main flex a-i-c" v-for="(item, index) in houseDataList.slice(0, 6)"
@@ -192,8 +192,8 @@
v-for="(item, index) in sectionList[menuTabIndex].children" :index="index" :key="index"
:customStyle="{paddingTop:20+'rpx'}">
<view class="grid-item flex f-d-c a-i-c" :style="{background:item.background}">
- <u-icon :name="item.pictureImg" width="60rpx" height="60rpx"></u-icon>
- <text class="grid-text f-24 fw mt-10">{{item.name}}</text>
+ <u-icon :name="item.pictureImg" width="64rpx" height="64rpx"></u-icon>
+ <text class="grid-text f-26 fw mt-10">{{item.name}}</text>
</view>
</u-grid-item>
</u-grid>
@@ -487,7 +487,11 @@
isBailer: false, //是否取保候审人员
sectionList: [],
menuTabIndex: 0,
- taskCount: 0
+ taskCount: 0,
+ background: {
+ top: "#017BFC",
+ banner: "linear-gradient(180deg, #017BFC 0%, rgba(1, 123, 252, 0) 100%)"
+ }
}
},
@@ -583,6 +587,13 @@
// },
methods: {
+
+ // handleOpenChange() {
+ // this.$nextTick(() => {
+ // this.$refs.myCollapse.init();
+ // });
+ // },
+
//获取待办事项数量
getTaskCount() {
@@ -700,10 +711,18 @@
type = 2
this.roleType = 2
this.roleTypeName = "居民"
+ uni.setTabBarItem({
+ index: 1,
+ visible: false
+ })
} else if (roleName == '民警') {
type = 1
this.roleType = 3
this.roleTypeName = "街道社区"
+ this.$set(this.background, "top", "#0d257E");
+ this.$set(this.background, "banner",
+ "linear-gradient( 180deg, #00176C 0%, rgba(1,97,203,0) 99%)");
+
}
const res = await getFuncList(type, roleName)
this.columnData = res.data;
diff --git a/subPackage/house/member/add.vue b/subPackage/house/member/add.vue
index 53055a3..4021148 100644
--- a/subPackage/house/member/add.vue
+++ b/subPackage/house/member/add.vue
@@ -29,14 +29,13 @@
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
- <u-form-item v-if="houseCode" @click="navToHouseTag" class="form-item" labelWidth="110"
- label="房屋标签" prop="gender">
+ <u-form-item v-if="form.currentAddress" @click="navToHouseTag" class="form-item"
+ labelWidth="110" label="房屋标签" prop="gender">
<u--input border="none" v-model="houseTag" 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="110" label="姓名" required prop="name">
<u--input border="none" v-model="form.name" placeholder="请输入姓名">
@@ -627,6 +626,7 @@
addressCode: code || uni.getStorageSync("siteInfo").houseCode,
}).then(res => {
console.log(res);
+ this.houseCode = code;
this.homeRegion = res.data.townStreetName;
this.form.currentAddress = res.data.addressName;
console.log("===>", this.getHouseRegion(res.data.townStreetName));
@@ -1029,7 +1029,7 @@
this.form.houseCode = i.houseCode;
this.form.currentAddress = i.address;
if (i.userHouseLabelVOList.length) {
- this.houseTag = i.userHouseLabelVOList[0].name;
+ this.houseTag = i.userHouseLabelVOList[0].labelName;
}
this.isShowPopup = false;
},
diff --git a/subPackage/house/member/index.vue b/subPackage/house/member/index.vue
index 4920d8a..6b9457f 100644
--- a/subPackage/house/member/index.vue
+++ b/subPackage/house/member/index.vue
@@ -306,7 +306,9 @@
<u-datetime-picker :show="showSelectBirthday" v-model="currentTime" mode="date" @confirm="confirmBirthday"
@cancel="showSelectBirthday = false" :minDate="minDate"></u-datetime-picker>
-
+ <u-picker :defaultIndex="[volunteerOrgTypeIndex]" :closeOnClickOverlay="true" :show="showVolunteerOrg"
+ :columns="[volunteerOrgTypeList]" @close="showRegion = false" @cancel="showVolunteerOrg = false"
+ @confirm="confirmVolunteerOrg"></u-picker>
<u-picker :defaultIndex="[homeIndex]" :closeOnClickOverlay="true" :show="showRegion" :columns="[regionList]"
@close="showRegion = false" @cancel="showRegion = false" keyName="name" @confirm="regionSelect"></u-picker>
diff --git a/subPackage/house/roomControl/index.vue b/subPackage/house/roomControl/index.vue
index fe1509b..c931fdb 100644
--- a/subPackage/house/roomControl/index.vue
+++ b/subPackage/house/roomControl/index.vue
@@ -499,7 +499,7 @@
lableType: 2,
houseCode: this.houseCode
}
- this.setLabelRequest(data)
+ this.setLabelRequest(data, item.name)
},
setLabelRequest(data, name) {
diff --git a/subPackage/workbench/components/formItem.vue b/subPackage/workbench/components/formItem.vue
index d50e2a4..dd86384 100644
--- a/subPackage/workbench/components/formItem.vue
+++ b/subPackage/workbench/components/formItem.vue
@@ -33,9 +33,23 @@
<u-form-item label="岗位" class="form-item">
<u--input v-model="form.jobNature" border="none" placeholder="请填写岗位"></u--input>
</u-form-item>
+ <u-form-item v-if="addressType == 2" @click="showEmploymentTime = true" class="form-item" label="入职时间"
+ prop="ethnicity">
+ <u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff" placeholder="请选择入职时间">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+ <u-form-item v-if="addressType == 2" @click="showResignationTime = true" class="form-item" label="离职时间"
+ prop="ethnicity">
+ <u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff" placeholder="请选择离职时间">
+ </u--input>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
<!-- <u-form-item label="户籍地址" class="form-item">
<u--input v-model="form.registeredAddress" border="none" placeholder="请填写户籍地址"></u--input>
</u-form-item> -->
+
<u-form-item label="从业人员照片" class="form-item" labelPosition="top" labelWidth="100">
<view style="padding:20rpx 0 0;">
<u-upload :fileList="form.employerImg" :previewFullImage="uploadConfig.previewFullImage"
@@ -46,6 +60,15 @@
</view>
</u-form-item>
</u-form>
+
+ <u-datetime-picker ref="datetimePicker" :show="showEmploymentTime" v-model="workTime" mode="datetime"
+ :formatter="formatter" @confirm="confirmResignationTime"
+ @cancel="showEmploymentTime = false"></u-datetime-picker>
+
+ <u-datetime-picker ref="datetimePicker" :show="showResignationTime" v-model="workTime" mode="datetime"
+ :formatter="formatter" @confirm="confirmEmploymentTime"
+ @cancel="showResignationTime = false"></u-datetime-picker>
+
<u-picker :defaultIndex="nationTypeListIndex" :closeOnClickOverlay="true" :show="showNationPicker"
:columns="[nationTypeList]" @close="showNationPicker = false" @cancel="showNationPicker = false"
keyName="name" @confirm="confirmNation"></u-picker>
@@ -101,11 +124,16 @@
genderIndex: [0],
genderValue: "",
showNationPicker: false,
- showGenderPicker: false
+ showGenderPicker: false,
+ showEmploymentTime: false,
+ showResignationTime: false,
+ workTime: Number(new Date()),
+ addressType: ""
}
},
created() {
+ this.addressType = uni.getStorageSync("siteInfo").addressType;
this.getAllBizDict()
},
@@ -171,7 +199,18 @@
deleteImages(event) {
this.form.employerImg.splice(event.index, 1)
- }
+ },
+
+ confirmResignationTime(e) {
+ this.showResignationTime = false;
+ this.form.resignationTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+ },
+
+ confirmEmploymentTime(e) {
+ this.showEmploymentTime = false;
+ this.form.employmentTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
+ },
+
}
}
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index aff8223..81b40c4 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -238,8 +238,13 @@
<view style="padding:20rpx 30rpx;">
<box-title title="从业人员信息"></box-title>
</view>
- <view class="info" v-for="(item, index) in personNum" :key="index">
- <view class="title" style="text-align:center;">人员信息-#{{ index*1 + 1 }}</view>
+ <view class="info" v-for="(item, index) in personNumArr" :key="index">
+ <view class="flex a-i-c j-c-s-b" style="padding:20rpx;">
+ <view class="title fw" style="text-align:center;">人员信息-#{{ index*1 + 1 }}</view>
+ <view v-if="(index+1) > 1">
+ <u-icon name="trash-fill" color="#ff0000" size="20" @click="deletePerson(index)" />
+ </view>
+ </view>
<formItem ref="formItemRef"></formItem>
</view>
<view class="" style="padding:20rpx 0;" v-if="personNum == 0 && currentId">
@@ -410,6 +415,7 @@
isFront: "",
frontType: "",
nineType: "",
+ threeFireProtection: "",
placeExtEntity: {
landlordName: "",
landlordIdCard: "",
@@ -648,6 +654,7 @@
showNationPicker: false,
showGenderPicker: false,
personNum: 1,
+ personNumArr: [1],
isLegalSame: "" //法人信息是否与负责人一致 1是 2否
}
},
@@ -843,7 +850,8 @@
return
}
const placePractitioner = data?.placePractitioner || []
- this.personNum = placePractitioner.length
+ this.personNum = placePractitioner.length;
+ this.personNumArr = placePractitioner;
this.source = data.source;
// this.houseCode = data.houseCode;
const dpaEntity = data?.doorplateAddressEntity || {}
@@ -1254,6 +1262,12 @@
addPerson() {
this.personNum++
+ this.personNumArr.push(1)
+ },
+
+ deletePerson(index) {
+ this.personNum--;
+ this.personNumArr.splice(index, 1)
}
}
}
diff --git a/subPackage/workbench/views/editCscj.vue b/subPackage/workbench/views/editCscj.vue
index 0c92c68..276993f 100644
--- a/subPackage/workbench/views/editCscj.vue
+++ b/subPackage/workbench/views/editCscj.vue
@@ -200,8 +200,13 @@
<view style="padding:20rpx 30rpx;">
<box-title title="从业人员信息"></box-title>
</view>
- <view class="info" v-for="(item, index) in personNum" :key="index">
- <view class="title" style="text-align: center;">人员信息-#{{ index*1 + 1 }}</view>
+ <view class="info" v-for="(item, index) in personNumArr" :key="index">
+ <view class="flex a-i-c j-c-s-b" style="padding:20rpx;">
+ <view class="title fw" style="text-align:center;">人员信息-#{{ index*1 + 1 }}</view>
+ <view v-if="(index+1) > 1">
+ <u-icon name="trash-fill" color="#ff0000" size="20" @click="deletePerson(index)" />
+ </view>
+ </view>
<formItem ref="formItemRef"></formItem>
</view>
@@ -373,6 +378,7 @@
isFront: "",
frontType: "",
nineType: "",
+ threeFireProtection: "",
placeExtEntity: {
landlordName: "",
landlordIdCard: "",
@@ -610,7 +616,7 @@
showNationPicker: false,
showGenderPicker: false,
personNum: 1,
-
+ personNumArr: [1],
}
},
options: {
@@ -796,6 +802,7 @@
}
const placePractitioner = data?.placePractitioner || []
this.personNum = placePractitioner.length
+ this.personNumArr = placePractitioner;
this.source = data.source;
// this.houseCode = data.houseCode;
const dpaEntity = data?.doorplateAddressEntity || {}
@@ -1143,6 +1150,16 @@
urls: minioBaseUrl + [value],
})
},
+
+ addPerson() {
+ this.personNum++
+ this.personNumArr.push(1)
+ },
+
+ deletePerson(index) {
+ this.personNum--;
+ this.personNumArr.splice(index, 1)
+ }
}
}
</script>
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index adc1cca..b0f6927 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -143,8 +143,13 @@
<view style="padding:20rpx 30rpx;">
<box-title title="从业人员信息"></box-title>
</view>
- <view class="info" v-for="(item, index) in personNum" :key="index">
- <view class="title">人员信息-#{{ index*1 + 1 }}</view>
+ <view class="info" v-for="(item, index) in personNumArr" :key="index">
+ <view class="flex a-i-c j-c-s-b" style="padding:20rpx;">
+ <view class="title fw" style="text-align:center;">人员信息-#{{ index*1 + 1 }}</view>
+ <view v-if="(index+1) > 1">
+ <u-icon name="trash-fill" color="#ff0000" size="20" @click="deletePerson(index)" />
+ </view>
+ </view>
<formItem ref="formItemRef"></formItem>
</view>
@@ -294,7 +299,8 @@
genderIndex: [0],
genderValue: "",
showNationPicker: false,
- showGenderPicker: false
+ showGenderPicker: false,
+ personNumArr: [1],
}
},
onShow() {
@@ -426,6 +432,7 @@
}
this.personNum = placePractitioner.length
+ this.personNumArr = placePractitioner;
// const componetns = this.$refs.formItemRef || []
placePractitioner.forEach((item, index) => {
this.$nextTick(() => {
@@ -524,9 +531,7 @@
})
})
},
- addPerson() {
- this.personNum++
- },
+
submit() {
if (this.personNum > 0) {
const placePractitioner = []
@@ -557,7 +562,13 @@
addPerson() {
this.personNum++
+ this.personNumArr.push(1)
},
+
+ deletePerson(index) {
+ this.personNum--;
+ this.personNumArr.splice(index, 1)
+ }
}
}
</script>
diff --git a/subPackage/workbench/views/examine.vue b/subPackage/workbench/views/examine.vue
index b0bb44a..93f2639 100644
--- a/subPackage/workbench/views/examine.vue
+++ b/subPackage/workbench/views/examine.vue
@@ -66,7 +66,7 @@
</view>
<view class="content">
- <text>岗位性质</text>
+ <text>岗位</text>
<text>{{ item.jobNature || '未完善' }}</text>
</view>
<view class="content">
@@ -78,6 +78,15 @@
<text>{{ item.registeredAddress || '未完善' }}</text>
</view>
+ <!-- <view class="content">
+ <text>入职时间</text>
+ <text>{{ item.registeredAddress || '未完善' }}</text>
+ </view>
+ <view class="content">
+ <text>离职时间</text>
+ <text>{{ item.registeredAddress || '未完善' }}</text>
+ </view> -->
+
<view class="content" v-if="!item.employerImg.length">
<text>从业人员照片</text>
<text>未完善</text>
--
Gitblit v1.9.3