Skip to content

M
member
Commit 590c1057 by chenyu
Options

update: update

parent bcc183d0
Showing with 69 additions and 69 deletions
src/components/allCustomers/components/mainstoreDialog.vue
......@@ -71,7 +71,7 @@ export default {
form: {
remark: '',
optType: 1, // 1服务门店（主门店），2协管门店
mainOptType: 4, // 服务门店类型 1替换为最新协管的门店 2替换为最新协管的自营门店 3 替换为最新协管的自营/联营门店 4自定义主门店
mainOptType: 4, // 服务门店类型 1替换为最新协管的门店 2替换为最新协管的自营门店 3 替换为最新协管的自营/联营门店 4自定义服务门店
mainStoreId: '',
},
rules: {
......
src/components/allCustomers/index.js
......@@ -291,7 +291,7 @@ export default {
cardNo: ele.cardNo ? ele.cardNo : '无会员卡',
mainStoreName: ele.mainStoreName
? ele.mainStoreName
: '主门店未知',
: '服务门店未知',
thirdImgUrl: ele.thirdImgUrl
? ele.thirdImgUrl
: this.storeImageUrl,
......
src/components/axios/url.js
......@@ -33,7 +33,7 @@ const urlConfig = {
getOnlineStore: '/api-admin/store-list-paging', // 获取门店列表
gradeList: '/api-admin/grade-list',//获取会员等级列表
updateGrade: '/api-member/members-batch-update-grade',//批量修改会员等级
updateStore: '/api-member/members-batch-update-store',//批量修改会员主门店、协管门店
updateStore: '/api-member/members-batch-update-store',//批量修改会员服务门店、协管门店
batchProcess: '/api-member/get-members-batch-process',//查看批量处理进度
membersSubStoreList: '/api-member/members-sub-store-list',//获取选中会员的协管门店
singleInfo: '/api-member/load-member-single-info',//会员简易信息(会员头像浮层显示)
......@@ -71,7 +71,7 @@ const urlConfig = {
memberLoadmemberInfo: '/api-member/member-load-member-info',//获取客户会员卡信息
posInfo: '/api-member/member-load-member-pos-info',//pos会员详情 会员信息
posBaseDetail: '/api-member/member-load-update-pos-base-detail',//修改pos会员基本信息
batchUpdateStore: '/api-member/batch-update-members-store', // 回收站修改主门店
batchUpdateStore: '/api-member/batch-update-members-store', // 回收站修改服务门店
getStorePicture: '/api-member/enterprise-info', // 获取企业配置信息
getReturnMember: '/api-member/query-members-page', // 回收站门店
getSubStoreList: 'api-member/members-sub-store-list', // 获取选中会员的协管门店
......
src/components/membergroup/membergroupDetail.vue
......@@ -293,7 +293,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......
src/components/memberlist/memberReturn.js
......@@ -210,7 +210,7 @@ export default {
returnVal = "积分余额";
}
if (tempVal == "mainStoreName") {
returnVal = "主门店";
returnVal = "服务门店";
}
if (tempVal == "createCardStoreName") {
returnVal = "开卡门店";
......@@ -353,7 +353,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......@@ -513,7 +513,7 @@ export default {
checkStatus(err);
});
},
// 修改主门店
// 修改服务门店
submitMainStore(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
......@@ -591,7 +591,7 @@ export default {
},
selectStore(val) {
if (Object.keys(val).length > 0) {
// 主门店
// 服务门店
if (this.batchValue == "mainstore") {
this.mainstoreForm.mainStoreId = val.storeId;
this.storeName = val.storeName;
......@@ -787,7 +787,7 @@ export default {
checkFalse("请勾选会员");
return false;
}
// 批量处理修改主门店
// 批量处理修改服务门店
if (this.batchValue == "mainstore") {
this.dialogMainstoreVisible = true;
if (this.$refs.mainstoreForm) {
......@@ -942,7 +942,7 @@ export default {
cardNo: !!ele.cardNo ? ele.cardNo : "无会员卡",
mainStoreName: !!ele.mainStoreName
? ele.mainStoreName
: "主门店未知",
: "服务门店未知",
thirdImgUrl: ele.thirdImgUrl
? ele.thirdImgUrl
: this.storeImageUrl
......
src/components/memberlist/memberReturn.vue
......@@ -51,7 +51,7 @@
>
<el-option
key="mainstore"
label="修改主门店"
label="修改服务门店"
value="mainstore"
></el-option>
<el-option
......@@ -436,9 +436,9 @@
</el-dialog>
<!--批量调整会员等级-弹框-end-->
<!--修改主门店-弹框-->
<!--修改服务门店-弹框-->
<el-dialog
title="修改主门店"
title="修改服务门店"
:visible.sync="dialogMainstoreVisible"
width="600px"
>
......@@ -449,7 +449,7 @@
label-width="120px"
>
<el-form-item
label="选择主门店"
label="选择服务门店"
prop="mainOptType"
>
<el-radio-group
......@@ -466,7 +466,7 @@
<el-radio :label=3>替换为最新协管的自营/联营门店</el-radio>
</p>
<p class="lheigth40">
<el-radio :label=4>自定义主门店</el-radio>
<el-radio :label=4>自定义服务门店</el-radio>
</p>
</el-radio-group>
<p
......@@ -482,7 +482,7 @@
><span
class="pointer"
@click="changeStore"
>点击选择主门店</span></p>
>点击选择服务门店</span></p>
</el-form-item>
<el-form-item
label="原因备注"
......@@ -505,7 +505,7 @@
>确 定</el-button>
</div>
</el-dialog>
<!--修改主门店-弹框-end-->
<!--修改服务门店-弹框-end-->
<!--批量修改协管门店-弹框-->
<el-dialog
......
src/components/memberlist/pos-recycle.js
......@@ -210,7 +210,7 @@ export default {
returnVal = "积分余额";
}
if (tempVal == "mainStoreName") {
returnVal = "主门店";
returnVal = "服务门店";
}
if (tempVal == "createCardStoreName") {
returnVal = "开卡门店";
......@@ -353,7 +353,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......@@ -513,7 +513,7 @@ export default {
checkStatus(err);
});
},
// 修改主门店
// 修改服务门店
submitMainStore(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
......@@ -591,7 +591,7 @@ export default {
},
selectStore(val) {
if (Object.keys(val).length > 0) {
// 主门店
// 服务门店
if (this.batchValue == "mainstore") {
this.mainstoreForm.mainStoreId = val.storeId;
this.storeName = val.storeName;
......@@ -787,7 +787,7 @@ export default {
checkFalse("请勾选会员");
return false;
}
// 批量处理修改主门店
// 批量处理修改服务门店
if (this.batchValue == "mainstore") {
this.dialogMainstoreVisible = true;
if (this.$refs.mainstoreForm) {
......@@ -942,7 +942,7 @@ export default {
cardNo: !!ele.cardNo ? ele.cardNo : "无会员卡",
mainStoreName: !!ele.mainStoreName
? ele.mainStoreName
: "主门店未知",
: "服务门店未知",
thirdImgUrl: ele.thirdImgUrl
? ele.thirdImgUrl
: this.storeImageUrl
......
src/components/memberlist/pos-recycle.vue
......@@ -51,7 +51,7 @@
>
<el-option
key="mainstore"
label="修改主门店"
label="修改服务门店"
value="mainstore"
></el-option>
<!-- <el-option
......@@ -435,9 +435,9 @@
</el-dialog>
<!--批量调整会员等级-弹框-end-->
<!--修改主门店-弹框-->
<!--修改服务门店-弹框-->
<el-dialog
title="修改主门店"
title="修改服务门店"
:visible.sync="dialogMainstoreVisible"
width="600px"
>
......@@ -448,7 +448,7 @@
label-width="120px"
>
<el-form-item
label="选择主门店"
label="选择服务门店"
prop="mainOptType"
>
<el-radio-group
......@@ -465,7 +465,7 @@
<el-radio :label=3>替换为最新协管的自营/联营门店</el-radio>
</p>
<p class="lheigth40">
<el-radio :label=4>自定义主门店</el-radio>
<el-radio :label=4>自定义服务门店</el-radio>
</p>
</el-radio-group>
<p
......@@ -481,7 +481,7 @@
><span
class="pointer"
@click="changeStore"
>点击选择主门店</span></p>
>点击选择服务门店</span></p>
</el-form-item>
<el-form-item
label="原因备注"
......@@ -504,7 +504,7 @@
>确 定</el-button>
</div>
</el-dialog>
<!--修改主门店-弹框-end-->
<!--修改服务门店-弹框-end-->
<!--批量修改协管门店-弹框-->
<el-dialog
......
src/components/posmembers/posmembers copy.js
......@@ -220,7 +220,7 @@ export default {
returnVal = "积分余额";
}
if (tempVal == "mainStoreName") {
returnVal = "主门店";
returnVal = "服务门店";
}
if (tempVal == "createCardStoreName") {
returnVal = "开卡门店";
......@@ -366,7 +366,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......
src/components/posmembers/posmembers.js
......@@ -239,7 +239,7 @@ export default {
returnVal = "积分余额";
}
if (tempVal == "mainStoreName") {
returnVal = "主门店";
returnVal = "服务门店";
}
if (tempVal == "createCardStoreName") {
returnVal = "开卡门店";
......@@ -386,7 +386,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......
src/components/posmembers/posmembers.vue
......@@ -97,7 +97,7 @@
></el-option>
<el-option
key="mainstore"
label="修改主门店"
label="修改服务门店"
value="mainstore"
></el-option>
<el-option
......@@ -655,9 +655,9 @@
</el-dialog>
<!--批量调整会员等级-弹框-end-->
<!--修改主门店-弹框-->
<!--修改服务门店-弹框-->
<el-dialog
title="修改主门店"
title="修改服务门店"
:visible.sync="dialogMainstoreVisible"
width="600px"
@close="resetBatchOptions">
......@@ -668,7 +668,7 @@
label-width="120px"
>
<el-form-item
label="选择主门店"
label="选择服务门店"
prop="mainOptType"
>
<el-radio-group
......@@ -686,7 +686,7 @@
</p>
<p class="lheigth40">
<el-radio :label=4>
自定义主门店
自定义服务门店
<span style="margin-left:40px;font-size: 14px;">
{{storeName}}
</span>
......@@ -694,7 +694,7 @@
v-if="mainstoreForm.mainOptType == 4"
type="text"
@click="changeStore">
{{storeName ? '修改' : '选择'}}主门店
{{storeName ? '修改' : '选择'}}服务门店
</el-button>
</el-radio>
</p>
......@@ -724,7 +724,7 @@
>确 定</el-button>
</div>
</el-dialog>
<!--修改主门店-弹框-end-->
<!--修改服务门店-弹框-end-->
<!--批量修改协管门店-弹框-->
<el-dialog
......
src/components/wechatmembers/abnormal-member-option.vue
......@@ -18,7 +18,7 @@
<div class="searchComb">
<el-select v-model="searchData.select1">
<el-option label="卡号" :value="1"></el-option>
<el-option label="主门店" :value="2"></el-option>
<el-option label="服务门店" :value="2"></el-option>
</el-select>
<el-input v-model.trim="searchData.input1" placeholder="请输入" prefix-icon="el-icon-search" @keydown.enter.native="searchStrategy" style="width:340px">
<i
......@@ -446,7 +446,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......
src/components/wechatmembers/abnormal-member.vue
......@@ -27,7 +27,7 @@
<div class="searchComb">
<el-select v-model="searchData.select1">
<el-option label="卡号" :value="1"></el-option>
<el-option label="主门店" :value="2"></el-option>
<el-option label="服务门店" :value="2"></el-option>
</el-select>
<el-input v-model.trim="searchData.input1" placeholder="请输入" prefix-icon="el-icon-search" @keydown.enter.native="searchStrategy" style="width:140px">
<i
......@@ -188,7 +188,7 @@
</el-table-column>
<el-table-column
prop="gradeName"
label="主门店名称"
label="服务门店名称"
>
<template slot-scope="scope">
{{ scope.row.mainStoreName || '--'}}
......@@ -537,7 +537,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......
src/components/wechatmembers/frozenList.vue
......@@ -462,7 +462,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务店未知"
};
} else {
checkFalse(res.data.message);
......
src/components/wechatmembers/frozenMember.vue
......@@ -451,7 +451,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......
src/components/wechatmembers/modifyintegral.vue
......@@ -225,7 +225,7 @@
></el-table-column>
<el-table-column
prop="mainStoreName"
label="主门店"
label="服务门店"
></el-table-column>
<!-- <el-table-column prop="openStoreName" label="开卡门店"></el-table-column> -->
<el-table-column
......
src/components/wechatmembers/total.js
......@@ -235,7 +235,7 @@ export default {
returnVal = "积分余额";
}
if (tempVal == "mainStoreName") {
returnVal = "主门店";
returnVal = "服务门店";
}
if (tempVal == "createCardStoreName") {
returnVal = "开卡门店";
......@@ -398,7 +398,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......@@ -1047,7 +1047,7 @@ export default {
sex: ele.sex == 0 ? "性别未知" : ele.sex == 1 ? "男" : "女",
age: !!ele.age ? ele.age : "年龄未知",
cardNo: !!ele.cardNo ? ele.cardNo : "无会员卡",
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : "主门店未知",
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : "服务门店未知",
thirdImgUrl: ele.thirdImgUrl ? ele.thirdImgUrl : this.storeImageUrl
}));
} else {
......
src/components/wechatmembers/wechat-total.vue
......@@ -75,7 +75,7 @@
label="调整会员等级"
value="grade"></el-option>
<el-option key="mainstore"
label="修改主门店"
label="修改服务门店"
value="mainstore"></el-option>
<el-option key="store"
label="修改协管门店"
......@@ -522,8 +522,8 @@
</el-dialog>
<!--批量调整会员等级-弹框-end-->
<!--修改主门店-弹框-->
<el-dialog title="修改主门店"
<!--修改服务门店-弹框-->
<el-dialog title="修改服务门店"
:visible.sync="dilogMainstoreVisible"
width="600px"
@close="resetBatchOptions">
......@@ -531,7 +531,7 @@
:model="mainstoreForm"
:rules="mainstorerules"
label-width="120px">
<el-form-item label="选择主门店"
<el-form-item label="选择服务门店"
prop="mainOptType">
<el-radio-group v-model="mainstoreForm.mainOptType"
@change="handleStore">
......@@ -545,14 +545,14 @@
<el-radio :label=3>替换为最新协管的自营/联营门店</el-radio>
</p>
<p class="lheigth40">
<el-radio :label=4>自定义主门店</el-radio>
<el-radio :label=4>自定义服务门店</el-radio>
<span style="margin-left:40px;vertical-align: middle;font-size: 14px;">
{{storeName}}
</span>
<span v-if="mainstoreForm.mainOptType == 4"
class="member-store-name"
@click="changeStore">
{{storeName ? '修改' : '选择'}}主门店
{{storeName ? '修改' : '选择'}}服务门店
</span>
</p>
</el-radio-group>
......@@ -573,7 +573,7 @@
@click="debounce(submitMainStore, 300)('mainstoreForm')">确 定</el-button>
</div>
</el-dialog>
<!--修改主门店-弹框-end-->
<!--修改服务门店-弹框-end-->
<!--批量修改协管门店-弹框-->
<el-dialog title="批量修改协管门店"
......
src/components/wechatmembers/wechatmembers.js
......@@ -307,7 +307,7 @@ export default {
cardNo: !!ret.cardNo ? ret.cardNo : "无会员卡",
mainStoreName: !!ret.mainStoreName
? ret.mainStoreName
: "主门店未知"
: "服务门店未知"
};
} else {
checkFalse(res.data.message);
......@@ -953,7 +953,7 @@ export default {
sex: ele.sex == 0 ? "性别未知" : ele.sex == 1 ? "男" : "女",
age: !!ele.age ? ele.age : "年龄未知",
cardNo: !!ele.cardNo ? ele.cardNo : "无会员卡",
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : "主门店未知",
mainStoreName: !!ele.mainStoreName ? ele.mainStoreName : "服务门店未知",
thirdImgUrl: ele.thirdImgUrl ? ele.thirdImgUrl : this.storeImageUrl
}));
} else {
......
src/components/wechatmembers/wechatmembers.vue
......@@ -96,7 +96,7 @@
></el-option>
<el-option
key="mainstore"
label="修改主门店"
label="修改服务门店"
value="mainstore"
></el-option>
<el-option
......@@ -652,9 +652,9 @@
</el-dialog>
<!--批量调整会员等级-弹框-end-->
<!--修改主门店-弹框-->
<!--修改服务门店-弹框-->
<el-dialog
title="修改主门店"
title="修改服务门店"
:visible.sync="dilogMainstoreVisible"
width="600px"
@close="resetBatchOptions">
......@@ -665,7 +665,7 @@
label-width="120px"
>
<el-form-item
label="选择主门店"
label="选择服务门店"
prop="mainOptType"
>
<el-radio-group
......@@ -682,7 +682,7 @@
<el-radio :label=3>替换为最新协管的自营/联营门店</el-radio>
</p>
<p class="lheigth40">
<el-radio :label=4>自定义主门店</el-radio>
<el-radio :label=4>自定义服务门店</el-radio>
<span style="margin-left:40px;vertical-align: middle;font-size: 14px;">
{{storeName}}
</span>
......@@ -690,7 +690,7 @@
v-if="mainstoreForm.mainOptType == 4"
class="member-store-name"
@click="changeStore">
{{storeName ? '修改' : '选择'}}主门店
{{storeName ? '修改' : '选择'}}服务门店
</span>
</p>
</el-radio-group>
......@@ -719,7 +719,7 @@
>确 定</el-button>
</div>
</el-dialog>
<!--修改主门店-弹框-end-->
<!--修改服务门店-弹框-end-->
<!--批量修改协管门店-弹框-->
<el-dialog
......
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