整合积分等报错

This commit is contained in:
aixianling
2022-05-12 16:22:31 +08:00
parent 5b94b47e02
commit f6d8a737df
3 changed files with 3 additions and 171 deletions

View File

@@ -43,7 +43,6 @@
<el-table-column label="操作" slot="options" fixed="right" align="center" width="180">
<template v-slot="{row}">
<div class="table-options">
<!-- <el-button type="text" title="编辑" @click="edit(row)" :disabled="!$permissions('app_appvillagerintegralfamily_edit')">编辑</el-button> -->
<el-button type="text" title="家庭成员" @click="familyMember(row)" :disabled="!$permissions('app_appvillagerintegralfamilymember_edit')">家庭成员</el-button>
<el-button type="text" :disabled="!$permissions('app_appvillagerintegralfamily_detail')" title="详情" @click="goDetail(row)">详情</el-button>
</div>
@@ -53,93 +52,12 @@
</template>
</ai-list>
<detail v-if="detailShow" @goBack="goBack" :detailInfo='detailInfo' :instance='instance' :dict='dict'></detail>
<ai-dialog
:title="dialog.title"
:visible.sync="dialog.visible"
:customFooter="true"
:destroyOnClose="true"
@close="init('ruleForm')"
width="520px">
<div class="form_div">
<el-form ref="ruleForm" :model="dialogInfo" :rules="formRules" size="small" label-suffix=""
label-width="120px">
<el-form-item label="类型" prop="personType">
<el-radio-group v-model="dialogInfo.personType" @change="typeChange"
:disabled="dialog.title.indexOf('修改')!=-1">
<el-radio label="0">户籍居民</el-radio>
<el-radio label="1">外来人员</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="dialog.title.indexOf('家庭')!=-1?'户主':'姓名'" prop="name">
<el-row type="flex" :gutter="8">
<el-col>
<el-input v-model="dialogInfo.name" disabled clearable/>
</el-col>
<el-col>
<ai-person-select :instance="instance" :key="personUrl" :url="personUrl" @selectPerson="getSelect"
v-if="dialog.title.indexOf('添加')!=-1"></ai-person-select>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model="dialogInfo.idNumber" disabled clearable/>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input type="number" v-model="dialogInfo.phone" maxlength="11" clearable/>
</el-form-item>
<el-form-item label="所属组" prop="villageGroup" v-if="dialog.title.indexOf('家庭')!=-1">
<el-select v-model="dialogInfo.villageGroup" placeholder="请选择...">
<el-option
v-for="(item,i) in dict.getDict('integralVillageGroup')"
:key="i"
:label="item.dictName"
:value="item.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status" v-if="dialog.title.indexOf('家庭')!=-1">
<el-select v-model="dialogInfo.status" placeholder="请选择...">
<el-option
v-for="(item,i) in dict.getDict('integralRuleStatus')"
:key="i"
:label="item.dictName"
:value="item.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="与户主关系" prop="householdRelation" v-if="dialog.title.indexOf('成员')!=-1">
<el-select
v-model="dialogInfo.householdRelation"
placeholder="请选择"
size="mini"
clearable
style="width:216px;"
>
<el-option
v-for="(item,i) in dict.getDict('householdRelation')"
:label="item.dictName"
:key="i"
:value="item.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<div class="dialog-footer" slot="footer">
<el-button @click="dialog.visible=false" size="medium">取消</el-button>
<el-button @click="onConfirm('ruleForm')" type="primary" size="medium">确认</el-button>
</div>
</ai-dialog>
<ai-dialog class="family-list"
title="成员列表"
:visible.sync="addMemberVisible"
:customFooter="true"
:destroyOnClose="true"
width="780px">
<!-- <p class="add_btn">
<span class="iconfont iconAdd" @click="addFamily()"></span>
<span @click="addFamily()">添加家庭成员</span>
</p> -->
<ai-table
:tableData="familyList"
:col-configs="familycolConfigs"
@@ -162,16 +80,6 @@
<ai-id mode="show" :show-eyes="false" :value="row.idNumber"/>
</template>
</el-table-column>
<!-- <el-table-column label="操作" slot="options" align="center">
<template v-slot="{row}">
<el-button type="text"
v-if="row.householdRelation!=11&&$permissions('app_appvillagerintegralfamilymember_edit')"
icon="iconfont iconEdit" title="编辑" @click="editFamily(row)"/>
<el-button type="text"
v-if="row.householdRelation!=11&&$permissions('app_appvillagerintegralfamilymember_del')"
icon="iconfont iconDelete" title="删除" @click="deleteFamily(row.id)"/>
</template>
</el-table-column> -->
</ai-table>
<div class="dialog-footer" slot="footer">
<el-button @click="addMemberVisible=false" size="medium"> </el-button>
@@ -372,7 +280,7 @@ export default {
},
created() {
this.areaId = this.user.info.areaId;
this.dict.load('integralVillageGroup', 'integralRuleStatus', 'integralPersonType', 'householdRelation', 'residentType');
this.dict.load('integralVillageGroup', 'integralRuleStatus', 'householdRelation', 'residentType');
this.getList();
},
methods: {
@@ -398,55 +306,6 @@ export default {
this.dialogInfo.avatar = "";
this.dialogInfo.areaId = "";
},
add() {
this.dialog.visible = true;
this.dialog.title = '添加家庭';
},
addFamily() {
this.dialog.visible = true;
this.dialog.title = '添加成员';
},
onConfirm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.dialog.title.indexOf('家庭') != -1) {
this.instance.post("/app/appvillagerintegralfamily/addOrUpdate", {
...this.dialogInfo,
}, null).then(res => {
if (res.code == 0) {
this.dialog.visible = false;
if (this.dialog.title.indexOf('添加') != -1) {
this.$message.success("添加成功")
} else {
this.$message.success("修改成功")
}
this.getList();
}
})
} else {
this.instance.post("/app/appvillagerintegralfamilymember/addOrUpdate", {
...this.dialogInfo,
familyId: this.familyId,
familyIdNumber: this.rowInfo.idNumber,
familyName: this.rowInfo.name
}, null).then(res => {
if (res.code == 0) {
this.dialog.visible = false;
if (this.dialog.title.indexOf('添加') != -1) {
this.$message.success("添加成功")
} else {
this.$message.success("修改成功")
}
this.familyMember(this.rowInfo);
this.getList();
}
})
}
} else {
return false;
}
});
},
init(formName) {
this.$refs[formName].clearValidate();
Object.keys(this.dialogInfo).forEach(e => {
@@ -461,35 +320,8 @@ export default {
});
this.getList();
},
edit(row) {
this.dialog.visible = true;
this.dialog.title = '修改家庭';
this.dialogInfo = {...row}
},
editFamily(row) {
this.dialog.visible = true;
this.dialog.title = '修改成员';
this.dialogInfo = {...row}
},
deleteFamily(ids) {
ids && this.$confirm("是否要删除该家庭成员", {
type: 'error'
}).then(() => {
this.instance.post("/app/appvillagerintegralfamilymember/delete", null, {
params: {ids}
}).then(res => {
if (res?.code == 0) {
this.$message.success("删除成功!")
this.familyMember(this.rowInfo);
}
})
}).catch(() => {
})
},
getSelect(val) {
console.log(val)
if (val) {
this.dialogInfo.name = val.name;
this.dialogInfo.idNumber = val.idNumber;
this.dialogInfo.avatar = val.photo;

View File

@@ -298,7 +298,7 @@ export default {
},
created() {
this.areaId = this.user.info.areaId;
this.dict.load('integralVillageGroup', 'integralRuleStatus', 'integralPersonType', 'householdRelation', 'residentType');
this.dict.load( 'integralRuleStatus', 'householdRelation', 'residentType');
this.getList();
},
methods: {

View File

@@ -282,7 +282,7 @@ export default {
},
created() {
this.dict.load(["classification", "integralIntegralType", "integralRuleStatus", 'atWillReportType']).then(() => {
this.dict.load([ "integralIntegralType", "integralRuleStatus", 'atWillReportType']).then(() => {
this.getList();
});
},