Skip to content

J
jiedao-app-operator-master
Commit 93c478e2 authored by chenwei's avatar chenwei
Browse files
Options

Merge branch 'feature/099_customer_filter' into 'dev' 

【099】| Change of filtering criteria for customer list

See merge request !1
parents 254e6d9f fb74019d
Show whitespace changes
Inline Side-by-side
Showing with 266 additions and 13 deletions
src/i18n/languages/en_US.json
View file @ 93c478e2
......@@ -4507,5 +4507,10 @@
"身份证认证状态": "Identity card authentication status",
"角标字段": "Subscript field",
"不清楚请留空,已设勿改": "Unclear, please leave blank. It has been set to remain unchanged",
"退仓/已混箱品名":"Returned/mixed Box"
"退仓/已混箱品名":"Returned/mixed Box",
"请输入会员编号":"Please input Member ID",
"会员名称": "Member nickname",
"请输入会员名称": "Please input Member nickname",
"会员电话":"Member Phone NO.",
"请输入会员电话":"Please input Member Phone NO."
}
src/views/ecw/customer/index.vue
View file @ 93c478e2
......@@ -159,6 +159,36 @@
@change="handleQuery"
></dict-selector>
</el-form-item>
<el-form-item :label="$t('会员电话')" prop="department">
<el-col :span="11">
<area-code-selector style="width: 100%;" v-model="queryParams.memberAreaCode" />
</el-col>
<el-col class="line" :span="2"></el-col>
<el-col :span="11">
<el-input maxlength="11"
width="100%"
class="ml-10 w-200"
clearable
v-model.number="queryParams.memberMobile"
:placeholder="$t('请输入会员电话')"/>
</el-col>
</el-form-item>
<el-form-item :label="$t('会员编号')" prop="number">
<el-input
v-model.trim="queryParams.memberCode"
:placeholder="$t('请输入会员编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员名称')" prop="name">
<el-input
v-model.trim="queryParams.memberName"
:placeholder="$t('请输入会员名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
$t("搜索")
......@@ -1045,6 +1075,8 @@ import AddPotentialCustom from "@/views/ecw/customer/addPotentialCustom.vue";
import Contacts from "@/views/ecw/customer/components/contacts.vue";
import { getUserProfile } from "@/api/system/user";
import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
export default {
name: "EcwCustomerIndex",
components: {
......@@ -1055,6 +1087,7 @@ export default {
CustomerFollowList,
customerComplaints,
transferCustomer,
AreaCodeSelector
},
data() {
return {
......@@ -1066,7 +1099,7 @@ export default {
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
showSearch: false,
// 总条数
total: 0,
// 客户列表
......@@ -1090,6 +1123,10 @@ export default {
creditLevel: null,
country: null,
resourceType: null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
},
// 表单参数
form: {},
......@@ -1483,6 +1520,10 @@ export default {
department: null,
creditLevel: null,
country: null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
};
this.handleQuery();
},
......
src/views/ecw/customer/indirectCustomer.vue
View file @ 93c478e2
......@@ -28,6 +28,36 @@
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector clearable :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('会员电话')" prop="department">
<el-col :span="11">
<area-code-selector style="width: 100%;" v-model="queryParams.memberAreaCode" />
</el-col>
<el-col class="line" :span="2"></el-col>
<el-col :span="11">
<el-input maxlength="11"
width="100%"
class="ml-10 w-200"
clearable
v-model.number="queryParams.memberMobile"
:placeholder="$t('请输入会员电话')"/>
</el-col>
</el-form-item>
<el-form-item :label="$t('会员编号')" prop="number">
<el-input
v-model.trim="queryParams.memberCode"
:placeholder="$t('请输入会员编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员名称')" prop="name">
<el-input
v-model.trim="queryParams.memberName"
:placeholder="$t('请输入会员名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
......@@ -35,6 +65,13 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table ref="multipleTable" v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<el-table-column
......@@ -43,7 +80,6 @@
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" >
<template v-slot="scope">
<span>{{ $l(scope.row,'name') }}</span>
</template>
</el-table-column>
......@@ -99,9 +135,13 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict';
import {listServiceUser} from "@/api/system/user";
import {exportCustomerComplaintExcel} from "@/api/ecw/customerComplaint";
import {indirectCustomerExportExcel} from "@/api/ecw/customer";
import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
export default {
name: "EcwCustomerIndirectcustomer",
components: {
AreaCodeSelector
},
activated() {
this.getList()
},
......@@ -114,7 +154,7 @@ export default {
loading: true,
// 导出遮罩层
// 显示搜索条件
showSearch: true,
showSearch: false,
// 总条数
total: 0,
// 客户列表
......@@ -131,7 +171,11 @@ export default {
name: null,
source: null,
customerService: null,
marketType:null
marketType:null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
},
// 网点
nodeList: [],
......@@ -203,6 +247,10 @@ export default {
name: null,
source: null,
customerService: null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
}
this.handleQuery();
},
......
src/views/ecw/customerConfirm/index.vue
View file @ 93c478e2
......@@ -57,6 +57,36 @@
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector multiple clearable :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('会员电话')" prop="department">
<el-col :span="11">
<area-code-selector style="width: 100%;" v-model="queryParams.memberAreaCode" />
</el-col>
<el-col class="line" :span="2"></el-col>
<el-col :span="11">
<el-input maxlength="11"
width="100%"
class="ml-10 w-200"
clearable
v-model.number="queryParams.memberMobile"
:placeholder="$t('请输入会员电话')"/>
</el-col>
</el-form-item>
<el-form-item :label="$t('会员编号')" prop="number">
<el-input
v-model.trim="queryParams.memberCode"
:placeholder="$t('请输入会员编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员名称')" prop="name">
<el-input
v-model.trim="queryParams.memberName"
:placeholder="$t('请输入会员名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
......@@ -373,7 +403,7 @@ import {getCountryListAll} from "@/api/ecw/country";
import {getCreditPage} from "@/api/customer/credit";
import transferCustomer from "@/views/ecw/customer/transferCustomer.vue";
import Contacts from "@/views/ecw/customer/components/contacts.vue";
import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
export default {
......@@ -391,7 +421,8 @@ export default {
},
components: {
Contacts,
transferCustomer
transferCustomer,
AreaCodeSelector
},
data() {
return {
......@@ -400,7 +431,7 @@ export default {
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
showSearch: false,
// 总条数
total: 0,
// 客户列表
......@@ -425,6 +456,10 @@ export default {
creditLevel:null,
country:null,
marketType:null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
},
// 表单参数
form: {},
......@@ -563,6 +598,10 @@ export default {
department: null,
creditLevel:null,
country:null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
}
this.handleQuery();
},
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ 93c478e2
......@@ -58,6 +58,36 @@
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector clearable :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number"></dict-selector>
</el-form-item>
<el-form-item :label="$t('会员电话')" prop="department">
<el-col :span="11">
<area-code-selector style="width: 100%;" v-model="queryParams.memberAreaCode" />
</el-col>
<el-col class="line" :span="2"></el-col>
<el-col :span="11">
<el-input maxlength="11"
width="100%"
class="ml-10 w-200"
clearable
v-model.number="queryParams.memberMobile"
:placeholder="$t('请输入会员电话')"/>
</el-col>
</el-form-item>
<el-form-item :label="$t('会员编号')" prop="number">
<el-input
v-model.trim="queryParams.memberCode"
:placeholder="$t('请输入会员编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员名称')" prop="name">
<el-input
v-model.trim="queryParams.memberName"
:placeholder="$t('请输入会员名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
......@@ -180,6 +210,7 @@ import {getCreditPage} from "@/api/customer/credit";
import transferCustomer from "@/views/ecw/customer/transferCustomer";
import Template from "@/views/cms/template/index.vue";
import Contacts from "@/views/ecw/customer/components/contacts.vue";
import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
export default {
name: "EcwCustomertobeassignedIndex",
activated() {
......@@ -189,7 +220,8 @@ export default {
Contacts,
Template,
upload,
transferCustomer
transferCustomer,
AreaCodeSelector
},
data() {
return {
......@@ -201,7 +233,7 @@ export default {
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
showSearch: false,
// 总条数
total: 0,
// 客户列表
......@@ -226,6 +258,10 @@ export default {
creditLevel:null,
country:null,
marketType:null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
},
// 表单参数
form: {},
......@@ -357,6 +393,10 @@ export default {
department: null,
creditLevel:null,
country:null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
}
this.handleQuery();
},
......
src/views/ecw/myCustomerService/index.vue
View file @ 93c478e2
......@@ -67,6 +67,36 @@
<el-form-item :label="$t('市场获客')" prop="department">
<dict-selector clearable multiple :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="queryParams.marketType" formatter="number" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('会员电话')" prop="department">
<el-col :span="11">
<area-code-selector style="width: 100%;" v-model="queryParams.memberAreaCode" />
</el-col>
<el-col class="line" :span="2"></el-col>
<el-col :span="11">
<el-input maxlength="11"
width="100%"
class="ml-10 w-200"
clearable
v-model.number="queryParams.memberMobile"
:placeholder="$t('请输入会员电话')"/>
</el-col>
</el-form-item>
<el-form-item :label="$t('会员编号')" prop="number">
<el-input
v-model.trim="queryParams.memberCode"
:placeholder="$t('请输入会员编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员名称')" prop="name">
<el-input
v-model.trim="queryParams.memberName"
:placeholder="$t('请输入会员名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
$t("搜索")
......@@ -304,6 +334,7 @@ import Template from "@/views/cms/template/index.vue";
import Contacts from "@/views/ecw/customer/components/contacts.vue";
//lanbm 2024-05-26 add
import { getUserProfile } from "@/api/system/user";
import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
export default {
name: "EcwMycustomerserviceIndex",
......@@ -314,6 +345,7 @@ export default {
customerFollowList,
customerComplaints,
transferCustomer,
AreaCodeSelector
},
computed: {
isChinese() {
......@@ -333,7 +365,7 @@ export default {
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
showSearch: false,
// 总条数
total: 0,
// 客户列表
......@@ -357,6 +389,10 @@ export default {
creditLevel: null,
country: null,
marketType: null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
},
// 表单参数
form: {},
......@@ -537,6 +573,10 @@ export default {
department: null,
creditLevel: null,
country: null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
};
this.handleQuery();
},
......
src/views/ecw/oceanCustomer/index.vue
View file @ 93c478e2
......@@ -163,6 +163,36 @@
@change="handleQuery"
></dict-selector>
</el-form-item>
<el-form-item :label="$t('会员电话')" prop="department">
<el-col :span="11">
<area-code-selector style="width: 100%;" v-model="queryParams.memberAreaCode" />
</el-col>
<el-col class="line" :span="2"></el-col>
<el-col :span="11">
<el-input maxlength="11"
width="100%"
class="ml-10 w-200"
clearable
v-model.number="queryParams.memberMobile"
:placeholder="$t('请输入会员电话')"/>
</el-col>
</el-form-item>
<el-form-item :label="$t('会员编号')" prop="number">
<el-input
v-model.trim="queryParams.memberCode"
:placeholder="$t('请输入会员编号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('会员名称')" prop="name">
<el-input
v-model.trim="queryParams.memberName"
:placeholder="$t('请输入会员名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
$t("搜索")
......@@ -378,6 +408,7 @@ import { getCountryListAll } from "@/api/ecw/country";
import { getCreditPage } from "@/api/customer/credit";
import Template from "@/views/cms/template/index.vue";
import Contacts from "@/views/ecw/customer/components/contacts.vue";
import AreaCodeSelector from "@/components/AreaCodeSelector/index.vue";
export default {
name: "EcwOceancustomerIndex",
activated() {
......@@ -387,6 +418,7 @@ export default {
Contacts,
Template,
upload,
AreaCodeSelector
},
data() {
return {
......@@ -397,7 +429,7 @@ export default {
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
showSearch: false,
// 总条数
total: 0,
// 客户列表
......@@ -420,6 +452,10 @@ export default {
status: null,
department: null,
marketType: null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
},
// 表单参数
form: {},
......@@ -597,6 +633,10 @@ export default {
department: null,
creditLevel: null,
country: null,
memberCode: null,
memberName: null,
memberMobile: null,
memberAreaCode: null
};
this.handleQuery();
},
......
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