Skip to content

J
jiedao-app-operator-master
Commit f9aafea4 authored by chenwei's avatar chenwei
Browse files
Options

Merge branch 'hotfix/preReleaseDefect' into 'pre-release' 

Hotfix/pre release defect

See merge request !59
parents f17d99e8 3abeab5a
Show whitespace changes
Inline Side-by-side
Showing with 99 additions and 28 deletions
src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue
View file @ f9aafea4
......@@ -420,7 +420,7 @@
</el-form-item>
<el-form-item :label="$t('创建时间')">
<el-date-picker
type="date"
type="datetime"
:placeholder="$t('选择创建时间')"
v-model="queryParams.createTime"
value-format="yyyy-MM-dd HH:mm:ss"
......@@ -429,6 +429,7 @@
</el-form-item>
<el-form-item :label="$t('最后更新人')">
<el-input
v-model.number="queryParams.updater"
:placeholder="$t('请输入最后更新人')"
clearable
......@@ -437,7 +438,7 @@
</el-form-item>
<el-form-item :label="$t('最后更新时间')">
<el-date-picker
type="date"
type="datetime"
:placeholder="$t('选择最后更新时间')"
v-model="queryParams.updateTime"
value-format="yyyy-MM-dd HH:mm:ss"
......@@ -1053,8 +1054,8 @@ export default {
}
);
params.createTime = parseTime(res.data.createTime);
params.updateTime = parseTime(res.data.updateTime);
params.createTime = parseTime(res.data.createTime, '{y}-{m}-{d} {h}:{i}:{s}');
params.updateTime = parseTime(res.data.updateTime, '{y}-{m}-{d} {h}:{i}:{s}');
if (isNumber(res.data.extraOrderV?.firstOrder)) {
params.extraOrderV.firstOrder =
......
src/views/ecw/memberManagement/exchangeRecord/index.vue
View file @ f9aafea4
......@@ -28,6 +28,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员编号')">
<el-input
v-model.trim="queryParams.memberCode"
style="width: 300px"
:placeholder="$t('请输入会员编号')"
clearable
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('领取方式')">
<dict-selector
v-model="queryParams.redeemType"
......@@ -179,8 +189,16 @@
width="140"
:label="$t('兑换记录ID')"
align="center"
prop="redemptionNumber"
/>
>
<template #default="{ row }">
<el-button
size="mini"
type="text"
@click="handleViewRecord(row )"
>{{ row.redemptionNumber}}</el-button
>
</template>
</el-table-column>
<el-table-column
width="140"
:label="$t('礼品ID')"
......@@ -297,14 +315,14 @@
@click="handleRewardEdit(scope.row)"
>{{ $t("编辑") }}</el-button
>
<el-button
<!-- <el-button
v-hasPermi="['ecw:memberManagement:view']"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleViewRecord(scope.row)"
>{{ $t("查看") }}</el-button
>
> -->
<el-button
v-hasPermi="['ecw:memberManagement:verification']"
size="mini"
......@@ -494,6 +512,7 @@ export default {
queryParams: {
rewardTitle: "",
memberName: "", // 会员昵称
memberCode:"", //会员编号
redeemType: "", // 兑换方式
status: "",
rewardCount: "",
......@@ -525,8 +544,17 @@ export default {
},
immediate: true,
},
"$route.query.memberCode": {
handler(val) {
if (val) {
this.queryParams.memberCode= val;
}
},
immediate: true,
},
},
created() {
this.getNodeListAPI();
this.handleQuery();
},
......@@ -573,21 +601,21 @@ export default {
// 核销
handleVerify(row) {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
query: { exchangeRewardID: row.id, pageStatus: "verify" },
});
},
// 查看按钮操作
handleViewRecord(row) {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
query: { exchangeRewardID: row.id, pageStatus: "view" },
});
},
// 兑换记录编辑操作
handleRewardEdit(row) {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
query: { exchangeRewardID: row.id, pageStatus: "edit" },
});
},
......@@ -721,7 +749,7 @@ export default {
// 新增兑换
handleNewExchange() {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
});
},
getNodeListAPI() {
......@@ -766,6 +794,7 @@ export default {
city: null,
endTime: null,
holdScore: null,
memberCode:'',
holdScoreOperate: null,
key: null,
redemptionNumber: null,
......@@ -808,6 +837,7 @@ export default {
country: null,
city: null,
endTime: null,
memberCode:'',
holdScore: null,
holdScoreOperate: null,
key: null,
......
src/views/ecw/memberManagement/exchangeRecordOperation/components/chooseGift.vue
View file @ f9aafea4
......@@ -153,7 +153,7 @@
></el-table-column>
<el-table-column :label="$t('礼品名称')" align="center">
<template slot-scope="scope">
<el-button type="text" @click="handleView(scope.row)">{{
<el-button type="text" >{{
isChinese ? scope.row.titleZh : scope.row.titleEn
}}</el-button>
</template>
......
src/views/ecw/memberManagement/exchangeRecordOperation/index.vue
View file @ f9aafea4
......@@ -360,7 +360,7 @@ import {
verifyRedeem,
} from "@/api/ecw/memberManagement";
import { memberUserGet } from "@/api/member/user";
import { getDictDatas, DICT_TYPE } from "@/utils/dict";
export default {
name: "exchangeRecordOperation",
components: {
......@@ -549,6 +549,7 @@ export default {
getDetails() {
memberUserGet({ id: this.$route.query.memberId }).then((r) => {
// this.details = r.data;
this.isChinese
? (this.queryParamsList[0].memberName = r.data.nickname)
: (this.queryParamsList[0].memberName = r.data.englishName);
......@@ -571,6 +572,7 @@ export default {
if (this.isChinese) {
this.queryParamsList[0].memberName = data.memberNameZh;
this.queryParamsList[0].rewardName = data.rewardTitleZh;
} else {
this.queryParamsList[0].memberName = data.memberNameEn;
this.queryParamsList[0].rewardName = data.rewardTitleEn;
......@@ -666,7 +668,7 @@ export default {
},
onGetSelectRewardsInfo(item) {
this.queryParamsList[0].rewardId = item.id;
this.queryParamsList[0];
this.queryParamsList[0].redeemType = item.pickMethod.split(",")[0]
if (this.isChinese) {
this.queryParamsList[0].rewardName = item.titleZh;
} else {
......
src/views/ecw/memberManagement/integralRecord/index.vue
View file @ f9aafea4
......@@ -174,6 +174,12 @@
{{ parseTime(row.createTime) || "/" }}</template
>
</el-table-column>
<el-table-column :label="$t('积分到期时间')" align="center">
<template v-slot="{ row }">
{{ parseTime(row.expireTime) || "/" }}</template
>
</el-table-column>
<el-table-column width="300" :label="$t('详细信息')" align="center">
<template v-slot="{ row }">
<!-- 人工操作-->
......@@ -186,7 +192,7 @@
type="text"
@click="
$router.push({
path: '/memberManagement/exchangeRecordOperation',
path: '/member/memberManagement/exchangeRecordOperation',
query: {
pageStatus: 'view',
exchangeRewardID: row.extParamJson.redeemId,
......@@ -230,7 +236,7 @@
type="text"
@click="
$router.push({
path: '/memberManagement/addIntegrationRuleOperation',
path: '/member/memberManagement/addIntegrationRuleOperation',
query: {
id: row.extParamJson.scoreRuleId,
pageStatus: 'view',
......@@ -258,6 +264,9 @@ import { queryMemberScoreRecord } from "@/api/ecw/memberManagement";
export default {
name: "EcwMembermanagementIntegralrecord",
props:{
memberCode:[String, Number],
},
data() {
return {
dateRangeCreateTime: [],
......@@ -285,7 +294,27 @@ export default {
return this.$i18n.locale === "zh_CN";
},
},
watch:{
memberCode:{
handler: function (newVal, oldVal) {
if(newVal){
this.queryParams.memberId= newVal
}
},
immediate: true,
},
$route: {
handler: function (route) {
const query = route.query;
if (query.memberCode) {
this.queryParams.key = this.$route.query.memberCode
}
},
immediate: true,
},
},
created() {
this.handleQuery();
},
activated() {
......
src/views/ecw/memberManagement/integrationRule/index.vue
View file @ f9aafea4
......@@ -385,14 +385,14 @@ export default {
// 编辑操作按钮
handleUpdate(row) {
this.$router.push({
path: "/memberManagement/addIntegrationRuleOperation",
path: "/member/memberManagement/addIntegrationRuleOperation",
query: { id: row.id, pageStatus: "edit" },
});
},
// 查看按钮操作
handleViewDetails(row) {
this.$router.push({
path: "/memberManagement/addIntegrationRuleOperation",
path: "/member/memberManagement/addIntegrationRuleOperation",
query: { id: row.id, pageStatus: "view" },
});
},
......
src/views/ecw/memberManagement/memberPointsSummary/index.vue
View file @ f9aafea4
......@@ -149,7 +149,10 @@
<template #default="{ row }">
<el-button
type="text"
@click="$router.push('/memberManagement/integralRecord')"
@click="$router.push(
{path:'/member/memberManagement/integralRecord',
query: {memberCode:row.memberCode}
})"
>{{ row.holdScore }}</el-button
>
</template>
......@@ -158,7 +161,9 @@
<template #default="{ row }">
<el-button
type="text"
@click="$router.push('/memberManagement/exchangeRecord')"
@click="$router.push({path:'/member/giftManagement/exchangeRecord',
query: {memberCode:row.memberCode}
})"
>{{ row.usedScore }}</el-button
>
</template>
......
src/views/ecw/memberManagement/sharingDetails/index.vue
View file @ f9aafea4
......@@ -197,7 +197,7 @@ export default {
goShareDetails(row) {
if (row.triggerCount != "0") {
this.$router.push({
path: "/memberManagement/sharingStatisticalDetails",
path: "/member/memberManagement/sharingStatisticalDetails",
query: {
id: row.id,
},
......
src/views/ecw/memberManagement/sharingStatistics/index.vue
View file @ f9aafea4
......@@ -207,7 +207,7 @@ export default {
goShareDetails(row) {
if (row.triggerCount != "0") {
this.$router.push({
path: "/memberManagement/sharingStatisticalDetails",
path: "/member/memberManagement/sharingStatisticalDetails",
query: {
id: row.id,
},
......
src/views/member/user/memberDetails.vue
View file @ f9aafea4
......@@ -237,7 +237,10 @@
</el-menu>
<div class="table-container">
<div class="reward" v-show="activeIndex == 'reward'">
<el-form
<!-- 积分记录 -->
<IntegralRecord :memberCode="$route.params.id"></IntegralRecord>
<!-- <el-form
:model="queryParams"
ref="queryForm"
size="small"
......@@ -334,7 +337,7 @@
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="handleQueryPagination"
/>
/> -->
</div>
<div class="exchange" v-show="activeIndex != 'reward'">
<el-form
......@@ -868,9 +871,10 @@ import {
} from "@/api/ecw/memberManagement";
import { getNodeList, getRewardsDetails } from '@/api/ecw/giftManagement'
import OperatingGift from '@/views/ecw/giftManagement/components/operatingGift.vue'
import IntegralRecord from "@/views/ecw/memberManagement/integralRecord"
export default {
name: "memberDetails",
components: { ImageUpload, FileUpload, OperatingGift },
components: { ImageUpload, FileUpload, OperatingGift, IntegralRecord },
data() {
return {
// 网点
......@@ -1070,7 +1074,7 @@ export default {
methods: {
handleViewRecord(row) {
this.$router.push({
path: '/memberManagement/exchangeRecordOperation',
path: '/member/memberManagement/exchangeRecordOperation',
query: { exchangeRewardID: row.id, pageStatus: 'view' }
})
},
......@@ -1214,7 +1218,7 @@ export default {
},
handleExchangeRewards(details) {
this.$router.push({
path: "/memberManagement/exchangeRecordOperation",
path: "/member/memberManagement/exchangeRecordOperation",
query: {
memberId: details.userScoreLevelInfo.memberId,
pageStatus: "add",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment