Skip to content

H
haoban-3
Commit 54fdde7f by 陈羽
Options

update: 门店绑定回显

parent 140ae901
Showing with 58 additions and 41 deletions
src/components/common/gic-select-group-auth.vue
......@@ -60,6 +60,7 @@
import { getRequest } from '@/api/api';
import errMsg from '@/common/js/error';
import { _debounce } from '@/common/js/public';
// import dayLoginChartVue from '../login-data/day-login-chart.vue';
export default {
name: 'gic-select-group',
props: {
......@@ -102,7 +103,7 @@ export default {
children: 'children',
label: 'storeGroupName'
},
checkedKeys: this.selectData.length ? this.selectData.map(ele => ele.departmentId) : []
checkedKeys: this.checkedList.length ? this.checkedList.map(ele => ele.relationId) : []
};
},
......@@ -201,6 +202,7 @@ export default {
}
return father.parentRelationId == 0; //返回第一层
});
console.log(tree);
return tree;
},
......@@ -252,6 +254,12 @@ export default {
that.groupIds = [];
}
},
checkedList: function(newData, oldData) {
let that = this;
if (!!newData.length) {
that.checkedKeys = that.checkedList.map(ele => ele.relationId);
}
},
searchSelect(val) {
this.$refs.groupTree.filter(val);
},
......
src/components/review/salesleads-task-info.vue
......@@ -16,7 +16,7 @@
<el-form :model="form" :rules="rules" ref="form" label-width="120px" class="demo-form">
<el-form-item label="完成时间" prop="overdueTime"> {{ form.finishTime | formatTimeStamp }}</el-form-item>
<el-form-item label="完成方式" prop="touchTypes"> {{ form.touchFinishTypeName }}</el-form-item>
<el-form-item label="备注" prop="finishRemark"> {{ form.finishRemark }} </el-form-item>
<el-form-item label="备注" prop="finishRemark"> {{ form.finishRemark || '' }} </el-form-item>
<el-form-item label="图片" prop="imgUrl">
<template v-for="item in form.remarkImgUrl">
<el-popover placement="right-start" :open-delay="200" width="300" trigger="hover" :key="item">
......
src/views/salesleads/storeDetail.vue
......@@ -18,7 +18,7 @@
<div role="alert" class="el-alert el-alert--info flex flex-align-start ">
<i class="el-alert__icon el-icon-warning font-12 color-2f54eb"></i>
<div class="el-alert__content">
<span class="el-alert__title color-303133 font-13">筛选时间：2020-12-31至2021-12-31</span>
<span class="el-alert__title color-303133 font-13">筛选时间：{{ dateStart | timeStampToYmd }} 至 {{ dateEnd | timeStampToYmd }}</span>
</div>
</div>
<el-popover placement="bottom-start" width="550" trigger="click" popper-class="salesleads-popover">
......@@ -42,7 +42,7 @@
</el-popover>
</div>
<div class="table-condition-search m-t-20">
<el-select class="w-103" v-model="pageParams.taskStatus" slot="prepend" placeholder="所有完成情况" @change="reFetch">
<el-select class="w-103" v-model="pageParams.finishOverStatus" slot="prepend" placeholder="所有完成情况" @change="reFetch">
<el-option :label="item.text" :value="item.id" v-for="item in filterOpts" :key="'filter' + item.id"></el-option>
</el-select>
</div>
......@@ -54,10 +54,10 @@
<el-table-column prop="" label="指派对象" width="176">
<template slot-scope="scope">
<div class="flex flex-align-center personal-info">
<el-image :src="scope.row.clerkImgUrl || headDefault" fit="cover"></el-image>
<el-image :src="scope.row.executeClerkClerkImgUrl || headDefault" fit="cover"></el-image>
<div>
<p class="color-303133 line-20">{{ scope.row.clerkName || '--' }}</p>
<p class="color-909399 line-20">{{ scope.row.clerkPhoneNum || '--' }}</p>
<p class="color-303133 line-20">{{ scope.row.executeClerkName || '--' }}</p>
<p class="color-909399 line-20">{{ scope.row.executeClerkPhoneNum || '--' }}</p>
</div>
</div>
</template>
......@@ -73,22 +73,22 @@
</div>
</template>
</el-table-column>
<el-table-column prop="" label="创建时间" width="114">
<el-table-column prop="" label="创建时间">
<template slot-scope="scope">
<div class="color-606266 line-20">{{ scope.row.createTime | timeStampToYmd }}</div>
<div class="color-606266 line-20">{{ scope.row.createTime | timeStampToHms }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="逾期期限" width="114">
<el-table-column prop="" label="逾期期限">
<template slot-scope="scope">
<div class="color-606266 line-20">{{ scope.row.overdueTime | timeStampToYmd }}</div>
<div class="color-606266 line-20">{{ scope.row.overdueTime | timeStampToHms }}</div>
</template>
</el-table-column>
<el-table-column prop="" label="逾期情况" width="102">
<el-table-column prop="" label="逾期情况">
<template slot-scope="scope"><span class="point" :style="'background:' + overdueStyle[scope.row.overdueStatus] + ';'"></span>{{ scope.row.overdueStatus === 1 ? '未逾期' : scope.row.overdueStatus === 2 ? '已逾期' : '' }}</template>
</el-table-column>
<el-table-column prop="" label="完成状态" width="102">
<el-table-column prop="" label="完成状态">
<template slot-scope="scope"><span class="point" :style="'background:' + taskStyle[scope.row.taskStatus] + ';'"></span>{{ scope.row.taskStatus === 1 ? '未完成' : scope.row.taskStatus === 2 ? '已完成' : '' }}</template>
</el-table-column>
<el-table-column prop="" label="完成详情">
......@@ -104,7 +104,7 @@
</el-table-column> -->
</el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParams.pageNum" :page-sizes="[20, 40, 60, 80]" :page-size="pageParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
</div>
</div>
<salesleads-taskinfo :item="confirmDetail" v-if="confirmDetailShow" @close="close"></salesleads-taskinfo>
......@@ -130,6 +130,8 @@ export default {
headDefault,
bgHeight: window.screen.availHeight - 298 + 'px',
loading: false,
dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365,
dateEnd: new Date(),
// 面包屑参数
navpath: [
{
......@@ -143,30 +145,30 @@ export default {
],
pageParams: {
storeId: this.$route.params.id,
finishOverStatus: '',
pageNum: 1,
pageSize: 20,
overdueStatus: 1
pageSize: 20
},
filterOpts: [],
// 分页参数
total: 0,
tableData: [
{
taskId: '12', // 任务id
taskTitle: 'kasjhdk', // 任务名称
clerkId: 'sdfsdf', // 导购id
clerkName: 'sdfsdf', // 导购名字
clerkImgUrl: '', // 导购头像
clerkPhoneNum: '13634565656', // 导购手机号
memberId: 'sdfsdf', // 会员id
memberName: 'sdfsdf', // 会员名称
memberImgUrl: '', // 会员头像
memberCardNum: '3332345665654332039', // 会员卡号
createTime: '2021-03-24T15:19:00', // 创建时间
overdueTime: '2021-03-24T15:19:00', // 逾期时间
overdueStatus: 1, // 逾期状态
taskStatus: 2 // 完成状态
}
// {
// taskId: '', // 任务id
// taskTitle: '', // 任务标题
// executeClerkId: '', // 指派导购id
// executeClerkName: '', // 指派导购名字
// executeClerkPhoneNum: '', // 指派导购手机号
// executeClerkClerkImgUrl: null, // 指派导购头像
// memberId: '', // 会员id
// memberName: '', // 会员名字
// memberImgUrl: '', // 会员头像
// memberCardNum: '', // 会员卡号
// createTime: null, // 创建时间
// overdueTime: null, // 逾期时间
// overdueStatus: null, // 逾期状态(1:逾期,2:未逾期)
// taskStatus: null // 完成状态(1:未完成,2:完成)
// }
],
overdueStyle: ['none', '#2F54EB', '#F5222D'],
taskStyle: ['none', '#F5222D', '#33AF4A'],
......@@ -221,18 +223,18 @@ export default {
*/
getTableList(val) {
const that = this;
let para = { ...that.pageParams };
if (para.date) {
para.startTime = para.date[0];
para.endTime = para.date[1];
delete para.date;
}
let para = {
...that.pageParams,
enterpriseId: localStorage.getItem('userInfoBrandId'),
storeId: 'ff80808175acbdbd0175aff217960011'
// (ecmPlanId )
};
getRequest('/haoban-task-manage-web/market/clue/web/task-info-list', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
that.tableData = resData.result.list || [];
that.total = resData.result.total;
that.total = resData.result.pageInfo.total || 0;
} else {
errMsg.errorMsg(resData);
}
......@@ -251,6 +253,7 @@ export default {
let resData = res.data;
if (resData.errorCode == 1 && resData.result) {
that.filterOpts = resData.result;
that.pageParams.finishOverStatus = '0';
} else {
errMsg.errorMsg(resData);
}
......@@ -267,8 +270,8 @@ export default {
const that = this;
that.loading = true;
const para = {
enterpriseId: 'ff8080815dacd3a2015dacd3ef5c0000',
taskId: 'b72417e8bb89481bb841c1f02e47602b'
enterpriseId: localStorage.getItem('userInfoBrandId'),
taskId: item.taskId
};
getRequest('/haoban-task-manage-web/market/clue/web/task-finish-info', para)
.then(res => {
......@@ -277,6 +280,8 @@ export default {
that.confirmDetail = { ...resData.result };
if (resData.result.remarkImgUrl) {
that.confirmDetail.remarkImgUrl = resData.result.remarkImgUrl.split(',');
} else {
that.confirmDetail.remarkImgUrl = [];
}
this.confirmDetailShow = true;
} else {
......
src/views/salesleads/storeList.vue
......@@ -18,7 +18,7 @@
<div role="alert" class="el-alert el-alert--info flex flex-align-start ">
<i class="el-alert__icon el-icon-warning font-12 color-2f54eb"></i>
<div class="el-alert__content">
<span class="el-alert__title color-303133 font-13">仅展示近一年数据，数据截取时间：2020-12-31至2021-12-31</span>
<span class="el-alert__title color-303133 font-13">仅展示近一年数据，数据截取时间：{{ dateStart | timeStampToYmd }} 至 {{ dateEnd | timeStampToYmd }}</span>
</div>
</div>
<el-popover placement="bottom-start" width="550" trigger="click" popper-class="salesleads-popover">
......@@ -103,6 +103,8 @@ export default {
data() {
return {
bgHeight: window.screen.availHeight - 298 + 'px',
dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365,
dateEnd: new Date(),
// 面包屑参数
navpath: [
{
......
src/views/salesleads/taskList.vue
......@@ -18,7 +18,7 @@
<div role="alert" class="el-alert el-alert--info flex flex-align-start ">
<i class="el-alert__icon el-icon-warning font-12 color-2f54eb"></i>
<div class="el-alert__content">
<span class="el-alert__title color-303133 font-13">仅展示近一年数据，数据截取时间：2020-12-31至2021-12-31</span>
<span class="el-alert__title color-303133 font-13">仅展示近一年数据，数据截取时间：{{ dateStart | timeStampToYmd }} 至 {{ dateEnd | timeStampToYmd }}</span>
</div>
</div>
<el-popover placement="bottom-start" width="550" trigger="click" popper-class="salesleads-popover">
......@@ -96,6 +96,8 @@ export default {
data() {
return {
bgHeight: window.screen.availHeight - 298 + 'px',
dateStart: new Date().getTime() - 3600 * 1000 * 24 * 365,
dateEnd: new Date(),
// 面包屑参数
navpath: [
{
......
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