Compare commits

..

No commits in common. '13e2e767badabac31c31b0381cd46069f2625b58' and '59fd5eda6af92855eb8a3eaf9fdc20123dc59724' have entirely different histories.

@ -200,65 +200,23 @@
</div> </div>
</Modal> </Modal>
</Row> <Page
</i-col> :total="total"
</Row> :current="pageNum"
<Table ref="table" :loading="loading" :columns="columns3" :data="data3" class="table-store" size="small" @on-row-dblclick="onDblClickRowLister"> :page-size="pageSize"
show-elevator
</Table> show-total
</Tab-pane> placement="top"
</Tabs> @on-change="handlePage"
class-name="ks-page"
<!-- 拒绝 --> ></Page>
<Modal
v-model="refuseIsShow"
:title="showStoreName"
:footer-hide="true"
width="600"
class-name="vertical-center-modal"
@on-ok="ok">
<div slot="header">
<p>审核不通过原因</p>
</div>
<div>
<i-input v-model="remark" type="textarea" :rows="4" placeholder="请填写审核不通过原因"></i-input>
</div>
<div style="margin-top:20px;text-align: center;">
<Button ghost type="primary" @click="refuse(rowData)"></Button>
</div>
</Modal>
<!-- 升级 -->
<Modal
v-model="passIsShow"
:title="showStoreName"
:footer-hide="true"
width="600"
class-name="vertical-center-modal"
@on-ok="ok">
<div slot="header">
<p style="text-align: center;">确认审核</p>
</div>
<div style="text-align:center;min-height:100px">
<span style="line-height:100px">确认通过审核吗?</span>
</div>
<div style="margin-top:20px;text-align: center;">
<Button @click="cancel(rowData)"></Button>
<Button style="margin-left:20px" type="primary" @click="confirm(rowData)"></Button>
</div>
</Modal>
<Page :total="total" :current="pageNum" :page-size="pageSize" show-elevator show-total
placement="top" @on-change="handlePage" class-name="ks-page"></Page>
</div> </div>
</template> </template>
<script> <script>
import zeroExtend from "../../services/customer/zeroExtend"; import zeroExtend from "../../services/customer/zeroExtend";
import staff from "../../services/staff/staff"; import staff from "../../services/staff/staff";
import { formatDate } from "../../utils/Common"; import CheckList from "../../services/recruit/CheckList";
import bulletinService from '../../services/recruit/Bulletin'
export default { export default {
name: "", name: "",
data() { data() {
@ -267,16 +225,16 @@
userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId, userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
searchShop: null, searchShop: null,
date: "", date: "",
companyId:null, companyId: 0,
refuseIsShow: false, refuseIsShow: false,
passIsShow: false, passIsShow: false,
showStoreName: '', showStoreName: "",
rowData: {}, rowData: {},
//list //list
companyList: [], companyList: [],
//list //list
organizationalList: [], organizationalList: [],
selectedStore: null, selectedStore: 0,
shopList: [], shopList: [],
loading: false, loading: false,
total: 0, total: 0,
@ -284,266 +242,267 @@
pageNum: 1, pageNum: 1,
columns1: [ columns1: [
{ {
title: '序号', title: "序号",
key: 'number', key: "number",
width: 60, width: 60,
render: (h, params) => { render: (h, params) => {
return h('span', params.index + (this.pageNum - 1) * this.pageSize + 1); return h(
"span",
params.index + (this.pageNum - 1) * this.pageSize + 1
);
} }
}, },
{ {
title: '推广员姓名', title: "推广员姓名",
width:120, key: "shopName",
render: (h, params) => { width: 120
return h('span', params.row.promoterInfo.name);
}
}, },
{ {
title: '推广员手机号', title: "推广员手机号",
width:120, key: "shopPhone",
render: (h, params) => { width: 120
return h('span', params.row.promoterInfo.phone);
}
}, },
{ {
title: '零售公司', title: "身份证号码",
key: 'companyName', key: "shopCode",
width:150, width: 160
render: (h, params) => {
return h('span', params.row.organizational.name);
}
}, },
{ {
title: '零售公司编号', title: "零售公司",
key: 'companyCode', key: "companyName",
width:80, width: 150
render: (h, params) => {
return h('span', params.row.organizational.code);
}
}, },
{ {
title: '店铺', title: "零售公司编号",
key: 'storeName', key: "companyCode",
width:160, width: 80
render: (h, params) => {
return h('span', params.row.store.name);
}
}, },
{ {
title: '店铺编号', title: "店铺",
key: 'storeNO', key: "storeName",
width:80, width: 160
render: (h, params) => {
return h('span', params.row.store.code);
}
}, },
{ {
title: '发展人', title: "店铺编号",
key: 'fissionNum', key: "storeNO",
width:80, width: 80
render: (h, params) => {
return h('span', params.row.fissionUser.name);
}
}, },
{ {
title: '加入时间', title: "发展人",
key: 'joinTime', key: "fissionNum",
width:120, width: 80
render: (h, params) => { },
return h('span', formatDate(params.row.joinTime)); {
} title: "提交时间",
key: "submitDate",
width: 120
}, },
{ {
title: '操作', title: "操作",
slot: 'action', slot: "action",
width: 250 width: 250
} }
], ],
data1: [ data1: [
{
shopName: "张继军",
shopPhone: "13819890111",
shopCode: "110001199010018171",
bankCard: "62210199918822121",
companyName: "上海零售公司",
companyCode: "601",
storeName: "上海波司登",
storeNO: "1001",
fissionNum: "王超看",
submitDate: "2020/05/21"
}
], ],
columns2: [ columns2: [
{ {
title: '序号', title: "序号",
key: 'number', key: "number",
width: 60, width: 60,
render: (h, params) => { render: (h, params) => {
return h('span', params.index + (this.pageNum - 1) * this.pageSize + 1); return h(
"span",
params.index + (this.pageNum - 1) * this.pageSize + 1
);
} }
}, },
{ {
title: '推广员姓名', title: "推广员姓名",
key: 'shopName', key: "shopName",
width: 120 width: 120
}, },
{ {
title: '推广员手机号', title: "推广员手机号",
key: 'shopPhone', key: "shopPhone",
width: 120 width: 120
}, },
{ {
title: '身份证号码', title: "身份证号码",
key: 'shopCode', key: "shopCode",
width: 160 width: 160
}, },
{ {
title: '零售公司', title: "零售公司",
key: 'companyName', key: "companyName",
width: 150 width: 150
}, },
{ {
title: '零售公司编号', title: "零售公司编号",
key: 'companyCode', key: "companyCode",
width: 80 width: 80
}, },
{ {
title: '店铺', title: "店铺",
key: 'storeName', key: "storeName",
width: 160 width: 160
}, },
{ {
title: '店铺编号', title: "店铺编号",
key: 'storeNO', key: "storeNO",
width: 80 width: 80
}, },
{ {
title: '导购', title: "导购",
key: 'salesName', key: "salesName",
width: 80 width: 80
}, },
{ {
title: '提交时间', title: "提交时间",
key: 'submitDate', key: "submitDate",
width: 120 width: 120
}, },
{ {
title: '审核时间', title: "审核时间",
key: 'checkDate', key: "checkDate",
width: 120 width: 120
}, }
], ],
data2: [ data2: [
{ {
shopName:'张继军', shopName: "张继军",
shopPhone:'13819890111', shopPhone: "13819890111",
shopCode:'110001199010018171', shopCode: "110001199010018171",
bankCard:'62210199918822121', bankCard: "62210199918822121",
companyName:'上海零售公司', companyName: "上海零售公司",
companyCode:'601', companyCode: "601",
storeName:'上海波司登', storeName: "上海波司登",
storeNO:'1001', storeNO: "1001",
salesName:'王超看', salesName: "王超看",
submitDate:'2020/05/21', submitDate: "2020/05/21",
checkDate:'2020/05/21', checkDate: "2020/05/21"
} }
], ],
columns3: [ columns3: [
{ {
title: '序号', title: "序号",
key: 'number', key: "number",
width: 60, width: 60,
render: (h, params) => { render: (h, params) => {
return h('span', params.index + (this.pageNum - 1) * this.pageSize + 1); return h(
"span",
params.index + (this.pageNum - 1) * this.pageSize + 1
);
} }
}, },
{ {
title: '推广员姓名', title: "推广员姓名",
key: 'shopName', key: "shopName",
width: 120 width: 120
}, },
{ {
title: '推广员手机号', title: "推广员手机号",
key: 'shopPhone', key: "shopPhone",
width: 120 width: 120
}, },
{ {
title: '身份证号码', title: "身份证号码",
key: 'shopCode', key: "shopCode",
width: 160 width: 160
}, },
{ {
title: '零售公司', title: "零售公司",
key: 'companyName', key: "companyName",
width: 150 width: 150
}, },
{ {
title: '零售公司编号', title: "零售公司编号",
key: 'companyCode', key: "companyCode",
width: 80 width: 80
}, },
{ {
title: '店铺', title: "店铺",
key: 'storeName', key: "storeName",
width: 160 width: 160
}, },
{ {
title: '店铺编号', title: "店铺编号",
key: 'storeNO', key: "storeNO",
width: 80 width: 80
}, },
{ {
title: '导购', title: "导购",
key: 'salesName', key: "salesName",
width: 80 width: 80
}, },
{ {
title: '提交时间', title: "提交时间",
key: 'submitDate', key: "submitDate",
width: 120 width: 120
}, },
{ {
title: '审核时间', title: "审核时间",
key: 'checkDate', key: "checkDate",
width: 120 width: 120
}, },
{ {
title: '审核不通过原因', title: "审核不通过原因",
key: 'refuseInfo', key: "refuseInfo",
width: 120 width: 120
}, }
], ],
data3: [ data3: [
{ {
shopName:'张继军', shopName: "张继军",
shopPhone:'13819890111', shopPhone: "13819890111",
shopCode:'110001199010018171', shopCode: "110001199010018171",
bankCard:'62210199918822121', bankCard: "62210199918822121",
companyName:'上海零售公司', companyName: "上海零售公司",
companyCode:'601', companyCode: "601",
storeName:'上海波司登', storeName: "上海波司登",
storeNO:'1001', storeNO: "1001",
salesName:'王超看', salesName: "王超看",
submitDate:'2020/05/21', submitDate: "2020/05/21",
checkDate:'2020/05/21', checkDate: "2020/05/21",
refuseInfo:'信息不完善' refuseInfo: "信息不完善"
} }
], ],
selectDate: [], selectDate: []
store:null, };
remark:null
}
}, },
mounted: function() { mounted: function() {
// let startDate = this.$moment().format("YYYY-MM-DD"); let startDate = this.$moment().format("YYYY-MM-DD");
// let endDate = this.$moment().format("YYYY-MM-DD"); let endDate = this.$moment().format("YYYY-MM-DD");
// this.selectDate.push(startDate); this.selectDate.push(startDate);
// this.selectDate.push(endDate); this.selectDate.push(endDate);
this.getSelectList(); this.getSelectList();
this.downShopData(); this.downShopData();
this.getRecruitList(); this.getCheckList();
}, },
methods: { methods: {
onChangeDateLister(date) { onChangeDateLister(date) {
console.log(date)
this.selectDate = date; this.selectDate = date;
}, },
/**基础数据区域list、零售公司list、客户list*/ /**基础数据区域list、零售公司list、客户list*/
getSelectList: function() { getSelectList: function() {
let that = this; let that = this;
let request = { let request = {
userId: this.userId, userId: this.userId
}; };
zeroExtend.getSelectListRequest(request, function(data) { zeroExtend.getSelectListRequest(request, function(data) {
if (data.data.code !== "0000") { if (data.data.code !== "0000") {
@ -552,7 +511,9 @@
data = data.data.results; data = data.data.results;
if (data) { if (data) {
that.organizationalList = data; that.organizationalList = data;
that.companyList = that.organizationalList.filter(item => item.level === 2); that.companyList = that.organizationalList.filter(
item => item.level === 2
);
} }
// //
that.insertAllOption(); that.insertAllOption();
@ -561,10 +522,10 @@
// //
insertAllOption: function() { insertAllOption: function() {
if (this.companyList.length === 0 || this.companyList[0].id !== 0) { if (this.companyList.length === 0 || this.companyList[0].id !== 0) {
this.companyList.splice(0, 0, {"id": 0, "name": "全部"}); this.companyList.splice(0, 0, { id: 0, name: "全部" });
} }
if (this.shopList.length === 0 || this.shopList[0].id !== 0) { if (this.shopList.length === 0 || this.shopList[0].id !== 0) {
this.shopList.splice(0, 0, {"id": 0, "name": "全部"}); this.shopList.splice(0, 0, { id: 0, name: "全部" });
} }
}, },
// //
@ -579,17 +540,21 @@
if (companyId === 0) { if (companyId === 0) {
// //
} else { } else {
this.customerList = this.organizationalList.filter(item => item.parentId === companyId && item.level === 3); this.customerList = this.organizationalList.filter(
item => item.parentId === companyId && item.level === 3
);
this.insertAllOption(); this.insertAllOption();
} }
customerIds = this.customerList.map(item => item.id); customerIds = this.customerList.map(item => item.id);
let request = let request = {
{userId: that.userId, customerIds: JSON.stringify(customerIds)}; userId: that.userId,
customerIds: JSON.stringify(customerIds)
};
staff.downShopData(request, function(data) { staff.downShopData(request, function(data) {
data = data.data.results; data = data.data.results;
if (data) { if (data) {
that.shopList = [{"id": 0, "name": "全部"}]; that.shopList = [{ id: 0, name: "全部" }];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
let entity = data[i]; let entity = data[i];
if (entity) { if (entity) {
@ -597,7 +562,7 @@
} }
} }
} }
}) });
}, },
// //
companySelect: function() { companySelect: function() {
@ -610,34 +575,40 @@
}, },
searchCustomerDataBtnClick: function() { searchCustomerDataBtnClick: function() {
this.pageNum = 1; this.pageNum = 1;
this.getRecruitList(); this.getCheckList();
}, },
// row // row
onDblClickRowLister: function(row) { onDblClickRowLister: function(row) {
this.$router.push({path:'/shop/increase/manager/staff',query:{storeId:row.id}}); this.$router.push({
path: "/shop/increase/manager/staff",
query: { storeId: row.id }
});
}, },
// //
handlePage: function(value) { handlePage: function(value) {
this.pageNum = value; this.pageNum = value;
this.getRecruitList(); this.getCheckList();
}, },
getRecruitList() { getCheckList() {
let that = this; let that = this;
this.loading = true; this.loading = true;
let request = { let request = {
status:that.tabIndex+2, userId: that.userId,
store: null,
companyId: null,
storeId: null,
pageNum: that.pageNum, pageNum: that.pageNum,
storeId:that.selectedStore, status: null
companyId: that.companyId,
store:that.searchShop,
start:that.selectDate[0] === ""||that.selectDate.length==0?null:that.selectDate[0],
end:that.selectDate[1] === ""||that.selectDate.length==0?null:that.selectDate[1],
}; };
bulletinService.getRecruitList(request, function (data) { CheckList.getList(
request,
data => {
data = data.data;
that.loading = false; that.loading = false;
if (data.data.code == "0000") { if (data.code == "0000") {
that.data1 = []; that.data1 = [];
let datas = data.data.results; let datas = data.results;
// //
if (datas.total == null) { if (datas.total == null) {
that.total = 0; that.total = 0;
@ -647,68 +618,11 @@
if (datas.list == null) { if (datas.list == null) {
datas.list = []; datas.list = [];
} }
that.data1 = datas.list;
that.data1 = datas.records;
}
}, function (error) {
that.loading = false;
});
},
onTabClick(e){
this.tabIndex = e;
this.pageNum= 1;
this.storeId=null;
this.companyId= null;
this.searchShop=null;
this.selectDate=[];
},
ok() {
this.refuseIsShow = false;
},
//
refuse(rData) {
let param = {
fissionPromoterId:rData.id,
status:4,
remark:this.remark
}
this.doRecruitSave(param);
this.refuseIsShow = false;
},
refuseShow(index) {
this.refuseIsShow = true;
this.rowData = index;
},
passShow(index) {
this.passIsShow = true;
this.rowData = index;
},
cancel(){
this.passIsShow = false;
},
//
confirm(rData) {
let param = {
fissionPromoterId:rData.id,
status:3
} }
this.doRecruitSave(param);
this.passIsShow = false;
}, },
// function(error) {
doRecruitSave(request){
let that = this;
bulletinService.recruitSave(request, function (data) {
that.loading = false;
if (data.data.code == "0000") {
that.$Message.info("审核通过");
}else{
that.$Message.error("系统异常");
}
}, function (error) {
that.loading = false; that.loading = false;
});
}
} }
); );
}, },

@ -5,9 +5,10 @@
<Row class="row-style"> <Row class="row-style">
<i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop"/> <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop"/>
<span class="search-span">选择日期</span> <span class="search-span">选择日期</span>
<DatePicker :value="selectDate" type="daterange" split-panels placeholder="请选择日期" <DatePicker v-model="date" class="left-15 date-picker" type="date"
@on-change="onChangeDateLister" placement="bottom-start"
class="date-picker"></DatePicker> split-panels placeholder="请选择日期">
</DatePicker>
<span class="search-span">零售公司</span> <span class="search-span">零售公司</span>
<Select v-model="companyId" filterable class="search-select" @on-change="companySelect"> <Select v-model="companyId" filterable class="search-select" @on-change="companySelect">
<Option v-for="(item,index) in companyList" :value="item.id" :key="index + item.id">{{ item.name }}</Option> <Option v-for="(item,index) in companyList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
@ -67,8 +68,6 @@
import recruitTable from "./recruitTable"; import recruitTable from "./recruitTable";
import zeroExtend from "../../services/customer/zeroExtend"; import zeroExtend from "../../services/customer/zeroExtend";
import staff from "../../services/staff/staff"; import staff from "../../services/staff/staff";
import { formatDate } from "../../utils/Common";
import bulletinService from '../../services/recruit/Bulletin'
export default { export default {
name: "", name: "",
components: { components: {
@ -80,7 +79,7 @@
userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId, userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
searchShop:null, searchShop:null,
date:"", date:"",
companyId:null, companyId:0,
isShow: false, isShow: false,
showStoreName: '', showStoreName: '',
showrecruit:false, showrecruit:false,
@ -88,7 +87,7 @@
rowData:{}, rowData:{},
//list //list
companyList: [], companyList: [],
selectedStore: null, selectedStore: 0,
shopList: [], shopList: [],
loading:false, loading:false,
//list //list
@ -108,18 +107,12 @@
{ {
title: '推广员姓名', title: '推广员姓名',
key: 'shopName', key: 'shopName',
width:120, width:120
render: (h, params) => {
return h('span', params.row.promoterInfo.name);
}
}, },
{ {
title: '推广员手机号', title: '推广员手机号',
key: 'shopPhone', key: 'shopPhone',
width:120, width:120
render: (h, params) => {
return h('span', params.row.promoterInfo.phone);
}
}, },
{ {
title: '等级', title: '等级',
@ -149,43 +142,28 @@
{ {
title: '零售公司', title: '零售公司',
key: 'companyName', key: 'companyName',
width:150, width:150
render: (h, params) => {
return h('span', params.row.organizational.name);
}
}, },
{ {
title: '店铺', title: '店铺',
key: 'storeName', key: 'storeName',
width:160, width:160
render: (h, params) => {
return h('span', params.row.store.name);
}
}, },
{ {
title: '店铺编号', title: '店铺编号',
key: 'storeNO', key: 'storeNO',
width:80, width:80
render: (h, params) => {
return h('span', params.row.store.code);
}
}, },
{ {
title: '发展人', title: '发展人',
key: 'fissionNum', key: 'fissionNum',
width:80, width:80
render: (h, params) => {
return h('span', params.row.fissionUser.name);
}
}, },
{ {
title: '加入时间', title: '加入时间',
key: 'submitDate', key: 'submitDate',
width:120, width:120
render: (h, params) => {
return h('span', formatDate(params.row.joinTime));
}
}, },
{ {
title: '操作', title: '操作',
@ -229,21 +207,28 @@
} }
], ],
data1:[ data1:[
{
shopName:'张继军',
shopPhone:'13819890111',
level:'二级',
managerNumb:'12',
companyName:'上海零售公司',
extensionNumb:'60',
clientNumb:'20',
performance:'21',
storeName:'上海波司登',
storeNO:'1001',
fissionNum:'王超看',
submitDate:'2020/05/21'
}
], ],
selectDate: [],
} }
}, },
mounted: function () { mounted: function () {
this.getSelectList(); this.getSelectList();
this.downShopData(); this.downShopData();
this.getPromoterList();
}, },
methods: { methods: {
onChangeDateLister(date) {
console.log(date)
this.selectDate = date;
},
/**基础数据区域list、零售公司list、客户list*/ /**基础数据区域list、零售公司list、客户list*/
getSelectList: function () { getSelectList: function () {
let that = this; let that = this;
@ -326,18 +311,21 @@
this.pageNum = value; this.pageNum = value;
this.getCheckList(); this.getCheckList();
}, },
getPromoterList() { getCheckList() {
let that = this; let that = this;
this.loading = true; this.loading = true;
let request = { let request = {
userId: that.userId,
regionId: that.changeData(that.regionId),
companyId: that.changeData(that.companyId),
storeId: that.changeData(that.selectedStore),
pageNum: that.pageNum, pageNum: that.pageNum,
storeId:that.selectedStore, pageSize: that.pageSize,
companyId: that.companyId, code: that.searchShop
store:that.searchShop,
start:that.selectDate[0] === ""||that.selectDate.length==0?null:that.selectDate[0],
end:that.selectDate[1] === ""||that.selectDate.length==0?null:that.selectDate[1],
}; };
bulletinService.promoterList(request, function (data) { http.checkList(request, function (data) {
data = data.data;
that.loading = false; that.loading = false;
if (data.code == "0000") { if (data.code == "0000") {
that.data1 = []; that.data1 = [];
@ -351,7 +339,7 @@
if (datas.list == null) { if (datas.list == null) {
datas.list = []; datas.list = [];
} }
that.data1 = datas.records; that.data1 = datas.list;
} }
}, function (error) { }, function (error) {
that.loading = false; that.loading = false;
@ -382,11 +370,6 @@
}, },
} }
} }
// : /fission/promoter/list
// : /fission/promoter/detail
// : /fission/promoter/upgrade
//
</script> </script>
<style scoped> <style scoped>

@ -1,41 +1,15 @@
import http from '../CommonHttp' import http from '../CommonHttp'
import axios from 'axios' import axios from 'axios'
//招募令
export function getDetail(params, call) { export function getDetail(params, call) {
return http.get('/fission/detail', params).then(call) return http.get('/fission/detail', params).then(call)
} }
//招募令保存
export function dosave(params, call) { export function dosave(params, call) {
return http.post('/fission/save', params).then(call) return http.post('/fission/save', params).then(call)
} }
//招募审核列表
export function getRecruitList(params, call) {
return http.get('/fission/recruit/list', params).then(call)
}
// 招募审核保存
export function recruitSave(params, call) {
return http.post('/fission/recruit/save', params).then(call)
}
//推广员管理 列表
export function promoterList(params, call) {
return http.get('/fission/promoter/list', params).then(call)
}
//推广员管理 查看看上下级
export function promoterDetail(params, call) {
return http.post('/fission/promoter/detail', params).then(call)
}
//推广员管理 升级
export function promoterUpgrade(params, call) {
return http.post('/fission/promoter/upgrade', params).then(call)
}
export default { export default {
getDetail, getDetail,
dosave, dosave
getRecruitList,
recruitSave,
promoterList,
promoterDetail,
promoterUpgrade
} }

@ -30,7 +30,7 @@ module.exports = {
/* 使用代理 后台接口路径 */ /* 使用代理 后台接口路径 */
// proxy: 'http://192.168.1.123:8312/' // proxy: 'http://192.168.1.123:8312/'
// proxy: 'http://192.168.31.177:8312/' // proxy: 'http://192.168.31.177:8312/'
proxy: 'http://111.231.218.44:8080/', proxy: "http://localhost:8080/",
// proxy: 'http://jdxdev.vipgz4.idcfengye.com/' // proxy: 'http://jdxdev.vipgz4.idcfengye.com/'
}, },
}; };

Loading…
Cancel
Save