Browse Source

调整居民类别

dev
战立标 2 years ago
parent
commit
892f507b4c
  1. 151
      components/DynamicForms/DynamicForms.js
  2. 12
      components/DynamicForms/DynamicForms.json
  3. 103
      components/DynamicForms/DynamicForms.wxml
  4. 38
      components/DynamicForms/DynamicForms.wxss
  5. 11
      components/ResourceInfo/ResourceInfo.js
  6. 4
      components/ResourceInfo/ResourceInfo.wxml
  7. 1641
      subpages/addResi/pages/addResi/addResi.js
  8. 3
      subpages/addResi/pages/addResi/addResi.json
  9. 259
      subpages/addResi/pages/addResi/addResi.wxml
  10. 6
      subpages/addResi/pages/addResi/addResi.wxss
  11. 54
      utils/statisticsApi.js

151
components/DynamicForms/DynamicForms.js

@ -0,0 +1,151 @@
Component({
properties: {
show: {
type: Boolean,
value: false
},
title: {
type: String,
value: ' '
},
formController: {
type: Object,
value: () => {
},
observer(val) {
this.setData({
formControllers: val
})
}
},
},
data: {
showDate: false,
dateKey: "",
defaultDate: "",
dateIndex: "",
formControllers: {},
showCheckbox: false,
checkboxTitle: '',
checkboxResult: [],
checkboxOptions: [],
checkboxIndex: ''
},
methods: {
onClose() {
this.triggerEvent('close')
},
onCloseCheckbox() {
this.setData({
showCheckbox: false
})
},
sureCheckbox() {
let formControllers = this.data.formControllers;
let checkboxResult = this.data.checkboxResult
let label = []
formControllers[this.data.checkboxIndex].value = checkboxResult.join(',');
checkboxResult.forEach(item => {
formControllers[this.data.checkboxIndex].options.forEach(option => {
if (option.value == item) {
label.push(option.label)
}
})
})
formControllers[this.data.checkboxIndex].selected = label.join(',');
this.setData({
formControllers,
showCheckbox: false
})
},
toggle(event) {
console.log(event)
const {index} = event.currentTarget.dataset;
const checkbox = this.selectComponent(`.checkboxes-${index}`);
console.log(checkbox)
checkbox.toggle();
},
onChangeCheckbox(event) {
this.setData({
checkboxResult: event.detail,
});
},
onShowCheckbox(e) {
let {options, value, label, index} = e.currentTarget.dataset
this.setData({
showCheckbox: true,
checkboxTitle: '选择' + label,
checkboxResult: value.split(','),
checkboxOptions: options,
checkboxIndex: index
})
},
onShowDate(e) {
let {key, value, index} = e.currentTarget.dataset
console.log(e.currentTarget.dataset)
this.setData({
showDate: true,
dateKey: key,
defaultDate: value,
dateIndex: index
})
},
onCloseDate(e) {
this.setData({
showDate: false
})
},
formatDate(date) {
date = new Date(date);
return `${date.getFullYear()}-${date.getMonth() + 1 > 10 ? date.getMonth() + 1 : '0' + (date.getMonth() + 1)}-${date.getDate() > 10 ? date.getDate() : '0' + date.getDate()}`;
},
onConfirmDate(e) {
let formControllers = this.data.formControllers;
formControllers[this.data.dateIndex].value = this.formatDate(e.detail)
this.setData({
showDate: false,
formControllers
});
console.log(this.data.formControllers)
},
setVal(e) {
let formControllers = this.data.formControllers;
console.log(e)
formControllers[e.currentTarget.dataset.index].value = e.detail
this.setData({
showDate: false,
formControllers
});
console.log(this.data.formControllers)
},
pickerChange(e) {
let {valuekey, options, currentindex, key} = e.currentTarget.dataset
let index = e.detail.value
console.log(key, 'key')
let formControllers = this.data.formControllers;
let selected = options[index]
formControllers[currentindex].value = selected[valuekey]
formControllers[currentindex].valueIndex = e.detail.value
if (selected.masterControl) {
formControllers.forEach(item => {
if (item.showFlag) {
if (item.showFlag === selected[valuekey]) {
item.hide = false
} else {
item.hide = true
}
}
})
}
this.setData({
formControllers
})
},
sure() {
console.log('ok', this.data.formControllers)
this.triggerEvent('ok', this.data.formControllers)
this.onClose();
}
},
});

12
components/DynamicForms/DynamicForms.json

@ -0,0 +1,12 @@
{
"component": true,
"usingComponents": {
"van-action-sheet": "@vant/weapp/action-sheet/index",
"van-field": "@vant/weapp/field/index",
"van-cell": "@vant/weapp/cell/index",
"van-cell-group": "@vant/weapp/cell-group/index",
"van-calendar": "@vant/weapp/calendar/index",
"van-checkbox-group": "@vant/weapp/checkbox-group/index",
"van-checkbox": "@vant/weapp/checkbox/index"
}
}

103
components/DynamicForms/DynamicForms.wxml

@ -0,0 +1,103 @@
<van-action-sheet show="{{ show }}" title="{{title}}" bind:close="onClose">
<van-cell-group>
<block wx:for="{{formControllers}}" wx:if="{{!item.hide}}">
<van-field
wx:if="{{item.type === 'input'}}"
label="{{item.label}}"
model:value="{{ item.value }}"
placeholder="请输入{{item.label}}"
bind:input="setVal"
data-key="{{item.key}}"
data-index="{{index}}"
/>
<van-field
wx:if="{{item.type === 'textarea'}}"
type="textarea"
label="{{item.label}}"
value="{{ item.value }}"
placeholder="请输入{{item.label}}"
autosize
maxlength="{{item.maxlength?item.maxlength:-1}}"
show-word-limit="{{item.maxlength}}"
bind:input="setVal"
data-key="{{item.key}}"
data-index="{{index}}"
/>
<block wx:if="{{item.type === 'date'}}">
<van-cell
title="{{item.label}}"
value="{{ item.value?item.value:'请选择'+item.label}}"
bind:click="onShowDate"
data-value="{{item.value}}"
data-index="{{index}}"
data-key="{{item.key}}"
/>
</block>
<block wx:if="{{item.type === 'checkbox'}}">
<van-cell
title="{{item.label}}"
value="{{ item.selected?item.selected:'请选择'+item.label}}"
bind:click="onShowCheckbox"
data-options="{{item.options}}"
data-value="{{item.value}}"
data-label="{{item.label}}"
data-index="{{index}}"
data-key="{{item.key}}"
/>
</block>
<block wx:if="{{item.type === 'select'}}">
<picker
value="{{item.valueIndex}}"
range="{{item.options}}"
range-key="{{item.optionsKey || 'label'}}"
bind:change="pickerChange"
data-value="{{item.value}}"
data-valuekey="{{item.valueKey || 'value'}}"
data-options="{{item.options || []}}"
data-currentindex="{{index}}"
data-optionsKey="{{item.optionsKey || 'label'}}"
data-index="{{index}}"
data-key="{{item.key}}"
>
<van-cell title="{{item.label}}"
value="{{ item.valueIndex>=0?item.options[item.valueIndex][item.optionsKey || 'label']:'请选择'+item.label }}"/>
</picker>
</block>
</block>
</van-cell-group>
<view class="bottom-btn">
<view class="btn btn-gray" bind:tap="onClose">取消</view>
<view class="btn btn-blue" bind:tap="sure">确定</view>
</view>
</van-action-sheet>
<van-calendar
show="{{ showDate }}"
bind:close="onCloseDate"
bind:confirm="onConfirmDate"
default-date="{{defaultDate}}"
/>
<van-action-sheet show="{{ showCheckbox }}" title="{{checkboxTitle}}" bind:close="onCloseCheckbox">
<scroll-view scroll-y style="max-height: 50vh">
<van-checkbox-group value="{{ checkboxResult }}" bind:change="onChangeCheckbox">
<view class="checkbox-item" wx:for="{{checkboxOptions}}"
data-index="{{ index }}"
bind:tap="toggle"
wx:key="index"
>
<van-checkbox
name="{{item.value}}"
class="checkboxes-{{ index }}"
>
{{item.label}}
</van-checkbox>
</view>
</van-checkbox-group>
</scroll-view>
<view class="bottom-btn">
<view class="btn btn-gray" bind:tap="onCloseCheckbox">取消</view>
<view class="btn btn-blue" bind:tap="sureCheckbox">确定</view>
</view>
</van-action-sheet>

38
components/DynamicForms/DynamicForms.wxss

@ -0,0 +1,38 @@
.btn {
width: 240rpx;
height: 76rpx;
border-radius: 38rpx;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
font-size: 32rpx;
font-weight: bold;
}
.btn-blue {
background: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%);
}
.btn-gray {
background: #D9D9D9;
}
.bottom-btn {
background: none;
display: flex;
align-items: center;
justify-content: space-between;
padding: 20rpx 99rpx 20rpx;
/*padding-bottom: calc(env(safe-area-inset-bottom) + 10rpx);*/
width: 100%;
box-sizing: border-box;
z-index: 999;
position: static;
}
.checkbox-item {
display: flex;
align-items: center;
padding: 30rpx 40rpx;
border-bottom: 1px solid #f2f2f2;
}

11
components/ResourceInfo/ResourceInfo.js

@ -1,5 +1,5 @@
import { import {
communitySelfOrgDetail, communitySelfOrgDetail, getServiceTypeRelationByHobbyCode,
icpartyunitDetail, icpartyunitDetail,
residentEduInfo, residentEduInfo,
residentHobbyInfo, residentHobbyInfo,
@ -74,12 +74,13 @@ Component({
if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) { if (monthDiff < 0 || (monthDiff === 0 && dayDiff < 0)) {
yearDiff--; yearDiff--;
} }
console.log(yearDiff, 'yearDiff')
return yearDiff; return yearDiff;
}, },
// 志愿者 公益岗 // 志愿者 公益岗
getVolunteer() { getVolunteer() {
volunteerDetail(this.data.id).then(({data}) => { volunteerDetail(this.data.id).then(({data}) => {
data.birthday = data.birthday ? this.getAgeByDateOfBirth(new Date(data.birthday)) : '未知' data.age = data.birthday ? this.getAgeByDateOfBirth(new Date(data.birthday)) : '未知'
this.setData({ this.setData({
detail: data || {} detail: data || {}
}) })
@ -91,9 +92,9 @@ Component({
}) })
residentHobbyInfo(this.data.id).then(({data}) => { residentHobbyInfo(this.data.id).then(({data}) => {
this.setData({ this.setData({
hobby: data || {} hobby: data || {}
}) })
}) })
}, },

4
components/ResourceInfo/ResourceInfo.wxml

@ -117,11 +117,11 @@
<view class="items"> <view class="items">
<view class="label">所在位置:</view> <view class="label">所在位置:</view>
<view class="value">{{ detail.houseInfo ? detail.houseInfo.homeName : '' }}</view> <view class="value">{{ detail&&detail.houseInfo&&detail.houseInfo.homeName ? detail.houseInfo.homeName : '' }}</view>
</view> </view>
<view class="items"> <view class="items">
<view class="label">兴趣爱好:</view> <view class="label">兴趣爱好:</view>
<view class="value">{{ hobby ? hobby.hobbyRemark : '' }}</view> <view class="value">{{ hobby&&hobby.hobbyRemark ? hobby.hobbyRemark : '' }}</view>
</view> </view>
</block> </block>
</view> </view>

1641
subpages/addResi/pages/addResi/addResi.js

File diff suppressed because it is too large

3
subpages/addResi/pages/addResi/addResi.json

@ -1,6 +1,7 @@
{ {
"usingComponents": { "usingComponents": {
"wux-select": "../../../../components/dist/select" "wux-select": "../../../../components/dist/select",
"DynamicForms": "../../../../components/DynamicForms/DynamicForms"
}, },
"navigationStyle": "custom" "navigationStyle": "custom"
} }

259
subpages/addResi/pages/addResi/addResi.wxml

@ -1,234 +1,279 @@
<!--subpages/addResi/pages/addResi/addResi.wxml--> <!--subpages/addResi/pages/addResi/addResi.wxml-->
<view class="header"> <view class="header">
<image src="../../../../images/back.png" class="back" style=" top: {{statusHeight}}px;width: 50rpx;height: 50rpx;" bindtap="back" mode=""/> <image src="../../../../images/back.png" class="back" style=" top: {{statusHeight}}px;width: 50rpx;height: 50rpx;"
<image class="header-bg" src="../images/header.png" mode="widthFix" /> bindtap="back" mode=""/>
<view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;"> <image class="header-bg" src="../images/header.png" mode="widthFix"/>
{{formType == 'edit'?'修改人口信息':'新增人口信息'}} <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
{{formType == 'edit' ? '修改人口信息' : '新增人口信息'}}
</view> </view>
<view class="content"> <view class="content">
<view class="h2">填写居民信息</view> <view class="h2">填写居民信息</view>
<view class="tag"> 带 <b>*</b> 号为必填项</view> <view class="tag">带 <b>*</b> 号为必填项
</view>
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<view class="form_card"> <view class="form_card">
<view class="title"><text class="tag"></text> 基本信息</view> <view class="title">
<text class="tag"></text> 基本信息
</view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">所在网格</view> <view class="title">所在网格</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangeGrid" range-key="label" value="{{index}}" range="{{gridList}}"> <picker bindchange="bindPickerChangeGrid" range-key="label" value="{{index}}" range="{{gridList}}">
<view class="{{form.gridName?'':'gray'}}"> <view class="{{form.gridName?'':'gray'}}">
{{form.gridName?form.gridName:'请选择'}} {{form.gridName ? form.gridName : '请选择'}}
</view> </view>
</picker> </picker>
<image src="../../../../images/right.png" mode=""/> <image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">所在小区</view> <view class="title">所在小区</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangevillageId" range-key="label" value="{{index}}" range="{{villageList}}"> <picker bindchange="bindPickerChangevillageId" range-key="label" value="{{index}}"
<view class="{{villageName?'':'gray'}}"> range="{{villageList}}">
{{villageName?villageName:'请选择'}} <view class="{{villageName?'':'gray'}}">
</view> {{villageName ? villageName : '请选择'}}
</picker> </view>
<image src="../../../../images/right.png" mode=""/> </picker>
<image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">所在楼栋</view> <view class="title">所在楼栋</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangebuilding" range-key="label" value="{{index}}" range="{{buildingList}}"> <picker bindchange="bindPickerChangebuilding" range-key="label" value="{{index}}"
<view class="{{buildingName?'':'gray'}}"> range="{{buildingList}}">
{{buildingName?buildingName:'请选择'}} <view class="{{buildingName?'':'gray'}}">
</view> {{buildingName ? buildingName : '请选择'}}
</picker> </view>
<image src="../../../../images/right.png" mode=""/> </picker>
<image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">所在单元</view> <view class="title">所在单元</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangeUnit" range-key="label" value="{{index}}" range="{{unitList}}"> <picker bindchange="bindPickerChangeUnit" range-key="label" value="{{index}}" range="{{unitList}}">
<view class="{{unitName?'':'gray'}}"> <view class="{{unitName?'':'gray'}}">
{{unitName?unitName:'请选择'}} {{unitName ? unitName : '请选择'}}
</view> </view>
</picker> </picker>
<image src="../../../../images/right.png" mode=""/> <image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_house"> <view class="form_house">
<view class="form_item"> <view class="form_item">
<view class="label "> <view class="label ">
<text class="must">*</text> <text class="must">*</text>
<view class="title">所在房屋</view> <view class="title">所在房屋</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangeHouse" range-key="label" value="{{index}}" range="{{houseList}}"> <picker bindchange="bindPickerChangeHouse" range-key="label" value="{{index}}"
<view class="{{houseName?'':'gray'}}"> range="{{houseList}}">
{{houseName?houseName:'请选择'}} <view class="{{houseName?'':'gray'}}">
{{houseName ? houseName : '请选择'}}
</view>
</picker>
<image src="../../../../images/right.png" mode=""/>
</view> </view>
</picker>
<image src="../../../../images/right.png" mode=""/>
</view> </view>
<view class="form_bottom">选项中如无该房屋,请先
<text bind:tap="handelJump">新增房屋</text>
</view> </view>
<view class="form_bottom">选项中如无该房屋,请先 <text bind:tap="handelJump">新增房屋</text></view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">姓名</view> <view class="title">姓名</view>
</view> </view>
<view class="input"> <view class="input">
<input confirm-type="next" bindblur="bindNameInput" bindinput="bindNameInput" value="{{form.name}}" placeholder-class="gray" placeholder="请输入" /> <input confirm-type="next" bindblur="bindNameInput" bindinput="bindNameInput" value="{{form.name}}"
placeholder-class="gray" placeholder="请输入"/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">性别</view> <view class="title">性别</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangeGender" range-key="label" value="{{index}}" range="{{genderList}}"> <picker bindchange="bindPickerChangeGender" range-key="label" value="{{index}}" range="{{genderList}}">
<view class="{{form.gender?'':'gray'}}"> <view class="{{form.gender?'':'gray'}}">
{{genderName?genderName:'请选择'}} {{genderName ? genderName : '请选择'}}
</view> </view>
</picker> </picker>
<image src="../../../../images/right.png" mode=""/> <image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">出生日期</view> <view class="title">出生日期</view>
</view> </view>
<view class="input"> <view class="input">
<picker mode="date" value="{{form.birthday}}" end="{{day}}" bindchange="bindDateChange"> <picker mode="date" value="{{form.birthday}}" end="{{day}}" bindchange="bindDateChange">
<view class="{{form.birthday?'':'gray'}}"> <view class="{{form.birthday?'':'gray'}}">
{{form.birthday?form.birthday:'请选择'}} {{form.birthday ? form.birthday : '请选择'}}
</view> </view>
</picker> </picker>
<image src="../../../../images/right.png" mode=""/> <image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">证件号</view> <view class="title">证件号</view>
</view> </view>
<view class="input"> <view class="input">
<input confirm-type="next" bindblur="bindIdNumInput" bindinput="bindidNumInput" value="{{form.idNum}}" placeholder-class="gray" placeholder="请输入" /> <input confirm-type="next" bindblur="bindIdNumInput" bindinput="bindidNumInput" value="{{form.idNum}}"
placeholder-class="gray" placeholder="请输入"/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<text class="must">*</text> <text class="must">*</text>
<view class="title">联系电话</view> <view class="title">联系电话</view>
</view> </view>
<view class="input"> <view class="input">
<input confirm-type="next" bindblur="bindMobileInput" bindinput="bindmobileInput" value="{{form.mobile}}" placeholder-class="gray" placeholder="请输入" /> <input confirm-type="next" bindblur="bindMobileInput" bindinput="bindmobileInput"
value="{{form.mobile}}" placeholder-class="gray" placeholder="请输入"/>
</view> </view>
</view> </view>
</view> </view>
<view class="form_card m-top20"> <view class="form_card m-top20">
<view class="title"><text class="tag"></text> 详细信息</view> <view class="title">
<text class="tag"></text> 详细信息
</view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<view class="title">户籍地</view> <view class="title">户籍地</view>
</view> </view>
<view class="input"> <view class="input">
<input confirm-type="next" bindblur="bindPlaceOfDomicileInput" bindinput="bindPlaceOfDomicileInput" value="{{form.resideInfoDto.placeOfDomicile}}" placeholder-class="gray" placeholder="请输入" /> <input confirm-type="next" bindblur="bindPlaceOfDomicileInput" bindinput="bindPlaceOfDomicileInput"
value="{{form.resideInfoDto.placeOfDomicile}}" placeholder-class="gray" placeholder="请输入"/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<view class="title">现居地</view> <view class="title">现居地</view>
</view> </view>
<view class="input"> <view class="input">
<input confirm-type="next" bindblur="bindCurrentResidenceInput" bindinput="bindCurrentResidenceInput" value="{{form.resideInfoDto.currentResidence}}" placeholder-class="gray" placeholder="请输入" /> <input confirm-type="next" bindblur="bindCurrentResidenceInput" bindinput="bindCurrentResidenceInput"
value="{{form.resideInfoDto.currentResidence}}" placeholder-class="gray" placeholder="请输入"/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<view class="title">民族</view> <view class="title">民族</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangeNation" range-key="label" value="{{index}}" range="{{nation}}"> <picker bindchange="bindPickerChangeNation" range-key="label" value="{{index}}" range="{{nation}}">
<view class="{{form.nation?'':'gray'}}"> <view class="{{form.nation?'':'gray'}}">
{{form.nation?nation[form.nation].label:'请选择'}} {{form.nation ? nation[form.nation].label : '请选择'}}
</view> </view>
</picker> </picker>
<image src="../../../../images/right.png" mode=""/> <image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<view class="title">籍贯</view> <view class="title">籍贯</view>
</view> </view>
<view class="input"> <view class="input">
<input confirm-type="next" bindblur="bindNativePlaceInput" bindinput="bindNativePlaceInput" value="{{form.resideInfoDto.nativePlace}}" placeholder-class="gray" placeholder="请输入" /> <input confirm-type="next" bindblur="bindNativePlaceInput" bindinput="bindNativePlaceInput"
value="{{form.resideInfoDto.nativePlace}}" placeholder-class="gray" placeholder="请输入"/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<view class="title">文化程度</view> <view class="title">文化程度</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangeEducation" range-key="label" value="{{index}}" range="{{education}}"> <picker bindchange="bindPickerChangeEducation" range-key="label" value="{{index}}"
<view class="{{form.eduInfoDto.cultureLevel?'':'gray'}}"> range="{{education}}">
{{form.eduInfoDto.cultureLevel?education[form.eduInfoDto.cultureLevel].label:'请选择'}} <view class="{{form.eduInfoDto.cultureLevel?'':'gray'}}">
</view> {{form.eduInfoDto.cultureLevel ? education[form.eduInfoDto.cultureLevel].label : '请选择'}}
</picker> </view>
<image src="../../../../images/right.png" mode=""/> </picker>
<image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item"> <view class="form_item">
<view class="label"> <view class="label">
<view class="title">婚姻状况</view> <view class="title">婚姻状况</view>
</view> </view>
<view class="input"> <view class="input">
<picker bindchange="bindPickerChangemarriage" range-key="label" value="{{index}}" range="{{marriageList}}"> <picker bindchange="bindPickerChangemarriage" range-key="label" value="{{index}}"
<view class="{{form.familyInfoDto.marriage?'':'gray'}}"> range="{{marriageList}}">
{{marriageName?marriageName:'请选择'}} <view class="{{form.familyInfoDto.marriage?'':'gray'}}">
</view> {{marriageName ? marriageName : '请选择'}}
</picker> </view>
<image src="../../../../images/right.png" mode=""/> </picker>
<image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
<view class="form_item "> <view class="form_item ">
<view class="label"> <view class="label">
<view class="title">宗教信仰</view> <view class="title">宗教信仰</view>
</view> </view>
<view class="input"> <view class="input">
<input confirm-type="next" bindblur="bindReligionInput" bindinput="bindReligionInput" value="{{form.religionDto.religion}}" placeholder-class="gray" placeholder="请输入" /> <input confirm-type="next" bindblur="bindReligionInput" bindinput="bindReligionInput"
value="{{form.religionDto.religion}}" placeholder-class="gray" placeholder="请输入"/>
</view> </view>
</view> </view>
</view> </view>
<view class="form_card m-top20"> <view class="form_card m-top20">
<view class="title"><text class="tag"></text> 居民类别</view> <view class="title">
<text class="tag"></text> 居民类别
</view>
<view class="form_item"> <view class="form_item">
<view class="label" > <view class="label">
<view class="title">居民类别</view> <view class="title">居民类别</view>
</view>
<view class="input" bind:tap="onClick3">
<view class="residentCategorySty {{residentCategorySty?'':'gray'}}" style="text-align: left;">
{{residentCategorySty ? residentCategorySty : '请选择'}}
</view>
<image src="../../../../images/right.png" mode=""/>
</view>
</view>
<view class="form_item"
wx:for="{{residentTypeFormCell}}"
:key="index"
bind:tap="openDynamicForms"
data-title="{{item.title}}"
data-formtype="{{item.value}}"
>
<view class="label">
<view class="title">{{item.title}}</view>
</view> </view>
<view class="input" bind:tap="onClick3"> <view class="input text-right">
<view class="residentCategorySty {{residentCategorySty?'':'gray'}}" style="text-align: left;"> {{residentCategorySty?residentCategorySty:'请选择'}}</view>
<image src="../../../../images/right.png" mode=""/> <image src="../../../../images/right.png" mode=""/>
</view> </view>
</view> </view>
</view> </view>
<view class="bottom_btn" bind:tap="submit">提交</view> <view class="bottom_btn" bind:tap="submit">提交</view>
</view> </view>
<wux-select id="wux-select3" /> <wux-select id="wux-select3"/>
<DynamicForms
show="{{isShowDynamicForms}}"
title="{{dynamicFormsTitle}}"
bind:close="closeDynamicForms"
bind:ok="okDynamicForms"
formController="{{formController}}"
/>

6
subpages/addResi/pages/addResi/addResi.wxss

@ -133,7 +133,7 @@ page {
color:#3A80E7 ; color:#3A80E7 ;
} }
.form_card .form_item .label{ .form_card .form_item .label{
width: 130rpx; min-width: 130rpx;
height: 100%; height: 100%;
line-height: 100rpx; line-height: 100rpx;
font-size: 32rpx; font-size: 32rpx;
@ -183,4 +183,8 @@ page {
color: #fff; color: #fff;
margin: 30rpx auto 0; margin: 30rpx auto 0;
line-height: 86rpx; line-height: 86rpx;
}
.text-right {
text-align: right!important;
justify-content: flex-end!important;
} }

54
utils/statisticsApi.js

@ -268,3 +268,57 @@ export function dwdEventEventList(params) {
export function getOwnedRolesOfStaffId(id) { export function getOwnedRolesOfStaffId(id) {
return request.get('gov/access/govroleuser/getOwnedRolesOfStaffId/'+id) return request.get('gov/access/govroleuser/getOwnedRolesOfStaffId/'+id)
} }
// 房屋性质
export function getHouseType(params) {
return request.post('sys/dict/data/house',params)
}
// 保障房信息详情
export function residentEnsureHouse(id) {
return request.get('actual/base/residentEnsureHouse/detail/'+id)
}
// 失业信息详情
export function residentUnemployed(id) {
return request.get('actual/base/residentUnemployed/detail/'+id)
}
// 退役军人信息详情
export function getVeteranDetailById(id) {
return request.post('actual/base/residentVeteran/getVeteranDetailById/'+id)
}
// 统战人员详情
export function residentUnitedFront(id) {
return request.get('actual/base/residentUnitedFront/detail/'+id)
}
// 志愿者信息详情
export function getVolunteerDetailById(id) {
return request.post('actual/base/residentVolunteer/getVolunteerDetailById/'+id)
}
// 老年人信息详情
export function getOldPeopleDetailById(id) {
return request.post('actual/base/residentOldPeople/getOldPeopleDetailById/'+id)
}
// 公益岗人员信息详情
export function publicWelfarePost(id) {
return request.get('actual/base/resiCategorized/publicWelfarePost/detail/'+id)
}
// 特殊人群信息
export function residentSpecial(id) {
return request.get('actual/base/residentSpecial/detail/'+id)
}
// 租户详情
export function residentTenant(id) {
return request.get('actual/base/residentTenant/detailByResiId/'+id)
}
// 特扶人员信息详情
export function specialSupport(id) {
return request.get('actual/base/resiCategorized/specialSupport/detail/'+id)
}

Loading…
Cancel
Save