Commit 6b81914f authored by zhengyi's avatar zhengyi

常用提货网点替换为字典配置

parent 9ec1198e
......@@ -163,6 +163,7 @@ export const DICT_TYPE = {
CUSTOMER_GET_METHOD: 'customer_get_method', //获取方式
CUSTOMER_FROM: 'customer_from', //创建入口
CUSTOMER_ROLE: 'customer_role', //角色
PICKUP_POINTS: 'pickup_points', //常用提货网点
CUSTOMER_FOLLOWUP_TYPE: 'customer_followup_type', //跟进类型
CUSTOMER_FOLLOWUP_METHOD: 'customer_followup_method', //跟进方式
CUSTOMER_FOLLOWUP_SALE_STAGE: 'sale_stage', //销售阶段
......
......@@ -198,9 +198,10 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoints">
<el-select filterable multiple v-model="form.pickupPoints">
<el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
</el-select>
<dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
<!-- <el-select filterable multiple v-model="form.pickupPoints">-->
<!-- <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
<!-- </el-select>-->
</el-form-item>
</el-col>
......@@ -216,7 +217,7 @@
<el-form-item :label="$t('主营类别')" prop="productTypes">
<el-row :gutter="10">
<el-col :span="11">
<el-select @change="change" v-model="form.productTypes" multiple :placeholder="$t('请选择产品类别')">
<el-select @change="change" v-model="form.productTypes" filterable multiple :placeholder="$t('请选择产品类别')">
<el-option :label="isChinese ? item.titleZh : item.titleEn" :value="item.id" v-for="item in productTypeList" :key="item.id" />
</el-select>
</el-col>
......
......@@ -57,9 +57,10 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select filterable multiple v-model="queryParams.pickupPoints">
<el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
</el-select>
<dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
<!-- <el-select filterable multiple v-model="queryParams.pickupPoints">-->
<!-- <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select filterable v-model="queryParams.founder">
......@@ -303,7 +304,12 @@
</el-table-column>
<el-table-column :label="$t('常用提货网点')">
<template slot-scope="{ row }">
{{ getPickupPointNames(row.pickupPoints) }}
{{
getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(","))
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
</template>
</el-table-column>
<el-table-column :label="$t('年度发货量')" align="center">
......
......@@ -516,7 +516,14 @@
}}
<!-- <dict-tag v-if="customer.transportType" v-for="item in (customer.transportType || '').split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>-->
</el-descriptions-item>
<el-descriptions-item :label="$t('常提货网点')">{{ $l(customer, "pickupPointName") }} </el-descriptions-item>
<!-- <el-descriptions-item :label="$t('常提货网点')">{{ $l(customer, "pickupPointName") }} </el-descriptions-item>-->
<el-descriptions-item :label="$t('常提货网点')">
{{
getDictDatas2(DICT_TYPE.PICKUP_POINTS, (customer.pickupPoints || "").split(","))
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
</el-descriptions-item>
<el-descriptions-item :label="$t('业务国家')">
{{ isChinese ? customer.busiCountryNameZh : customer.busiCountryNameEn }}
</el-descriptions-item>
......
......@@ -58,9 +58,10 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select multiple v-model="queryParams.pickupPoints">
<el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
</el-select>
<dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
<!-- <el-select multiple v-model="queryParams.pickupPoints">-->
<!-- <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder">
......@@ -293,7 +294,12 @@
</el-table-column>
<el-table-column :label="$t('常用提货网点')">
<template slot-scope="{ row }">
{{ getPickupPointNames(row.pickupPoints) }}
{{
getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(","))
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
</template>
</el-table-column>
<el-table-column :label="$t('年度发货量')" align="center">
......@@ -433,9 +439,10 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">
<el-option :label="$t('请选择字典生成')" value="" />
</el-select>
<dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
<!-- <el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">-->
<!-- <el-option :label="$t('请选择字典生成')" value="" />-->
<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="12">
......
......@@ -10,7 +10,7 @@
<el-input v-model.trim="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery" @input="queryParams.name = queryParams.name.replace(/\s+/g, '')" />
</el-form-item>
<el-form-item :label="$t('区号')">
<el-select v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
<el-select filterable v-model="queryParams.areaCode" :placeholder="$t('请选择区号')">
<el-option v-for="(item, index) in countryList" :key="index" :label="item.nameShort + (isChinese ? item.nameZh : item.nameEn) + ' +' + item.tel" :value="item.tel" />
</el-select>
</el-form-item>
......@@ -18,33 +18,33 @@
<el-input :placeholder="$t('请输入联系方式')" clearable v-model.trim="queryParams.defaultContactPhone" @input="queryParams.defaultContactPhone = queryParams.defaultContactPhone.replace(/\s+/g, '')"></el-input>
</el-form-item>
<el-form-item :label="$t('部门')" v-if="path != '/customer/department-customers'">
<el-select v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
<el-select filterable v-model="queryParams.deptIds" :placeholder="$t('请选择部门')">
<el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item :label="$t('客户经理')" prop="customerService">
<el-select multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">
<el-select filterable multiple clearable v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" size="small" @change="handleQuery">
<el-option v-for="dict in customerServiceList" :key="dict.id" :label="dict.nickname" :value="dict.id" />
</el-select>
</el-form-item>
<el-form-item :label="$t('客户来源')" prop="source">
<el-select multiple clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" size="small" @change="handleQuery">
<el-select filterable multiple clearable v-model="queryParams.source" :placeholder="$t('请选择客户来源')" size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item :label="$t('客户类别')" prop="level">
<dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type" @change="handleQuery"></dict-selector>
<dict-selector filterable multiple clearable :type="DICT_TYPE.CUSTOMER_TYPE" v-model="queryParams.type" @change="handleQuery"></dict-selector>
</el-form-item>
<el-form-item :label="$t('角色')">
<dict-selector multiple clearable :type="DICT_TYPE.CUSTOMER_ROLE" v-model="queryParams.role" formatter="number" @change="handleQuery" :placeholder="$t('请选择')"></dict-selector>
<dict-selector filterable multiple clearable :type="DICT_TYPE.CUSTOMER_ROLE" v-model="queryParams.role" formatter="number" @change="handleQuery" :placeholder="$t('请选择')"></dict-selector>
</el-form-item>
<el-form-item :label="$t('客户状态')" prop="status">
<el-select multiple clearable v-model="queryParams.status" :placeholder="$t('请选择客户状态')" size="small" @change="handleQuery">
<el-select filterable multiple clearable v-model="queryParams.status" :placeholder="$t('请选择客户状态')" size="small" @change="handleQuery">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item :label="$t('国籍')" prop="country">
<el-select multiple clearable v-model="queryParams.country" :placeholder="$t('请选择')" @change="handleQuery">
<el-select filterable multiple clearable v-model="queryParams.country" :placeholder="$t('请选择')" @change="handleQuery">
<el-option v-for="dict in countryList" :key="dict.id" :label="isChinese ? dict.nameZh : dict.nameEn" :value="parseInt(dict.id)" />
</el-select>
</el-form-item>
......@@ -58,9 +58,10 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select multiple v-model="queryParams.pickupPoints">
<el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
</el-select>
<dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
<!-- <el-select multiple v-model="queryParams.pickupPoints">-->
<!-- <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder">
......@@ -81,7 +82,7 @@
</el-input>
</el-form-item>
<el-form-item :label="$t('商品类别')" v-show="showSearch">
<el-select @change="handleSelectProductType" multiple v-model="queryParams.productTypes" :placeholder="$t('请选择')">
<el-select filterable @change="handleSelectProductType" multiple v-model="queryParams.productTypes" :placeholder="$t('请选择')">
<el-option :label="item.titleZh" :value="item.id" v-for="item in productTypeList" :key="item.id" />
</el-select>
</el-form-item>
......@@ -108,7 +109,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('获取方式')" v-show="showSearch">
<el-select v-model="queryParams.getMethod" multiple :placeholder="$t('请选择')">
<el-select filterable v-model="queryParams.getMethod" multiple :placeholder="$t('请选择')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_GET_METHOD)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
......@@ -118,7 +119,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('结算方式')" v-show="showSearch">
<el-select v-model="queryParams.balances" multiple :placeholder="$t('请选择结算方式')">
<el-select filterable v-model="queryParams.balances" multiple :placeholder="$t('请选择结算方式')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
......@@ -279,7 +280,12 @@
</el-table-column>
<el-table-column :label="$t('常用提货网点')">
<template slot-scope="{ row }">
{{ getPickupPointNames(row.pickupPoints) }}
{{
getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(","))
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
</template>
</el-table-column>
<el-table-column :label="$t('年度发货量')" align="center">
......
......@@ -58,9 +58,10 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select multiple v-model="queryParams.pickupPoints">
<el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
</el-select>
<dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
<!-- <el-select multiple v-model="queryParams.pickupPoints">-->
<!-- <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder">
......@@ -300,7 +301,12 @@
</el-table-column>
<el-table-column :label="$t('常用提货网点')">
<template slot-scope="{ row }">
{{ getPickupPointNames(row.pickupPoints) }}
{{
getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(","))
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
</template>
</el-table-column>
<el-table-column :label="$t('年度发货量')" align="center">
......
......@@ -59,9 +59,10 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('常用提货网点')" v-show="showSearch">
<el-select multiple v-model="queryParams.pickupPoints">
<el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>
</el-select>
<dict-selector :type="DICT_TYPE.PICKUP_POINTS" form-type="checkbox" filterable multiple v-model="form.pickupPoints"></dict-selector>
<!-- <el-select multiple v-model="queryParams.pickupPoints">-->
<!-- <el-option v-for="item in getNodeLists" :key="item.id" :value="item.id" :label="isChinese ? item.titleZh : item.titleEn"></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item :label="$t('创建人')" v-show="showSearch">
<el-select v-model="queryParams.founder">
......@@ -309,7 +310,12 @@
</el-table-column>
<el-table-column :label="$t('常用提货网点')">
<template slot-scope="{ row }">
{{ getPickupPointNames(row.pickupPoints) }}
{{
getDictDatas2(DICT_TYPE.PICKUP_POINTS, (row.pickupPoints || "").split(","))
.map((e) => (isChinese ? e.label : e.labelEn))
.join(", ")
}}
<!-- {{ getPickupPointNames(row.pickupPoints) }}-->
</template>
</el-table-column>
<el-table-column :label="$t('年度发货量')" align="center">
......
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