kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-04-27 08:59:20 +08:00
parent 35fcde4dca 054f8b8a50
commit ee93320cad
7 changed files with 66 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/jianping/AppHelpedResident/detail/hrLog.vue
View File

@@ -3,7 +3,7 @@
<ai-card title="走访日志">
<template #right>
<!-- <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/> -->
<el-button type="text" icon="el-icon-plus" @click="dialog=true">添加</el-button>
<el-button type="text" icon="el-icon-plus" @click="dialog=true" v-if="$permissions('app_apppreventionreturntopovertylog_edit')">添加</el-button>
</template>
<template #content>
<div class="logItem" v-for="row in tableData" :key="row.id">
@@ -15,8 +15,8 @@
<div class="content" v-text="row.detail"/>
<ai-uploader v-model="row.files" disabled/>
<div class="btns">
<el-button type="text" @click="handleEdit(row)">编辑</el-button>
<el-button type="text" @click="handleDelete(row.id)">删除</el-button>
<el-button type="text" @click="handleEdit(row)" v-if="$permissions('app_apppreventionreturntopovertylog_edit')">编辑</el-button>
<el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopovertylog_del')">删除</el-button>
</div>
</div>
<ai-empty v-if="tableData.length==0"/>

17
packages/jianping/AppHelpedResident/hrAdd.vue
View File

@@ -13,8 +13,7 @@
:disabled="isEdit"/> -->
<el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit || isSelectUser">
<template slot="append">
<ai-person-select :instance="instance" @selectPerson="checkName">
</ai-person-select>
<ai-person-select :instance="instance" @selectPerson="checkName" :url="'/app/appresident/list?auditStatus=1&householdName=1&areaId='+user.info.areaId"></ai-person-select>
</template>
</el-input>
</el-form-item>
@@ -282,7 +281,8 @@ export default {
this.form.name = ''
this.form.idNumber = ''
this.form.phone =''
this.form.areaId = ''
this.form.currentAreaId = ''
this.form.currentAddress = ''
this.form.birthDate = ''
this.form.sex = ''
this.form.age = ''
@@ -291,7 +291,8 @@ export default {
this.form.name = e.name
this.form.idNumber = e.idNumber
this.form.phone = e.phone
this.form.areaId = e.householdAreaId
this.form.currentAreaId = e.currentAreaId
this.form.currentAddress = e.currentAddress
this.handleIdNumberAutocomplete(e.idNumber)
this.isSelectUser = true
},
@@ -309,7 +310,6 @@ export default {
res.data.healthyStatusList = res.data.healthyStatus.split(',')
}
this.form = {...res.data}
console.log(res.data)
}
})
},
@@ -325,6 +325,9 @@ export default {
if (this.form.healthyStatusList.length) {
this.form.healthyStatus = this.form.healthyStatusList.join(',')
}
if(this.user.info.girdCheckType == 1) {
this.form.girdId = this.user.info.girdId
}
this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
if (res.code == 0) {
this.$message.success('提交成功!');
@@ -360,5 +363,9 @@ export default {
.el-date-editor {
width: 100%;
}
::v-deep .AiPersonSelect .el-button {
color: #fff;
}
}
</style>

48
packages/jianping/AppHelpedResident/hrDetail.vue
View File

@@ -9,21 +9,19 @@
@onBackClick="back"
>
<template #rightBtn>
<template v-if="detail.status == 1">
<el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit">编辑</el-button>
<el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
</template>
<el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit" v-if="$permissions('app_apppreventionreturntopoverty_edit')">编辑</el-button>
<template v-if="isGridAdmin">
<el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status === null">纳入监测</el-button>
<el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0">纳入监测审批</el-button>
<el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 0 && girdAdminApplyStatus != 1">纳入监测</el-button>
<el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
<el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
<el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
<el-button type="primary" @click="applyMonitor('继续监测', 1)" v-if="detail.status == 3">继续监测</el-button>
<el-button icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
</template>
<template v-else>
<el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 0">申请纳入监测</el-button>
<el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 2">申请解除风险</el-button>
<el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 3">申请纳入监测</el-button>
<el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
</template>
<!-- <template v-if="/2/.test(detail.status) && isGridAdmin">
@@ -80,7 +78,7 @@
</template> -->
<el-button
v-if="/4/g.test(detail.status)"
v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status)"
icon="iconfont iconDelete"
@click="handleDelete(detail.id)"
>
@@ -210,7 +208,7 @@
<template slot="content">
<div flex class="half wrap">
<el-form-item label="档案状态">{{
dict.getLabel("fpType", detail.objectType)
dict.getLabel("fpPrtpStatus", detail.status)
}}</el-form-item>
<el-form-item label="监测对象类型">{{
dict.getLabel("fpType", detail.objectType)
@@ -311,7 +309,7 @@
</ai-card>
</template>
</el-tab-pane>
<el-tab-pane label="走访日志" lazy name="HrLog">
<el-tab-pane label="走访日志" lazy name="HrLog" v-if="$permissions('app_apppreventionreturntopovertylog_detail')">
<hr-log
v-if="currentTab == 'HrLog'"
:instance="instance"
@@ -360,6 +358,7 @@
<ai-person-select
:instance="instance"
@selectPerson="checkName"
:url="'/app/appresident/list?auditStatus=1&areaId='+user.info.areaId"
>
</ai-person-select>
</template>
@@ -527,7 +526,7 @@
</el-form-item>
</el-form>
</ai-dialog>
<ai-dialog
<ai-dialog customFooter
:visible.sync="isShowDetail"
width="1000px"
height="500px"
@@ -544,9 +543,7 @@
<el-form-item label="身份证号" prop="name">{{
familyInfo.name
}}</el-form-item>
<el-form-item label="身份证号" prop="name">{{
familyInfo.idNumber
}}</el-form-item>
<el-form-item label="身份证号" prop="name"><ai-id mode="show" :value="familyInfo.idNumber" right-btn /></el-form-item>
<el-form-item label="性别" prop="sex">{{
dict.getLabel("sex", familyInfo.sex)
}}</el-form-item>
@@ -614,6 +611,9 @@
<span v-for="(item, index) in familyInfo.healthyStatusList" :key="index"><span v-if="index > 0">,</span>{{dict.getLabel("fpHealth", item)}}</span>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="isShowDetail=false">关闭</el-button>
</template>
</ai-dialog>
<ai-dialog :visible.sync="isShowApply" :title="dialogTitle" @closed="applyInfo={},applyFileList=[]" @onConfirm="submitApply" width="600px">
<el-form :model="applyInfo" :rules="rulesApply" ref="dialogApplyInfo" size="small" label-width="120px">
@@ -784,6 +784,7 @@ export default {
applyFileList: [],
examineFileList: [],
changeStatus: 0, //操作状态 0:申请纳入监测 1:纳入监测 2:纳入监测审批 3:申请解除风险 4:解除风险 5:解除风险审批
girdAdminApplyStatus: 0, //网格长纳入监测状态 0：纳入监测 1：纳入监测审批
};
},
methods: {
@@ -797,12 +798,15 @@ export default {
this.form.birthDate = ''
this.form.sex = ''
this.form.age = ''
this.form.currentAreaId = ''
this.form.currentAddress = ''
return
}
this.form.name = e.name
this.form.idNumber = e.idNumber
this.form.phone = e.phone
this.form.areaId = e.householdAreaId
this.form.currentAreaId = e.currentAreaId
this.form.currentAddress = e.currentAddress
this.handleIdNumberAutocomplete(e.idNumber)
this.isSelectUser = true
},
@@ -883,6 +887,14 @@ export default {
if(this.detail.healthyStatus) {
this.detail.healthyStatusList = this.detail.healthyStatus.split(',')
}
if(this.detail.status == 0 && this.isGridAdmin) {
this.instance.post(`/app/apppreventionreturntopoverty/popup?id=${this.detail.id}`).then(res => {
if (res.code == 0 && res.data) { //纳入监测审批
this.girdAdminApplyStatus = 1
}
})
}
}
});
},
@@ -1074,6 +1086,10 @@ export default {
}
}
::v-deep .AiPersonSelect .el-button {
color: #fff;
}
::v-deep.el-tabs__content {
max-height: calc(100vh - 136px);
overflow-y: auto;

15
packages/jianping/AppHelpedResident/hrList.vue
View File

@@ -4,7 +4,7 @@
<ai-title slot="title" title="监测对象" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance"
@change="page.current=1,getTableData()">
<template #rightBtn>
<el-button type="primary" icon="iconfont iconSetting" @click="dialog=true">预警规则</el-button>
<el-button type="primary" icon="iconfont iconSetting" @click="dialog=true" v-if="$permissions('app_apppreventionreturntopovertyalarmconfig_edit')">预警规则</el-button>
</template>
</ai-title>
<template #content>
@@ -20,7 +20,7 @@
<ai-select placeholder="性别" v-model="search.sex" :selectList="dict.getDict('sex')" @change="page.current=1,getTableData()"/>
<ai-select placeholder="文化程度" v-model="search.education" :selectList="dict.getDict('fpEducation')" @change="page.current=1,getTableData()"/>
<ai-select placeholder="民族" v-model="search.nation" :selectList="dict.getDict('fpNation')" @change="page.current=1,getTableData()"/>
<ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" @change="page.current=1,getTableData()"/>
<!-- <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" @change="page.current=1,getTableData()"/> -->
</template>
<template #right>
<el-input size="small" placeholder="姓名/身份证/联系方式" v-model="search.con" clearable
@@ -29,8 +29,8 @@
</ai-search-bar>
<ai-search-bar>
<template #left>
<el-button type="primary" icon="iconfont iconAdd" @click="showEdit()">添加</el-button>
<el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button>
<el-button type="primary" icon="iconfont iconAdd" @click="showEdit()" v-if="$permissions('app_apppreventionreturntopoverty_edit')">添加</el-button>
<el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)" v-if="$permissions('app_apppreventionreturntopoverty_del')">删除</el-button>
</template>
<template #right>
<ai-import :instance="instance" name="监测对象" title="导入监测对象"
@@ -52,8 +52,8 @@
</el-table-column>
<el-table-column slot="options" label="操作" fixed="right" align="center">
<template slot-scope="{row}">
<el-button type="text" @click="showDetail(row.id)">详情</el-button>
<el-button type="text" @click="handleDelete(row.id)">删除</el-button>
<el-button type="text" @click="showDetail(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_detail')">详情</el-button>
<el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_del') && row.status == 4">删除</el-button>
</template>
</el-table-column>
</ai-table>
@@ -98,7 +98,8 @@ export default {
{label: "年龄", prop: "age", align: "center"},
{label: "民族", prop: "nation", align: "center", dict: "fpNation"},
{label: "文化程度", prop: "education", align: "center", dict: "fpEducation"},
{label: "政治面貌", prop: "politicsStatus", align: "center", dict: "fpPoliticalOutlook"},
{label: "监测对象类型", prop: "objectType", align: "center", dict:"fpType"},
{label: "风险因素", prop: "riskType", align: "center", dict:"fpRiskType"},
{label: "档案状态", prop: "status", dict: "fpPrtpStatus", align: "center"},
{slot: "options"}
],

3
packages/jianping/AppPublicizeInformation/Add.vue
View File

@@ -7,7 +7,7 @@
<ai-card title="基本信息">
<template #content>
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" :maxlength="50" />
<el-input v-model="form.title" placeholder="请输入标题" :maxlength="50" show-word-limit/>
</el-form-item>
<el-form-item label="发布地区" prop="areaId">
<ai-area-get :instance="instance" v-model="form.areaId" :root="rootArea" />
@@ -92,6 +92,7 @@ export default {
],
moduleId: [{required: true, message: "请选择文章类型"}],
categoryId: [{required: true, message: "选择分类"}],
content: [{required: true, message: "请输入正文"}],
}
},
rootArea() {

4
packages/jianping/AppPublicizeInformation/AppPublicizeInformation.vue
View File

@@ -1,6 +1,8 @@
<template>
<section class="AppPublicizeInformation">
<component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
<keep-alive :include="['List']">
<component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
</keep-alive>
</section>
</template>

10
packages/jianping/AppPublicizeInformation/List.vue
View File

@@ -66,7 +66,7 @@
</el-form-item>
</el-form>
<ai-table :tableData="newTypeList" :total="newPage.total" :current.sync="newPage.current" :size.sync="newPage.size"
@getList="getTableData" :col-configs="colConfigsNew" v-if="type == 2">
:col-configs="colConfigsNew" v-if="type == 2">
<el-table-column slot="options" label="操作" fixed="right" align="center">
<template slot-scope="{row}">
<el-button type="text" @click="editNew(row)">编辑</el-button>
@@ -98,7 +98,7 @@ export default {
newPage: {current: 1, size: 10, total: 0},
tableData: [],
colConfigs: [
{label: "标题", prop: "title", align: "center"},
{label: "标题", prop: "title"},
{label: "地区", prop: "areaName", align: "center", width: '150px'},
{label: "浏览次数", prop: "viewCount", align: "center", width: '100px'},
{label: "发布人", prop: "createUserName", align: "center", width: '100px'},
@@ -180,8 +180,8 @@ export default {
this.type = e
this.parentId = parentId
this.form.showIndex = index
this.dialogTitle = ['宣传板本', '宣传模块', '文章分类'][e]
this.addLabelText = ['板本名称', '模块名称', '分类名称'][e]
this.dialogTitle = ['宣传板块', '宣传模块', '文章分类'][e]
this.addLabelText = ['板块名称', '模块名称', '分类名称'][e]
this.rules.categoryName = [{required: true, message: "请输入"+this.addLabelText, trigger: "change"}]
this.dialog = true
},
@@ -232,6 +232,8 @@ export default {
}).then(() => {
this.instance.post(`/app/apppublicitycategory/delete?ids=${id}`).then(res => {
if (res.code == 0) {
this.getNewTypeList(this.miniTypeList[this.miniTypeIndex].id)
this.getMiniTypeList(this.typeList[this.typeIndex].id)
this.$message.success('删除成功');
}
}).catch((err) => {