Commit 7d7f9789 authored by Marcus's avatar Marcus

Merge remote-tracking branch 'origin/dev' into dev

parents c3dc3fca f3197757
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="客户名称" prop="customerId" > <el-form-item :label="$t('客户名称')" prop="customerId" >
<el-select <el-select
clearable clearable
filterable filterable
v-model="queryParams.customerId" v-model="queryParams.customerId"
placeholder="请输入关键词"> :placeholder="$t('请输入关键词')">
<el-option <el-option
v-for="(item, index) in customeList" v-for="(item, index) in customeList"
:key="index" :key="index"
...@@ -18,41 +18,41 @@ ...@@ -18,41 +18,41 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="type"> <el-form-item :label="$t('联系电话')" prop="type">
<el-input v-model="queryParams.defaultContactPhone" placeholder="请输入电话" clearable size="small"> <el-input v-model="queryParams.defaultContactPhone" :placeholder="$t('请输入电话')" clearable size="small">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="佣金类型" prop="transportId"> <el-form-item :label="$t('佣金类型')" prop="transportId">
<el-select v-model="queryParams.type" clearable size="small"> <el-select v-model="queryParams.type" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_TYPE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="运输方式" prop="departureId"> <el-form-item :label="$t('运输方式')" prop="departureId">
<el-select v-model="queryParams.departureId" clearable size="small"> <el-select v-model="queryParams.departureId" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="始发地" prop="objectiveId"> <el-form-item :label="$t('始发地')" prop="objectiveId">
<el-select v-model="queryParams.objectiveId" clearable size="small"> <el-select v-model="queryParams.objectiveId" clearable size="small">
<el-option v-for="dict in exportCityList" <el-option v-for="dict in exportCityList"
:key="dict.id" :label="dict.titleZh" :value="dict.id"/> :key="dict.id" :label="dict.titleZh" :value="dict.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="目的地" prop="customsType"> <el-form-item :label="$t('目的地')" prop="customsType">
<el-select v-model="queryParams.customsType" clearable size="small"> <el-select v-model="queryParams.customsType" clearable size="small">
<el-option v-for="dict in importCityList" <el-option v-for="dict in importCityList"
:key="dict.id" :label="dict.titleZh" :value="dict.id"/> :key="dict.id" :label="dict.titleZh" :value="dict.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="报关方式" prop="approval"> <el-form-item :label="$t('报关方式')" prop="approval">
<el-select v-model="queryParams.approval" clearable size="small"> <el-select v-model="queryParams.approval" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备案" prop="darkReturnType"> <el-form-item :label="$t('备案')" prop="darkReturnType">
<el-select v-model="queryParams.darkReturnType" clearable size="small"> <el-select v-model="queryParams.darkReturnType" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
...@@ -60,11 +60,11 @@ ...@@ -60,11 +60,11 @@
</el-form-item> </el-form-item>
<div style="width:100%;display: flex;justify-content: space-between;margin-bottom: 50px;"> <div style="width:100%;display: flex;justify-content: space-between;margin-bottom: 50px;">
<div style="flex: 1"> <div style="flex: 1">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button></div> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button></div>
<div style="flex: 1; text-align: right;"> <div style="flex: 1; text-align: right;">
<router-link :to="'/customerCommissionInfo/'+ 0 "> <router-link :to="'/customerCommissionInfo/'+ 0 ">
<el-button type="primary">佣金设置</el-button> <el-button type="primary">{{$t('佣金设置')}}</el-button>
</router-link> </router-link>
</div> </div>
</div> </div>
...@@ -83,48 +83,48 @@ ...@@ -83,48 +83,48 @@
type="selection" type="selection"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="佣金编码" align="center" prop="customerId" /> <el-table-column :label="$t('佣金编码')" align="center" prop="customerId" />
<el-table-column label="客户名称" align="center" prop="customerName" show-overflow-tooltip > <el-table-column :label="$t('客户名称')" align="center" prop="customerName" show-overflow-tooltip >
</el-table-column> </el-table-column>
<el-table-column label="联系电话" align="center" prop="transportId" show-overflow-tooltip > <el-table-column :label="$t('联系电话')" align="center" prop="transportId" show-overflow-tooltip >
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{scope.row.defaultContactPhone}}</div> <div>{{scope.row.defaultContactPhone}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="佣金类型" type="" align="center" prop="type"> <el-table-column :label="$t('佣金类型')" type="" align="center" prop="type">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.COMMISSION_TYPE" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="暗佣返佣类型" align="center" prop="darkReturnType"> <el-table-column :label="$t('暗佣返佣类型')" align="center" prop="darkReturnType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.COMMISSION_DARK_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.COMMISSION_DARK_TYPE" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="运输方式" align="center" prop="transportId"> <el-table-column :label="$t('运输方式')" align="center" prop="transportId">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag v-if="scope.row.transportId" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" /> <dict-tag v-if="scope.row.transportId" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
<div v-else>全部</div> <div v-else>{{$t('全部')}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="始发地/目的地 " align="center" prop="departureId" show-overflow-tooltip :formatter="originDestination"> <el-table-column :label="$t('始发地/目的地')" align="center" prop="departureId" show-overflow-tooltip :formatter="originDestination">
</el-table-column> </el-table-column>
<el-table-column label="报关方式" align="center" prop="customsType" show-overflow-tooltip> <el-table-column :label="$t('报关方式')" align="center" prop="customsType" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag v-if="scope.row.customsType" :type="DICT_TYPE.SHIPPING_DECLARATION_TYPE" :value="scope.row.customsType" /> <dict-tag v-if="scope.row.customsType" :type="DICT_TYPE.SHIPPING_DECLARATION_TYPE" :value="scope.row.customsType" />
<div v-else>全部</div> <div v-else>{{$t('全部')}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备案" align="center" prop="approval"> <el-table-column :label="$t('备案')" align="center" prop="approval">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag v-if="scope.row.approval" :type="DICT_TYPE.COMMISSION_PRODUCT_APPROVAL" :value="scope.row.approval" /> <dict-tag v-if="scope.row.approval" :type="DICT_TYPE.COMMISSION_PRODUCT_APPROVAL" :value="scope.row.approval" />
<div v-else>全部</div> <div v-else>{{$t('全部')}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>--> <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>-->
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">{{$t('删除')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -182,9 +182,9 @@ export default { ...@@ -182,9 +182,9 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
customerId: [{ required: true, message: "客户id不能为空", trigger: "change" }], customerId: [{ required: true, message: this.$t('客户id不能为空'), trigger: "change" }],
type: [{ required: true, message: "佣金类型不能为空", trigger: "change" }], type: [{ required: true, message: this.$t('佣金类型不能为空'), trigger: "change" }],
darkReturnType: [{ required: true, message: "暗佣类型 1产品2达标不能为空", trigger: "change" }], darkReturnType: [{ required: true, message: this.$t('暗佣类型 1产品2达标不能为空'), trigger: "change" }],
}, },
customeList:[], customeList:[],
}; };
...@@ -245,7 +245,7 @@ export default { ...@@ -245,7 +245,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除客户佣金类型编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除客户佣金类型编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCustomerCommission(id); return deleteCustomerCommission(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
...@@ -256,7 +256,7 @@ export default { ...@@ -256,7 +256,7 @@ export default {
let index1 = this.exportCityList.findIndex(item =>item.id == row.departureId); let index1 = this.exportCityList.findIndex(item =>item.id == row.departureId);
let index2 = this.importCityList.findIndex(item => item.id == row.objectiveId); let index2 = this.importCityList.findIndex(item => item.id == row.objectiveId);
let flag = `${index1 === -1 ? '全部' : this.exportCityList[index1].titleZh}/${index2 === -1 ? '全部' : this.importCityList[index2].titleZh}`; let flag = `${index1 === -1 ? this.$t('全部') : this.exportCityList[index1].titleZh}/${index2 === -1 ? this.$t('全部') : this.importCityList[index2].titleZh}`;
return flag return flag
}, },
} }
......
<template> <template>
<el-select v-if="options" v-model="selectVal" placeholder="请选择"> <el-select v-if="options" v-model="selectVal" :placeholder="$t('请选择')">
<el-option v-if="allShow" label="全部" :value='0'></el-option> <el-option v-if="allShow" :label="$t('全部')" :value='0'></el-option>
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item[valueKey]" :key="item[valueKey]"
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="客户名称" prop="customerId"> <el-form-item :label="$t('客户名称')" prop="customerId">
<div style="display: flex"> <div style="display: flex">
<el-input readonly="readonly" placeholder="请输入选择客户" v-model="customerName"></el-input> <el-input readonly="readonly" :placeholder="$t('请输入选择客户')" v-model="customerName"></el-input>
<img style="width: 40px;height: 40px;margin-left: 40px;" src="@/assets/images/phonebook.png" class="phonebook" @click="customerNameShow= true" /> <img style="width: 40px;height: 40px;margin-left: 40px;" src="@/assets/images/phonebook.png" class="phonebook" @click="customerNameShow= true" />
</div> </div>
<!-- <el-select--> <!-- <el-select-->
...@@ -29,14 +29,14 @@ ...@@ -29,14 +29,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="运输方式" prop="transportId"> <el-form-item :label="$t('运输方式')" prop="transportId">
<div> <div>
<custom-selectors-dictionary :all-show="true" v-model="form.transportId" :options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary> <custom-selectors-dictionary :all-show="true" v-model="form.transportId" :options="getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE)"></custom-selectors-dictionary>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="始发地" prop="departureId"> <el-form-item :label="$t('始发地')" prop="departureId">
<div> <div>
<custom-selectors-dictionary :all-show="true" label-key="titleZh" value-key="id" v-model="form.departureId" <custom-selectors-dictionary :all-show="true" label-key="titleZh" value-key="id" v-model="form.departureId"
:options="exportCityList"></custom-selectors-dictionary> :options="exportCityList"></custom-selectors-dictionary>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="目的地" prop="objectiveId"> <el-form-item :label="$t('目的地')" prop="objectiveId">
<div> <div>
<custom-selectors-dictionary :all-show="true" label-key="titleZh" value-key="id" v-model="form.objectiveId" <custom-selectors-dictionary :all-show="true" label-key="titleZh" value-key="id" v-model="form.objectiveId"
:options="importCityList"></custom-selectors-dictionary> :options="importCityList"></custom-selectors-dictionary>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="报关方式" prop="customsType"> <el-form-item :label="$t('报关方式')" prop="customsType">
<div> <div>
<custom-selectors-dictionary :all-show="true" v-model="form.customsType" <custom-selectors-dictionary :all-show="true" v-model="form.customsType"
:options="getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"></custom-selectors-dictionary> :options="getDictDatas(DICT_TYPE.SHIPPING_DECLARATION_TYPE)"></custom-selectors-dictionary>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="备案" prop="approval"> <el-form-item :label="$t('备案')" prop="approval">
<div> <div>
<custom-selectors-dictionary :all-show="true" v-model="form.approval" <custom-selectors-dictionary :all-show="true" v-model="form.approval"
:options="getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"></custom-selectors-dictionary> :options="getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL)"></custom-selectors-dictionary>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label-width="150px" label="佣金类型(明佣、暗佣)"> <el-form-item label-width="150px" :label="$t('佣金类型(明佣、暗佣)')">
<el-radio-group v-model="form.type"> <el-radio-group v-model="form.type">
<el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)" v-show="item.value != 0" :label="parseInt(item.value)" <el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)" v-show="item.value != 0" :label="parseInt(item.value)"
:key="index">{{ item.label }} :key="index">{{ item.label }}
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="返佣类型" v-if="form.type == 2"> <el-form-item :label="$t('返佣类型')" v-if="form.type == 2">
<el-radio-group v-model="form.darkReturnType"> <el-radio-group v-model="form.darkReturnType">
<el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_DARK_TYPE)" :label="parseInt(item.value)" <el-radio v-for="(item,index) in getDictDatas(DICT_TYPE.COMMISSION_DARK_TYPE)" :label="parseInt(item.value)"
:key="index">{{ item.label }} :key="index">{{ item.label }}
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="ming-servant" v-if="form.type == 1"> <div class="ming-servant" v-if="form.type == 1">
<div class="label">佣金</div> <div class="label">{{$t('佣金')}}</div>
<div class="content"> <div class="content">
<div> <div>
<el-input v-model="mingServantFrom[0].refund"></el-input> <el-input v-model="mingServantFrom[0].refund"></el-input>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</div> </div>
</div> </div>
<el-form v-if="form.type == 2 && form.darkReturnType == 1"> <el-form v-if="form.type == 2 && form.darkReturnType == 1">
<el-form-item label="商品类型" v-for="(item,index) in darkServantAndProductForm" :key="index"> <el-form-item :label="$t('商品类型')" v-for="(item,index) in darkServantAndProductForm" :key="index">
<div class="shanping-type"> <div class="shanping-type">
<div class="tool"> <div class="tool">
<custom-selectors-dictionary :all-show="true" v-model="item.productType" :options="productAttrList" label-key="titleZh" <custom-selectors-dictionary :all-show="true" v-model="item.productType" :options="productAttrList" label-key="titleZh"
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</div> </div>
<div class="box"> <div class="box">
<div class="label"> <div class="label">
商品特性 {{$t('商品特性')}}
</div> </div>
<div class="custom"> <div class="custom">
<custom-selectors-dictionary :all-show="true" v-model="item.productAttr" label-key="attrName" value-key="id" <custom-selectors-dictionary :all-show="true" v-model="item.productAttr" label-key="attrName" value-key="id"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</div> </div>
<div class="box"> <div class="box">
<div class="label"> <div class="label">
佣金 {{$t('佣金')}}
</div> </div>
<div class="custom"> <div class="custom">
<el-input v-model="item.darkCommission"></el-input> <el-input v-model="item.darkCommission"></el-input>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
</div> </div>
</div> </div>
<div> <div>
<el-button type="primary" @click="addToFn(1)" v-if="darkServantAndProductForm.length - 1 === index">添加</el-button> <el-button type="primary" @click="addToFn(1)" v-if="darkServantAndProductForm.length - 1 === index">{{$t('添加')}}</el-button>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -150,10 +150,10 @@ ...@@ -150,10 +150,10 @@
<div class="column" v-if="form.type == 2 && form.darkReturnType == 2"> <div class="column" v-if="form.type == 2 && form.darkReturnType == 2">
<div style="margin-bottom: 10px" v-for="(item,index) in darkServantAndRebateForm" :key="index"> <div style="margin-bottom: 10px" v-for="(item,index) in darkServantAndRebateForm" :key="index">
<div class="label"> <div class="label">
佣金: {{$t(' 佣金:')}}
</div> </div>
<div class="content"> <div class="content">
<div class="item label"></div> <div class="item label">{{$t('')}}</div>
<div class="item"> <div class="item">
<el-input v-model="item.amount"></el-input> <el-input v-model="item.amount"></el-input>
</div> </div>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="item label"></div> <div class="item label">{{$t('')}}</div>
<div class="item"> <div class="item">
<el-input v-model="item.refund"></el-input> <el-input v-model="item.refund"></el-input>
</div> </div>
...@@ -180,12 +180,12 @@ ...@@ -180,12 +180,12 @@
label-key="titleZh" value-key="id" :options="weightList"></custom-selectors-dictionary> label-key="titleZh" value-key="id" :options="weightList"></custom-selectors-dictionary>
</div> </div>
</div> </div>
<el-button type="primary" @click="addToFn(2)" v-show="darkServantAndRebateForm.length -1 === index">添加</el-button> <el-button type="primary" @click="addToFn(2)" v-show="darkServantAndRebateForm.length -1 === index">{{$t('添加')}}</el-button>
</div> </div>
</div> </div>
<div class="mingServantAndDarkServant" v-if="form.type == 3"> <div class="mingServantAndDarkServant" v-if="form.type == 3">
<div class="box"> <div class="box">
<div class="label">暗佣佣金</div> <div class="label">{{$t('暗佣佣金')}}</div>
<div class="content"> <div class="content">
<div class="item"> <div class="item">
<el-input v-model="mingServantAnddarkServant[0].refund"></el-input> <el-input v-model="mingServantAnddarkServant[0].refund"></el-input>
...@@ -201,10 +201,10 @@ ...@@ -201,10 +201,10 @@
</div> </div>
</div> </div>
<div class="title"> <div class="title">
<span class="label">成本价 = 原价-暗佣佣金</span> <span class="label">{{$t('成本价 = 原价-暗佣佣金')}}</span>
</div> </div>
<div class="box"> <div class="box">
<div class="label">销售价上调</div> <div class="label">{{$t('销售价上调')}}</div>
<div class="content"> <div class="content">
<div class="item"> <div class="item">
<el-input v-model="mingServantAnddarkServant[0].darkAdjustCommission"></el-input> <el-input v-model="mingServantAnddarkServant[0].darkAdjustCommission"></el-input>
...@@ -220,15 +220,15 @@ ...@@ -220,15 +220,15 @@
</div> </div>
</div> </div>
<div class="title"> <div class="title">
<span class="label"> 实际佣金返点 = 销售价-成本价</span> <span class="label">{{$t(' 实际佣金返点 = 销售价-成本价')}}</span>
</div> </div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" style="margin-top: 20px"> <el-col :span="12" style="margin-top: 20px">
<el-button style="width:200px;margin: 0 40px" type="primary" @click="submitForm">确定</el-button> <el-button style="width:200px;margin: 0 40px" type="primary" @click="submitForm">{{$t('确定')}}</el-button>
<el-button style="width:200px" @click="cancel">取消</el-button> <el-button style="width:200px" @click="cancel">{{$t('取消')}}</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
...@@ -331,7 +331,7 @@ export default { ...@@ -331,7 +331,7 @@ export default {
commodity: [], commodity: [],
// 表单校验 // 表单校验
rules: { rules: {
customerId: [{required: true, message: "客户名称不能为空", trigger: "blur"}], customerId: [{required: true, message: this.$t('客户名称不能为空'), trigger: "blur"}],
}, },
customerShow: true, customerShow: true,
id:undefined,//佣金id id:undefined,//佣金id
...@@ -519,7 +519,7 @@ export default { ...@@ -519,7 +519,7 @@ export default {
createCommission(this.form).then(r =>{ createCommission(this.form).then(r =>{
console.log('添加',r) console.log('添加',r)
if(r.code == 0){ if(r.code == 0){
this.$message.success('添加成功!'); this.$message.success(this.$t('添加成功!'));
this.$tab.closeOpenPage({path:'/customer/customerCommission'}); this.$tab.closeOpenPage({path:'/customer/customerCommission'});
} }
}) })
...@@ -532,7 +532,7 @@ export default { ...@@ -532,7 +532,7 @@ export default {
updateCustomerCommissionInfo(p).then(r=>{ updateCustomerCommissionInfo(p).then(r=>{
if(r.code == 0){ if(r.code == 0){
this.$router.go(-1) this.$router.go(-1)
this.$message.success('修改成功!'); this.$message.success(this.$t('修改成功!'));
} }
}) })
} }
......
...@@ -3,40 +3,40 @@ ...@@ -3,40 +3,40 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch && !!!customerId" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch && !!!customerId" label-width="68px">
<el-form-item label="客户名称" prop="customerId"> <el-form-item :label="$t('客户名称')" prop="customerId">
<el-select v-model="queryParams.customerId" placeholder="请选择客户名称" clearable size="small"> <el-select v-model="queryParams.customerId" :placeholder="$t('请选择客户名称')" clearable size="small">
<el-option v-for="customer in myFollowCustomerList" :key="customer.id" :value="customer.id" <el-option v-for="customer in myFollowCustomerList" :key="customer.id" :value="customer.id"
:label="customer.name.join('|').join(customer.name)"/> :label="customer.name.join('|').join(customer.name)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="投诉类型" prop="type"> <el-form-item :label="$t('投诉类型')" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择投诉类型" clearable size="small"> <el-select v-model="queryParams.type" :placeholder="$t('请选择投诉类型')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_TYPE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="orderId"> <el-form-item :label="$t('订单号')" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单号" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.orderId" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="提单号" prop="ladingbillId"> <el-form-item :label="$t('提单号')" prop="ladingbillId">
<el-input v-model="queryParams.ladingbillId" placeholder="请输入提单号" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.ladingbillId" :placeholder="$t('请输入提单号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="处理状态" prop="status"> <el-form-item :label="$t('处理状态')" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择处理状态" clearable size="small"> <el-select v-model="queryParams.status" :placeholder="$t('请选择处理状态')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="投诉编号" prop="code"> <el-form-item :label="$t('投诉编号')" prop="code">
<el-input v-model="queryParams.code" placeholder="请输入投诉编号" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.code" :placeholder="$t('请输入投诉编号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item :label="$t('创建时间')">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -44,49 +44,49 @@ ...@@ -44,49 +44,49 @@
<el-row :gutter="10" v-show="!!!customerId" class="mb8"> <el-row :gutter="10" v-show="!!!customerId" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:customer-complaint:create']">新增</el-button> v-hasPermi="['ecw:customer-complaint:create']">{{$t('新增')}}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:customer-complaint:export']">导出</el-button> v-hasPermi="['ecw:customer-complaint:export']">{{$t('导出')}}</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="客户名称" align="center" > <el-table-column :label="$t('客户名称')" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ formatCustomerName(scope.row.customerId) }}</div> <div>{{ formatCustomerName(scope.row.customerId) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投诉类型" align="center" prop="type"> <el-table-column :label="$t('投诉类型')" align="center" prop="type">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单号" align="center" prop="orderId" /> <el-table-column :label="$t('订单号')" align="center" prop="orderId" />
<el-table-column label="提单号" align="center" prop="ladingbillId" /> <el-table-column :label="$t('提单号')" align="center" prop="ladingbillId" />
<el-table-column label="投诉内容" align="center" prop="content" /> <el-table-column :label="$t('投诉内容')" align="center" prop="content" />
<el-table-column label="处理状态" align="center" prop="status"> <el-table-column :label="$t('处理状态')" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:customer-complaint:update']">修改</el-button> v-hasPermi="['ecw:customer-complaint:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleHandle(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleHandle(scope.row)"
v-hasPermi="['ecw:customer-complaint:update']" v-show="scope.row.status != 3">处理</el-button> v-hasPermi="['ecw:customer-complaint:update']" v-show="scope.row.status != 3">{{$t('处理')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:customer-complaint:delete']">删除</el-button> v-hasPermi="['ecw:customer-complaint:delete']">{{$t('删除')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleSee(scope.row)">查看</el-button> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSee(scope.row)">{{$t('查看')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<div class="formShow"> <div class="formShow">
<div> <div>
<el-form-item label="客户名称" prop="customerId"> <el-form-item :label="$t('客户名称')" prop="customerId">
<el-select v-model="form.customerId" placeholder="请选择客户名称" :disabled="!!customerId" filterable> <el-select v-model="form.customerId" :placeholder="$t('请选择客户名称')" :disabled="!!customerId" filterable>
<el-option <el-option
v-for="item in customerSelect" v-for="item in customerSelect"
:key="item.id" :key="item.id"
...@@ -108,18 +108,18 @@ ...@@ -108,18 +108,18 @@
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="投诉类型" prop="type"> <el-form-item :label="$t('投诉类型')" prop="type">
<el-select v-model="form.type" placeholder="请选择投诉类型"> <el-select v-model="form.type" :placeholder="$t('请选择投诉类型')">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_TYPE)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_COMPLAINT_TYPE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="orderId"> <el-form-item :label="$t('订单号')" prop="orderId">
<el-select <el-select
v-model="form.orderId" v-model="form.orderId"
filterable filterable
remote remote
placeholder="请输入订单号" :placeholder="$t('请输入订单号')"
:remote-method="getOrderList" :remote-method="getOrderList"
:loading="loading"> :loading="loading">
<el-option <el-option
...@@ -130,12 +130,12 @@ ...@@ -130,12 +130,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="提单号" prop="ladingbillId"> <el-form-item :label="$t('提单号')" prop="ladingbillId">
<el-select <el-select
v-model="form.ladingbillId" v-model="form.ladingbillId"
filterable filterable
remote remote
placeholder="请输入提单号" :placeholder="$t('请输入提单号')"
:remote-method="getBillList" :remote-method="getBillList"
:loading="loading"> :loading="loading">
<el-option <el-option
...@@ -148,40 +148,40 @@ ...@@ -148,40 +148,40 @@
</el-form-item> </el-form-item>
</div> </div>
<div v-if="form.id"> <div v-if="form.id">
<el-form-item label="投诉时间"> <el-form-item :label="$t('投诉时间')">
<span>{{parseTime(form.createTime)}}</span> <span>{{parseTime(form.createTime)}}</span>
</el-form-item> </el-form-item>
<el-form-item label="投诉状态"> <el-form-item :label="$t('投诉状态')">
<dict-selector :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :disabled="true" form-type="radio" v-model="form.status" :filter="(e) => e.value == '1' ||e.value == '2' || e.value == '3'" <dict-selector :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :disabled="true" form-type="radio" v-model="form.status" :filter="(e) => e.value == '1' ||e.value == '2' || e.value == '3'"
:formatter="Number"></dict-selector> :formatter="Number"></dict-selector>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<el-form-item label="投诉内容" prop="content"> <el-form-item :label="$t('投诉内容')" prop="content">
<el-input v-model="form.content" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.content" type="textarea" :placeholder="$t('请输入内容')" />
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '2'||form.status == '3'" label="查明原因" required> <el-form-item v-show="form.status == '2'||form.status == '3'" :label="$t('查明原因')" required>
<el-input type="textarea" placeholder="请输入查明原因" v-model="form.ascertainReason"></el-input> <el-input type="textarea" :placeholder="$t('请输入查明原因')" v-model="form.ascertainReason"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '2'||form.status == '3'" label="处理方案"> <el-form-item v-show="form.status == '2'||form.status == '3'" :label="$t('处理方案')">
<el-input v-model="form.plan" placeholder="请输入处理方案"></el-input> <el-input v-model="form.plan" :placeholder="$t('请输入处理方案')"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="处理结果" required> <el-form-item v-show="form.status == '3'" :label="$t('处理结果')" required>
<el-input type="textarea" placeholder="请输入处理结果" v-model="form.result"></el-input> <el-input type="textarea" :placeholder="$t('请输入处理结果')" v-model="form.result"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="赔付金额"> <el-form-item v-show="form.status == '3'" :label="$t('赔付金额')">
<el-input v-model="form.indemnity" placeholder="请输入赔付金额"> <el-input v-model="form.indemnity" :placeholder="$t('请输入赔付金额')">
<dict-selector <dict-selector
defaultable defaultable
style="width: 110px" style="width: 110px"
placeholder="请选择货币单位" :placeholder="$t('请选择货币单位')"
slot="append" slot="append"
v-model="form.currencyUnit" v-model="form.currencyUnit"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector> :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="处理时间" required> <el-form-item v-show="form.status == '3'" :label="$t('处理时间')" required>
<span>{{parseTime(form.handleAt)}}</span> <span>{{parseTime(form.handleAt)}}</span>
</el-form-item> </el-form-item>
<!-- <el-form-item label="处理状态" prop="status" v-if="form.id"> <!-- <el-form-item label="处理状态" prop="status" v-if="form.id">
...@@ -196,8 +196,8 @@ ...@@ -196,8 +196,8 @@
<!-- <customer-follow v-if="!!this.form.id" :id="form.id" :customer-id="form.customerId"></customer-follow> --> <!-- <customer-follow v-if="!!this.form.id" :id="form.id" :customer-id="form.customerId"></customer-follow> -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -206,45 +206,45 @@ ...@@ -206,45 +206,45 @@
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :model="form" label-width="80px">
<div class="formShow"> <div class="formShow">
<div> <div>
<el-form-item label="客户名称:"> <el-form-item :label="$t('客户名称')+':'">
<div>{{ formatCustomerName(form.customerId) }}</div> <div>{{ formatCustomerName(form.customerId) }}</div>
</el-form-item> </el-form-item>
<el-form-item label="投诉类型:"> <el-form-item :label="$t('投诉类型') +':'">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="form.type" /> <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="form.type" />
</el-form-item> </el-form-item>
<el-form-item label="订单号:" prop="orderId" > <el-form-item :label="$t('订单号')+':'" prop="orderId" >
<div>{{form.orderId}}</div> <div>{{form.orderId}}</div>
</el-form-item> </el-form-item>
<el-form-item label="提单号:" prop="ladingbillId" > <el-form-item label="提单号:" prop="ladingbillId" >
<div>{{form.ladingbillId||'无'}}</div> <div>{{form.ladingbillId|| $t('无')}}</div>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item label="投诉时间:"> <el-form-item :label="$t('投诉时间')+':'">
<span>{{parseTime(form.createTime)}}</span> <span>{{parseTime(form.createTime)}}</span>
</el-form-item> </el-form-item>
<el-form-item label="投诉状态:"> <el-form-item :label="$t('投诉状态')+':'">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.status" /> <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.status" />
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<el-form-item label="投诉内容:" > <el-form-item :label="$t('投诉内容')+':'" >
<div>{{form.content||'无'}}</div> <div>{{form.content|| $t('无')}}</div>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '2'||form.status == '3'" label="查明原因:" prop="ascertainReason" > <el-form-item v-show="form.status == '2'||form.status == '3'" :label="$t('查明原因')+':'" prop="ascertainReason" >
<div>{{form.ascertainReason||'无'}}</div> <div>{{form.ascertainReason||'无'}}</div>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '2'||form.status == '3'" label="处理方案:" prop="plan" > <el-form-item v-show="form.status == '2'||form.status == '3'" :label="$t('处理方案')+':'" prop="plan" >
<div>{{form.plan||'无'}}</div> <div>{{form.plan||$t('无')}}</div>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="处理结果:" prop="result" > <el-form-item v-show="form.status == '3'" :label="$t('处理结果')+':'" prop="result" >
<div>{{form.result||'无'}}</div> <div>{{form.result||$t('无')}}</div>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="赔付金额:"> <el-form-item v-show="form.status == '3'" :label="$t('赔付金额')+':'">
<span>{{form.indemnity||0}}</span> <span>{{form.indemnity||0}}</span>
<dict-tag :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="form.currencyUnit"></dict-tag> <dict-tag :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="form.currencyUnit"></dict-tag>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="处理时间:"> <el-form-item v-show="form.status == '3'" :label="$t('处理时间')+':'">
<span>{{parseTime(form.handleAt)}}</span> <span>{{parseTime(form.handleAt)}}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -252,48 +252,48 @@ ...@@ -252,48 +252,48 @@
<customer-follow v-if="!!this.form.id" :id="form.id" :customer-id="form.customerId"></customer-follow> <customer-follow v-if="!!this.form.id" :id="form.id" :customer-id="form.customerId"></customer-follow>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="openCustomer=false">确 定</el-button> <el-button type="primary" @click="openCustomer=false">{{$t('确 定')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="提示" :title="$t('提示')"
:visible.sync="handle.dialogVisible" :visible.sync="handle.dialogVisible"
width="30%" width="30%"
> >
<el-form ref="form" :model="form" label-width="80px" :rules="rules"> <el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-form-item label="投诉类型"> <el-form-item :label="$t('投诉类型')">
<dict-selector :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" form-type="radio" v-model="form.status" <dict-selector :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" form-type="radio" v-model="form.status"
:filter="(e) => e.value == '2' || e.value == '3'" :formatter="Number"></dict-selector> :filter="(e) => e.value == '2' || e.value == '3'" :formatter="Number"></dict-selector>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '2'" label="查明原因" required > <el-form-item v-show="form.status == '2'" :label="$t('查明原因')" required >
<el-input type="textarea" placeholder="请输入查明原因" v-model="form.ascertainReason"></el-input> <el-input type="textarea" :placeholder="$t('请输入查明原因')" v-model="form.ascertainReason"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '2'" label="处理方案"> <el-form-item v-show="form.status == '2'" :label="$t('处理方案')">
<el-input v-model="form.plan" placeholder="请输入处理方案"></el-input> <el-input v-model="form.plan" :placeholder="$t('请输入处理方案')"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="处理结果" required> <el-form-item v-show="form.status == '3'" :label="$t('处理结果')" required>
<el-input type="textarea" placeholder="请输入处理结果" v-model="form.result"></el-input> <el-input type="textarea" :placeholder="$t('请输入处理结果')" v-model="form.result"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="赔付金额"> <el-form-item v-show="form.status == '3'" :label="$t('赔付金额')">
<el-input v-model="form.indemnity" placeholder="请输入赔付金额"> <el-input v-model="form.indemnity" :placeholder="$t('请输入赔付金额')">
<dict-selector <dict-selector
defaultable defaultable
style="width: 110px" style="width: 110px"
placeholder="请选择货币单位" :placeholder="$t('请选择货币单位')"
slot="append" slot="append"
v-model="form.currencyUnit" v-model="form.currencyUnit"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector> :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.status == '3'" label="处理时间" required> <el-form-item v-show="form.status == '3'" :label="$t('处理时间')" required>
<el-date-picker type="datetime" v-model="form.handleAt" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" v-model="form.handleAt" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handle.dialogVisible = false">取 消</el-button> <el-button @click="handle.dialogVisible = false">{{$t('取 消')}}</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -357,9 +357,9 @@ export default { ...@@ -357,9 +357,9 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
customerId: [{ required: true, message: "客户名称不能为空", trigger: "change" }], customerId: [{ required: true, message: this.$t('客户名称不能为空'), trigger: "change" }],
type: [{ required: true, message: "投诉类型不能为空", trigger: "change" }], type: [{ required: true, message: this.$t('投诉类型不能为空'), trigger: "change" }],
content: [{ required: true, message: "投诉内容不能为空", trigger: "blur" }], content: [{ required: true, message: this.$t('投诉内容不能为空'), trigger: "blur" }],
}, },
myFollowCustomerList: [], myFollowCustomerList: [],
...@@ -452,7 +452,7 @@ export default { ...@@ -452,7 +452,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加客户投诉"; this.title = this.$t('添加客户投诉');
// 新增客诉默认状态为待处理 // 新增客诉默认状态为待处理
this.form.status = 1; this.form.status = 1;
}, },
...@@ -464,7 +464,7 @@ export default { ...@@ -464,7 +464,7 @@ export default {
getCustomerComplaint(id).then(response => { getCustomerComplaint(id).then(response => {
this.form = response.data; this.form = response.data;
this.openCustomer = true; this.openCustomer = true;
this.title = "投诉详情"; this.title = this.$t('投诉详情');
}); });
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
...@@ -474,7 +474,7 @@ export default { ...@@ -474,7 +474,7 @@ export default {
getCustomerComplaint(id).then(response => { getCustomerComplaint(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改客户投诉"; this.title = this.$t('修改客户投诉');
}); });
}, },
handleHandle(row){ handleHandle(row){
...@@ -496,22 +496,22 @@ export default { ...@@ -496,22 +496,22 @@ export default {
if (this.form.id != null) { if (this.form.id != null) {
if(this.form.status==2){ if(this.form.status==2){
if(!this.form.ascertainReason){ if(!this.form.ascertainReason){
this.$modal.msgError("请输入查明原因"); this.$modal.msgError(this.$t('请输入查明原因'));
return return
} }
} }
if(this.form.status==3){ if(this.form.status==3){
if(!this.form.result){ if(!this.form.result){
this.$modal.msgError("请输入处理结果"); this.$modal.msgError(this.$t('请输入处理结果'));
return return
} }
if(!this.form.handleAt){ if(!this.form.handleAt){
this.$modal.msgError("请输入处理时间"); this.$modal.msgError(this.$t('请输入处理时间'));
return return
} }
} }
updateCustomerComplaint(this.form).then(response => { updateCustomerComplaint(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false; this.open = false;
this.handle.dialogVisible = false this.handle.dialogVisible = false
this.getList(); this.getList();
...@@ -520,7 +520,7 @@ export default { ...@@ -520,7 +520,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createCustomerComplaint(this.form).then(response => { createCustomerComplaint(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -529,11 +529,11 @@ export default { ...@@ -529,11 +529,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除客户投诉编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除客户投诉编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCustomerComplaint(id); return deleteCustomerComplaint(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -544,7 +544,7 @@ export default { ...@@ -544,7 +544,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有客户投诉数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有客户投诉数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportCustomerComplaintExcel(params); return exportCustomerComplaintExcel(params);
}).then(response => { }).then(response => {
...@@ -559,7 +559,7 @@ export default { ...@@ -559,7 +559,7 @@ export default {
return customer.name; return customer.name;
} }
} }
return '找不到客户:' + customerId; return this.$t('找不到客户') + ':' + customerId;
} }
} }
}; };
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:customer:export']">导出</el-button> v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -95,14 +95,14 @@ ...@@ -95,14 +95,14 @@
<el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn"> <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
</el-table-column> </el-table-column>
<el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column> <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleConfirmService(scope.row)" <el-button size="mini" type="text" @click="handleConfirmService(scope.row)"
v-hasPermi="['ecw:customer:update']">确认接收</el-button> v-hasPermi="['ecw:customer:update']">{{$t('确认接收')}}</el-button>
<el-button size="mini" type="text" @click="handOver(scope.row)" <el-button size="mini" type="text" @click="handOver(scope.row)"
v-hasPermi="['ecw:customer:update']">移交</el-button> v-hasPermi="['ecw:customer:update']">{{$t('移交')}}</el-button>
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:customer:update']">完善</el-button> v-hasPermi="['ecw:customer:update']">{{$t('完善')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -115,80 +115,80 @@ ...@@ -115,80 +115,80 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户名称" prop="name"> <el-form-item :label="$t('客户名称')" prop="name">
<el-input v-model="form.name" placeholder="请输入客户名称" /> <el-input v-model="form.name" :placeholder="$t('请输入客户名称')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="国家" prop="country"> <el-form-item label="国家" prop="country">
<el-select v-model="form.country" placeholder="请选择国家"> <el-select v-model="form.country" :placeholder="$t('请选择国家')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</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="客户等级" prop="level"> <el-form-item :label="$t('客户等级')" prop="level">
<el-select v-model="form.level" placeholder="请选择客户等级"> <el-select v-model="form.level" :placeholder="$t('请选择客户等级')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</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="所属代理" prop="agentId"> <el-form-item :label="$t('所属代理')" prop="agentId">
<el-select v-model="form.agentId" placeholder="请选择所属代理"> <el-select v-model="form.agentId" :placeholder="$t('请选择所属代理')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</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="联系地址" prop="address"> <el-form-item :label="$t('联系地址')" prop="address">
<el-input v-model="form.address" placeholder="请输入联系地址" /> <el-input v-model="form.address" :placeholder="$t('请输入联系地址')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户类别" prop="type"> <el-form-item :label="$t('客户类别')" prop="type">
<el-select v-model="form.type" placeholder="请选择客户类别"> <el-select v-model="form.type" :placeholder="$t('请选择客户类别')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_TYPE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" /> :key="dict.value" :label="dict.label" :value="dict.value" />
</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="常用提货网点" prop="pickupPoint"> <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
<el-select v-model="form.pickupPoint" placeholder="请输入常用提货网点"> <el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">
<el-option label="请选择字典生成" value="" /> <el-option :label="$t('请选择字典生成')" value="" />
</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="公司名称" prop="company"> <el-form-item :label="$t('公司名称')" prop="company">
<el-input v-model="form.company" placeholder="请输入公司名称" /> <el-input v-model="form.company" :placeholder="$t('请输入公司名称')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户生日" prop="birthday"> <el-form-item :label="$t('客户生日')" prop="birthday">
<el-input v-model="form.birthday" placeholder="请输入客户生日" /> <el-input v-model="form.birthday" :placeholder="$t('请输入客户生日')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="产品类型" prop="productType"> <el-form-item :label="$t('产品类型')" prop="productType">
<el-select v-model="form.productType" placeholder="请选择产品类型"> <el-select v-model="form.productType" :placeholder="$t('请选择产品类型')">
<el-option label="请选择字典生成" value="" /> <el-option :label="$t('请选择字典生成')" value="" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="产品id" prop="productId"> <el-form-item :label="$t('产品id')" prop="productId">
<el-input v-model="form.productId" placeholder="请输入产品id" /> <el-input v-model="form.productId" :placeholder="$t('请输入产品id')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户来源" prop="source"> <el-form-item :label="$t('客户来源')" prop="source">
<el-select v-model="form.source" placeholder="请选择客户来源"> <el-select v-model="form.source" :placeholder="$t('请选择客户来源')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
...@@ -196,8 +196,8 @@ ...@@ -196,8 +196,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="结算方式" prop="balance"> <el-form-item :label="$t('结算方式')" prop="balance">
<el-select v-model="form.balance" placeholder="请选择结算方式"> <el-select v-model="form.balance" :placeholder="$t('请选择结算方式')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
...@@ -205,8 +205,8 @@ ...@@ -205,8 +205,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户经理" prop="customerService"> <el-form-item :label="$t('客户经理')" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择客户经理"> <el-select v-model="form.customerService" :placeholder="$t('请选择客户经理')">
<el-option v-for="dict in serviceStaffOptions" <el-option v-for="dict in serviceStaffOptions"
:key="dict.id" :label="dict.nickname" :value="dict.id" /> :key="dict.id" :label="dict.nickname" :value="dict.id" />
</el-select> </el-select>
...@@ -214,88 +214,88 @@ ...@@ -214,88 +214,88 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="图片" prop="picture"> <el-form-item :label="$t('图片')" prop="picture">
<el-input v-model="form.picture" placeholder="请输入图片" /> <el-input v-model="form.picture" :placeholder="$t('请输入图片')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户状态" prop="status"> <el-form-item :label="$t('客户状态')" prop="status">
<el-select v-model="form.status" placeholder="请选择客户状态"> <el-select v-model="form.status" :placeholder="$t('请选择客户状态')">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</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="推介人" prop="promoter"> <el-form-item :label="$t('推介人')" prop="promoter">
<el-input v-model="form.promoter" placeholder="请输入推介人" /> <el-input v-model="form.promoter" :placeholder="$t('请输入推介人')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="创建人" prop="founder"> <el-form-item :label="$t('创建人')" prop="founder">
<el-input v-model="form.founder" placeholder="请输入创建人" /> <el-input v-model="form.founder" :placeholder="$t('请输入创建人')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="创建时间" prop="founder"> <el-form-item :label="$t('创建时间')" prop="founder">
<el-input v-model="form.founder" placeholder="请输入创建人" /> <el-input v-model="form.founder" :placeholder="$t('请输入创建人')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remarks"> <el-form-item :label="$t('备注')" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" /> <el-input v-model="form.remarks" :placeholder="$t('请输入备注')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="到仓确认" prop="arrivalConfirm"> <el-form-item :label="$t('到仓确认')" prop="arrivalConfirm">
<el-switch v-model="form.arrivalConfirm" :active-value="0" :inactive-value="1" /> <el-switch v-model="form.arrivalConfirm" :active-value="0" :inactive-value="1" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="重货标准(CBM)" prop="weightUnit"> <el-form-item :label="$t('重货标准(CBM)')" prop="weightUnit">
<el-input v-model="form.weightUnit" placeholder="请输入重货标准(CBM)" /> <el-input v-model="form.weightUnit" :placeholder="$t('请输入重货标准(CBM)')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item label="关联会员账号" prop="memberId"> <el-form-item :label="$t('关联会员账号')" prop="memberId">
<el-input v-model="form.memberId" placeholder="请输入关联会员账号" /> <el-input v-model="form.memberId" :placeholder="$t('请输入关联会员账号')" />
</el-form-item> </el-form-item>
<el-form-item label="部门" prop="department"> <el-form-item :label="$t('部门')" prop="department">
<el-input v-model="form.department" placeholder="请输入部门" /> <el-input v-model="form.department" :placeholder="$t('请输入部门')" />
</el-form-item> </el-form-item>
<el-form-item label="发票抬头" prop="invoiceTitle"> <el-form-item :label="$t('发票抬头')" prop="invoiceTitle">
<el-input v-model="form.invoiceTitle" placeholder="请输入发票抬头" /> <el-input v-model="form.invoiceTitle" :placeholder="$t('请输入发票抬头')" />
</el-form-item> </el-form-item>
<el-form-item label="纳税人识别号" prop="licenseNumber"> <el-form-item :label="$t('纳税人识别号')" prop="licenseNumber">
<el-input v-model="form.licenseNumber" placeholder="请输入纳税人识别号" /> <el-input v-model="form.licenseNumber" :placeholder="$t('请输入纳税人识别号')" />
</el-form-item> </el-form-item>
<el-form-item label="开户行" prop="bank"> <el-form-item :label="$t('开户行')" prop="bank">
<el-input v-model="form.bank" placeholder="请输入开户行" /> <el-input v-model="form.bank" :placeholder="$t('请输入开户行')" />
</el-form-item> </el-form-item>
<el-form-item label="账户" prop="bankNumber"> <el-form-item :label="$t('账户')" prop="bankNumber">
<el-input v-model="form.bankNumber" placeholder="请输入账户" /> <el-input v-model="form.bankNumber" :placeholder="$t('请输入账户')" />
</el-form-item> </el-form-item>
<el-form-item label="项目" prop="project"> <el-form-item :label="$t('项目')" prop="project">
<el-input v-model="form.project" placeholder="请输入项目" /> <el-input v-model="form.project" :placeholder="$t('请输入项目')" />
</el-form-item> </el-form-item>
<el-form-item label="开票地址" prop="billingAddress"> <el-form-item :label="$t('开票地址')" prop="billingAddress">
<el-input v-model="form.billingAddress" placeholder="请输入开票地址" /> <el-input v-model="form.billingAddress" :placeholder="$t('请输入开票地址')" />
</el-form-item> </el-form-item>
<el-form-item label="开票电话" prop="billingTell"> <el-form-item :label="$t('开票电话')" prop="billingTell">
<el-input v-model="form.billingTell" placeholder="请输入开票电话" /> <el-input v-model="form.billingTell" :placeholder="$t('请输入开票电话')" />
</el-form-item> </el-form-item>
<el-form-item label="税率" prop="taxRate"> <el-form-item :label="$t('税率')" prop="taxRate">
<el-input v-model="form.taxRate" placeholder="请输入税率" /> <el-input v-model="form.taxRate" :placeholder="$t('请输入税率')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -303,8 +303,8 @@ ...@@ -303,8 +303,8 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="openHandOver" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="openHandOver" width="500px" append-to-body>
<el-form ref="handOverForm" :model="handOverForm" :rules="rules" label-width="80px"> <el-form ref="handOverForm" :model="handOverForm" :rules="rules" label-width="80px">
<el-form-item label="客户经理" prop="customerServiceId"> <el-form-item :label="$t('客户经理')" prop="customerServiceId">
<el-select v-model="handOverForm.customerServiceId" placeholder="请选择客户经理" clearable filterable> <el-select v-model="handOverForm.customerServiceId" :placeholder="$t('请选择客户经理')" clearable filterable>
<el-option v-for="user in serviceStaffOptions" <el-option v-for="user in serviceStaffOptions"
:key="user.id" :value="user.id" :key="user.id" :value="user.id"
:label="user.nickname" /> :label="user.nickname" />
...@@ -312,8 +312,8 @@ ...@@ -312,8 +312,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitHandOverForm">确 定</el-button> <el-button type="primary" @click="submitHandOverForm">{{$t('确 定')}}</el-button>
<el-button @click="cancelHandOver">取 消</el-button> <el-button @click="cancelHandOver">{{$t('取 消')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -370,8 +370,8 @@ export default { ...@@ -370,8 +370,8 @@ export default {
handOverForm: {}, handOverForm: {},
// 表单校验 // 表单校验
rules: { rules: {
name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }], name: [{ required: true, message: this.$t('客户名称不能为空'), trigger: "blur" }],
weightUnit: [{ required: true, message: "重货标准(CBM)不能为空", trigger: "blur" }], weightUnit: [{ required: true, message: this.$t('重货标准(CBM)不能为空'), trigger: "blur" }],
}, },
serviceStaffOptions: [], serviceStaffOptions: [],
...@@ -485,7 +485,7 @@ export default { ...@@ -485,7 +485,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加客户"; this.title = this.$t('添加客户');
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -501,11 +501,11 @@ export default { ...@@ -501,11 +501,11 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleConfirmService(row) { handleConfirmService(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认接收客户["' + row.name + '"]?').then(function() { this.$modal.confirm(this.$t('是否确认接收客户')+'["' + row.name + '"]?').then(function() {
return confirm({"customerId": id}); return confirm({"customerId": id});
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("接收成功"); this.$modal.msgSuccess(this.$t('接收成功'));
}).catch(() => {}); }).catch(() => {});
}, },
...@@ -525,7 +525,7 @@ export default { ...@@ -525,7 +525,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.id != null) { if (this.form.id != null) {
updateCustomer(this.form).then(response => { updateCustomer(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t('修改成功'));
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
...@@ -536,11 +536,11 @@ export default { ...@@ -536,11 +536,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除客户编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除客户编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteCustomer(id); return deleteCustomer(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t('删除成功'));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -551,7 +551,7 @@ export default { ...@@ -551,7 +551,7 @@ export default {
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出 // 执行导出
this.$modal.confirm('是否确认导出所有客户数据项?').then(() => { this.$modal.confirm(this.$t('是否确认导出所有客户数据项?')).then(() => {
this.exportLoading = true; this.exportLoading = true;
return exportCustomerExcel(params); return exportCustomerExcel(params);
}).then(response => { }).then(response => {
...@@ -566,7 +566,7 @@ export default { ...@@ -566,7 +566,7 @@ export default {
submitHandOverForm() { submitHandOverForm() {
// 移交的提交 // 移交的提交
handOverCustomer(this.handOverForm).then(response => { handOverCustomer(this.handOverForm).then(response => {
this.$modal.msgSuccess("移交成功"); this.$modal.msgSuccess(this.$t('移交成功'));
this.openHandOver = false; this.openHandOver = false;
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