建平需求变更调整完毕

This commit is contained in:
aixianling
2022-08-15 18:39:33 +08:00
parent 25e45267c1
commit 3544a290ab
13 changed files with 599 additions and 389 deletions

View File

@@ -16,17 +16,17 @@
</div>
</div>
</div> -->
<div class="form-item" v-if="!isEdit">
<div class="form-item__wrapper">
<div class="left">
<i>*</i>
<span>监测对象类型</span>
</div>
<div class="right">
<AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
</div>
</div>
</div>
<!-- <div class="form-item" v-if="!isEdit">-->
<!-- <div class="form-item__wrapper">-->
<!-- <div class="left">-->
<!-- <i>*</i>-->
<!-- <span>监测对象类型</span>-->
<!-- </div>-->
<!-- <div class="right">-->
<!-- <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-item" v-if="isEdit">
<div class="form-item__wrapper">
<div class="left">

View File

@@ -6,7 +6,7 @@
<div class="search-obj">
<div class="selectBox" @click="showType = true">
<span v-if="!status">全部类型</span>
<span v-else>{{ $dict.getLabel('fpPrtpStatus', status)}}</span>
<span v-else>{{ $dict.getLabel('fpPrtpStatus', status) }}</span>
<u-icon name="arrow-down"></u-icon>
</div>
<u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名/身份证号" :show-action="false" bg-color="#F5F5F5"
@@ -35,7 +35,7 @@
<AiEmpty class="emptyWrap" v-else></AiEmpty>
<u-select v-model="showType" :list="typelist" label-name="dictName" value-name="dictValue"
@confirm="confirmTypeSelect"/>
@confirm="confirmTypeSelect"/>
<AiFixedBtn v-if="checkType == 1 && currentTabs==0">
<div class="addBtn iconfont iconfont-iconfangda" @tap="toAdd" v-if="$permissions('app_apppreventionreturntopoverty_edit')"></div>
@@ -71,8 +71,6 @@ export default {
currentTabs: 0,
areaId: '',
areaName: '',
isAdmin: false,
checkType: '',
showType: false,
typelist: [],
status: ''
@@ -80,40 +78,29 @@ export default {
},
computed: {
...mapState(['user']),
checkType: v => v.user.girdCheckType,
isAdmin: v => v.user.girdCheckType > 0
},
onShow() {
document.title = '监测对象'
this.areaId = this.user.areaId
this.areaName = this.user.areaName
this.$dict.load('fpPrtpStatus').then(() => {
this.isGirdUser()
this.isAdmin && this.getList()
this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5)
this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
this.typelist.unshift({dictName: '全部类型', dictValue: ''})
})
uni.$on('reload', () => {
this.getListInit()
})
},
methods: {
isGirdUser() {
this.isAdmin = false
this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
if (res?.data) {
if (res.data.checkType != '0') {
this.isAdmin = true
this.checkType = res.data.checkType
this.getList()
}
}
})
},
confirmTypeSelect(val) {
this.status = val?.[0].value
this.$nextTick(()=>{
this.$nextTick(() => {
this.current = 1,
this.list = []
this.list = []
this.getList()
})
},
@@ -148,16 +135,16 @@ export default {
change(index) {
this.currentTabs = index
if(this.currentTabs == 1) {
if (this.currentTabs == 1) {
this.typelist = this.$dict.getDict('fpPrtpStatus')
this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
this.typelist.unshift({dictName: '全部类型', dictValue: ''})
} else if (this.currentTabs == 0) {
this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5)
this.typelist.unshift({ dictName: '全部类型', dictValue: ''})
this.typelist.unshift({dictName: '全部类型', dictValue: ''})
}
this.status = ''
this.getListInit()
},
toDetail(item) {
@@ -233,6 +220,7 @@ export default {
border-top: 2px solid #f5f5f5;
padding: 20px 32px;
background: #fff;
.selectBox {
margin-right: 30px;
}

View File

@@ -1,5 +1,5 @@
<template>
<div class="detail" v-if="pageShow" :class="[isFrom ? 'active' : '']">
<div class="detail" v-if="pageShow" :class="{active:isFrom}">
<!-- <div class="tab" v-if="!isFrom">
<span @click="changeTab(0)" :class="[currIndex === 0 ? 'active' : '']">基本信息</span>
<span @click="changeTab(1)" :class="[currIndex === 1 ? 'active' : '']">走访日志</span>
@@ -10,35 +10,28 @@
<div class="item-header item-avatar">
<div class="left">
<!-- <img :src="info.photo" alt="" v-if="info.photo" /> -->
<img :src="$cdn + 'avatar.png'" />
<img :src="$cdn + 'avatar.png'"/>
<div class="left-right">
<h2>{{ info.name }}</h2>
<p style="color: #2979ff;" @click="callPhone(info.phone)"><u-icon name="phone" color="#2979ff" size="28"></u-icon>{{ info.phone }}</p>
<p style="color: #2979ff;" @click="callPhone(info.phone)">
<u-icon name="phone" color="#2979ff" size="28"></u-icon>
{{ info.phone }}
</p>
</div>
</div>
<span @click="linkTo(`./residentDetail?id=${info.id}`)">详情</span>
</div>
<AiItem label="现住地址">{{ info.countyName + info.townName + info.villageName }}</AiItem>
<AiItem label="详细地址">{{ info.currentAddress }}</AiItem>
<div class="item-info">
<label>现住地址</label>
<span>{{ info.countyName + info.townName + info.villageName }}</span>
<span></span>
</div>
<div class="item-info">
<label>详细地址</label>
<span>{{ info.currentAddress }}</span>
</div>
</div>
<!-- <div class="item-wrapper">
<div class="item-header">
<div class="left">
<h2>帮扶措施</h2>
</div>
<span @click="toLogList()" v-if="$permissions('app_apppreventionreturntopovertylog_detail')">查看</span>
</div>
<div class="item-info">
<label>采取措施</label>
<span>{{ info.helpLog? $dict.getLabel('fpAssistanceMeasures',info.helpLog.operationDesc): '-' }}</span>
</div>
</div> -->
<div class="item-wrapper">
<div class="item-header">
<div class="left">
@@ -112,7 +105,6 @@
</div>
</div>
<!-- 风险解除 -->
<!-- v-if="info.status == 3" -->
<div class="item-wrapper" v-if="info.status == 3">
<div class="item-header">
<div class="left">
@@ -131,7 +123,11 @@
</div>
</div>
</div>
<div class="item-wrapper" v-if="info.status==4">
<AiItem label="审批人" :border="false">{{ info.auditUserName }}</AiItem>
<AiItem label="驳回日期" :border="false">{{ info.auditTime }}</AiItem>
<AiItem label="驳回理由" :border="false" top-label>{{ info.auditOpinion }}</AiItem>
</div>
<!-- <div class="tab-content__item" v-show="currIndex === 1 && info.status!=5">
<div class="log-item" v-for="(item, index) in list" :key="index">
<div class="log-item__wrapper">
@@ -162,7 +158,7 @@
<AiFixedBtn v-if="currIndex === 1">
<div class="addBtn iconfont iconfont-iconfangda" @tap="toAddLog()"></div>
</AiFixedBtn>
<!-- 0待纳入1监测中2待解除3已解除4已驳回 -->
<!-- 0待纳入1监测中2待解除3已解除4已驳回 -->
<div v-if="checkType == 1 && currIndex != 1"> <!-- 网格员 -->
<div class="footer-btn" v-if="info.status == 1">
<div class="confirm-btn" @click="toAddView('您确认要申请解除此监测对象的风险吗?', '')">申请解除风险</div>
@@ -176,7 +172,6 @@
<div class="confirm-btn" @click="toAddView('您确认要申请纳入此监测对象吗?', '')">申请纳入监测</div>
</div>
</div>
<div v-if="checkType == 2 && currIndex != 1"> <!-- 网格长 -->
<div class="footer-btn" v-if="info.status == 0 && userInfo != ''">
@@ -201,15 +196,18 @@
<div class="confirm-btn" @click="toAddView('您确认要将此居民纳入监测对象吗?', 1)">纳入监测</div>
</div>
</div>
</div>
<AiEmpty v-else/>
</template>
<script>
import { mapState } from 'vuex'
import {mapState} from 'vuex'
import AiGroup from "../../components/AiGroup";
import AiItem from "../../components/AiItem";
export default {
name: 'detail',
components: {AiItem, AiGroup},
data() {
return {
info: {},
@@ -241,7 +239,7 @@ export default {
return false
}
return (this.info.industrialAssistance || this.info.healthAssistance || this.info.employmentAssistance || this.info.educationalAssistance
|| this.info.financialAssistance || this.info.socialAssistance || this.info.publicWelfarePostAssistance);
|| this.info.financialAssistance || this.info.socialAssistance || this.info.publicWelfarePostAssistance);
},
isFamilySituation() {
@@ -262,9 +260,9 @@ export default {
return false
}
return (this.info.income1 || this.info.income2 || this.info.income3 || this.info.income4
|| this.info.income5|| this.info.income6|| this.info.income7|| this.info.income8 || this.info.income9 ||
this.info.income10 || this.info.income11 || this.info.income12 ||
this.info.income13 || this.info.income14 || this.info.income15)
|| this.info.income5 || this.info.income6 || this.info.income7 || this.info.income8 || this.info.income9 ||
this.info.income10 || this.info.income11 || this.info.income12 ||
this.info.income13 || this.info.income14 || this.info.income15)
},
moveRisk() {
@@ -272,7 +270,7 @@ export default {
return false
}
return (this.info.fxxcIncome1 || this.info.fxxcIncome2 || this.info.fxxcIncome3 || this.info.fxxcIncome4
|| this.info.fxxcIncome5 || this.info.fxxcIncome6 || this.info.fxxcIncome7)
|| this.info.fxxcIncome5 || this.info.fxxcIncome6 || this.info.fxxcIncome7)
}
},
@@ -282,7 +280,7 @@ export default {
this.isFrom = true
}
this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
'fpLaborSkills', 'fpPoliticalOutlook', 'fpIndustrialAssistance', 'fpHealthAssistance','fpAssistanceMeasures']).then(() => {
'fpLaborSkills', 'fpPoliticalOutlook', 'fpIndustrialAssistance', 'fpHealthAssistance', 'fpAssistanceMeasures']).then(() => {
this.isGirdUser()
this.getInfo()
})
@@ -382,12 +380,11 @@ export default {
getInfo() {
this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${this.id}`).then(res => {
if (res.code === 0) {
if (res?.data) {
this.info = res.data
let ylbxCount = 0
let ylCount = 0
if(res.data.family && res.data.family.length) {
if (res.data.family && res.data.family.length) {
res.data.family.forEach(item => {
if (item.basicMedicalTreatment === '02') {
ylbxCount = ylbxCount + 1
@@ -396,11 +393,11 @@ export default {
ylCount = ylCount + 1
}
})
this.endNum = res.data.family.filter(item =>
(item.jcbxCxyiliao == '02' || '') && (item.jcbxCzyiliao == '02' || '')
this.endNum = res.data.family.filter(item =>
(item.jcbxCxyiliao == '02' || '') && (item.jcbxCzyiliao == '02' || '')
)
this.endNum = res.data.family.filter(v=>
(v.jcbxCxyanglao == '02' || '') && (v.jcbxCzyanglao == '02' || '')
this.endNum = res.data.family.filter(v =>
(v.jcbxCxyanglao == '02' || '') && (v.jcbxCzyanglao == '02' || '')
)
}
@@ -426,7 +423,7 @@ export default {
this.$confirm('', '您确认要要删除此监测对象的信息吗?').then(() => {
this.$http.post(`/app/apppreventionreturntopoverty/delete?ids=${this.id}`).then(res => {
if (res.code === 0) {
this.$u.toast('删除成功')
this.$u.toast('删除成功')
uni.$emit('reload')
setTimeout(() => {
uni.navigateBack()
@@ -436,7 +433,7 @@ export default {
})
},
toRemove(text, pass,type) {
toRemove(text, pass, type) {
this.$confirm('', text).then(() => {
uni.navigateTo({url: `./MonitorRemoveView?pass=${pass}&id=${this.info.id}&status=${this.info.status}&type=${type}`})
})
@@ -674,13 +671,15 @@ export default {
}
}
}
.view-all{
.view-all {
text-align: center;
font-size: 32px;
font-family: PingFangSC-Regular, PingFang SC;
color: #3975C6;
line-height: 44px;
img{
img {
width: 32px;
height: 32px;
margin-left: 8px;
@@ -688,11 +687,13 @@ export default {
transition: all 0.3s ease-in-out;
vertical-align: middle;
}
.img-active{
.img-active {
transform: rotate(0deg);
}
}
.footer-btn{
.footer-btn {
width: 100%;
height: 112px;
line-height: 112px;
@@ -702,7 +703,8 @@ export default {
position: fixed;
bottom: 0;
left: 0;
div{
div {
flex: 1;
text-align: center;
font-size: 32px;
@@ -710,10 +712,21 @@ export default {
font-weight: 400;
color: #333;
}
.confirm-btn{
.confirm-btn {
background-color: #3192F4;
color: #fff;
}
}
::v-deep.AiItem {
.normal {
padding-right: 0;
}
.label {
padding-left: 0;
}
}
}
</style>

View File

@@ -1,33 +1,35 @@
<template>
<div class="form">
<div class="help" v-if="type == 1">
<div><span style="color: #FF4466;">*</span>帮扶类型</div>
<AiSelect dict="fpAssistanceMeasures" v-model="operationDesc"></AiSelect>
</div>
<div class="form-item form-item__textarea">
<div class="form-item__title">
<em>*</em>
<h2>{{type == 1 ? '帮扶内容' : '走访内容'}}</h2>
</div>
<textarea maxlength="500" v-model="detail" :placeholder="type == 1 ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
<div class="hint">{{ detail.length }}/500</div>
</div>
<div class="form-item form-item__imgs">
<div class="form-item__title">
<h2>图片</h2>
<i>最多9张</i>
</div>
<div>
<div class="MonitorAddLog">
<AiGroup v-if="isBangFu">
<AiItem label="帮扶类型" required>
<AiSelect dict="fpAssistanceMeasures" v-model="operationDesc"/>
</AiItem>
</AiGroup>
<!--走访日志-->
<AiGroup v-else>
<AiItem label="走访日期" required>
<AiDate v-model="createDate"/>
</AiItem>
</AiGroup>
<AiGroup>
<AiItem :label="isBangFu ? '帮扶内容' : '走访内容'" required topLabel>
<textarea maxlength="500" v-model="detail" :placeholder="isBangFu ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
<div class="hint">{{ detail.length }}/500</div>
</AiItem>
</AiGroup>
<AiGroup>
<AiItem label="图片" topLabel>
<span slot="sub" class="color-999" v-text="`最多9张`"/>
<AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
</div>
</div>
</AiItem>
</AiGroup>
<div class="btn" @click="submit">提交</div>
</div>
</template>
<script>
export default {
name: "MonitorAddLog",
data() {
return {
detail: '',
@@ -37,21 +39,27 @@ export default {
type: '',
operationDesc: '',
flag: false,
createDate: ""
}
},
computed: {
isBangFu: v => v.type == 1
},
onLoad(query) {
this.$dict.load('fpAssistanceMeasures')
this.pid = query.pid
this.type = query.type
if(query.id) {
if (query.id) {
this.id = query.id
this.getInfo()
}else{
this.createDate = this.$dateFormat(this.$dayjs())
}
},
onShow() {
if(this.type == 1) {
if (this.isBangFu) {
document.title = this.id ? '编辑帮扶措施' : '添加帮扶措施'
}else {
} else {
document.title = this.id ? '编辑走访日志' : '添加走访日志'
}
@@ -67,8 +75,8 @@ export default {
})
},
submit() {
if(this.flag) return
if(this.type == 1) {
if (this.flag) return
if (this.isBangFu) {
if (!this.operationDesc) {
return this.$u.toast('请选择帮扶类型')
}
@@ -107,71 +115,9 @@ export default {
</script>
<style lang="scss">
.form {
.MonitorAddLog {
padding-bottom: 120px;
.help {
padding: 32px;
box-sizing: border-box;
display: flex;
justify-content: space-between;
background: #fff;
margin-bottom: 16px;
}
.form-item {
padding: 32px;
background: #fff;
margin-bottom: 16px;
.form-item__title {
display: flex;
align-items: center;
margin-bottom: 34px;
em {
margin-right: 4px;
font-style: normal;
color: #FF4466;
}
h2 {
color: #333333;
font-weight: normal;
font-size: 32px;
}
i {
color: #999999;
font-size: 28px;
font-style: normal;
}
}
textarea {
width: 100%;
}
}
.form-type {
display: flex;
align-items: center;
justify-content: space-between;
height: 112px;
padding: 0 32px;
h2 {
font-weight: normal;
color: #333333;
font-size: 32px;
}
span {
color: #999999;
font-size: 28px;
}
}
.btn {
position: fixed;
left: 0;
@@ -187,7 +133,7 @@ export default {
background: #3192F4;
}
.hint{
.hint {
text-align: right;
color: #999;
}

View File

@@ -10,8 +10,8 @@
</div>
<div class="item">
<span>监测类型</span>
<span v-if="info.operationType == 0">{{ $dict.getLabel('fpRiskType',info.bizDictValue) }}</span>
<span v-if="info.operationType == 1">{{ $dict.getLabel('fpRiskEliminationMethod',info.bizDictValue) }}</span>
<span v-if="info.operationType == 0">{{ $dict.getLabel('fpRiskType', info.bizDictValue) }}</span>
<span v-if="info.operationType == 1">{{ $dict.getLabel('fpRiskEliminationMethod', info.bizDictValue) }}</span>
</div>
<div class="item">
<span>申请人</span>
@@ -29,38 +29,31 @@
<span style="color: #999;">图片</span>
<div class="imgs" v-if="info.files && info.files.length">
<image :src="img.url" @click="prevImg(info.files, img.url)" v-for="(img, index) in info.files"
:key="index"/>
:key="index"/>
</div>
</div>
</div>
</div>
<div class="result">
<div class="title">处理意见</div>
<div class="check">
<div class="left">
<span style="color: #FF4466;">*</span>
<span>审核结果</span>
</div>
<div class="right">
<div class="check-item" :class="form.pass == '1' ? 'check-active' : '' " @click="form.pass='1'">{{ type == 0? '纳入监测': '解除风险'}}<img src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="form.pass == '0' ? 'check-active' : '' " @click="form.pass='0'">驳回申请<img src="./components/img/check-icon.png" alt=""></div>
</div>
</div>
<div class="item">
<div><span style="display: inline-block;width: 6px;"></span>备注说明</div>
<div>
<AiGroup>
<AiItem label="审核结果" required>
<div class="check-item" :class="{active:form.pass==1}" @click="form.pass='1'">{{ type == 0 ? '纳入监测' : '解除风险' }}<img
src="./components/img/check-icon.png" alt=""></div>
<div class="check-item" :class="{active:form.pass=='0'}" @click="form.pass='0'">驳回申请<img src="./components/img/check-icon.png"/></div>
</AiItem>
<AiItem label="监测对象类型">
<AiSelect v-model="form.objectType" dict="fpType"/>
</AiItem>
<AiItem label="备注说明" topLabel>
<u-input v-model="form.opinion" type="textarea" placeholder="请输入备注说明" height="200" :maxlength="500"></u-input>
</div>
</div>
<div class="item">
<div><span style="width: 8px;"></span>图片<span style="color: #999;">(最多9张)</span></div>
<div style="margin-top: 20px; box-sizing: border-box;">
</AiItem>
<AiItem label="图片" topLabel>
<span slot="sub" class="color-999" v-text="`(最多9张)`"/>
<AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
</div>
</div>
</AiItem>
</AiGroup>
</div>
<div class="btn" @click="submit">提交</div>
</div>
@@ -86,7 +79,7 @@ export default {
}
},
onLoad(o) {
this.$dict.load('fpRiskType','fpRiskEliminationMethod')
this.$dict.load('fpRiskType', 'fpRiskEliminationMethod')
this.pass = o.pass;
this.id = o.id;
this.status = o.status;
@@ -95,7 +88,7 @@ export default {
},
created() {
this.getInfo()
document.title = this.type == 0? '纳入监测审核': '解除风险审核'
document.title = this.type == 0 ? '纳入监测审核' : '解除风险审核'
},
methods: {
getInfo() {
@@ -121,24 +114,24 @@ export default {
}
if (this.type == 0) { // 纳入审核
url = `/app/apppreventionreturntopoverty/examine`
} else if (this.type == 1){ // 解除审核
} else if (this.type == 1) { // 解除审核
url = `/app/apppreventionreturntopoverty/relieve`
}
var formData = new FormData()
for (let key in params) {
formData.append(key, params[key])
formData.append(key, params[key])
}
this.$http.post(url,formData).then(res => {
this.$http.post(url, formData).then(res => {
if (res.code == 0) {
this.$u.toast('提交成功')
uni.$emit('reload')
setTimeout(() =>{
setTimeout(() => {
uni.navigateBack({
delta: 2
})
},600)
}, 600)
}
})
}
@@ -150,28 +143,35 @@ export default {
.MonitorRemoveView {
.user-info {
background: #FFF;
.title {
padding: 30px 32px;
box-sizing: border-box;
border-bottom: 1px solid #DDDDDD;
font-weight: 600;
}
.info {
padding: 30px 32px;
box-sizing: border-box;
.item {
display: flex;
span {
padding: 12px 0;
}
span:first-child {
width: 140px;
color: #999999;
text-align: right;
}
span:last-child {
color: #343D65;
}
.imgs {
image {
width: 136px;
@@ -183,10 +183,12 @@ export default {
}
}
}
.result {
margin-top: 16px;
padding-bottom: 112px;
box-sizing: border-box;
.title {
height: 112px;
padding: 30px 32px;
@@ -195,39 +197,26 @@ export default {
border-bottom: 1px solid #DDDDDD;
background: #FFF;
}
.check {
display: flex;
justify-content: space-between;
border-bottom: 1px solid #DDDDDD;
padding: 30px 32px;
box-sizing: border-box;
background: #FFF;
align-items: center;
border-bottom: 1px solid #DDDDDD;
.check-item{
display: inline-block;
width: 140px;
height: 64px;
line-height: 64px;
text-align: center;
background: #F5F5F5;
border-radius: 4px;
font-size: 30px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333;
position: relative;
img{
display: none;
}
}
.check-item:nth-of-type(1) {
margin-right: 36px;
}
.check-active{
.check-item {
display: inline-block;
width: 140px;
height: 64px;
line-height: 64px;
text-align: center;
background: #F5F5F5;
border-radius: 4px;
font-size: 30px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333;
position: relative;
&.active {
background: #E7F1FE;
color: #1174FE;
img{
img {
display: block;
position: absolute;
bottom: 0;
@@ -236,17 +225,22 @@ export default {
height: 48px;
}
}
img {
display: none;
}
&:nth-of-type(1) {
margin-right: 36px;
}
}
.item {
border-bottom: 1px solid #DDDDDD;
padding: 30px 32px;
background: #FFF;
}
::v-deep .ai-uploader .fileList .default {
width: 160px;
height: 160px;
}
}
.btn {
width: 100%;
height: 112px;
@@ -258,5 +252,9 @@ export default {
bottom: 0;
left: 0;
}
.bg-fff {
background: #fff;
}
}
</style>