Skip to content

H
haoban-3
Commit 51a0f0e9 by huaying
Options

fix: huoma

parent 93e97530
Showing with 52 additions and 83 deletions
src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue
......@@ -42,7 +42,7 @@
</el-form-item>
</el-form>
<el-table ref="actCodeTableRef" v-loading="loadingStatus" :data="tableData" class="act-code-table" @sort-change="sortChange" :max-height="tableMaxHeight">
<!-- @select="selectTable" :max-height="tableMaxHeight" tooltip-effect="dark"-->
<!-- @select="selectTable" tooltip-effect="dark"-->
<el-table-column type="selection" width="60" fixed> </el-table-column>
<el-table-column width="60" class-name="table-select-cell" fixed>
<template #header>
......@@ -76,11 +76,11 @@
<p>{{ row.addNumT == null ? row.addNumT : '--' }}</p>
</template>
</el-table-column>
<el-table-column label="使用成员" width="120">
<el-table-column label="使用成员" width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.clerkName ? row.clerkName : '--' }}</p>
<p class="ft-12 phone">{{ row.clerkCode == null ? row.clerkCode : '--' }}</p>
<p>
<p class="ft-12 phone">{{ row.clerkCode ? row.clerkCode : '--' }}</p>
<p v-if="row.clerkList && row.clerkList.length > 0">
<el-popover width="200" trigger="click">
<ul class="userMember-ul">
<li v-for="item in row.clerkList" :key="item.clerkId" class="userMemberLi">
......@@ -96,11 +96,11 @@
<el-table-column label="成员所属门店" width="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<p>{{ row.storeName ? row.storeName : '--' }}</p>
<p class="ft-12 phone">{{ row.storeCode == null ? row.storeCode : '--' }}</p>
<p>
<p class="ft-12 phone">{{ row.storeCode ? row.storeCode : '--' }}</p>
<p v-if="row.storeList && row.storeList.length > 0">
<el-popover width="200" trigger="click">
<ul class="userMember-ul">
<li v-for="item in row.clerkList" :key="item.storeId" class="userMemberLi">
<li v-for="item in row.storeList" :key="item.storeId" class="userMemberLi">
<p class="ulName">{{ item.storeName }}</p>
<p class="ft-12 phone">{{ item.storeCode }}</p>
</li>
......@@ -198,48 +198,6 @@ export default {
storeSelect: 1,
dateTime: [],
tableData: [],
hmUserMember: [
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
},
{
name: 'test'
}
],
total: 1,
totalCount: 100,
selectPage: {
......@@ -312,7 +270,8 @@ export default {
}).then(() => {
deleteRequest('/haoban-manage3-web/hm/qrcode/del', { hmId: row.hmId }).then(res => {
if (res.data.code == 0) {
this.getTableList();
// this.getTableList();
this.$router.go(0);
}
});
});
......
src/views/salesleads/actCodeManage/staffActCode/views/batchAddCode.vue
......@@ -31,7 +31,7 @@ export default {
components: { setActCode, SelectClerk },
data() {
return {
hmMemberNum: 103,
hmMemberNum: 1,
form: {
hmType: 1,
// name: '',
......@@ -40,49 +40,31 @@ export default {
hmUserNum: null
},
data: [],
storeClerkList: [],
dataArr: []
storeClerkList: []
};
},
created() {
this.getStoreClerkList();
this.getClerkNum();
},
methods: {
radioChange(e) {
if (e == 1) {
this.form.clerkIdList = ['-1'];
this.data = [];
this.form.hmUserNum = this.hmMemberNum;
}
},
// 获取全部成员个数
getStoreClerkList() {
getRequest('/haoban-manage3-web/hm/store-clerk-list', { pageNum: 1, pageSize: 20 }).then(res => {
const { code, message, result } = res.data || {};
if (code != 0) {
return this.$message.error(message);
getClerkNum() {
getRequest('/haoban-manage3-web/hm/qrcode/getAddCount', {}).then(res => {
if (res.data.code == 0) {
this.hmMemberNum = res.data.result || 1;
}
result.result = Array.isArray(result.result) ? result.result : [];
this.storeClerkList = result.result.map(el => {
el.clerkList = Array.isArray(el.clerkList) ? el.clerkList : [];
return el.clerkList.length;
});
let sum = 0;
this.storeClerkList.forEach(item => {
sum = sum + item;
});
this.hmMemberNum = sum;
});
},
onChange(data) {
this.data = data;
this.form.clerkIdList = data;
this.form.hmUserNum = data.length;
// this.dataArr = data.map(item => {
// return item.clerkName;
// });
// if (this.form.name == '') {
// this.form.name = this.dataArr.toString();
// }
},
async onSubmit(event) {
let obj = {
......
src/views/salesleads/actCodeManage/staffActCode/views/group-list.vue
......@@ -51,6 +51,13 @@ import { getRequest } from '@/api/api';
export default {
name: 'staffActCodeGroupList',
data() {
let exitName = (rule, value, callback) => {
let flag = this.namelist.map(item => item.interfaceName).includes(this.form.interfaceName);
if (flag == true) {
callback(new Error('该分组名称已存在，请重新输入'));
}
callback();
};
return {
searchTip: false,
groupLoading: false,
......@@ -64,7 +71,10 @@ export default {
groupId: ''
},
groupListFormRules: {
groupName: [{ required: true, message: '请输入分组名称', trigger: 'blur' }]
groupName: [
{ required: true, message: '请输入分组名称', trigger: 'blur' },
{ validator: exitName, trigger: 'blur' }
]
},
isEditGroup: false,
// 分页相关
......
src/views/salesleads/actCodeManage/staffActCode/views/setActCode.vue
......@@ -77,9 +77,13 @@ export default {
const that = this;
that.loading = true;
if (this.$route.query.hmId) {
await getRequest('/hm/qrcode/detail', { hmId: this.$route.query.hmId }).then(res => {
this.detailCode = res.data;
console.log(this.detailCode, 'detailcode');
await getRequest('/haoban-manage3-web/hm/qrcode/detail', { hmId: this.$route.query.hmId }).then(res => {
this.detailCode = res.data.result;
this.form.hmType = this.detailCode.hmType;
this.form.name = this.detailCode.name;
this.form.clerkIdList = this.detailCode.clerkList.map(i => i.clerkId);
this.form.hmUserNum = this.form.clerkIdList.length;
this.data = this.detailCode.clerkList;
that.loading = false;
});
}
......@@ -127,7 +131,6 @@ export default {
}
});
}
// this.$refs.form.clearValidate();
}
}
};
......
src/views/salesleads/components/ActCodeSet.vue
......@@ -141,6 +141,21 @@ export default {
}
});
}
},
watch: {
actCodeData: {
handler: function(val) {
if (val) {
console.log(val, 'val');
this.form.hmGroupId = val.hmGroupId;
this.form.passFlag = val.passFlag == 1 ? true : false;
this.form.memberLabelId = val.memberLabelId;
this.form.welcomeId = val.welcomeId;
}
},
immediate: true,
deep: true
}
}
};
</script>
......
src/views/salesleads/components/dataDetail.vue
......@@ -212,7 +212,6 @@ export default {
this.pageParam.inFields.startTime = this.dateDefault ? this.dateDefault[0].toString() : '';
this.pageParam.inFields.endTime = this.dateDefault ? this.dateDefault[1].toString() : '';
if (this.$route.query.id && this.typeT == 'code') {
// this.pageParam.inFields.hmId = '420370925331480577';
this.pageParam.inFields.hmId = this.$route.query.id;
delete this.pageParam.inFields.linkId;
} else if (this.$route.query.id && this.typeT == 'link') {
......@@ -229,6 +228,8 @@ export default {
if (res.data.code == 0) {
this.tableData = res.data.result.data || [];
this.totalCount = res.result.totalCount;
} else {
return this.$message(res.data.message);
}
});
},
......
src/views/salesleads/components/welcomesItem.vue
......@@ -44,7 +44,6 @@
</template>
</el-table-column>
</el-table>
<!-- <dm-pagination class="paginationBox" background @current-change="handleCurrentChange" :current-page="welcomePage.pageNum" layout=" prev, pager, next " :page-size="welcomePage.pageSize" :total="totalNum"> </dm-pagination> -->
<el-pagination class="paginationBox" background @current-change="handleCurrentChange" :current-page="welcomePage.pageNum" layout=" prev, pager, next " :page-size="welcomePage.pageSize" :total="totalNum"></el-pagination>
</div>
</el-form-item>
......
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