Skip to content

J
jiedao-app-operator-master
Commit 39fc4430 authored by 余金瑶's avatar 余金瑶
Browse files
Options

修改客户信息界面，控货和异常订单搜索

parent 41628737
Hide whitespace changes
Inline Side-by-side
Showing with 257 additions and 240 deletions
src/views/ecw/customer/edit.vue
View file @ 39fc4430
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('业绩类型')"> <el-form-item :label="$t('业绩类型')">
<el-switch <el-switch
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
></dict-selector> ></dict-selector>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col
:span="13" :span="13"
v-show="form.roles && form.roles.indexOf('2') !== -1" v-show="form.roles && form.roles.indexOf('2') !== -1"
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('出货渠道')" prop="transportType"> <el-form-item :label="$t('出货渠道')" prop="transportType">
<!-- <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" form-type="checkbox" multiple v-model="form.transportType"></dict-selector>--> <!-- <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" form-type="checkbox" multiple v-model="form.transportType"></dict-selector>-->
...@@ -471,7 +471,6 @@ ...@@ -471,7 +471,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('年度发货量')"> <el-form-item :label="$t('年度发货量')">
<el-input-number v-model="form.weightYearly" :min="1" /> <el-input-number v-model="form.weightYearly" :min="1" />
...@@ -506,7 +505,240 @@ ...@@ -506,7 +505,240 @@
</el-row> </el-row>
</el-card> </el-card>
</el-form>
<el-card class="box-card" style="margin-top: 15px;">
<div slot="header" class="clearfix">
<span class="title-text">{{ $t("联系人") }}</span>
<el-button
style="float: right"
size="small"
type="primary"
@click="handleAddContact"
>+</el-button
>
</div>
<el-form ref="contactForm" :rules="contactRules" :model="form">
<el-table :data="form.customerContacts" style="width: 100%">
<el-table-column prop="department" :label="$t('部门')" width="">
<template v-slot="{ row }">
<el-form-item label="">
<el-input
v-model="row.department"
:placeholder="$t('请输入部门')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="position" :label="$t('职位')" width="">
<template v-slot="{ row }">
<el-form-item label="">
<el-input
v-model="row.position"
:placeholder="$t('请输入职位')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="name" :label="$t('联系人')">
<template slot="header">
{{ $t("联系人") }} <span style="color: #ff0000">*</span>
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item
:rules="contactRules.name"
:prop="'customerContacts.' + $index + '.name'"
label=""
>
<el-input
v-model="row.name"
:placeholder="$t('请输入联系人')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column>
<template slot="header">
{{ $t("联系人英文名称") }}
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item label="">
<el-input
v-model="row.nameEn"
:placeholder="$t('请输入联系人英文名称')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="areaCode" :label="$t('区号')">
<template slot="header">
{{ $t("区号") }} <span style="color: #ff0000">*</span>
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item
:rules="contactRules.areaCode"
:prop="'customerContacts.' + $index + '.areaCode'"
label=""
>
<el-select
v-model="row.areaCode"
:placeholder="$t('请选择区号')"
filterable
size="mini"
>
<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>
</template>
</el-table-column>
<el-table-column prop="phoneNew" :label="$t('联系方式')">
<template slot="header">
{{ $t("联系方式") }} <span style="color: #ff0000">*</span>
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item
:rules="contactRules.phoneNew"
:prop="'customerContacts.' + $index + '.phoneNew'"
label=""
>
<el-input
v-model.trim="row.phoneNew"
:placeholder="$t('请输入联系方式')"
size="mini"
@input="row.phoneNew=row.phoneNew.replace(/\s+/g, '')"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('关联账号')">
<template v-slot="{ row }">
<el-form-item label="">
<!-- <el-select v-model="row.userid" clearable remote :remote-method="getUserMemberUserFn" @change="selectBD" size="mini" filterable>
<el-option v-for="(item,index) in userMemberUser" :value="item.id" :key="index" :label="item.nickname + '(' + item.mobile + ')'" ></el-option>
</el-select> -->
<MemberSelector v-model="row.userid" size="mini" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="social" :label="$t('社交软件')">
<template v-slot="{ row }">
<el-form-item label="">
<el-select
v-model="row.social"
:placeholder="$t('请选择社交软件')"
size="mini"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.SOCIAL)"
:key="dict.value"
:label="isChinese ? dict.label : dict.labelEn"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column
prop="socialNumber"
:label="$t('社交软件号码')"
>
<template v-slot="{ row }">
<el-form-item label="">
<el-input
v-model="row.socialNumber"
:placeholder="$t('请输入社交软件号码')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column width="260px" prop="email" :label="$t('邮箱')">
<template v-slot="{ row }">
<el-form-item
v-for="(item, index) in row.email"
:key="index"
label=""
>
<div style="display: flex; align-items: center">
<el-input
v-model="row.email[index]"
:placeholder="$t('请输入邮箱')"
size="mini"
/>
<el-button
@click="deleteEmail(row.email, index)"
v-if="row.email.length !== 1"
style="height: 25px; margin-left: 5px"
type="danger"
size="mini"
>删除</el-button
>
<el-button
@click="addEmail(row.email)"
style="height: 25px; margin-left: 5px"
v-if="
index === row.email.length - 1 &&
row.email.length < 5
"
size="mini"
type="primary"
>添加</el-button
>
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="isDefault" :label="$t('设为默认')">
<template v-slot="{ row, column, $index }">
<el-form-item label="">
<el-select
v-model="row.isDefault"
:placeholder="$t('设为默认')"
@change="handleDefaultChange($index)"
size="mini"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.IS_DEFAULT)"
:key="dict.value"
:label="isChinese ? dict.label : dict.labelEn"
:value="Number(dict.value)"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="name" :label="$t('操作')">
<template v-slot="{ row, column, $index }">
<el-form-item label="">
<el-button
type="danger"
@click="handleDeleteContact($index)"
size="mini"
>{{ $t("删除") }}</el-button
>
</el-form-item>
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-form ref="setForm" label-width="150px">
<el-card class="box-card" style="margin-top: 15px;"> <el-card class="box-card" style="margin-top: 15px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span class="title-text">{{ $t('设置') }}</span> <span class="title-text">{{ $t('设置') }}</span>
...@@ -748,7 +980,7 @@ ...@@ -748,7 +980,7 @@
<el-card class="box-card" style="margin-top: 15px;"> <el-card class="box-card" style="margin-top: 15px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>{{ $t("银行信息") }}</span> <span class="title-text">{{ $t("银行信息") }}</span>
<el-button <el-button
style="float: right" style="float: right"
size="small" size="small"
...@@ -867,237 +1099,6 @@ ...@@ -867,237 +1099,6 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card class="box-card" style="margin-top: 15px;">
<div slot="header" class="clearfix">
<span>{{ $t("联系人") }}</span>
<el-button
style="float: right"
size="small"
type="primary"
@click="handleAddContact"
>+</el-button
>
</div>
<el-form ref="contactForm" :rules="contactRules" :model="form">
<el-table :data="form.customerContacts" style="width: 100%">
<el-table-column prop="department" :label="$t('部门')" width="">
<template v-slot="{ row }">
<el-form-item label="">
<el-input
v-model="row.department"
:placeholder="$t('请输入部门')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="position" :label="$t('职位')" width="">
<template v-slot="{ row }">
<el-form-item label="">
<el-input
v-model="row.position"
:placeholder="$t('请输入职位')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="name" :label="$t('联系人')">
<template slot="header">
{{ $t("联系人") }} <span style="color: #ff0000">*</span>
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item
:rules="contactRules.name"
:prop="'customerContacts.' + $index + '.name'"
label=""
>
<el-input
v-model="row.name"
:placeholder="$t('请输入联系人')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column>
<template slot="header">
{{ $t("联系人英文名称") }}
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item label="">
<el-input
v-model="row.nameEn"
:placeholder="$t('请输入联系人英文名称')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="areaCode" :label="$t('区号')">
<template slot="header">
{{ $t("区号") }} <span style="color: #ff0000">*</span>
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item
:rules="contactRules.areaCode"
:prop="'customerContacts.' + $index + '.areaCode'"
label=""
>
<el-select
v-model="row.areaCode"
:placeholder="$t('请选择区号')"
filterable
size="mini"
>
<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>
</template>
</el-table-column>
<el-table-column prop="phoneNew" :label="$t('联系方式')">
<template slot="header">
{{ $t("联系方式") }} <span style="color: #ff0000">*</span>
</template>
<template v-slot="{ row, cellValue, $index }">
<el-form-item
:rules="contactRules.phoneNew"
:prop="'customerContacts.' + $index + '.phoneNew'"
label=""
>
<el-input
v-model.trim="row.phoneNew"
:placeholder="$t('请输入联系方式')"
size="mini"
@input="row.phoneNew=row.phoneNew.replace(/\s+/g, '')"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('关联账号')">
<template v-slot="{ row }">
<el-form-item label="">
<!-- <el-select v-model="row.userid" clearable remote :remote-method="getUserMemberUserFn" @change="selectBD" size="mini" filterable>
<el-option v-for="(item,index) in userMemberUser" :value="item.id" :key="index" :label="item.nickname + '(' + item.mobile + ')'" ></el-option>
</el-select> -->
<MemberSelector v-model="row.userid" size="mini" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="social" :label="$t('社交软件')">
<template v-slot="{ row }">
<el-form-item label="">
<el-select
v-model="row.social"
:placeholder="$t('请选择社交软件')"
size="mini"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.SOCIAL)"
:key="dict.value"
:label="isChinese ? dict.label : dict.labelEn"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column
prop="socialNumber"
:label="$t('社交软件号码')"
>
<template v-slot="{ row }">
<el-form-item label="">
<el-input
v-model="row.socialNumber"
:placeholder="$t('请输入社交软件号码')"
size="mini"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column width="260px" prop="email" :label="$t('邮箱')">
<template v-slot="{ row }">
<el-form-item
v-for="(item, index) in row.email"
:key="index"
label=""
>
<div style="display: flex; align-items: center">
<el-input
v-model="row.email[index]"
:placeholder="$t('请输入邮箱')"
size="mini"
/>
<el-button
@click="deleteEmail(row.email, index)"
v-if="row.email.length !== 1"
style="height: 25px; margin-left: 5px"
type="danger"
size="mini"
>删除</el-button
>
<el-button
@click="addEmail(row.email)"
style="height: 25px; margin-left: 5px"
v-if="
index === row.email.length - 1 &&
row.email.length < 5
"
size="mini"
type="primary"
>添加</el-button
>
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="isDefault" :label="$t('设为默认')">
<template v-slot="{ row, column, $index }">
<el-form-item label="">
<el-select
v-model="row.isDefault"
:placeholder="$t('设为默认')"
@change="handleDefaultChange($index)"
size="mini"
>
<el-option
v-for="dict in getDictDatas(DICT_TYPE.IS_DEFAULT)"
:key="dict.value"
:label="isChinese ? dict.label : dict.labelEn"
:value="Number(dict.value)"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="name" :label="$t('操作')">
<template v-slot="{ row, column, $index }">
<el-form-item label="">
<el-button
type="danger"
@click="handleDeleteContact($index)"
size="mini"
>{{ $t("删除") }}</el-button
>
</el-form-item>
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<div style="margin-top: 15px; text-align: center"> <div style="margin-top: 15px; text-align: center">
<el-button type="primary" @click="submitForm">{{ <el-button type="primary" @click="submitForm">{{
$t("确 定") $t("确 定")
......
src/views/ecw/order/cargoControl.vue
View file @ 39fc4430
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
:placeholder="$t('请输入订单号、唛头、提单号')" :placeholder="$t('请输入订单号、唛头、提单号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="noParam.value=noParam.value.replace(/\s+/g, '')"
> >
<template slot="prepend"> <template slot="prepend">
<dict-selector <dict-selector
...@@ -129,11 +130,11 @@ ...@@ -129,11 +130,11 @@
<el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('发货人')" prop="consignorKey"> <el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" @input="queryParams.consignorKey=queryParams.consignorKey.replace(/\s+/g, '')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" @input="queryParams.consigneeKey=queryParams.consigneeKey.replace(/\s+/g, '')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsTypes"> <el-form-item :label="$t('报关方式')" prop="customsTypes">
...@@ -223,6 +224,21 @@ ...@@ -223,6 +224,21 @@
<el-option :label="$t('否')" :value="0"></el-option> <el-option :label="$t('否')" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
<el-select
v-model="queryParams.packageTypeArr"
multiple
:placeholder="$t('请选择')"
clearable
>
<template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
<el-option
:label="$l(item, 'label')"
:value="item.value"
></el-option>
</template>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
...@@ -406,7 +422,7 @@ export default { ...@@ -406,7 +422,7 @@ export default {
// 导出遮罩层 // 导出遮罩层
exportLoading: false, exportLoading: false,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: false,
// 总条数 // 总条数
total: 0, total: 0,
// 订单列表 // 订单列表
......
src/views/ecw/order/exception/index.vue
View file @ 39fc4430
...@@ -1062,7 +1062,7 @@ export default { ...@@ -1062,7 +1062,7 @@ export default {
this.destCountryId = null this.destCountryId = null
this.destWarehouseId = null this.destWarehouseId = null
this.objectiveId = null this.objectiveId = null
this.queryParams.isHaveCustomer = null
this.queryParams.channelIds = null this.queryParams.channelIds = null
this.getList(); this.getList();
}, },
......
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