Skip to content

H
haoban-4
Commit 05ed1690 by 无尘
Options

fix: 修改分配

parent 509358a3
Showing with 52 additions and 22 deletions
src/components/app/my-customer/customer-assign.vue
......@@ -4,10 +4,10 @@
* @Author: 无尘
* @Date: 2020-04-14 09:50:16
* @LastEditors: 无尘
* @LastEditTime: 2020-09-17 10:03:55
* @LastEditTime: 2020-09-17 11:45:09
-->
<!--
<customer-assign v-if="assignShow" :brand-id="brandId" :customer-assign-total="customerAssignTotal" :clerk-id="clerkId" :search-params="searchInput" :choose-all="selectRadio" :depart-obj="departObj" :multiple-data="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
<customer-assign v-if="assignShow" :store-brand-id="storeBrandId" :brand-id="brandId" :customer-assign-total="customerAssignTotal" :clerk-id="clerkId" :search-params="searchInput" :choose-all="selectRadio" :depart-obj="departObj" :multiple-data="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
import customerAssign from '@/components/app/my-customer/customer-assign.vue';
-->
<template>
......@@ -62,6 +62,12 @@ export default {
return '';
}
},
storeBrandId: {
type: String,
default() {
return '';
}
},
customerAssignTotal: {
type: [ String, Number ],
default() {
......@@ -379,7 +385,8 @@ export default {
search: that.searchParams,
mcuIds: that.chooseAll == 1 ? '' : Object.keys(that.editRow).length ? [ that.editRow ] : that.multipleData,
clerkIds: clerkIds,
staffName: that.staffName
staffName: that.staffName,
brandId: that.storeBrandId
};
saveAssign(data)
.then(res => {
......
src/components/app/my-customer/store-list.vue
......@@ -3,7 +3,7 @@
* @Author : 无尘
* @Date : 2020-08-13 14:02:22
* @LastEditors: 无尘
* @LastEditTime: 2020-09-16 16:25:17
* @LastEditTime: 2020-09-17 11:34:17
* @FilePath : haoban-4\src\components\app\my-customer\store-list.vue
-->
<!--
......@@ -94,32 +94,37 @@ export default {
storeTypeId: '',
storeTypeOptions: [
{
id: '0',
id: '1',
name: '自营',
},
{
id: '1',
id: '2',
name: '联营',
},
{
id: '2',
name: '代理(加盟)',
id: '3',
name: '代理',
},
{
id: '3',
id: '4',
name: '加盟',
},
{
id: '5',
name: '代销',
},
{
id: '4',
id: '6',
name: '托管',
}
],
storeType: {
'0': '自营',
'1': '联营',
'2': '代理(加盟)',
'3': '代销',
'4': '托管'
'1': '自营',
'2': '联营',
'3': '代理',
'4': '加盟',
'5': '代销',
'6': '托管'
},
// 分页参数
currentPage: 1,
......
src/views/apps/customer-app/customer-assign.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2020-08-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-09-17 09:18:41
* @LastEditTime: 2020-09-17 11:44:10
-->
<template>
<div class="customer-assign-wrap">
......@@ -49,7 +49,7 @@
<el-button type="primary" @click="toAssign">批量分配会员</el-button>
</div>
<div class="table-body m-t-20">
<el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }" @selection-change="handleSelectionChange">
<el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }" @sort-change="sortChange" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="45"> </el-table-column>
<el-table-column width="25">
<template slot="header">
......@@ -76,13 +76,13 @@
</div>
</template>
</el-table-column>
<el-table-column prop="consumeTotal" label="消费总额" sortable show-overflow-tooltip>
<el-table-column prop="consumeTotal" label="消费总额" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">¥ {{ scope.row.consumeTotal }} {{ scope.row.consumeTotal == null && scope.row.consumeTotal != 0 ? '--' : '' }}</template>
</el-table-column>
<el-table-column prop="consumeTimes" label="消费次数" sortable>
<el-table-column prop="consumeTimes" label="消费次数" sortable="custom">
<template slot-scope="scope">{{ scope.row.consumeTimes || '0' }}</template>
</el-table-column>
<el-table-column prop="lastConsume" label="最近消费" sortable show-overflow-tooltip>
<el-table-column prop="lastConsume" label="最近消费" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-h-18">{{ scope.row.lastConsume | timeStampToYmd }} {{ !scope.row.lastConsume ? '--' : '' }}</div>
<div class="line-h-18">{{ scope.row.lastConsume | timeStampToHms }} {{ !scope.row.lastConsume ? '--' : '' }}</div>
......@@ -107,7 +107,7 @@
</div>
</div>
</div>
<customer-assign v-if="assignShow" :brand-id="brandId" :customer-assign-total="total" :clerk-id="clerkId" :search-params="searchInput" :edit-row="editRow" :choose-all="selectRadio" :depart-obj="storeObj" :multiple-data="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
<customer-assign v-if="assignShow" :store-brand-id="storeBrandId" :brand-id="brandId" :customer-assign-total="total" :clerk-id="clerkId" :search-params="searchInput" :edit-row="editRow" :choose-all="selectRadio" :depart-obj="storeObj" :multiple-data="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
</div>
</template>
<script>
......@@ -170,6 +170,8 @@ export default {
assignShow: false,
// 是否显示会员列表
showMember: false,
sortCode: '',
sortRule: '',
storeObj: {},
gicDataCopy: [],
navData: []
......@@ -185,6 +187,20 @@ export default {
},
methods: {
/**
* @description: 排序
* @param {Object} column
* @param {String} prop
* @param {String} order
* @author: 无尘
*/
sortChange(column, prop, order) {
const that = this;
that.sortCode = column.prop;
that.sortRule = column.order == 'ascending' ? 'asc' : 'desc';
that.currentPage = 1;
that.getTableList();
},
/**
* @description: 当前函数信息
* @author: 无尘
*/
......@@ -667,7 +683,9 @@ export default {
storeInfoId: that.storeObj.storeInfoId,
mainClerkId: that.clerkId,
brandId: that.storeBrandId,
search: that.searchInput
search: that.searchInput,
sortCode: that.sortCode,
sortRule: that.sortRule
};
getMemberList(para)
.then(res => {
......
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