积分继续调整

This commit is contained in:
aixianling
2022-03-22 19:39:23 +08:00
parent 26f96dd6b1
commit 6bbc40ef41
6 changed files with 110 additions and 105 deletions

View File

@@ -38,13 +38,12 @@
</template>
<template slot="right">
<el-input
v-model="search.familyName"
v-model="search.portalUserPhone"
class="search-input"
size="mini"
placeholder="申诉人/申诉对象/..."
clearable
v-throttle="() => {page.current = 1, getList()}"
@clear="page.current = 1, getList()"
@change="page.current = 1, getList()"
suffix-icon="iconfont iconSearch"/>
</template>
</ai-search-bar>
@@ -144,8 +143,8 @@
<span class="form_value">{{ rowInfo.declareObjName }}</span>
</div>
<div>
<span class="form_label">户主</span>
<span class="form_value">{{ rowInfo.familyName }}</span>
<span class="form_label">用户账号</span>
<span class="form_value">{{ rowInfo.portalUserPhone }}</span>
</div>
</div>
<div class="form_info">
@@ -260,7 +259,7 @@ export default {
return {
search: {
status: '',
familyName: '',
portalUserPhone: '',
declareTimeStart: null,
declareTimeEnd: null
},
@@ -274,8 +273,8 @@ export default {
{prop: "declareName", label: "申诉人", align: "center"},
{prop: "declareObjName", label: "申诉对象", align: "center", hide: this.bizType == 1},
{
prop: "familyName",
label: "户主",
prop: "portalUserPhone",
label: "用户账号",
},
{
prop: "declareDescription",

View File

@@ -38,13 +38,12 @@
</template>
<template slot="right">
<el-input
v-model="search.familyName"
v-model="search.portalUserPhone"
class="search-input"
size="mini"
placeholder="申诉人/申诉对象/..."
clearable
v-throttle="() => {page.current = 1, getList()}"
@clear="page.current = 1, getList()"
@change="page.current = 1, getList()"
suffix-icon="iconfont iconSearch"/>
</template>
</ai-search-bar>
@@ -138,8 +137,8 @@
<span class="form_value">{{ rowInfo.declareObjName }}</span>
</div>
<div>
<span class="form_label">户主</span>
<span class="form_value">{{ rowInfo.familyName }}</span>
<span class="form_label">用户账号</span>
<span class="form_value">{{ rowInfo.portalUserPhone }}</span>
</div>
</div>
<div class="form_info">
@@ -254,7 +253,7 @@ export default {
return {
search: {
status: '',
familyName: '',
portalUserPhone: '',
declareTimeStart: null,
declareTimeEnd: null
},
@@ -268,8 +267,8 @@ export default {
{prop: "declareName", label: "申报人", align: "center"},
{prop: "declareObjName", label: "申报对象", align: "center", hide: this.bizType == 1},
{
prop: "familyName",
label: "户主",
prop: "portalUserPhone",
label: "用户账号",
},
{
prop: "declareDescription",

View File

@@ -4,18 +4,19 @@
<template slot="content">
<ai-search-bar bottomBorder>
<template slot="left">
<el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
<el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至"
@change="timeChange"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"></el-date-picker>
</template>
<template slot="right">
<el-input
v-model="search.familyName"
v-model="search.portalUserPhone"
class="search-input"
size="small"
placeholder="对象、户主、事件类型"
placeholder="对象、用户账号、事件类型"
clearable
v-throttle="() => {search.current = 1, getList()}"
@clear="search.current = 1, getList()"
@change="search.current = 1, getList()"
suffix-icon="iconfont iconSearch"/>
</template>
</ai-search-bar>
@@ -60,8 +61,8 @@
>
<div class="form_content">
<div class="form_info">
<span class="form_label">户主</span>
<span class="form_value">{{dialogInfo.familyName}}</span>
<span class="form_label">用户账号</span>
<span class="form_value">{{ dialogInfo.portalUserPhone }}</span>
</div>
<div class="form_info">
<span class="form_label">事项</span>
@@ -70,7 +71,8 @@
<div class="form_flex form_info">
<div>
<span class="form_label">积分</span>
<span class="form_value">{{dialogInfo.changeIntegral >= 0 ? '增加' : '减少'}}<span style="color:#2266FF">{{Math.abs(dialogInfo.changeIntegral)}}</span></span>
<span class="form_value">{{ dialogInfo.changeIntegral >= 0 ? '增加' : '减少' }}<span
style="color:#2266FF">{{ Math.abs(dialogInfo.changeIntegral) }}</span></span>
</div>
<!-- <div>
<span class="form_label">途径</span>
@@ -114,14 +116,13 @@ export default {
search: {
current: 1,
size: 10,
familyName: '',
portalUserPhone: '',
doTimeStart: null,
doTimeEnd: null
},
total: 10,
colConfigs: [
{ prop: "residentName", label: "对象", width:160 },
{ prop: "familyName", label: "户主", align: "center", width:160 },
{prop: "portalUserPhone", label: "用户账号", align: "center", width: 160},
{
prop: "ruleName",
label: "事件类型",
@@ -223,7 +224,7 @@ export default {
this.search.current = 1
this.search.doTimeStart = null
this.search.doTimeEnd = null
this.search.familyName = ''
this.search.portalUserPhone = ''
this.searchDotime = []
this.getList();
},
@@ -236,16 +237,20 @@ export default {
height: 100%;
background: #f3f6f9;
overflow: auto;
.form_content {
.form_flex {
display: flex;
div {
flex: 1;
}
}
.form_info {
margin-bottom: 8px;
}
.form_label {
display: inline-block;
color: #999;
@@ -253,6 +258,7 @@ export default {
width: 70px;
text-align: right;
}
.form_value {
display: inline-block;
color: #333;
@@ -264,10 +270,12 @@ export default {
// }
}
}
.form_div {
padding-top: 24px;
border-top: 1px solid #eee;
}
.status-0 {
color: #FF4466;
}

View File

@@ -102,7 +102,7 @@ export default {
},
colConfigs() {
return [
{prop: "residentName", label: "姓名"},
{prop: "portalUserPhone", label: "用户账号"},
{prop: "description", label: "调整说明"},
{
prop: "changeIntegral", label: "类型", align: "center",

View File

@@ -203,8 +203,8 @@
<template #content>
<div class="info">
<ai-wrapper label-width="70px" :columnsNumber="2">
<ai-info-item label="户主"><span>{{ detailInfo.familyName }}</span></ai-info-item>
<ai-info-item label="联系方式"><span>{{ detailInfo.familyPhone || "-" }}</span></ai-info-item>
<ai-info-item label="用户账号"><span>{{ detailInfo.portalUserPhone }}</span></ai-info-item>
<ai-info-item label="联系方式"><span>{{ detailInfo.portalUserPhone || "-" }}</span></ai-info-item>
</ai-wrapper>
<ai-wrapper label-width="70px" :columnsNumber="1">
<ai-info-item label="备注"><span>{{ detailInfo.remark || "-" }}</span></ai-info-item>
@@ -290,8 +290,8 @@ export default {
return {
forms: {
shopId: "",
familyId: "",
familyName: "",
portalUserId: "",
portalUserPhone: "",
name: "",
memberId: "",
merchandiseList: [],
@@ -389,15 +389,15 @@ export default {
methods: {
getSelect(val) {
if (val) {
this.forms.familyName = val.familyName;
this.forms.familyId = val.familyId;
this.forms.portalUserPhone = val.portalUserPhone;
this.forms.portalUserId = val.portalUserId;
this.forms.name = val.name;
this.forms.memberId = val.id;
this.forms.phone = val.phone;
this.integral = val.integral;
} else {
this.forms.familyName = "";
this.forms.familyId = "";
this.forms.portalUserPhone = "";
this.forms.portalUserId = "";
this.forms.name = "";
this.forms.memberId = "";
this.forms.phone = "";

View File

@@ -56,8 +56,7 @@
v-model="searchObj.name"
size="small"
placeholder="订单号/商品名/兑换家庭"
v-throttle="() => {page.current = 1, getList()}"
@clear="page.current = 1, searchObj.name = '', getList()"
@change="page.current = 1, searchObj.name = '', getList()"
clearable
suffix-icon="iconfont iconSearch"
/>
@@ -131,11 +130,11 @@
</ai-uploader>
</template>
</el-table-column>
<el-table-column label="兑换家庭" slot="familyName" align="left">
<el-table-column label="兑换家庭" slot="portalUserPhone" align="left">
<template v-slot="{ row }">
<el-row>
<el-col style="width: 100%">{{ row.familyName }}</el-col>
<el-col style="color: #999999">{{ row.familyPhone }}</el-col>
<el-col style="width: 100%">{{ row.portalUserPhone }}</el-col>
<el-col style="color: #999999">{{ row.portalUserPhone }}</el-col>
</el-row>
</template>
</el-table-column>
@@ -282,10 +281,10 @@
label: "消耗积分",
},
{
prop: "familyName",
prop: "portalUserPhone",
align: "center",
label: "兑换家庭",
slot: "familyName",
slot: "portalUserPhone",
},
{
prop: "createUserName",