Skip to content

S
SuperMan
Commit 57abcef1 authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent ba9fbe8f
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 205 deletions
src/components/SalesModule/customerTransfer.vue
View file @ 57abcef1
<template> <template>
<div class="customerTransfer flexOne"> <div class="customerTransfer flexOne">
<div class="query-box" style="border: none;"> <div class="query-box" style="border: none;">
<ul style="overflow: initial!important"> <ul>
<li> <li>
<span> <el-form label-width="100px" style="padding-top:8px;">
<em>{{$t('visaT.sale')}}</em> <el-row :gutter="24">
</span> <template v-if="userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49||userInfo.EmployeeId==718">
<el-select v-model="msg.CreateBy" class="h34 w150" filterable remote reserve-keyword <el-col :span="6">
:placeholder="$t('pub.PleaseKeyWords')" :remote-method="GetClientAccountListByKeyWord"> <el-form-item :label="$t('system.table_company')">
<el-select filterable v-model="msg.RB_Branch_id"
@change="msg.RB_Department_Id=null,msg.CreateBy='',getDepartment" class>
<template v-if="userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for="item in CompanyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option>
</template>
<template v-else>
<el-option v-for="item in CompanyList" v-if="item.Id==36||item.Id==1214" :label="item.BName"
:value="item.Id" :key="item.Id">
</el-option>
</template>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<!--class="h34 w150"-->
<el-form-item :label="$t('admin.admin_Department')">
<treeselect class="w200 fl" style="height:34px !important;margin-top: 5px !important"
:options="departmentList" v-model="msg.RB_Department_Id" :label="$t('pub.unlimitedSel')"
:normalizer="normalizer" @select="changeDepart" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('visaT.sale')">
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.PleaseKeyWords')" clearable>
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in employeeList" :label="item.name" :value="item.empId" :key="item.empId"> <el-option v-for="item in employeeList" :label="item.name" :value="item.empId" :key="item.empId">
<div>
<span>{{`${item.name}`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.isLeave==1">{{$t('pub.noJobSel')}}</el-tag>
</span>
</div>
</el-option> </el-option>
</el-select> </el-select>
</li> </el-form-item>
<li> </el-col>
<span> <el-col :span="6">
<em>{{$t('salesModule.keyWords')}}</em> <el-form-item :label="$t('salesModule.keyWords')">
</span> <el-input v-model="msg.CustomerName" :placeholder="$t('salesModule.InputPhone')" style="width:215px;">
<el-input class="h34" v-model="msg.CustomerName" :placeholder="$t('salesModule.InputPhone')"></el-input> </el-input>
</li> </el-form-item>
<li> </el-col>
<span> <el-col :span="6">
<em>{{$t('salesModule.Belongbrand')}}</em> <el-form-item :label="$t('salesModule.Belongbrand')">
</span> <el-select filterable class='h34 multiple_input' v-model='msg.Brand'
<el-select filterable class='h34 multiple_input' v-model='msg.Brand' :placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for='item in CustomerBrandList' :label='item.name' :value='item.id' :key='item.id'> <el-option v-for='item in CustomerBrandList' :label='item.name' :value='item.id' :key='item.id'>
</el-option> </el-option>
</el-select> </el-select>
</li> </el-form-item>
<li> </el-col>
<span> <el-col :span="6">
<em>{{$t('objFill.v101.Rest.guanlianztai')}}</em> <el-form-item :label="$t('objFill.v101.Rest.guanlianztai')">
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus' <el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option> <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
<el-option :label="$t('pub.normalSel')" :value="1"></el-option> <el-option :label="$t('pub.normalSel')" :value="1"></el-option>
<el-option :label="$t('objFill.v102.shifang')" :value="2"></el-option> <el-option :label="$t('objFill.v102.shifang')" :value="2"></el-option>
</el-select> </el-select>
</li> </el-form-item>
<li> </el-col>
<span> <el-col :span="6">
<em>{{$t('salesModule.CustomerStatus')}}</em> <el-form-item :label="$t('salesModule.CustomerStatus')">
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus' <el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option> <el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
...@@ -58,74 +77,61 @@ ...@@ -58,74 +77,61 @@
<el-option :label="$t('salesModule.HasRefused')" :value="3"></el-option> <el-option :label="$t('salesModule.HasRefused')" :value="3"></el-option>
<el-option :label="$t('objFill.v101.activity.heimindan')" :value="4"></el-option> <el-option :label="$t('objFill.v101.activity.heimindan')" :value="4"></el-option>
</el-select> </el-select>
</li> </el-form-item>
<li> </el-col>
<span> <el-col :span="6">
<em>{{$t('objFill.v101.Rest.shifouyichan')}}</em> <el-form-item :label="$t('objFill.v101.Rest.shifouyichan')">
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.ExceptionCount' <el-select filterable class='h34 multiple_input' v-model='msg.ExceptionCount'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option :label="$t('pub.yes')" :value="1"></el-option> <el-option :label="$t('pub.yes')" :value="1"></el-option>
<el-option :label="$t('pub.no')" :value="2"></el-option> <el-option :label="$t('pub.no')" :value="2"></el-option>
</el-select> </el-select>
</li> </el-form-item>
<li> </el-col>
<span>
<em class="fl" style="margin-top: 10px !important">{{$t('admin.admin_Department')}}</em> <el-col :span="6">
<treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList" v-model="DepartmentId" <el-form-item :label="$t('objFill.v101.Rest.tehuizankehu')">
style="height: 25px;" :placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" /> <el-select filterable class='h34 multiple_input' v-model='msg.fanYong'
</span> :placeholder="$t('pub.pleaseSel')">
</li>
<li>
<span>
<em>
{{$t('objFill.v101.Rest.tehuizankehu')}}
</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.fanYong' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option :label="$t('pub.yes')" :value="1"></el-option> <el-option :label="$t('pub.yes')" :value="1"></el-option>
<el-option :label="$t('pub.no')" :value="2"></el-option> <el-option :label="$t('pub.no')" :value="2"></el-option>
</el-select> </el-select>
</li> </el-form-item>
<li> </el-col>
<span> <el-col :span="6">
<em> <el-form-item :label="$t('scen.sc_ftTime')">
{{$t('scen.sc_ftTime')}}
</em>
</span>
<el-date-picker class="h34 w250" v-model="missionDate" @change="timeAdd()" type="daterange" <el-date-picker class="h34 w250" v-model="missionDate" @change="timeAdd()" type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</li> </el-form-item>
<li> </el-col>
<span> <el-col :span="6">
<em> <el-form-item :label="$t('objFill.v102.nurushijian')">
{{ $t('objFill.v102.nurushijian') }}
</em>
</span>
<el-date-picker class="h34 w250" v-model="EnterTime" @change="timeAdd(2)" type="daterange" <el-date-picker class="h34 w250" v-model="EnterTime" @change="timeAdd(2)" type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</li> </el-form-item>
<li style="margin-left: 10px"> </el-col>
<span> <el-col :span="6">
<em>{{$t('objFill.v102.appjihuozhuant')}}</em> <el-form-item :label="$t('objFill.v102.appjihuozhuant')">
<el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="msg.OpenIdStatus"> <el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="msg.OpenIdStatus">
<el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option> <el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select> </el-select>
</span> </el-form-item>
</li> </el-col>
<li style="margin-left: 40px">
<span> <el-col :span="6">
<em> <el-form-item label="激活时间">
激活时间
</em>
</span>
<el-date-picker class="h34 w220" v-model="activationTime" @change="timeAdd(3)" type="daterange" <el-date-picker class="h34 w220" v-model="activationTime" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()"> <input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
...@@ -180,7 +186,7 @@ ...@@ -180,7 +186,7 @@
<th width="7%">{{$t('salesModule.belongUnion')}}</th> <th width="7%">{{$t('salesModule.belongUnion')}}</th>
<th width="8%">{{$t('salesModule.SuoSales')}}</th> <th width="8%">{{$t('salesModule.SuoSales')}}</th>
<th width="8%">{{$t('salesModule.CustomerStatus')}}</th> <th width="8%">{{$t('salesModule.CustomerStatus')}}</th>
<th width="5%" class="cursorpointer" @click="changeSort(1, 'TradeMoney')"> <th width="7%" class="cursorpointer" @click="changeSort(1, 'TradeMoney')">
<div class="sort-th"> <div class="sort-th">
<div> <div>
{{$t('fnc.jiaoyie')}} {{$t('fnc.jiaoyie')}}
...@@ -206,8 +212,8 @@ ...@@ -206,8 +212,8 @@
</th> </th>
<th width="5%">{{$t('salesModule.HappinessPassbook')}}</th> <th width="5%">{{$t('salesModule.HappinessPassbook')}}</th>
<th width="4%">{{$t('active.ad_yhq')}}</th> <th width="4%">{{$t('active.ad_yhq')}}</th>
<th width="8%">{{$t('pub.pubRemark')}}</th> <!-- <th width="8%">{{$t('pub.pubRemark')}}</th> -->
<th width="14%">{{$t('system.table_operation')}}</th> <th width="12%">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr> <tr>
<td colspan="13" align="center" v-show="list.length==0">{{$t('system.content_noData')}}</td> <td colspan="13" align="center" v-show="list.length==0">{{$t('system.content_noData')}}</td>
...@@ -259,9 +265,7 @@ ...@@ -259,9 +265,7 @@
{{item.CouponNum}} {{item.CouponNum}}
</span> </span>
</td> </td>
<!-- <td>{{item.Remark}}</td> -->
<td>{{item.Remark}}</td>
<td> <td>
<el-button-group> <el-button-group>
<el-tooltip effect="dark" :content="$t('fnc.zhuanjiao')" placement="top-start"> <el-tooltip effect="dark" :content="$t('fnc.zhuanjiao')" placement="top-start">
...@@ -271,12 +275,6 @@ ...@@ -271,12 +275,6 @@
<p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p> <p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
<p class="fz12 mt30 color666"> <p class="fz12 mt30 color666">
<span>{{$t('salesModule.Recipient')}}</span>&nbsp; <span>{{$t('salesModule.Recipient')}}</span>&nbsp;
<!-- <el-select
filterable
class="w180"
v-model="RecipientMsg.NewEmployeeId"
:placeholder="$t('pub.pleaseSel')"
> -->
<el-select v-model="RecipientMsg.NewEmployeeId" class="w150" filterable remote reserve-keyword <el-select v-model="RecipientMsg.NewEmployeeId" class="w150" filterable remote reserve-keyword
:placeholder="$t('pub.PleaseKeyWords')" :remote-method="GetClientAccountListByKeyWord1"> :placeholder="$t('pub.PleaseKeyWords')" :remote-method="GetClientAccountListByKeyWord1">
<el-option v-for="item in employeeList1" :label="item.name" :value="item.empId" <el-option v-for="item in employeeList1" :label="item.name" :value="item.empId"
...@@ -384,17 +382,6 @@ ...@@ -384,17 +382,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<!--<el-col :span="6">-->
<!--<el-form-item label="所属品牌：" prop="brandIds">-->
<!--<el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds' :placeholder="$t('pub.pleaseSel')">-->
<!--<el-option v-for='item in CustomerBrandList'-->
<!--:label='item.name'-->
<!--:value='item.id'-->
<!--:key='item.id'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('visaT.post')" prop="Duty"> <el-form-item :label="$t('visaT.post')" prop="Duty">
<el-select filterable v-model="addMsg.Duty" :placeholder="$t('pub.pleaseSel')"> <el-select filterable v-model="addMsg.Duty" :placeholder="$t('pub.pleaseSel')">
...@@ -474,26 +461,29 @@ ...@@ -474,26 +461,29 @@
data() { data() {
return { return {
normalizer(node) { normalizer(node) {
return { var obj = {
id: node.DepartmentId, id: node.DepartmentID,
label: node.DepartmentName, label: node.DepartmentName,
children: node.ChildList
}; };
if (node.ChildList != null && node.ChildList.length > 0) {
obj.children = node.ChildList;
}
return obj;
}, },
CustomerException: [], CustomerException: [],
datainfo: {}, datainfo: {},
CustomerBrandList: [], CustomerBrandList: [],
missionDate: [], missionDate: [],
EnterTime: [], EnterTime: [],
DepartmentId: null,
isSelLayer: false, isSelLayer: false,
layerShow: false, layerShow: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 14, pageSize: 14,
RB_Branch_id: -1,
CustomerName: "", CustomerName: "",
CreateBy: "-1", CreateBy: "-1",
DepartmentId: "-1", DepartmentId: null,
Brand: -1, Brand: -1,
allDepartment: 0, allDepartment: 0,
CustomerStatus: 2, CustomerStatus: 2,
...@@ -656,13 +646,31 @@ ...@@ -656,13 +646,31 @@
Id: 2 Id: 2
}, },
], ],
activationTime: [] activationTime: [],
CompanyList: [], //公司列表
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0",
},
userInfo: {},
}; };
}, },
watch: { watch: {
'$route': { '$route': {
handler(val, oldVal) { handler(val, oldVal) {
console.log(this.$route.query, '-------') // console.log(this.$route.query, '-------')
// this.getList();
},
deep: true,
immediate: true
},
},
created() {
this.userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = this.userInfo.RB_Group_id;
this.getCompanyList();
if (this.$route.query.EnterTime) { if (this.$route.query.EnterTime) {
this.EnterTime = this.$route.query.EnterTime this.EnterTime = this.$route.query.EnterTime
this.msg.StartCreate = this.EnterTime[0]; this.msg.StartCreate = this.EnterTime[0];
...@@ -674,16 +682,53 @@ ...@@ -674,16 +682,53 @@
this.msg.ActivateEndDate = this.activationTime[1]; this.msg.ActivateEndDate = this.activationTime[1];
} }
if (this.$route.query.activation) { if (this.$route.query.activation) {
this.msg.OpenIdStatus = this.$route.query.activation this.msg.OpenIdStatus = Number(this.$route.query.activation);
}
if (this.$route.query.RB_Branch_Id) {
this.msg.RB_Branch_id = Number(this.$route.query.RB_Branch_Id);
} else {
if (this.userInfo.RB_Branch_id != 0 && this.userInfo.RB_Branch_id != 49) {
this.msg.RB_Branch_id = Number(this.userInfo.RB_Branch_id);
}
} }
if (this.$route.query.RB_Department_Id && Number(this.$route.query.RB_Department_Id) > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id);
this.getEmployee();
}
if (this.$route.query.EnterID && Number(this.$route.query.EnterID) > 0) {
this.msg.CreateBy = Number(this.$route.query.EnterID);
}
},
mounted() {
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('Select_AllCustomer') != -1) {
this.departState = true;
}
this.bossID = this.userInfo.EmployeeId;
this.departmentMsg.RB_Group_Id = this.userInfo.RB_Group_id; //集团
this.getDepartment();
this.getList(); this.getList();
this.getCreateByInfoList();
this.getProvince();
this.getJycs();
this.getZw();
this.getKhly();
this.getCustomerBrandList();
}, },
deep: true, methods: {
immediate: true getCompanyList() {
//获取公司列表
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
(res) => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
}
}, },
(err) => {}
);
}, },
methods: {
timeAdd(t) { // 日期格式 timeAdd(t) { // 日期格式
if (t == 2) { if (t == 2) {
if (!this.EnterTime) { if (!this.EnterTime) {
...@@ -1191,15 +1236,16 @@ ...@@ -1191,15 +1236,16 @@
); );
}, },
getDepartment() { getDepartment() {
let msg = {}; let deparMsg = {
if (this.departState) { RB_Group_Id: this.userInfo.RB_Group_id,
msg = { RB_Branch_Id: -1,
allDepartment: 1 Status: 0,
ParentId: -1,
Tier: 0,
}; };
this.msg.allDepartment = 1 deparMsg.RB_Branch_Id = this.msg.RB_Branch_id;
}
this.apipost( this.apipost(
"Advertising_get_GetNowDepartmentAndSubordinate", msg, "admin_get_DepartmentGetList", deparMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.departmentList = res.data.data; this.departmentList = res.data.data;
...@@ -1210,21 +1256,18 @@ ...@@ -1210,21 +1256,18 @@
err => {} err => {}
); );
}, },
getEmployeeList(node, id) { changeDepart(node, id) {
this.isSelLayer = false; console.log(node, "changeDepart")
this.msg.CreateBy = "-1"; this.msg.CreateBy = "";
this.msg.DepartmentId = this.employeeMsg.departmentId = node.DepartmentId; this.msg.DepartmentId = node.DepartmentID;
this.employeeMsg.departmentId = node.DepartmentID;
this.getEmployee(); this.getEmployee();
}, },
getEmployee() { getEmployee() {
this.employeeMsg.departmentId = 0; this.employeeMsg.RB_Group_id = this.userInfo.RB_Group_id;
this.employeeMsg.RB_Group_id = this.getLocalStorage().RB_Group_id; this.employeeMsg.RB_Branch_id = this.msg.RB_Branch_id;
this.employeeMsg.RB_Branch_id = -1;
this.employeeList2 = []; this.employeeList2 = [];
this.employeeMsg.IsLeave = -1; this.employeeMsg.IsLeave = -1;
if (this.employeeMsg.KeyWord == '') {
return
}
this.apipost( this.apipost(
"app_get_company_employee", "app_get_company_employee",
this.employeeMsg, this.employeeMsg,
...@@ -1388,25 +1431,6 @@ ...@@ -1388,25 +1431,6 @@
}); });
} }
} }
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('Select_AllCustomer') != -1) {
this.departState = true;
}
this.bossID = userInfo.EmployeeId;
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getDepartment();
// this.getEmployee();
this.getList();
this.getCreateByInfoList();
this.getProvince();
this.getJycs();
this.getZw();
this.getKhly();
this.getCustomerBrandList();
} }
}; };
......
src/components/rank/salesVolumeRank.vue
View file @ 57abcef1
...@@ -237,12 +237,18 @@ ...@@ -237,12 +237,18 @@
if (type == 1) { if (type == 1) {
query = { query = {
blank: "y", blank: "y",
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
} }
} }
//今日新增 //今日新增
else if (type == 2) { else if (type == 2) {
query = { query = {
EnterTime: Time, EnterTime: Time,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
blank: "y", blank: "y",
} }
} }
...@@ -250,6 +256,9 @@ ...@@ -250,6 +256,9 @@
else if (type == 3) { else if (type == 3) {
query = { query = {
activation: 1, activation: 1,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
blank: "y", blank: "y",
} }
} }
...@@ -258,6 +267,9 @@ ...@@ -258,6 +267,9 @@
query = { query = {
activationTime: Time, activationTime: Time,
activation: 1, activation: 1,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
blank: "y", blank: "y",
} }
} }
......
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