Commit aa6bc78c authored by dragondean@qq.com's avatar dragondean@qq.com

完善多语言

parent 01b78ce4
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<template v-for="(dict, index) in this.getDictDatas2(type, value)"> <template v-for="(dict, index) in this.getDictDatas2(type, value)">
<!-- 默认样式 --> <!-- 默认样式 -->
<span v-if="dict.colorType === 'default' || dict.colorType === '' || dict.colorType === undefined" :key="dict.value" :index="index" <span v-if="dict.colorType === 'default' || dict.colorType === '' || dict.colorType === undefined" :key="dict.value" :index="index"
:class="dict.cssClass">{{ dict.label }}</span> :class="dict.cssClass">111{{ $l(dict, 'label') }}</span>
<!-- Tag 样式 --> <!-- Tag 样式 -->
<el-tag v-else :disable-transitions="true" :key="dict.value" :index="index" :type="dict.colorType" :class="dict.cssClass"> <el-tag v-else :disable-transitions="true" :key="dict.value" :index="index" :type="dict.colorType" :class="dict.cssClass">
{{ dict.label }} {{ $l(dict, 'label') }}
</el-tag> </el-tag>
</template> </template>
</span> </span>
......
...@@ -12,6 +12,11 @@ const i18n = new VueI18n({ ...@@ -12,6 +12,11 @@ const i18n = new VueI18n({
} }
}) })
console.log({i18n}) console.log({i18n})
Vue.prototype.$l = (object, field) => {
let prefix = i18n.locale.split('_')[0]
let append = prefix.charAt(0).toUpperCase() + prefix.toLowerCase().substr(1)
return object[field + append] || object[field]
}
/* Vue.filter('$t', Vue.$i18n) /* Vue.filter('$t', Vue.$i18n)
*/ */
// 重新console.warn来捕获未翻译的内容 // 重新console.warn来捕获未翻译的内容
......
...@@ -34,6 +34,7 @@ const actions = { ...@@ -34,6 +34,7 @@ const actions = {
dictDataMap[dictData.dictType].push({ dictDataMap[dictData.dictType].push({
value: dictData.value, value: dictData.value,
label: dictData.label, label: dictData.label,
labelEn: dictData.labelEn,
colorType: dictData.colorType, colorType: dictData.colorType,
cssClass: dictData.cssClass, cssClass: dictData.cssClass,
}) })
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div slot="header" class="card-title">报表跟进</div> <div slot="header" class="card-title">{{$t('报表跟进')}}</div>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left"> <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
<el-form-item label="报价单号" prop="number" style="width: 46%;display: inline-block;"> <el-form-item :label="$t('报价单号')" prop="number" style="width: 46%;display: inline-block;">
<label>{{form.number}}</label> <label>{{form.number}}</label>
<!-- <el-input :value="form.number" disabled placeholder="请输入报价单号" /> --> <!-- <el-input :value="form.number" disabled placeholder="请输入报价单号" /> -->
</el-form-item> </el-form-item>
<el-form-item label="跟进类型" prop="type" style="width: 46%;display: inline-block;margin-left:8%"> <el-form-item :label="$t('跟进类型')" prop="type" style="width: 46%;display: inline-block;margin-left:8%">
<el-radio v-model="form.type" label="2">商务洽谈</el-radio> <el-radio v-model="form.type" label="2">{{$t('商务洽谈')}}</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="跟进时间" prop="followUpTime" style="width: 46%;display: inline-block"> <el-form-item :label="$t('跟进时间')" prop="followUpTime" style="width: 46%;display: inline-block">
<el-date-picker clearable v-model="form.followUpTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择跟进时间" /> <el-date-picker clearable v-model="form.followUpTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('选择跟进时间')" />
</el-form-item> </el-form-item>
<el-form-item label="跟进业务员" prop="followUpSalesmanId" style="width: 46%;display: inline-block;;margin-left:8%"> <el-form-item :label="$t('跟进业务员')" prop="followUpSalesmanId" style="width: 46%;display: inline-block;;margin-left:8%">
<el-select v-model="form.followUpSalesmanId" placeholder="请选择跟进业务员"> <el-select v-model="form.followUpSalesmanId" :placeholder="$t('请选择跟进业务员')">
<el-option v-for="item in creatorData" <el-option v-for="item in creatorData"
:key="item.id" :label="item.nickname" :value="item.id"/> :key="item.id" :label="item.nickname" :value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="contacts" style="width: 46%;display: inline-block"> <el-form-item :label="$t('联系人')" prop="contacts" style="width: 46%;display: inline-block">
<el-select v-model="form.contacts" placeholder="请选择联系人"> <el-select v-model="form.contacts" :placeholder="$t('请选择联系人')">
<el-option v-for="item in contactsData" <el-option v-for="item in contactsData"
:key="item.customerId" :label="item.name" :value="item.customerId"/> :key="item.customerId" :label="item.name" :value="item.customerId"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="跟进方式" prop="followUpMethod" style="width: 46%;display: inline-block;margin-left:8%"> <el-form-item :label="$t('跟进方式')" prop="followUpMethod" style="width: 46%;display: inline-block;margin-left:8%">
<dict-selector <dict-selector
:type="DICT_TYPE.ECW_OFFER_METHOD" :type="DICT_TYPE.ECW_OFFER_METHOD"
placeholder="请选择跟进方式" :placeholder="$t('请选择跟进方式')"
v-model="form.followUpMethod" v-model="form.followUpMethod"
form-type="select" form-type="select"
/> />
</el-form-item> </el-form-item>
<el-form-item label="客户反馈" prop="customerFeedback"> <el-form-item :label="$t('客户反馈')" prop="customerFeedback">
<el-input type="textarea" :rows="3" v-model="form.customerFeedback" placeholder="请输入客户反馈" /> <el-input type="textarea" :rows="3" v-model="form.customerFeedback" :placeholder="$t('请输入客户反馈')" />
</el-form-item> </el-form-item>
<el-form-item label="处理结果" prop="processingResults"> <el-form-item :label="$t('处理结果')" prop="processingResults">
<el-input type="textarea" :rows="3" v-model="form.processingResults" placeholder="请输入处理结果" /> <el-input type="textarea" :rows="3" v-model="form.processingResults" :placeholder="$t('请输入处理结果')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<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>
</div> </div>
</div> </div>
</template> </template>
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
relationId:0, relationId:0,
// 表单校验 // 表单校验
rules: { rules: {
type: [{ required: true, message: "请选择跟进类型", trigger: "change" }], type: [{ required: true, message: this.$t("请选择跟进类型"), trigger: "change" }],
followUpTime: [{ required: true, message: "跟进时间不能为空", trigger: "blur" }], followUpTime: [{ required: true, message: this.$t("跟进时间不能为空"), trigger: "blur" }],
followUpSalesmanId: [{ required: true, message: "跟进业务员不能为空", trigger: "change" }], followUpSalesmanId: [{ required: true, message: this.$t("跟进业务员不能为空"), trigger: "change" }],
contacts: [{ required: true, message: "联系人不能为空", trigger: "blur" }], contacts: [{ required: true, message: this.$t("联系人不能为空"), trigger: "blur" }],
followUpMethod: [{ required: true, message: "请选择跟进方式", trigger: "change" }], followUpMethod: [{ required: true, message: this.$t("请选择跟进方式"), trigger: "change" }],
customerFeedback: [{ required: true, message: "客户反馈不能为空", trigger: "blur" }], customerFeedback: [{ required: true, message: this.$t("客户反馈不能为空"), trigger: "blur" }],
processingResults: [{ required: true, message: "处理结果不能为空", trigger: "blur" }], processingResults: [{ required: true, message: this.$t("处理结果不能为空"), trigger: "blur" }],
} }
}; };
}, },
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
this.form.type = parseInt(this.form.type) this.form.type = parseInt(this.form.type)
this.form.followUpMethod = parseInt(this.form.followUpMethod) this.form.followUpMethod = parseInt(this.form.followUpMethod)
createOfferLog(this.form).then(response => { createOfferLog(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false; this.open = false;
}); });
}); });
......
This diff is collapsed.
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<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="number"> <el-form-item :label="$t('报价单号')" prop="number">
<el-input v-model="queryParams.number" placeholder="请输入报价单号" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.number" :placeholder="$t('请输入报价单号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="订单编号" prop="orderNo"> <el-form-item :label="$t('订单编号')" prop="orderNo">
<el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单编号')" clearable @keyup.enter.native="handleQuery"/>
</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>
...@@ -21,54 +21,54 @@ ...@@ -21,54 +21,54 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" 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:offer:create']">新增</el-button> v-hasPermi="['ecw:offer: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:offer:export']">导出</el-button> v-hasPermi="['ecw:offer: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" border> <el-table v-loading="loading" :data="list" border>
<el-table-column label="报价单号" align="left" prop="number" width="200px" /> <el-table-column :label="$t('报价单号')" align="left" prop="number" width="200px" />
<el-table-column label="订单编号" align="left" prop="orderNo" /> <el-table-column :label="$t('订单编号')" align="left" prop="orderNo" />
<el-table-column label="客户名称" align="left" prop="relationName" /> <el-table-column :label="$t('客户名称')" align="left" prop="relationName" />
<el-table-column label="目的地" align="center" prop="objectiveName" /> <el-table-column :label="$t('目的地')" align="center" prop="objectiveName" />
<el-table-column label="销售阶段" align="left" width="180"> <el-table-column :label="$t('销售阶段')" align="left" width="180">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="row.status" /> <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计结束时间" align="left"> <el-table-column :label="$t('预计结束时间')" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.stopTime, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.stopTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="运输方式" align="left"> <el-table-column :label="$t('运输方式')" align="left">
<template slot-scope="scope" v-if="scope.row.transportIds" > <template slot-scope="scope" v-if="scope.row.transportIds" >
<span v-for="(item, index) in scope.row.transportIds.split(',')" :key="index"> <span v-for="(item, index) in scope.row.transportIds.split(',')" :key="index">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item" /> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item" />
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="业务员" align="left"> <el-table-column :label="$t('业务员')" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
暂无 暂无
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计销售额" align="center" prop="estCost"> <el-table-column :label="$t('预计销售额')" align="center" prop="estCost">
<template slot-scope="{row}"> <template slot-scope="{row}">
<div class="" v-if="row.estCostVO.clearanceNGN || row.estCostVO.clearanceRMB || row.estCostVO.clearanceUSD"> <div class="" v-if="row.estCostVO.clearanceNGN || row.estCostVO.clearanceRMB || row.estCostVO.clearanceUSD">
清关费 {{$t('清关费')}}
<span v-if="row.estCostVO.clearanceNGN">{{row.estCostVO.clearanceNGN}}N</span> <span v-if="row.estCostVO.clearanceNGN">{{row.estCostVO.clearanceNGN}}N</span>
<span v-if="row.estCostVO.clearanceRMB">{{row.estCostVO.clearanceRMB}}</span> <span v-if="row.estCostVO.clearanceRMB">{{row.estCostVO.clearanceRMB}}</span>
<span v-if="row.estCostVO.clearanceUSD">{{row.estCostVO.clearanceUSD}}$</span> <span v-if="row.estCostVO.clearanceUSD">{{row.estCostVO.clearanceUSD}}$</span>
</div> </div>
<div class="" v-if="row.estCostVO.seaNGN || row.estCostVO.seaRMB || row.estCostVO.seaUSD"> <div class="" v-if="row.estCostVO.seaNGN || row.estCostVO.seaRMB || row.estCostVO.seaUSD">
运费 {{$t('运费')}}
<span v-if="row.estCostVO.seaNGN">{{row.estCostVO.seaNGN}}N</span> <span v-if="row.estCostVO.seaNGN">{{row.estCostVO.seaNGN}}N</span>
<span v-if="row.estCostVO.seaRMB">{{row.estCostVO.seaRMB}}</span> <span v-if="row.estCostVO.seaRMB">{{row.estCostVO.seaRMB}}</span>
<span v-if="row.estCostVO.seaUSD">{{row.estCostVO.seaUSD}}$</span> <span v-if="row.estCostVO.seaUSD">{{row.estCostVO.seaUSD}}$</span>
...@@ -77,34 +77,34 @@ ...@@ -77,34 +77,34 @@
</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">
<template v-if="[1,2].indexOf(scope.row.status) > -1"> <template v-if="[1,2].indexOf(scope.row.status) > -1">
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)" <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">详情</el-button> v-hasPermi="['ecw:offer:update']">{{$t('详情')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('edit?id=' + scope.row.offerId)" <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('edit?id=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">编辑</el-button> v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('logList?offerId=' + scope.row.offerId)" <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('logList?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">跟进</el-button> v-hasPermi="['ecw:offer:update']">{{$t('跟进')}}</el-button>
</template> </template>
<template v-if="scope.row.status == 2"> <template v-if="scope.row.status == 2">
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)" <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">详情</el-button> v-hasPermi="['ecw:offer:update']">{{$t('详情')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)"
v-hasPermi="['ecw:offer:update']">结果</el-button> v-hasPermi="['ecw:offer:update']">{{$t('结果')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/offer/special/' + scope.row.offerId)" <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/offer/special/' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">特价</el-button> v-hasPermi="['ecw:offer:update']">{{$t('特价')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" <el-button size="mini" type="text" icon="el-icon-edit"
v-hasPermi="['ecw:offer:update']">取消</el-button> v-hasPermi="['ecw:offer:update']">{{$t('取消')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" <el-button size="mini" type="text" icon="el-icon-edit"
v-hasPermi="['ecw:offer:update']">恢复</el-button> v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-button>
</template> </template>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)" <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">详情</el-button> v-hasPermi="['ecw:offer:update']">{{$t('详情')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" <el-button size="mini" type="text" icon="el-icon-delete"
v-hasPermi="['ecw:offer:delete']">删除</el-button> v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -224,11 +224,11 @@ export default { ...@@ -224,11 +224,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const offerId = row.offerId; const offerId = row.offerId;
this.$modal.confirm('是否确认删除报价单管理编号为"' + offerId + '"的数据项?').then(function() { this.$modal.confirm(this.$t('是否确认删除报价单管理编号为{offerId}的数据项?', {offerId})).then(function() {
return deleteOffer(offerId); return deleteOffer(offerId);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
...@@ -242,7 +242,7 @@ export default { ...@@ -242,7 +242,7 @@ export default {
this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime'); this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
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 exportOfferExcel(params); return exportOfferExcel(params);
}).then(response => { }).then(response => {
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="form" label-position="left" label-width="120px"> <el-form :model="form" label-position="left" label-width="120px">
<el-form-item label="订单号" v-if="order"> <el-form-item :label="$t('订单号')" v-if="order">
{{order.orderNo}} {{order.orderNo}}
</el-form-item> </el-form-item>
<el-form-item label="放货方式"> <el-form-item :label="$t('放货方式')">
<dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector> <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
</el-form-item> </el-form-item>
<el-form-item label="提货时间" v-if="form.pickType == 1"> <el-form-item :label="$t('提货时间')" v-if="form.pickType == 1">
<el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<template v-if="form.pickType == 2"> <template v-if="form.pickType == 2">
<el-form-item label="收货人"> <el-form-item :label="$t('收货人')">
{{order.consigneeVO.name}} {{order.consigneeVO.name}}
</el-form-item> </el-form-item>
<el-form-item label="收货电话"> <el-form-item :label="$t('收货电话')">
{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}} {{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
</el-form-item> </el-form-item>
<el-form-item label="收货地址"> <el-form-item :label="$t('收货地址')">
<!--缺少国城名字--> <!--缺少国城名字-->
{{order.consigneeVO.address}} {{order.consigneeVO.address}}
</el-form-item> </el-form-item>
<el-form-item label="快递单号"> <el-form-item :label="$t('快递单号')">
<el-input v-model="form.trackingNumber" placeholder=""></el-input> <el-input v-model="form.trackingNumber" placeholder=""></el-input>
</el-form-item> </el-form-item>
<el-form-item label="送货时间"> <el-form-item :label="$t('送货时间')">
<el-date-picker v-model="form.deliverTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker v-model="form.deliverTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="签收时间"> <el-form-item :label="$t('签收时间')">
<el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
<el-form-item label="附件"> <el-form-item :label="$t('附件')">
<image-upload v-model="form.attachment" /> <image-upload v-model="form.attachment" />
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item :label="$t('备注')">
<el-input v-model="form.remark" type="textarea" placeholder=""></el-input> <el-input v-model="form.remark" type="textarea" placeholder=""></el-input>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="">
<el-button type="primary" @click="submit">确认放货</el-button> <el-button type="primary" @click="submit">{{$t('确认放货')}}</el-button>
<el-button type="default" @click="$router.back()">取消</el-button> <el-button type="default" @click="$router.back()">{{$t('取消')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -70,7 +70,7 @@ export default { ...@@ -70,7 +70,7 @@ export default {
}, },
submit(){ submit(){
createOrderPickup(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => { createOrderPickup(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => {
return this.$alert(res.message || '操作成功') return this.$alert(res.message || this.$t('操作成功'))
}).then(res => { }).then(res => {
this.$router.back() this.$router.back()
}) })
......
...@@ -5,33 +5,33 @@ ...@@ -5,33 +5,33 @@
<img src="../../../assets/images/u5.png" /> <img src="../../../assets/images/u5.png" />
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<div class="title">新增订单生成成功</div> <div class="title">{{$t('新增订单生成成功')}}</div>
<div class="line">订单号{{order.orderNo}}</div> <div class="line">{{$t('订单号')}}{{order.orderNo}}</div>
<div class="line">运输方式<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /></div> <div class="line">{{$t('运输方式')}}<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /></div>
<div class="line">路线{{order.logisticsInfoDto.startTitleZh}} >> {{order.logisticsInfoDto.destTitleZh}}</div> <div class="line">{{$t('路线')}}{{order.logisticsInfoDto.startTitleZh}} >> {{order.logisticsInfoDto.destTitleZh}}</div>
<div class="line">商品列表 <div class="line">{{$t('商品列表')}}
<span v-for="(item, index) in order.orderItemVOList" :key="index"> <span v-for="(item, index) in order.orderItemVOList" :key="index">
{{item.prodTitleZh}} {{item.prodTitleZh}}
<template v-if="index < order.orderItemVOList.length - 1"></template> <template v-if="index < order.orderItemVOList.length - 1"></template>
</span> </span>
</div> </div>
<div class="line">仓库地址:{{order.logisticsInfoDto.startAddressZh}}</div> <div class="line">{{$t('仓库地址')}}:{{order.logisticsInfoDto.startAddressZh}}</div>
<div class="line">仓库电话: {{order.logisticsInfoDto.startTell}}</div> <div class="line">{{$t('仓库电话')}}: {{order.logisticsInfoDto.startTell}}</div>
<div class="line"></div> <div class="line"></div>
<div class="line">您的订单已提交,谢谢您选择捷道物流!</div> <div class="line">{{$t('您的订单已提交,谢谢您选择捷道物流!')}}</div>
</el-col> </el-col>
</el-row> </el-row>
<div class="actions"> <div class="actions">
<el-button type="primary" @click="$router.replace('detail?orderId=' + order.orderId)">查看订单</el-button> <el-button type="primary" @click="$router.replace('detail?orderId=' + order.orderId)">{{$t('查看订单')}}</el-button>
<el-button type="warning" @click="showNotice = true">入仓须知</el-button> <el-button type="warning" @click="showNotice = true">{{$t('入仓须知')}}</el-button>
<el-button type="info" @click="$router.replace('edit')">再来一单</el-button> <el-button type="info" @click="$router.replace('edit')">{{$t('再来一单')}}</el-button>
</div> </div>
<el-dialog title="查看须知" :visible.sync="showNotice" width="700px"> <el-dialog :title="$t('查看须知')" :visible.sync="showNotice" width="700px">
<!-- <img :src="noticeUrl" id="noticeImg" /> --> <!-- <img :src="noticeUrl" id="noticeImg" /> -->
<need-know keyname="warehousing" ref="needKnow" /> <need-know keyname="warehousing" ref="needKnow" />
<div style="text-align:center"> <div style="text-align:center">
<el-button type="primary" @click="$refs.needKnow.download()">下载</el-button> <el-button type="primary" @click="$refs.needKnow.download()">{{$t('下载')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
<div class="app-container"> <div class="app-container">
<el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px" <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px"
label-position="left"> label-position="left">
<el-form-item label="公司全称" prop="companyZh"> <el-form-item :label="$t('公司全称')" prop="companyZh">
<el-input v-model="formData.companyZh" placeholder="请输入公司全称" show-word-limit clearable <el-input v-model="formData.companyZh" :placeholder="$t('请输入公司全称')" show-word-limit clearable
:style="{width: '100%'}"></el-input> :style="{width: '100%'}"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="代理名称" prop="agentName"> <el-form-item :label="$t('代理名称')" prop="agentName">
<el-input v-model="formData.agentName" placeholder="请输入代理名称" clearable :style="{width: '100%'}"> <el-input v-model="formData.agentName" :placeholder="$t('请输入代理名称')" clearable :style="{width: '100%'}">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="公司电话" prop="tell"> <el-form-item :label="$t('公司电话')" prop="tell">
<el-input v-model="formData.tell" placeholder="请输入公司电话" clearable :style="{width: '100%'}"></el-input> <el-input v-model="formData.tell" :placeholder="$t('请输入公司电话')" clearable :style="{width: '100%'}"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="公司地址" prop="address"> <el-form-item :label="$t('公司地址')" prop="address">
<!-- <el-select v-model="formData.country"> <!-- <el-select v-model="formData.country">
<el-option v-for="(item, index) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" /> <el-option v-for="(item, index) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select> </el-select>
...@@ -31,69 +31,69 @@ ...@@ -31,69 +31,69 @@
@provinceChange="onAreaChange('province', $event)" @provinceChange="onAreaChange('province', $event)"
@cityChange="onAreaChange('city', $event)" @cityChange="onAreaChange('city', $event)"
/> />
<el-input v-model="formData.address" placeholder="请输入详细地址" class="mt-10"></el-input> <el-input v-model="formData.address" :placeholder="$t('请输入详细地址')" class="mt-10"></el-input>
<!-- <el-select v-model="selectedRegionIndex"> <!-- <el-select v-model="selectedRegionIndex">
<el-option v-for="(item, index) in regionList" :value="index" :label="item.titleZh" :key="item.id" /> <el-option v-for="(item, index) in regionList" :value="index" :label="item.titleZh" :key="item.id" />
</el-select> --> </el-select> -->
<!-- <el-select v-model="formData.address" placeholder="请选择下拉选择公司地址" clearable :style="{width: '100%'}"> <!-- <el-select v-model="formData.address" placeholder="请选择下拉选择公司地址" clearable :style="{width: '100%'}">
</el-select> --> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" <el-input v-model="formData.remark" type="textarea" :placeholder="$t('请输入备注')"
:autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input> :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
</el-form-item> </el-form-item>
<el-form-item label-width="0" prop="field110"> <el-form-item label-width="0" prop="field110">
<table-form title="联系人" :fields="[ <table-form :title="$t('联系人')" :fields="[
{ label: '部门', field: 'department'}, { label: this.$t('部门'), field: 'department'},
{ label: '职位', field: 'position'}, { label: this.$t('职位'), field: 'position'},
{ label: '名称*', field: 'name', required: true}, { label: this.$t('名称') + '*', field: 'name', required: true},
{ label: '电话*', field: 'phone', required: true}, { label: this.$t('电话') + '*', field: 'phone', required: true},
]" v-model="formData.contactList"> ]" v-model="formData.contactList">
</table-form> </table-form>
</el-form-item> </el-form-item>
<el-form-item label="供应商类别" prop="companyType"> <el-form-item :label="$t('供应商类别')" prop="companyType">
<!-- <el-checkbox-group v-model="formData.companyType" size="medium"> <!-- <el-checkbox-group v-model="formData.companyType" size="medium">
<el-checkbox v-for="(item, index) in companyTypeOptions" :key="index" :label="item.value" <el-checkbox v-for="(item, index) in companyTypeOptions" :key="index" :label="item.value"
:disabled="item.disabled">{{item.label}}</el-checkbox> :disabled="item.disabled">{{item.label}}</el-checkbox>
</el-checkbox-group> --> </el-checkbox-group> -->
<dict-selector v-model="formData.companyType" type="company_type" multiple /> <dict-selector v-model="formData.companyType" type="company_type" multiple />
</el-form-item> </el-form-item>
<el-form-item label="合作类型" prop="cooperationType"> <el-form-item :label="$t('合作类型')" prop="cooperationType">
<dict-selector v-model="formData.cooperationType" type="cooperation_type" /> <dict-selector v-model="formData.cooperationType" type="cooperation_type" />
</el-form-item> </el-form-item>
<el-form-item label="营业执照" prop="license"> <el-form-item :label="$t('营业执照')" prop="license">
<upload v-model="formData.license" /> <upload v-model="formData.license" />
<!-- <el-upload ref="license" :file-list="licensefileList" :action="licenseAction" <!-- <el-upload ref="license" :file-list="licensefileList" :action="licenseAction"
:before-upload="licenseBeforeUpload"> :before-upload="licenseBeforeUpload">
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button> <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
</el-upload> --> </el-upload> -->
</el-form-item> </el-form-item>
<el-form-item label="合同" prop="contract"> <el-form-item :label="$t('合同')" prop="contract">
<upload v-model="formData.contract" /> <upload v-model="formData.contract" />
<!-- <el-upload ref="contract" :file-list="contractfileList" :action="contractAction" <!-- <el-upload ref="contract" :file-list="contractfileList" :action="contractAction"
:before-upload="contractBeforeUpload"> :before-upload="contractBeforeUpload">
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button> <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
</el-upload> --> </el-upload> -->
</el-form-item> </el-form-item>
<el-form-item label="统一信用代码" prop="licenseNumber"> <el-form-item :label="$t('统一信用代码')" prop="licenseNumber">
<el-input v-model="formData.licenseNumber" placeholder="请输入统一社会信用代码" clearable <el-input v-model="formData.licenseNumber" :placeholder="$t('请输入统一社会信用代码')" clearable
:style="{width: '100%'}"></el-input> :style="{width: '100%'}"></el-input>
</el-form-item> </el-form-item>
<el-form-item label-width="0" prop="field110"> <el-form-item label-width="0" prop="field110">
<table-form title="银行信息" :fields="[ <table-form :title="$t('银行信息')" :fields="[
{ label: '账户名称*', field: 'accountName', required: true}, { label: this.$t('账户名称') + '*', field: 'accountName', required: true},
{ label: '币别*', field: 'currency', required: true}, { label: this.$t('币别') + '*', field: 'currency', required: true},
{ label: '银行名称*', field: 'bankName', required: true}, { label: this.$t('银行名称*'), field: 'bankName', required: true},
{ label: '银行账户*', field: 'bankAccount', required: true}, { label: this.$t('银行账户') + '*', field: 'bankAccount', required: true},
{ label: '银行代码', field: 'bankCode'}, { label: this.$t('银行代码'), field: 'bankCode'},
{ label: '账户类型', field: 'accountType'}, { label: this.$t('账户类型'), field: 'accountType'},
{ label: '银行地址', field: 'bankAddress'}, { label: this.$t('银行地址'), field: 'bankAddress'},
]" v-model="formData.bankList"> ]" v-model="formData.bankList">
</table-form> </table-form>
</el-form-item> </el-form-item>
<el-form-item size="large"> <el-form-item size="large">
<el-button type="primary" @click="submitForm">提交</el-button> <el-button type="primary" @click="submitForm">{{$t('提交')}}</el-button>
<el-button @click="resetForm">重置</el-button> <el-button @click="resetForm">{{$t('重置')}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
rules: { rules: {
companyZh: [{ companyZh: [{
required: true, required: true,
message: '请输入公司全称', message: this.$t('请输入公司全称'),
trigger: 'blur' trigger: 'blur'
}], }],
agentName: [], agentName: [],
...@@ -135,12 +135,12 @@ export default { ...@@ -135,12 +135,12 @@ export default {
companyType: [{ companyType: [{
required: true, required: true,
type: 'string', type: 'string',
message: '请至少选择一个供应商类别', message: this.$t('请至少选择一个供应商类别'),
trigger: 'change' trigger: 'change'
}], }],
cooperationType: [{ cooperationType: [{
required: true, required: true,
message: '请选择合作类型', message: this.$t('请选择合作类型'),
trigger: 'change' trigger: 'change'
}], }],
licenseNumber: [], licenseNumber: [],
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
// 修改的提交 // 修改的提交
if (data.id != null) { if (data.id != null) {
updateSupplier(data).then(response => { updateSupplier(data).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false; this.open = false;
this.$router.back() this.$router.back()
}); });
...@@ -207,7 +207,7 @@ export default { ...@@ -207,7 +207,7 @@ export default {
} }
// 添加的提交 // 添加的提交
createSupplier(data).then(response => { createSupplier(data).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess(this.$t("新增成功"));
this.$router.back() this.$router.back()
}); });
}); });
......
This diff is collapsed.
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div v-html="html"></div> <div v-html="html"></div>
<div class="">下面是通过watch更新</div> <div class="" @click="$l">下面是通过watch更新</div>
<div v-html="watchHtml"></div> <div v-html="watchHtml"></div>
</el-col> </el-col>
</el-row> </el-row>
......
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