Commit 3d18f9a9 by huaying

fix: 按钮权限

parent 3b566ecc
...@@ -322,6 +322,16 @@ module.exports = { ...@@ -322,6 +322,16 @@ module.exports = {
adminList: { adminList: {
// 1.刷新(按钮) // 1.刷新(按钮)
refreshAdminList: ['刷新', 1, 2] refreshAdminList: ['刷新', 1, 2]
} },
// 按钮名称、是否受权限控制0否1是、是否增删改0:跳转 1:增删改 2:其他、按钮跳转路径 // 按钮名称、是否受权限控制0否1是、是否增删改0:跳转 1:增删改 2:其他、按钮跳转路径
actCode: {
addActCode: ['新建活码', 1, 0],
batchActCode: ['批量创建活码', 1, 0],
batchGroup: ['批量分组', 1, 1],
dataActCode: ['数据', 1, 0],
infoActCode: ['详情', 1, 0],
editActCode: ['编辑', 1, 1],
downActCode: ['下载活码', 1, 1],
delActCode: ['作废', 1, 1]
}
} }
{"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList"} {"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList","addActCode":"addActCode","batchActCode":"batchActCode","batchGroup":"batchGroup","dataActCode":"dataActCode","infoActCode":"infoActCode","editActCode":"editActCode","downActCode":"downActCode","delActCode":"delActCode"}
\ No newline at end of file \ No newline at end of file
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<!-- 页面内容 --> <!-- 页面内容 -->
<!-- <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view> --> <!-- <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view> -->
<keep-alive> <keep-alive>
<router-view :brand-id="enterpriseId" v-if="$route.meta.keepAlive"></router-view> <router-view :brand-id="enterpriseId" :key="$route.path" v-if="$route.meta.keepAlive"></router-view>
</keep-alive> </keep-alive>
<router-view v-if="!$route.meta.keepAlive" :brand-id="enterpriseId"></router-view> <router-view v-if="!$route.meta.keepAlive" :key="$route.path" :brand-id="enterpriseId"></router-view>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -4,7 +4,11 @@ const staffActCodeRouter = [ ...@@ -4,7 +4,11 @@ const staffActCodeRouter = [
{ {
path: '/staffActCode', path: '/staffActCode',
name: '员工活码', name: '员工活码',
component: _import('salesleads/actCodeManage/staffActCode', 'index') component: _import('salesleads/actCodeManage/staffActCode', 'index'),
meta: {
keepAlive: true,
fromPath: ['/actCodeAdd', '/actCodeEdit', '/actCodeBatch', '/actCodeDetail']
}
}, },
{ {
path: '/actCodeRecord', path: '/actCodeRecord',
...@@ -13,7 +17,12 @@ const staffActCodeRouter = [ ...@@ -13,7 +17,12 @@ const staffActCodeRouter = [
}, },
{ {
path: '/actCodeDetail', path: '/actCodeDetail',
name: '活码详情', name: '活码详情-数据',
component: _import('salesleads/actCodeManage/staffActCode', 'actCodeDetail')
},
{
path: '/actCodeDetails',
name: '活码详情-详情',
component: _import('salesleads/actCodeManage/staffActCode', 'actCodeDetail') component: _import('salesleads/actCodeManage/staffActCode', 'actCodeDetail')
}, },
{ {
......
...@@ -49,9 +49,11 @@ ...@@ -49,9 +49,11 @@
</el-tabs> </el-tabs>
</div> </div>
<el-tabs v-model="activeName" type="card"> <el-tabs v-model="activeName" type="card">
<!-- <el-tab-pane label="详情信息" name="first" v-if="$getButtonLimit($buttonCode.infoActCode)" :limit-code="$buttonCode.infoActCode"> -->
<el-tab-pane label="详情信息" name="first"> <el-tab-pane label="详情信息" name="first">
<act-code-detail-info :enterprise-id="codeInfo.enterpriseId" :welcome-id="codeInfo.welcomeId" :hm-id="$route.query.hmId" @useMemberList="useMemberData"></act-code-detail-info> <act-code-detail-info :enterprise-id="codeInfo.enterpriseId" :welcome-id="codeInfo.welcomeId" :hm-id="$route.query.hmId" @useMemberList="useMemberData"></act-code-detail-info>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="数据统计" name="second" v-if="$getButtonLimit($buttonCode.dataActCode)" :limit-code="$buttonCode.dataActCode"> -->
<el-tab-pane label="数据统计" name="second"> <el-tab-pane label="数据统计" name="second">
<act-code-detail-statistics :hm-id="$route.query.hmId"></act-code-detail-statistics> <act-code-detail-statistics :hm-id="$route.query.hmId"></act-code-detail-statistics>
</el-tab-pane> </el-tab-pane>
......
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
<el-form-item> <el-form-item>
<el-select v-model="storeSelect" placeholder="请选择" style="width: 128px" @change="storeMemberSe"> <el-select v-model="storeSelect" placeholder="请选择" style="width: 128px" @change="storeMemberSe">
<el-option label="成员所属门店" :value="1"></el-option> <el-option label="成员所属门店" :value="1"></el-option>
<el-option label="使用成员" :value="2"></el-option> <el-option label="关联导购" :value="2"></el-option>
</el-select> </el-select>
<el-select v-model="inFields.storeSelect" v-if="storeSelect == 1" filterable remote placeholder="请输入门店名称/code" :remote-method="remoteMethods" :loading="selectLoading" v-loadmore="onLoadmoreStore" @change="searchList" style="margin-left: -4px; width:196px;"> <el-select v-model="inFields.storeSelect" v-if="storeSelect == 1" filterable remote placeholder="请输入门店名称/code" :remote-method="remoteMethods" :loading="selectLoading" v-loadmore="onLoadmoreStore" @change="searchList" style="margin-left: -4px; width:196px;" clearable>
<el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeId"> </el-option> <el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeId"> </el-option>
</el-select> </el-select>
<el-select v-model="inFields.clerkSelect" v-if="storeSelect == 2" filterable remote placeholder="请输入成员名称/code" :loading="selectLoading" @change="searchList" style="margin-left: -4px; width:196px;"> <el-select v-model="inFields.clerkSelect" v-if="storeSelect == 2" filterable remote placeholder="请输入成员名称/code" :loading="selectLoading" @change="searchList" style="margin-left: -4px; width:196px;" clearable>
<el-option v-for="item in memberList" :key="item.clerkId" :label="item.clerkName" :value="item.clerkId"> </el-option> <el-option v-for="item in memberList" :key="item.clerkId" :label="item.clerkName" :value="item.clerkId"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
<el-date-picker v-model="dateTime" @change="searchList" :picker-options="pickerOptions" :editable="false" :value-format="'yyyy-MM-dd HH:mm:ss'" type="datetimerange" align="right" unlink-panels range-separator="至" start-placeholder="创建开始日期" end-placeholder="创建结束日期"> </el-date-picker> <el-date-picker v-model="dateTime" @change="searchList" :picker-options="pickerOptions" :editable="false" :value-format="'yyyy-MM-dd HH:mm:ss'" type="datetimerange" align="right" unlink-panels range-separator="至" start-placeholder="创建开始日期" end-placeholder="创建结束日期"> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="frmbt20"> <el-form-item class="frmbt20">
<!-- <el-button @click="batchGoupEvent" v-if="$getButtonLimit($buttonCode.batchGroup)" :limit-code="$buttonCode.batchGroup">批量分组</el-button>
<el-button class="ghost-btn " @click="$router.push('/actCodeBatch')" v-if="$getButtonLimit($buttonCode.batchActCode)" :limit-code="$buttonCode.batchActCode">批量创建活码</el-button>
<el-button type="primary" @click="$router.push('/actCodeAdd')" v-if="$getButtonLimit($buttonCode.addActCode)" :limit-code="$buttonCode.addActCode">新增活码</el-button> -->
<el-button @click="batchGoupEvent">批量分组</el-button> <el-button @click="batchGoupEvent">批量分组</el-button>
<el-button class="ghost-btn " @click="$router.push('/actCodeBatch')">批量创建活码</el-button> <el-button class="ghost-btn " @click="$router.push('/actCodeBatch')">批量创建活码</el-button>
<el-button type="primary" @click="$router.push('/actCodeAdd')">新增活码</el-button> <el-button type="primary" @click="$router.push('/actCodeAdd')">新增活码</el-button>
...@@ -76,7 +79,7 @@ ...@@ -76,7 +79,7 @@
<p>{{ row.addNumT == null ? row.addNumT : '--' }}</p> <p>{{ row.addNumT == null ? row.addNumT : '--' }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="使用成员" width="120" show-overflow-tooltip> <el-table-column label="关联导购" width="120" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<p>{{ row.clerkName ? row.clerkName : '--' }}</p> <p>{{ row.clerkName ? row.clerkName : '--' }}</p>
<p class="ft-12 phone">{{ row.clerkCode ? row.clerkCode : '--' }}</p> <p class="ft-12 phone">{{ row.clerkCode ? row.clerkCode : '--' }}</p>
...@@ -215,21 +218,30 @@ export default { ...@@ -215,21 +218,30 @@ export default {
operateBtnArr: [ operateBtnArr: [
{ {
text: '数据', text: '数据',
visible: true, visible: row => {
// if (this.$getButtonLimit(this.$buttonCode.dataActCode)) {
return true;
// }
},
handler: row => { handler: row => {
this.$router.push(`/actCodeDetail?hmId=${row.hmId}&activeName=second`); this.$router.push(`/actCodeDetail?hmId=${row.hmId}&activeName=second`);
} }
}, },
{ {
text: '详情', text: '详情',
visible: true, visible: row => {
// if (this.$getButtonLimit(this.$buttonCode.infoActCode)) {
return true;
// }
},
handler: row => { handler: row => {
this.$router.push('/actCodeDetail?hmId=' + row.hmId); this.$router.push('/actCodeDetails?hmId=' + row.hmId);
} }
}, },
{ {
text: '编辑', text: '编辑',
visible: row => { visible: row => {
// if (!this.$getButtonLimit(this.$buttonCode.editActCode) || row.statusFlag == 2) {
if (row.statusFlag == 2) { if (row.statusFlag == 2) {
return false; return false;
} else { } else {
...@@ -243,6 +255,7 @@ export default { ...@@ -243,6 +255,7 @@ export default {
{ {
text: '下载活码', text: '下载活码',
visible: row => { visible: row => {
// if (!this.$getButtonLimit(this.$buttonCode.downActCode) || row.hmType == 1 || row.statusFlag != 1) {
if (row.hmType == 1 || row.statusFlag != 1) { if (row.hmType == 1 || row.statusFlag != 1) {
return false; return false;
} else { } else {
...@@ -258,6 +271,7 @@ export default { ...@@ -258,6 +271,7 @@ export default {
{ {
text: '作废', text: '作废',
visible: row => { visible: row => {
// if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2) {
if (row.statusFlag != 2) { if (row.statusFlag != 2) {
return true; return true;
} }
...@@ -320,6 +334,26 @@ export default { ...@@ -320,6 +334,26 @@ export default {
this.getStraff(); this.getStraff();
this.getStore(); this.getStore();
}, },
activated() {
if (this.$route.meta.refresh) {
this.inFields = {
hmSelect: '',
statusFlagInt: '',
storeSelect: '',
clerkSelect: '',
hmTypeInt: '',
startTime: '',
endTime: '',
orderByField: 'createTime desc',
hmGroupId: ''
};
this.pageParam = {
pageSize: 20,
pageNo: 1
};
}
this.getTableList();
},
methods: { methods: {
storeMemberSe(e) { storeMemberSe(e) {
if (e == 1) { if (e == 1) {
...@@ -491,11 +525,11 @@ export default { ...@@ -491,11 +525,11 @@ export default {
watch: { watch: {
currentGroupId: { currentGroupId: {
handler: function(val) { handler: function(val) {
// if (val != null) { if (val) {
this.currentGroupId = val; this.currentGroupId = val;
this.pageParam.pageNo = 1; this.pageParam.pageNo = 1;
this.getTableList(); this.getTableList();
// } }
}, },
immediate: true immediate: true
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</el-form-item> </el-form-item>
</template> </template>
<template #member> <template #member>
<el-form-item label="使用成员" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]"> <el-form-item label="关联导购" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]">
<el-radio-group v-model="memberType" @change="radioChange"> <el-radio-group v-model="memberType" @change="radioChange">
<el-radio :label="1">全部成员</el-radio> <el-radio :label="1">全部成员</el-radio>
<el-radio :label="2">部分成员</el-radio> <el-radio :label="2">部分成员</el-radio>
...@@ -79,6 +79,7 @@ export default { ...@@ -79,6 +79,7 @@ export default {
await postJsonRequest('/haoban-manage3-web/hm/qrcode/addList', obj).then(res => { await postJsonRequest('/haoban-manage3-web/hm/qrcode/addList', obj).then(res => {
if (res.data.code == 0) { if (res.data.code == 0) {
setTimeout(() => { setTimeout(() => {
this.$route.meta.refresh = true;
this.$router.go(-1); this.$router.go(-1);
this.form = { this.form = {
hmType: 1, hmType: 1,
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</el-form-item> </el-form-item>
</template> </template>
<template #member> <template #member>
<el-form-item label="使用成员" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]"> <el-form-item label="关联导购" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]">
<p class="tabs" v-if="form.hmType == 1">单人活码仅可选择一名成员</p> <p class="tabs" v-if="form.hmType == 1">单人活码仅可选择一名成员</p>
<p class="tabs" v-if="form.hmType == 2">若选择多名成员,则随机分配企微员工</p> <p class="tabs" v-if="form.hmType == 2">若选择多名成员,则随机分配企微员工</p>
<select-clerk :multiple="multiple" :data="data" @change="onChange" :disabled="clerkDisabled"></select-clerk> <select-clerk :multiple="multiple" :data="data" @change="onChange" :disabled="clerkDisabled"></select-clerk>
...@@ -128,6 +128,7 @@ export default { ...@@ -128,6 +128,7 @@ export default {
await postJsonRequest('/haoban-manage3-web/hm/qrcode/add', obj).then(res => { await postJsonRequest('/haoban-manage3-web/hm/qrcode/add', obj).then(res => {
if (res.data.code == 0) { if (res.data.code == 0) {
setTimeout(() => { setTimeout(() => {
this.$route.meta.refresh = true;
this.$router.go(-1); this.$router.go(-1);
this.form = { this.form = {
hmType: 1, hmType: 1,
......
...@@ -17,14 +17,13 @@ ...@@ -17,14 +17,13 @@
</el-form-item> </el-form-item>
<el-form-item label="活码标签" prop="memberLabelId" class="memberTag-form-item"> <el-form-item label="活码标签" prop="memberLabelId" class="memberTag-form-item">
<el-button v-if="!form.memberLabelId || !form.memberLabelName" plain class="ylbtn" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button> <el-button v-if="!form.memberLabelId || !form.memberLabelName" plain class="ylbtn" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
<!-- <el-tag v-else closable @close="handleTagCloseTag">{{ form.memberLabelName }}</el-tag> -->
<el-tooltip :disabled="form.memberLabelStatus != 0" content="已删除" placement="top" v-else> <el-tooltip :disabled="form.memberLabelStatus != 0" content="已删除" placement="top" v-else>
<el-tag closable @close="handleTagCloseTag" :type="isEdit && form.memberLabelStatus == 0 ? 'warning' : ''">{{ form.memberLabelName }}</el-tag> <el-tag closable @close="handleTagCloseTag" :type="isEdit && form.memberLabelStatus == 0 ? 'warning' : ''">{{ form.memberLabelName }}</el-tag>
</el-tooltip> </el-tooltip>
<dm-memberTag-group isHb :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group> <dm-memberTag-group isHb :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
</el-form-item> </el-form-item>
<dm-sub-title text="欢迎语设置" type="line" class="mt40b20" /> <dm-sub-title text="欢迎语设置" type="line" class="mt40b20" />
<welcomeItem @getWelcomeId="getWelcomeId" :welcomeIdP="form.welcomeId" ref="welcomeItem" :welcomeSetType="welcomeSetType"></welcomeItem> <welcomeItem @getWelcomeId="getWelcomeId" :welcomeId.sync="form.welcomeId" ref="welcomeItem" :welcomeType.sync="welcomeType" welcomeName="code"></welcomeItem>
</el-form> </el-form>
</div> </div>
<div class="saveBtn"> <div class="saveBtn">
...@@ -60,7 +59,7 @@ export default { ...@@ -60,7 +59,7 @@ export default {
}, },
data() { data() {
return { return {
welcomeSetType: 1, welcomeType: 1,
form: { form: {
// hmType: 1, //1单人 2多人 // hmType: 1, //1单人 2多人
// name: '', // 名称 // name: '', // 名称
...@@ -162,9 +161,9 @@ export default { ...@@ -162,9 +161,9 @@ export default {
}); });
return; return;
} }
// if (!this.$refs.welcomeItem.submit()) { if (this.welcomeType == 2) {
// return; this.form.welcomeId = '';
// } }
this.$refs.form.validate(async valid => { this.$refs.form.validate(async valid => {
if (valid) { if (valid) {
this.form.passFlag = this.form.passFlag ? 1 : 0; this.form.passFlag = this.form.passFlag ? 1 : 0;
...@@ -177,12 +176,17 @@ export default { ...@@ -177,12 +176,17 @@ export default {
actCodeData: { actCodeData: {
handler: function(val) { handler: function(val) {
if (val) { if (val) {
this.welcomeSetType = 2;
this.form.hmGroupId = val.hmGroupId; this.form.hmGroupId = val.hmGroupId;
// this.form.passFlag = val.passFlag == 1 ? true : false; // this.form.passFlag = val.passFlag == 1 ? true : false;
this.form.memberLabelId = val.memberLabelId ? val.memberLabelId : ''; this.form.memberLabelId = val.memberLabelId ? val.memberLabelId : '';
this.form.memberLabelName = val.memberLabelName ? val.memberLabelName : ''; this.form.memberLabelName = val.memberLabelName ? val.memberLabelName : '';
this.form.welcomeId = val.welcomeId; this.form.welcomeId = val.welcomeId;
console.log(val.welcomeId, this.form.welcomeId, 'val.welcomeId');
if (!val.welcomeId) {
this.welcomeType = 2;
} else {
this.welcomeType = 1;
}
} }
}, },
immediate: true, immediate: true,
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div v-if="type == 'actCode'"> <div v-if="type == 'actCode'">
<div class="title flex"> <div class="title flex">
<div class="blue-block"></div> <div class="blue-block"></div>
<span class="font-w-500 color-303133">使用成员</span> <span class="font-w-500 color-303133">关联导购</span>
</div> </div>
<el-table ref="useMemberTableRef" v-loading="loading" :data="useMemberData" tooltip-effect="dark"> <el-table ref="useMemberTableRef" v-loading="loading" :data="useMemberData" tooltip-effect="dark">
<el-table-column prop="" label="导购信息" show-overflow-tooltip min-width="185px"> <el-table-column prop="" label="导购信息" show-overflow-tooltip min-width="185px">
......
...@@ -114,6 +114,7 @@ export default { ...@@ -114,6 +114,7 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(this.welcomeType, 'welcomeType');
this.getWelcomeTable(); this.getWelcomeTable();
document.addEventListener('visibilitychange', () => { document.addEventListener('visibilitychange', () => {
if (document.visibilityState == 'visible') { if (document.visibilityState == 'visible') {
......
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