Skip to content

J
jiedao-app-operator-master
Commit aa6bc78c authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

完善多语言

parent 01b78ce4
Show whitespace changes
Inline Side-by-side
Showing with 455 additions and 446 deletions
src/components/DictTag/index.vue
View file @ aa6bc78c
......@@ -3,10 +3,10 @@
<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"
:class="dict.cssClass">{{ dict.label }}</span>
:class="dict.cssClass">111{{ $l(dict, 'label') }}</span>
<!-- Tag 样式 -->
<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>
</template>
</span>
......
src/i18n/index.js
View file @ aa6bc78c
......@@ -12,6 +12,11 @@ const i18n = new VueI18n({
}
})
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)
*/
// 重新console.warn来捕获未翻译的内容
......
src/store/modules/dict.js
View file @ aa6bc78c
......@@ -34,6 +34,7 @@ const actions = {
dictDataMap[dictData.dictType].push({
value: dictData.value,
label: dictData.label,
labelEn: dictData.labelEn,
colorType: dictData.colorType,
cssClass: dictData.cssClass,
})
......
src/views/ecw/offer/createLog.vue
View file @ aa6bc78c
<template>
<div class="app-container">
<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-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>
<!-- <el-input :value="form.number" disabled placeholder="请输入报价单号" /> -->
</el-form-item>
<el-form-item label="跟进类型" prop="type" style="width: 46%;display: inline-block;margin-left:8%">
<el-radio v-model="form.type" label="2">商务洽谈</el-radio>
<el-form-item :label="$t('跟进类型')" prop="type" style="width: 46%;display: inline-block;margin-left:8%">
<el-radio v-model="form.type" label="2">{{$t('商务洽谈')}}</el-radio>
</el-form-item>
<el-form-item label="跟进时间" 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-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="$t('选择跟进时间')" />
</el-form-item>
<el-form-item label="跟进业务员" prop="followUpSalesmanId" style="width: 46%;display: inline-block;;margin-left:8%">
<el-select v-model="form.followUpSalesmanId" placeholder="请选择跟进业务员">
<el-form-item :label="$t('跟进业务员')" prop="followUpSalesmanId" style="width: 46%;display: inline-block;;margin-left:8%">
<el-select v-model="form.followUpSalesmanId" :placeholder="$t('请选择跟进业务员')">
<el-option v-for="item in creatorData"
:key="item.id" :label="item.nickname" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item label="联系人" prop="contacts" style="width: 46%;display: inline-block">
<el-select v-model="form.contacts" placeholder="请选择联系人">
<el-form-item :label="$t('联系人')" prop="contacts" style="width: 46%;display: inline-block">
<el-select v-model="form.contacts" :placeholder="$t('请选择联系人')">
<el-option v-for="item in contactsData"
:key="item.customerId" :label="item.name" :value="item.customerId"/>
</el-select>
</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
:type="DICT_TYPE.ECW_OFFER_METHOD"
placeholder="请选择跟进方式"
:placeholder="$t('请选择跟进方式')"
v-model="form.followUpMethod"
form-type="select"
/>
</el-form-item>
<el-form-item label="客户反馈" prop="customerFeedback">
<el-input type="textarea" :rows="3" v-model="form.customerFeedback" placeholder="请输入客户反馈" />
<el-form-item :label="$t('客户反馈')" prop="customerFeedback">
<el-input type="textarea" :rows="3" v-model="form.customerFeedback" :placeholder="$t('请输入客户反馈')" />
</el-form-item>
<el-form-item label="处理结果" prop="processingResults">
<el-input type="textarea" :rows="3" v-model="form.processingResults" placeholder="请输入处理结果" />
<el-form-item :label="$t('处理结果')" prop="processingResults">
<el-input type="textarea" :rows="3" v-model="form.processingResults" :placeholder="$t('请输入处理结果')" />
</el-form-item>
</el-form>
</el-card>
<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>
</template>
......@@ -74,13 +74,13 @@
relationId:0,
// 表单校验
rules: {
type: [{ required: true, message: "请选择跟进类型", trigger: "change" }],
followUpTime: [{ required: true, message: "跟进时间不能为空", trigger: "blur" }],
followUpSalesmanId: [{ required: true, message: "跟进业务员不能为空", trigger: "change" }],
contacts: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
followUpMethod: [{ required: true, message: "请选择跟进方式", trigger: "change" }],
customerFeedback: [{ required: true, message: "客户反馈不能为空", trigger: "blur" }],
processingResults: [{ required: true, message: "处理结果不能为空", trigger: "blur" }],
type: [{ required: true, message: this.$t("请选择跟进类型"), trigger: "change" }],
followUpTime: [{ required: true, message: this.$t("跟进时间不能为空"), trigger: "blur" }],
followUpSalesmanId: [{ required: true, message: this.$t("跟进业务员不能为空"), trigger: "change" }],
contacts: [{ required: true, message: this.$t("联系人不能为空"), trigger: "blur" }],
followUpMethod: [{ required: true, message: this.$t("请选择跟进方式"), trigger: "change" }],
customerFeedback: [{ required: true, message: this.$t("客户反馈不能为空"), trigger: "blur" }],
processingResults: [{ required: true, message: this.$t("处理结果不能为空"), trigger: "blur" }],
}
};
},
......@@ -113,7 +113,7 @@
this.form.type = parseInt(this.form.type)
this.form.followUpMethod = parseInt(this.form.followUpMethod)
createOfferLog(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
});
});
......
src/views/ecw/offer/edit.vue
View file @ aa6bc78c
......@@ -3,37 +3,37 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-card>
<div slot="header" class="card-title">新建报价单</div>
<el-form-item label="所属人">
<div slot="header" class="card-title">{{$t('新建报价单')}}</div>
<el-form-item :label="$t('所属人')">
<el-radio-group v-model="form.relation">
<el-radio label="1">发件人</el-radio>
<el-radio label="2">收件人</el-radio>
<el-radio label="1">{{$t('发件人')}}</el-radio>
<el-radio label="2">{{$t('收件人')}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="订单类型" style="margin-bottom: 0">
<el-form-item :label="$t('订单类型')" style="margin-bottom: 0">
<el-checkbox-group v-model="form.type">
<el-checkbox label="1">集运服务</el-checkbox>
<el-checkbox label="1">{{$t('集运服务')}}</el-checkbox>
<!-- <el-checkbox label="2">海外仓</el-checkbox> -->
</el-checkbox-group>
</el-form-item>
<el-descriptions :column="3" border>
<el-descriptions-item label="*发货人" :labelStyle="labelStyle" >
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consignorId" required error="发货人不能为空">
<el-descriptions-item :label="$t('*发货人')" :labelStyle="labelStyle" >
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consignorId" required :error="$t('发货人不能为空')">
<customer-contact-selector v-model="form.consignorId" @change="consignor = $event" />
</el-form-item>
</el-descriptions-item>
<!-- <el-descriptions-item label="发货人" :labelStyle="labelStyle">
{{consignor.contactsName || '无'}}
</el-descriptions-item> -->
<el-descriptions-item label="手机号" :labelStyle="labelStyle">
{{consignor.areaCode}} {{consignor.phoneNew || '无'}}
<el-descriptions-item :label="$t('手机号')" :labelStyle="labelStyle">
{{consignor.areaCode}} {{consignor.phoneNew || this.$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货人公司名称" :labelStyle="labelStyle">
{{consignor.company || '无'}}
<el-descriptions-item :label="$t('发货人公司名称')" :labelStyle="labelStyle">
{{consignor.company || this.$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="Email" :labelStyle="labelStyle">
{{consignor.email || '无'}}
{{consignor.email || this.$t('无')}}
</el-descriptions-item><!--
<el-descriptions-item label="社交软件">
{{consignor.social}} {{consignor.socialNumber}}
......@@ -43,23 +43,23 @@
</el-descriptions-item> -->
</el-descriptions>
<el-descriptions :column="3" border>
<el-descriptions-item label="*收货人" :labelStyle="labelStyle">
<el-descriptions-item :label="$t('收货人')" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeId" required error="收货人不能为空">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeId" required :error="$t('收货人不能为空')">
<customer-contact-selector v-model="form.consigneeId" @change="consignee = $event" />
</el-form-item>
</el-descriptions-item>
<!-- <el-descriptions-item label="收货人" :labelStyle="labelStyle">
{{consignee.contactsName || '无'}}
</el-descriptions-item> -->
<el-descriptions-item label="手机号" :labelStyle="labelStyle">
<el-descriptions-item :label="$t('手机号')" :labelStyle="labelStyle">
{{consignee.areaCode}} {{consignee.phoneNew}}
</el-descriptions-item>
<el-descriptions-item label="发货人公司名称" :labelStyle="labelStyle">
{{consignee.company || '无'}}
<el-descriptions-item :label="$t('发货人公司名称')" :labelStyle="labelStyle">
{{consignee.company || this.$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="Email" :labelStyle="labelStyle">
{{consignee.email || '无'}}
{{consignee.email || this.$t('无')}}
</el-descriptions-item><!--
<el-descriptions-item label="社交软件">
{{consignee.social}} {{consignee.socialNumber}}
......@@ -70,13 +70,13 @@
</el-descriptions>
<el-descriptions :column="2" border>
<el-descriptions-item label="*运输方式" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="transportId" required error="请选择运输方式">
<el-descriptions-item :label="$t('运输方式')" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="transportId" required :error="$t('请选择运输方式')">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" @input="calculationPrice" />
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="出货渠道" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="channelId" :required="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" error="请选择出货渠道">
<el-descriptions-item :label="$t('出货渠道')" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="channelId" :required="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" :error="$t('请选择出货渠道')">
<selector
:disabled="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass != 'channel'"
v-model="form.channelId"
......@@ -89,24 +89,24 @@
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="2" border>
<el-descriptions-item label="*始发城市" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="departureId" required error="始发地必选">
<el-select v-model="form.departureId" placeholder="请选择始发地">
<el-descriptions-item :label="$t('始发城市')" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="departureId" required :error="$t('始发地必选')">
<el-select v-model="form.departureId" :placeholder="$t('请选择始发地')">
<el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="*目的城市" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="objectiveId" required error="目的城市必选">
<el-select v-model="form.objectiveId" placeholder="请选择始发地">
<el-descriptions-item :label="$t('目的城市')" :labelStyle="labelStyle">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="objectiveId" required :error="$t('目的城市必选')">
<el-select v-model="form.objectiveId" :placeholder="$t('请选择始发地')">
<el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="*请选择线路" :span="2" :labelStyle="labelStyle">
<el-descriptions-item :label="$t('请选择线路')" :span="2" :labelStyle="labelStyle">
<el-row :gutter="10">
<el-col :span="12">
<el-input :value="getRouterNameById(form.lineId)" readonly placeholder="请在右侧选择线路"></el-input>
<el-input :value="getRouterNameById(form.lineId)" readonly :placeholder="$t('请在右侧选择线路')"></el-input>
</el-col>
<el-col :span="12">
<select size="5" v-model="form.lineId" style="min-width: 300px" @change="calculationPrice">
......@@ -121,72 +121,72 @@
</el-card>
<el-card class="mt-10">
<div slot="header" class="card-title">
<div class="card-name">商品信息</div>
<div class="card-name">{{$t('商品信息')}}</div>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addProduct()" :disabled="!form.lineId"></el-button>
</div>
<el-table :data="productList" border>
<el-table-column label="序号" width="60px" fixed>
<el-table-column :label="$t('序号')" width="60px" fixed>
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column>
<el-table-column label="中文名" width="160px">
<el-table-column :label="$t('中文名')" width="160px">
<template slot-scope="{row}">
<product-selector v-model="row.prodId" @change="onProductChange(row, $event)" />
</template>
</el-table-column>
<el-table-column label="英文名" width="160px">
<el-table-column :label="$t('英文名')" width="160px">
<template slot-scope="{row}">
<product-selector v-model="row.prodId" @change="onProductChange(row, $event)" />
</template>
</el-table-column>
<el-table-column label="商品类型" width="160px">
<el-table-column :label="$t('商品类型')" width="160px">
<template slot-scope="{row}">
<selector disabled v-model="row.goodsType" :options="productAttrList" label-field="attrName" value-field="id" @input="calculationPrice"></selector>
</template>
</el-table-column>
<el-table-column label="品牌" width="100px">
<el-table-column :label="$t('品牌')" width="100px">
<template slot-scope="{row}">
<dict-selector v-model="row.brand" :type="DICT_TYPE.ECW_IS_BRAND" defaultable @input="calculationPrice" />
</template>
</el-table-column>
<el-table-column label="件数" width="90px">
<el-table-column :label="$t('件数')" width="90px">
<template slot-scope="{row}">
<el-input v-model.number="row.num" @input="calculationPrice" />
</template>
</el-table-column>
<el-table-column label="包装单位">
<el-table-column :label="$t('包装单位')">
<template slot-scope="{row}">
<dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable @input="calculationPrice" />
</template>
</el-table-column>
<el-table-column label="数量(个)">
<el-table-column :label="$t('数量') + '(个)'">
<template slot-scope="{row}">
<el-input v-model.number="row.quantity" @input="calculationPrice" />
</template>
</el-table-column>
<el-table-column label="箱规(m)" width="120px">
<el-table-column :label="$t('箱规') + '(m)'" width="120px">
<template slot-scope="{row}">
<el-input v-model="row.boxGauge" @input="calcVolume(row);calculationPrice()" />
</template>
</el-table-column>
<el-table-column label="总体积(m³)" width="100px">
<el-table-column :label="$t('总体积') + '(m³)'" width="100px">
<template slot-scope="{row}">
<el-input v-model="row.volume" @input="calculationPrice"/>
</template>
</el-table-column>
<el-table-column label="总重量(kg)" width="100px">
<el-table-column :label="$t('总重量') + '(kg)'" width="100px">
<template slot-scope="{row}">
<el-input v-model="row.weight" @input="calculationPrice" />
</template>
</el-table-column>
<el-table-column label="货值(RMB)" width="100px">
<el-table-column :label="$t('货值') + '(RMB)'" width="100px">
<template slot-scope="{row}">
<el-input v-model="row.worth" />
</template>
</el-table-column>
<el-table-column label="商品特性" width="250px">
<el-table-column :label="$t('商品特性')" width="250px">
<template slot-scope="{row}">
<el-checkbox-group v-model="row.prodAttrArr" @change="onProductAttrChange(row, $event)">
<el-checkbox v-for="item in productAttrList" :label="item.id" :key="item.id">{{item.attrName}}</el-checkbox>
......@@ -221,42 +221,42 @@
:label-field="(item, index) => item.startTitleZh + ' >> ' + item.destTitleZh" value-field="id"></selector>
</template>
</el-table-column> -->
<el-table-column label="运费" width="200px">
<el-table-column :label="$t('运费')" width="200px">
<template slot-scope="{row}">
<template v-if="row.fee && row.fee.charging == 1">
<template v-if="!row.fee.freight">未报价</template>
<template v-if="!row.fee.freight">{{$t('未报价')}}</template>
<template v-else>
全包价：{{row.fee.freight}} {{currentcyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
{{$t('全包价')}}：{{row.fee.freight}} {{currentcyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
</template>
</template>
<template v-else-if="!row.fee || !row.fee.freight && !row.fee.clearanceFee">未报价</template>
<template v-else-if="!row.fee || !row.fee.freight && !row.fee.clearanceFee">{{$t('未报价')}}</template>
<template v-else-if="row.fee">
<div>
运费：{{row.fee.freight}} {{currentcyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
{{$t('运费')}}：{{row.fee.freight}} {{currentcyMap[row.fee.freightCurrency]}} / {{unitMap[row.fee.freightVolume]}}
</div>
<div>
清关费：{{row.fee.clearanceFee}} {{currentcyMap[row.fee.clearanceFeeCurrency]}} / {{unitMap[row.fee.clearanceFeeVolume]}}
{{$t('清关费')}}：{{row.fee.clearanceFee}} {{currentcyMap[row.fee.clearanceFeeCurrency]}} / {{unitMap[row.fee.clearanceFeeVolume]}}
</div>
</template>
</template>
</el-table-column>
<el-table-column label="是否预付">
<el-table-column :label="$t('是否预付')">
<template slot-scope="{row}">
<dict-tag v-if="row.fee" :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="row.fee.isPayAdvance" />
</template>
</el-table-column>
<el-table-column label="商品链接" width="200px" align="center">
<el-table-column :label="$t('商品链接')" width="200px" align="center">
<template slot-scope="{row}">
<el-link type="primary" :href="row.link" target="_blank" style="display:block">{{row.link}}</el-link>
<el-button type="primary" size="mini" @click="setLink(row)">
{{row.link ? '编辑商品链接' : '添加商品链接'}}
{{row.link ? $t('编辑商品链接') : $t('添加商品链接')}}
</el-button>
</template>
</el-table-column>
<el-table-column label="操作" width="180px" fixed="right">
<el-table-column :label="$t('操作')" width="180px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="delProduct(scope.$index)">删除</el-button>
<el-button size="mini" type="primary" @click="showMorePrice($index)">更多报价</el-button>
<el-button size="mini" type="danger" @click="delProduct(scope.$index)">{{$t('删除')}}</el-button>
<el-button size="mini" type="primary" @click="showMorePrice($index)">{{$t('更多报价')}}</el-button>
<!-- <el-button size="mini" type="primary" @click="getProductFee(scope.row)">计算</el-button> -->
</template>
</el-table-column>
......@@ -264,9 +264,9 @@
<!--
</el-card>
<el-card class="mt-10"> -->
<div class="card-title" style="padding:20px 0;">费用小计</div>
<div class="card-title" style="padding:20px 0;">{{$t('费用小计')}}</div>
<el-descriptions :column="4" border>
<el-descriptions-item label="总件数">
<el-descriptions-item :label="$t('总件数')">
{{sum.totalNum || 0}}
</el-descriptions-item>
<!-- <el-descriptions-item label="总体积">
......@@ -275,11 +275,11 @@
<el-descriptions-item label="总重量">
{{sum.totalWeight || 0}}kg
</el-descriptions-item> -->
<el-descriptions-item label="总货值">
{{sum.totalWorth || 0}}人民币
<el-descriptions-item :label="$t('总货值')">
{{sum.totalWorth || 0}}{{$t('人民币')}}
</el-descriptions-item>
<el-descriptions-item label="保价费">
{{fee.insuranceFee || 0}}人民币
<el-descriptions-item :label="$t('保价费')">
{{fee.insuranceFee || 0}}{{$t('人民币')}}
</el-descriptions-item>
<!-- <el-descriptions-item label="总运费">
<div>{{fee.seaNGN || 0}}泰拉</div>
......@@ -300,47 +300,47 @@
</el-card>
<el-card class="mt-10">
<div class="card-title" slot="header">预计费用</div>
<div class="card-title" slot="header">{{$t('预计费用')}}</div>
<el-descriptions :column="5" border>
<el-descriptions-item label="保价费">
{{fee.insuranceFee || 0}} 人民币
<el-descriptions-item :label="$t('保价费')">
{{fee.insuranceFee || 0}} {{$t('人民币')}}
</el-descriptions-item>
<el-descriptions-item label="总运费">
<div>{{fee.seaNGN || 0}}奈拉</div>
<div>{{fee.seaRMB || 0}}人民币</div>
<div>{{fee.seaUSD || 0}}美元</div>
<el-descriptions-item :label="$t('总运费')">
<div>{{fee.seaNGN || 0}}{{$t('奈拉')}}</div>
<div>{{fee.seaRMB || 0}}{{$t('人民币')}}</div>
<div>{{fee.seaUSD || 0}}{{$t('美元')}}</div>
</el-descriptions-item>
<!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
<el-descriptions-item label="总清关费">
<div>{{fee.clearanceNGN || 0}}奈拉</div>
<div>{{fee.clearanceRMB || 0}}人民币</div>
<div>{{fee.clearanceUSD || 0}}美元</div>
<el-descriptions-item :label="$t('总清关费')">
<div>{{fee.clearanceNGN || 0}}{{$t('奈拉')}}</div>
<div>{{fee.clearanceRMB || 0}}{{$t('人民币')}}</div>
<div>{{fee.clearanceUSD || 0}}{{$t('美元')}}</div>
</el-descriptions-item>
<el-descriptions-item label="其他费用">
<el-descriptions-item :label="$t('其他费用')">
<el-input v-model="form.otherFee" placeholder="" class="w-100 mr-10"></el-input>
<selector v-model="form.otherFeeCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-descriptions-item>
<el-descriptions-item label="原价" :span="2">
<el-descriptions-item :label="$t('原价')" :span="2">
<!--TODO 缺少字段-->
<div>{{fee.clearanceNGN || 0}}奈拉</div>
<div>{{fee.clearanceRMB || 0}}人民币</div>
<div>{{fee.clearanceUSD || 0}}美元</div>
<div>{{fee.clearanceNGN || 0}}{{$t('奈拉')}}</div>
<div>{{fee.clearanceRMB || 0}}{{$t('人民币')}}</div>
<div>{{fee.clearanceUSD || 0}}{{$t('美元')}}</div>
</el-descriptions-item>
</el-descriptions>
<div class="card-title" style="padding:20px 0;">优惠信息</div>
<div class="card-title" style="padding:20px 0;">{{$t('优惠信息')}}</div>
<div v-for="(item, index) in couponList" :key="index" style="display:flex;align-items:center">
<div class="w-150">
{{index+1}}.
{{productNames[item.prodId] || '未知'}}
{{productNames[item.prodId] || $t('未知')}}
</div>
<div class="w-100">
<dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="item.type" />
</div>
<div style="display:flex; align-items:center">
<el-select placeholder="请选择优惠" v-model="item.selectedIndex" :data-type="item.value" clearable class="w-300">
<el-select :placeholder="$t('请选择优惠')" v-model="item.selectedIndex" :data-type="item.value" clearable class="w-300">
<template v-for="(coupon, couponIndex) in item.options">
<el-option :key="coupon.couponId" :label="coupon.titleZh" :value="couponIndex"></el-option>
</template>
......@@ -350,51 +350,51 @@
-{{item.options[item.selectedIndex].reduceAmount}}
{{currentcyMap[item.options[item.selectedIndex].reduceCurrencyId]}}
</div>
<div class="ml-20">有效期：{{item.options[item.selectedIndex].endTime || '永久有效'}}</div>
<div class="ml-20">{{$t('有效期')}}：{{item.options[item.selectedIndex].endTime || $t('永久有效')}}</div>
</template>
</div>
</div>
<el-descriptions :column="1" class="mt-20">
<el-descriptions-item label="优惠合计">
<el-descriptions-item :label="$t('优惠合计')">
<div v-for="(discount, discountIndex) in discountArr" :key="discountIndex">
{{discount.reduceAmount}} {{currentcyMap[discount.reduceCurrencyId]}}
</div>
</el-descriptions-item>
<el-descriptions-item label="预计费用">
<el-descriptions-item :label="$t('预计费用')">
// TODO
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="mt-10">
<div class="card-title" slot="header">通用</div>
<div class="card-title" slot="header">{{$t('通用')}}</div>
<el-descriptions :column="2" border>
<el-descriptions-item label="唛头">
<el-descriptions-item :label="$t('唛头')">
<el-input v-model="form.marks" placeholder=""></el-input>
</el-descriptions-item>
<el-descriptions-item label="报关方式">
<el-descriptions-item :label="$t('报关方式')">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable />
</el-descriptions-item>
<el-descriptions-item label="预计结束时间">
<el-descriptions-item :label="$t('预计结束时间')">
<el-date-picker v-model="form.stopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-descriptions-item>
<el-descriptions-item label="是否控货">
<el-descriptions-item :label="$t('是否控货')">
<dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.control" form-type="radio" defaultable />
</el-descriptions-item>
<el-descriptions-item label="竞争对手">
<el-descriptions-item :label="$t('竞争对手')">
<el-input v-model="form.competitor" placeholder=""></el-input>
</el-descriptions-item>
<el-descriptions-item label="重要程度">
<el-descriptions-item :label="$t('重要程度')">
<el-rate v-model="form.importance"></el-rate>
</el-descriptions-item>
<el-descriptions-item label="价格有效时间">
<el-descriptions-item :label="$t('价格有效时间')">
<el-date-picker v-model="form.startTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-
<el-date-picker v-model="form.endTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-descriptions-item>
<el-descriptions-item label="交货方式">
<el-descriptions-item :label="$t('交货方式')">
<!--
接口要求数据为整数，所以增加trade_type类型的字典，用1234代码以下不同类型
FOB(离岸价)，CIF(到岸价)，CNF(成本加运费)，EXW(出厂价)
......@@ -414,7 +414,7 @@
<!-- <el-descriptions-item label="佣金类型" :span="2">
<dict-selector :type="DICT_TYPE.COMMISSION_TYPE" form-type="radio" fomtter="number" v-model="form.commissionType" defaultable />
</el-descriptions-item> -->
<el-descriptions-item label="备注" :span="2">
<el-descriptions-item :label="$t('备注')" :span="2">
<el-input v-model="form.remarks" type="textarea" placeholder=""></el-input>
</el-descriptions-item>
</el-descriptions>
......@@ -422,49 +422,49 @@
<el-card class="mt-10" v-if="transport">
<div class="card-title" slot="header">{{transport.label}}</div>
<el-form-item label="快递单号">
<el-input v-model="form.number" placeholder="请输入购买商品的快递单号"></el-input>
<el-form-item :label="$t('快递单号')">
<el-input v-model="form.number" :placeholder="$t('请输入购买商品的快递单号')"></el-input>
</el-form-item>
<el-form-item label="是否双清" v-if="[2,3,4].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('是否双清')" v-if="[2,3,4].indexOf(+form.transportId) > -1">
<dict-selector v-model="form.doubleClear" form-type="radio" :type="DICT_TYPE.ECW_DOUBLE_CLEAR" />
</el-form-item>
<el-form-item label="航空公司" v-if="[3,4].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('航空公司')" v-if="[3,4].indexOf(+form.transportId) > -1">
<!--待查询备选数据-->
<el-select placeholder="" v-model="form.airlineCompany">
</el-select>
</el-form-item>
<el-form-item label="船公司" v-if="[2].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('船公司')" v-if="[2].indexOf(+form.transportId) > -1">
<el-select placeholder="" v-model="form.shippingCompany">
</el-select>
</el-form-item>
<el-form-item label="清关证书" v-if="[2,3,4].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('清关证书')" v-if="[2,3,4].indexOf(+form.transportId) > -1">
<dict-selector v-model="form.customsClearCert" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
</el-form-item>
<el-form-item label="清关证书备注" v-if="[2,3,4].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('清关证书备注')" v-if="[2,3,4].indexOf(+form.transportId) > -1">
<el-input v-model="form.remarks" ></el-input>
</el-form-item>
<el-form-item label="是否拆包" v-if="[3,4].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('是否拆包')" v-if="[3,4].indexOf(+form.transportId) > -1">
<dict-selector v-model="form.isUnpack" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
</el-form-item>
<el-form-item label="单票立刻转运" v-if="[3,4].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('单票立刻转运')" v-if="[3,4].indexOf(+form.transportId) > -1">
<dict-selector v-model="form.isSingleTicketTransport" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
<span style="margin-left:10px">注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”</span>
<span style="margin-left:10px">{{$t('注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”')}}</span>
</el-form-item>
<el-form-item label="特殊要求" >
<el-form-item :label="$t('特殊要求')" >
<dict-selector v-model="form.packageType" form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple />
</el-form-item>
<el-form-item label="特殊要求备注">
<el-form-item :label="$t('特殊要求备注')">
<el-input v-model="form.packageRemarks" ></el-input>
</el-form-item>
</el-card>
<el-form-item label="">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="$router.back()">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确定')}}</el-button>
<el-button @click="$router.back()">{{$t('取消')}}</el-button>
</el-form-item>
</el-form>
</div>
......@@ -751,7 +751,7 @@ export default {
}, */
addProduct(data){
if(!data && !this.form.lineId){
return this.$message.error('请先选择路线')
return this.$message.error(this.$t('请先选择路线'))
}
this.productList.push(data || {prodAttrArr:[]})
},
......@@ -793,7 +793,7 @@ export default {
},
// 删除一条产品
delProduct(index){
this.$confirm('确定删除此条内容么？')
this.$confirm(this.$t('确定删除此条内容么？'))
.then(res => {
this.productList.splice(index, 1)
})
......@@ -858,7 +858,7 @@ export default {
prodUpdateReqVOList: this.productList
})
updateOffer(data).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.$router.back()
});
return;
......@@ -869,13 +869,13 @@ export default {
})
// 添加的提交
createOffer(data).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.$router.replace('index')
});
});
},
setLink(row){
this.$prompt('请输入商品链接', {inputValue: row.link}).then(({value}) => {
this.$prompt(this.$t('请输入商品链接'), {inputValue: row.link}).then(({value}) => {
console.log('value', value)
this.$set(row, 'link', value)
})
......
src/views/ecw/offer/index.vue
View file @ aa6bc78c
......@@ -3,17 +3,17 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="报价单号" prop="number">
<el-input v-model="queryParams.number" placeholder="请输入报价单号" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('报价单号')" prop="number">
<el-input v-model="queryParams.number" :placeholder="$t('请输入报价单号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="订单编号" prop="orderNo">
<el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('订单编号')" prop="orderNo">
<el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单编号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -21,54 +21,54 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<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 :span="1.5">
<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>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list" border>
<el-table-column label="报价单号" align="left" prop="number" width="200px" />
<el-table-column label="订单编号" align="left" prop="orderNo" />
<el-table-column label="客户名称" align="left" prop="relationName" />
<el-table-column label="目的地" align="center" prop="objectiveName" />
<el-table-column label="销售阶段" align="left" width="180">
<el-table-column :label="$t('报价单号')" align="left" prop="number" width="200px" />
<el-table-column :label="$t('订单编号')" align="left" prop="orderNo" />
<el-table-column :label="$t('客户名称')" align="left" prop="relationName" />
<el-table-column :label="$t('目的地')" align="center" prop="objectiveName" />
<el-table-column :label="$t('销售阶段')" align="left" width="180">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="row.status" />
</template>
</el-table-column>
<el-table-column label="预计结束时间" align="left">
<el-table-column :label="$t('预计结束时间')" align="left">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.stopTime, "{y}-{m}-{d}") }}</span>
</template>
</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" >
<span v-for="(item, index) in scope.row.transportIds.split(',')" :key="index">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item" />
</span>
</template>
</el-table-column>
<el-table-column label="业务员" align="left">
<el-table-column :label="$t('业务员')" align="left">
<template slot-scope="scope">
暂无
</template>
</el-table-column>
<el-table-column label="预计销售额" align="center" prop="estCost">
<el-table-column :label="$t('预计销售额')" align="center" prop="estCost">
<template slot-scope="{row}">
<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.clearanceRMB">{{row.estCostVO.clearanceRMB}}￥</span>
<span v-if="row.estCostVO.clearanceUSD">{{row.estCostVO.clearanceUSD}}$</span>
</div>
<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.seaRMB">{{row.estCostVO.seaRMB}}￥</span>
<span v-if="row.estCostVO.seaUSD">{{row.estCostVO.seaUSD}}$</span>
......@@ -77,34 +77,34 @@
</template>
</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 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)"
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)"
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)"
v-hasPermi="['ecw:offer:update']">跟进</el-button>
v-hasPermi="['ecw:offer:update']">{{$t('跟进')}}</el-button>
</template>
<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)"
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}`)"
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)"
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"
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"
v-hasPermi="['ecw:offer:update']">恢复</el-button>
v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-button>
</template>
<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"
v-hasPermi="['ecw:offer:delete']">删除</el-button>
v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -224,11 +224,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const offerId = row.offerId;
this.$modal.confirm('是否确认删除报价单管理编号为"' + offerId + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除报价单管理编号为{offerId}的数据项?', {offerId})).then(function() {
return deleteOffer(offerId);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -242,7 +242,7 @@ export default {
this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有报价单管理数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有报价单管理数据项?')).then(() => {
this.exportLoading = true;
return exportOfferExcel(params);
}).then(response => {
......
src/views/ecw/order/release.vue
View file @ aa6bc78c
<template>
<div class="app-container">
<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}}
</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>
</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-form-item>
<template v-if="form.pickType == 2">
<el-form-item label="收货人">
<el-form-item :label="$t('收货人')">
{{order.consigneeVO.name}}
</el-form-item>
<el-form-item label="收货电话">
<el-form-item :label="$t('收货电话')">
{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
</el-form-item>
<el-form-item label="收货地址">
<el-form-item :label="$t('收货地址')">
<!--缺少国城名字-->
{{order.consigneeVO.address}}
</el-form-item>
<el-form-item label="快递单号">
<el-form-item :label="$t('快递单号')">
<el-input v-model="form.trackingNumber" placeholder=""></el-input>
</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-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-form-item>
</template>
<el-form-item label="附件">
<el-form-item :label="$t('附件')">
<image-upload v-model="form.attachment" />
</el-form-item>
<el-form-item label="备注">
<el-form-item :label="$t('备注')">
<el-input v-model="form.remark" type="textarea" placeholder=""></el-input>
</el-form-item>
<el-form-item label="">
<el-button type="primary" @click="submit">确认放货</el-button>
<el-button type="default" @click="$router.back()">取消</el-button>
<el-button type="primary" @click="submit">{{$t('确认放货')}}</el-button>
<el-button type="default" @click="$router.back()">{{$t('取消')}}</el-button>
</el-form-item>
</el-form>
</div>
......@@ -70,7 +70,7 @@ export default {
},
submit(){
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 => {
this.$router.back()
})
......
src/views/ecw/order/success.vue
View file @ aa6bc78c
......@@ -5,33 +5,33 @@
<img src="../../../assets/images/u5.png" />
</el-col>
<el-col :span="14">
<div class="title">新增订单生成成功</div>
<div class="line">订单号：{{order.orderNo}}</div>
<div class="line">运输方式：<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">商品列表：
<div class="title">{{$t('新增订单生成成功')}}</div>
<div class="line">{{$t('订单号')}}：{{order.orderNo}}</div>
<div class="line">{{$t('运输方式')}}：<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /></div>
<div class="line">{{$t('路线')}}：{{order.logisticsInfoDto.startTitleZh}} >> {{order.logisticsInfoDto.destTitleZh}}</div>
<div class="line">{{$t('商品列表')}}：
<span v-for="(item, index) in order.orderItemVOList" :key="index">
{{item.prodTitleZh}}
<template v-if="index < order.orderItemVOList.length - 1">、</template>
</span>
</div>
<div class="line">仓库地址：{{order.logisticsInfoDto.startAddressZh}}</div>
<div class="line">仓库电话： {{order.logisticsInfoDto.startTell}}</div>
<div class="line">{{$t('仓库地址')}}：{{order.logisticsInfoDto.startAddressZh}}</div>
<div class="line">{{$t('仓库电话')}}： {{order.logisticsInfoDto.startTell}}</div>
<div class="line"></div>
<div class="line">您的订单已提交，谢谢您选择捷道物流！</div>
<div class="line">{{$t('您的订单已提交，谢谢您选择捷道物流！')}}</div>
</el-col>
</el-row>
<div class="actions">
<el-button type="primary" @click="$router.replace('detail?orderId=' + order.orderId)">查看订单</el-button>
<el-button type="warning" @click="showNotice = true">入仓须知</el-button>
<el-button type="info" @click="$router.replace('edit')">再来一单</el-button>
<el-button type="primary" @click="$router.replace('detail?orderId=' + order.orderId)">{{$t('查看订单')}}</el-button>
<el-button type="warning" @click="showNotice = true">{{$t('入仓须知')}}</el-button>
<el-button type="info" @click="$router.replace('edit')">{{$t('再来一单')}}</el-button>
</div>
<el-dialog title="查看须知" :visible.sync="showNotice" width="700px">
<el-dialog :title="$t('查看须知')" :visible.sync="showNotice" width="700px">
<!-- <img :src="noticeUrl" id="noticeImg" /> -->
<need-know keyname="warehousing" ref="needKnow" />
<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>
</el-dialog>
</div>
......
src/views/ecw/productPrice/batchEdit.vue
View file @ aa6bc78c
......@@ -7,46 +7,46 @@
<el-card style="margin-bottom: 10px">
<div slot="header" style="font-size:20px;">
价格设置
{{$t('价格设置')}}
<span>
<el-checkbox label="" @change="form.advanceStatus=$event ? 1 : 0">预付</el-checkbox>
<el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">阶梯订单</el-checkbox>
<el-checkbox label="" @change="form.advanceStatus=$event ? 1 : 0">{{$t('预付')}}</el-checkbox>
<el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">{{$t('阶梯订单')}}</el-checkbox>
</span>
</div>
<el-form-item label="单价模式" prop="priceType">
<el-form-item :label="$t('单价模式')" prop="priceType">
<dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" defaultable />
</el-form-item>
<!--阶梯订单-->
<template v-if="form.stepPrice==1" >
<div v-for="(item, index) in priceStepList" :key="index">
<div style="font-size:14px; margin:10px 0">
第{{index+1}}阶梯定价方案：
{{$t('第{index}阶梯定价方案', {index: index+1})}}：
<template v-if="index == priceStepList.length - 1">
<el-link type="primary" @click.native="priceStepList.push({})">添加区间</el-link>
<el-link type="primary" @click.native="priceStepList.push({})">{{$t('添加区间')}}</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="danger" @click.native="priceStepList.splice(index, 1)">删除</el-link>
<el-link type="danger" @click.native="priceStepList.splice(index, 1)">{{$t('删除')}}</el-link>
</template>
</div>
<el-form-item :label="`第${index+1}阶梯`">
<el-form-item :label="$t(`第{index}阶梯`, {index: index+1})">
<el-input v-model="item.startNum" type="number" placeholder="" class="w100"></el-input>
-
<el-input v-model="item.endNum" type="number" placeholder="" class="w100"></el-input>
/
<selector v-model="form.weightUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<el-form-item label="默认运费" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.transportPrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认运费')" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="item.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="item.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<el-form-item label="默认清关费" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.clearancePrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认清关费')" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="item.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="item.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<el-form-item label="默认全包价" v-if="form.priceType == 1">
<inputor default="0" v-model.number="item.allPrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
<inputor default="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="item.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="item.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
......@@ -54,33 +54,33 @@
</template>
<template v-else>
<el-form-item label="默认全包价" v-if="form.priceType == 1">
<inputor default="0" v-model.number="form.allPrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
<inputor default="0" v-model.number="form.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="form.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="form.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<template v-else>
<el-form-item label="默认运费" prop="transportPrice">
<el-form-item :label="$t('默认运费')" prop="transportPrice">
<el-row :gutter="20">
<el-col :span="4">
<selector v-model="form.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="form.transportPrice" type="number" placeholder="整数或者两位小数" />
<inputor default="0" v-model.number="form.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" />
</el-col>
<el-col :span="4">
/ <selector v-model="form.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label="默认清关费" prop="clearancePrice">
<el-form-item :label="$t('默认清关费')" prop="clearancePrice">
<el-row :gutter="20">
<el-col :span="4">
<selector v-model="form.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="form.clearancePrice" type="number" placeholder="整数或者两位小数" />
<inputor default="0" v-model.number="form.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" />
</el-col>
<el-col :span="4">
......@@ -96,7 +96,7 @@
<template v-if="form.priceType==1">
<el-form-item
v-for="(special, specialIndex) in this.specialProducts"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '全包价'"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('全包价')"
:key="specialIndex + 'transport'">
<el-row :gutter="20">
<el-col :span="4">
......@@ -104,7 +104,7 @@
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="special.allPrice" type="number" placeholder="整数或者两位小数" />
<inputor default="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" />
</el-col>
<el-col :span="4">
......@@ -115,7 +115,7 @@
</template>
<template v-else v-for="(special, specialIndex) in this.specialProducts">
<el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '运费'"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('运费')"
:key="specialIndex + 'transport'">
<el-row :gutter="20">
<el-col :span="4">
......@@ -123,7 +123,7 @@
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="special.transportPrice" type="number" placeholder="整数或者两位小数" />
<inputor default="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" />
</el-col>
<el-col :span="4">
......@@ -132,7 +132,7 @@
</el-row>
</el-form-item>
<el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '清关费'"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')"
:key="specialIndex + 'clearance'">
<el-row :gutter="20">
<el-col :span="4">
......@@ -140,7 +140,7 @@
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="special.clearancePrice" type="number" placeholder="整数或者两位小数" />
<inputor default="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" />
</el-col>
<el-col :span="4">
......@@ -182,8 +182,8 @@
</el-form>
<div style="margin: 20px 0">
<el-button @click="submitForm" type="primary">确认提交</el-button>
<el-button type="default" @click="$router.back()">返回上一页</el-button>
<el-button @click="submitForm" type="primary">{{$t('确认提交')}}</el-button>
<el-button type="default" @click="$router.back()">{{$t('返回上一页')}}</el-button>
</div>
</div>
</template>
......@@ -217,9 +217,9 @@ export default {
/* typeId: [{ required: true, message: "产品类型不能为空", trigger: "blur" }],
titleZh: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }], */
transportPrice: [{ required: true, message: "海运费不能为空", trigger: "blur" }],
clearancePrice: [{ required: true, message: "清关费不能为空", trigger: "blur" }],
advanceStatus: [{ required: true, message: "是否预付不能为空", trigger: "blur" }],
transportPrice: [{ required: true, message: this.$t("海运费不能为空"), trigger: "blur" }],
clearancePrice: [{ required: true, message: this.$t("清关费不能为空"), trigger: "blur" }],
advanceStatus: [{ required: true, message: this.$t("是否预付不能为空"), trigger: "blur" }],
//containerLocation: [{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
//square: [{ required: true, message: "方数不能为空", trigger: "blur" }],
// zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
......@@ -351,7 +351,7 @@ export default {
// 只有新增的时候做判断
if (!this.$route.query.ids && (!this.selectedRoutes || !this.selectedRoutes.length)) {
this.$message.error('请选择线路');
this.$message.error(this.$t('请选择线路'));
return;
}
let data = Object.assign({}, this.form, {
......@@ -366,10 +366,10 @@ export default {
data.lineChannelList = this.selectedRoutes
if(data.lineChannelList.length < 1){
return this.$message.error('请选择需要修改的路线')
return this.$message.error(this.$t('请选择需要修改的路线'))
}
batchUpdateProductPrice(data).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.$router.replace('/lineProject/product-price?' + (new URLSearchParams(this.$route.query)).toString())
})
});
......
src/views/ecw/productPrice/edit.vue
View file @ aa6bc78c
......@@ -2,17 +2,17 @@
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="readonly">
<el-form-item label="商品类型" prop="productType">
<el-form-item :label="$t('商品类型')" prop="productType">
<el-select v-model="form.productType" :disabled="!!$route.query.ids">
<el-option v-for="type in productTypeList" :key="type.id" :label="type.titleZh" :value="type.id" />
</el-select>
</el-form-item>
<el-form-item label="商品名称" prop="titleZh">
<el-form-item :label="$t('商品名称')" prop="titleZh">
<product-selector v-model="form.productId" :product-type="form.productType" @change="product = $event" :disabled="!!$route.query.ids" />
</el-form-item>
<el-form-item label="英文名称" prop="titleEn">
<el-form-item :label="$t('英文名称')" prop="titleEn">
<el-input :value="product ? product.titleEn : ''" disabled />
</el-form-item>
......@@ -25,12 +25,16 @@
disabled/>
</el-form-item>-->
<!--多条路线批量修改-->
<el-form-item label="路线" prop="lineChannelList" v-if="lineList.length">
<el-form-item :label="$t('路线')" prop="lineChannelList" v-if="lineList.length">
<template v-if="lineList.length == 1">
<el-input
v-for="item in lineList"
:key="item.id"
:value="!item.warehouseLineDO ? '数据异常,缺少warehouseLineDO字段' : '【' + getDictDataLabel(DICT_TYPE.ECW_TRANSPORT_TYPE, item.warehouseLineDO.transportType) + '】从【' + item.warehouseLineDO.startTitleZh + '】发往【' + item.warehouseLineDO.destTitleZh + '】'"
:value="!item.warehouseLineDO ? '数据异常,缺少warehouseLineDO字段' : $t('【{transport}】从【{from}】发往【{to}】', {
transport: getDictDataLabel(DICT_TYPE.ECW_TRANSPORT_TYPE, item.warehouseLineDO.transportType),
from: item.warehouseLineDO.startTitleZh,
to: item.warehouseLineDO.destTitleZh
})"
disabled />
</template>
<el-checkbox-group v-else v-model="checkList">
......@@ -42,9 +46,11 @@
style="display:block"
>
{{
!item.warehouseLineDO ? '数据异常,缺少warehouseLineDO字段' :
'【' + getDictDataLabel(DICT_TYPE.ECW_TRANSPORT_TYPE, item.warehouseLineDO.transportType) + '】从【' +
item.warehouseLineDO.startTitleZh + '】发往【' + item.warehouseLineDO.destTitleZh + '】'
!item.warehouseLineDO ? $t('数据异常,缺少warehouseLineDO字段') : $t('【{transport}】从【{from}】发往【{to}】', {
transport: getDictDataLabel(DICT_TYPE.ECW_TRANSPORT_TYPE, item.warehouseLineDO.transportType),
from: item.warehouseLineDO.startTitleZh,
to: item.warehouseLineDO.destTitleZh
})
}}
</el-checkbox>
</el-checkbox-group>
......@@ -55,46 +61,46 @@
<el-card style="margin-bottom: 10px">
<div slot="header" style="font-size:20px;">
价格设置
{{$t('价格设置')}}
<span>
<el-checkbox label="" @change="form.advanceStatus=$event ? 1 : 0">预付</el-checkbox>
<el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">阶梯订单</el-checkbox>
<el-checkbox label="" @change="form.advanceStatus=$event ? 1 : 0">{{$t('预付')}}</el-checkbox>
<el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">{{$t('阶梯订单')}}</el-checkbox>
</span>
</div>
<el-form-item label="单价模式" prop="priceType">
<el-form-item :label="$t('单价模式')" prop="priceType">
<dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" defaultable />
</el-form-item>
<!--阶梯订单-->
<template v-if="form.stepPrice==1" >
<div v-for="(item, index) in priceStepList" :key="index">
<div style="font-size:14px; margin:10px 0">
第{{index+1}}阶梯定价方案：
{{$t('第{index}阶梯定价方案', {index: index+1})}}：
<template v-if="index == priceStepList.length - 1">
<el-link type="primary" @click.native="priceStepList.push({})">添加区间</el-link>
<el-link type="primary" @click.native="priceStepList.push({})">{{$t('添加区间')}}</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="danger" @click.native="priceStepList.splice(index, 1)">删除</el-link>
<el-link type="danger" @click.native="priceStepList.splice(index, 1)">{{$t('删除')}}</el-link>
</template>
</div>
<el-form-item :label="`第${index+1}阶梯`">
<el-form-item :label="$t(`第{index}阶梯`, {index: index + 1})">
<el-input v-model="item.startNum" type="number" placeholder="" class="w100"></el-input>
-
<el-input v-model="item.endNum" type="number" placeholder="" class="w100"></el-input>
/
<selector v-model="form.weightUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<el-form-item label="默认运费" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.transportPrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认运费')" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="item.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="item.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<el-form-item label="默认清关费" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.clearancePrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认清关费')" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="item.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="item.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<el-form-item label="默认全包价" v-if="form.priceType == 1">
<inputor default="0" v-model.number="item.allPrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
<inputor default="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="item.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="item.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
......@@ -102,21 +108,21 @@
</template>
<template v-else>
<el-form-item label="默认全包价" v-if="form.priceType == 1">
<inputor default="0" v-model.number="form.allPrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
<inputor default="0" v-model.number="form.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="form.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
/ <selector v-model="form.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-form-item>
<template v-else>
<el-form-item label="默认运费" prop="transportPrice">
<el-form-item :label="$t('默认运费')" prop="transportPrice">
<selector v-model="form.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
<inputor default="0" v-model.number="form.transportPrice" type="number" placeholder="整数或者两位小数" class="w-100 mr-10" />
<inputor default="0" v-model.number="form.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span>
<selector v-model="form.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-form-item>
<el-form-item label="默认清关费" prop="clearancePrice">
<el-form-item :label="$t('默认清关费')" prop="clearancePrice">
<selector v-model="form.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
<inputor default="0" v-model.number="form.clearancePrice" type="number" placeholder="整数或者两位小数" class="w-100 mr-10" />
<inputor default="0" v-model.number="form.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span>
<selector v-model="form.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-form-item>
......@@ -127,35 +133,35 @@
<template v-if="form.priceType==1">
<el-form-item
v-for="(special, specialIndex) in this.specialProducts"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '全包价'"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('全包价')"
:key="specialIndex + 'transport'">
<selector v-model="special.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
<inputor default="0" v-model.number="special.allPrice" type="number" placeholder="整数或者两位小数" class="w-100 mr-10" />
<inputor default="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span>
<selector v-model="special.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-form-item>
</template>
<template v-else v-for="(special, specialIndex) in this.specialProducts">
<el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '运费'"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('运费')"
:key="specialIndex + 'transport'">
<selector v-model="special.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
<inputor default="0" v-model.number="special.transportPrice" type="number" placeholder="整数或者两位小数" class="w-100 mr-10" />
<inputor default="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span>
<selector v-model="special.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-form-item>
<el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '清关费'"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')"
:key="specialIndex + 'clearance'">
<selector v-model="special.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100 mr-10" />
<inputor default="0" v-model.number="special.clearancePrice" type="number" placeholder="整数或者两位小数" class="w-100 mr-10" />
<inputor default="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span>
<selector v-model="special.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-form-item>
</template>
</template>
<el-form-item label="价格有效期">
<el-form-item :label="$t('价格有效期')">
<el-date-picker v-model="form.validateStartDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-
<el-date-picker v-model="form.validateEndDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
......@@ -165,31 +171,31 @@
<el-card>
<div slot="header" style="font-size:20px;">
基础信息
{{$t('基础信息')}}
</div>
<el-form-item label="是否预约入仓" prop="needBook">
<el-radio v-model.number="form.needBook" :label="1">是</el-radio>
<el-radio v-model.number="form.needBook" :label="0">否</el-radio>
<el-form-item :label="$t('是否预约入仓')" prop="needBook">
<el-radio v-model.number="form.needBook" :label="1">{{$t('是')}}</el-radio>
<el-radio v-model.number="form.needBook" :label="0">{{$t('否')}}</el-radio>
</el-form-item>
<el-form-item label="每日入仓上限" prop="dayLimit" v-if="form.needBook == 1">
<el-input v-model.number="form.dayLimit" type="number" class="w-100" />立方米
<el-form-item :label="$t('每日入仓上限')" prop="dayLimit" v-if="form.needBook == 1">
<el-input v-model.number="form.dayLimit" type="number" class="w-100" />{{$t('立方米')}}
</el-form-item>
<el-form-item label="货柜位置" prop="containerLocation">
<el-form-item :label="$t('货柜位置')" prop="containerLocation">
<dict-selector :type="DICT_TYPE.ECW_CONTAINER_LOCATION" v-model="form.containerLocation" />
</el-form-item>
<el-form-item label="订单方数上限" prop="square">
<el-form-item :label="$t('订单方数上限')" prop="square">
<el-input v-model.number="form.square" type="number" style="width:200px" />
</el-form-item>
</el-card>
</el-form>
<div style="margin: 20px 0">
<el-button @click="submitForm" type="primary" v-if="!readonly">确认提交</el-button>
<el-button type="default" @click="$router.back()">返回上一页</el-button>
<el-button @click="submitForm" type="primary" v-if="!readonly">{{$t('确认提交')}}</el-button>
<el-button type="default" @click="$router.back()">{{$t('返回上一页')}}</el-button>
</div>
</div>
</template>
......@@ -225,9 +231,9 @@ export default {
/* typeId: [{ required: true, message: "产品类型不能为空", trigger: "blur" }],
titleZh: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }], */
transportPrice: [{ required: true, message: "海运费不能为空", trigger: "blur" }],
clearancePrice: [{ required: true, message: "清关费不能为空", trigger: "blur" }],
advanceStatus: [{ required: true, message: "是否预付不能为空", trigger: "blur" }],
transportPrice: [{ required: true, message: this.$t("海运费不能为空"), trigger: "blur" }],
clearancePrice: [{ required: true, message: this.$t("清关费不能为空"), trigger: "blur" }],
advanceStatus: [{ required: true, message: this.$t("是否预付不能为空"), trigger: "blur" }],
//containerLocation: [{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
//square: [{ required: true, message: "方数不能为空", trigger: "blur" }],
// zhongLinjie:[{ required: true, message: "默认重货标准不能为空", trigger: "blur" }],
......@@ -409,7 +415,7 @@ export default {
return;
} */
if(!this.lineList.length && (!this.selectedRoutes || !this.selectedRoutes.length)) {
this.$message.error('请选择线路');
this.$message.error(this.$t('请选择线路'));
return;
}
let data = Object.assign({}, this.form, {
......@@ -424,7 +430,7 @@ export default {
// 修改单条路线
if (this.$route.query.action == 'update') {
return updateProductPrice(data).then(res => {
this.$modal.msgSuccess("请求成功");
this.$modal.msgSuccess(this.$t("请求成功"));
this.$router.back()
})
}
......@@ -456,11 +462,11 @@ export default {
data.lineChannelList = this.selectedRoutes
}
if(data.lineChannelList.length < 1){
return this.$message.error('请选择需要修改的路线')
return this.$message.error(this.$t('请选择需要修改的路线'))
}
data.productIdList = [this.form.productId]
batchUpdateProductPrice(data).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.$router.replace('/product/product-price?' + (new URLSearchParams(this.$route.query)).toString())
})
return;
......@@ -469,7 +475,7 @@ export default {
data.productId = this.product.id;
data.lineChannelList = this.selectedRoutes
createProductPrice(data).then(response => {
this.$modal.msgSuccess("请求成功");
this.$modal.msgSuccess(this.$t("请求成功"));
this.$router.replace('/product/product-price?' + (new URLSearchParams(this.$route.query)).toString())
});
});
......
src/views/ecw/productPrice/index.vue
View file @ aa6bc78c
<template>
<div class="app-container">
<div class="page-title">{{$route.query.product_id ? productTitle + '-' : '全部'}}路线价格列表</div>
<div class="page-title">{{$route.query.product_id ? productTitle + '-' : this.$t('全部')}}{{$t('路线价格列表')}}</div>
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="商品编码" prop="productCode" v-if="!$route.query.product_id">
......@@ -11,12 +11,12 @@
<el-input v-model="queryParams.customsCode" placeholder="请输入海关编码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> -->
<el-form-item label="商品名称" prop="titleZh" v-if="!$route.query.product_id">
<el-input v-model="queryParams.titleZh" placeholder="请输入中英文名称、商品编码、海关编码" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('商品名称')" prop="titleZh" v-if="!$route.query.product_id">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入中英文名称、商品编码、海关编码')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="商品类型" prop="typeId" v-if="!$route.query.product_id">
<el-select v-model="queryParams.typeId" placeholder="选择商品类型" clearable>
<el-form-item :label="$t('商品类型')" prop="typeId" v-if="!$route.query.product_id">
<el-select v-model="queryParams.typeId" :placeholder="$t('选择商品类型')" clearable>
<el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id"/>
</el-select>
</el-form-item>
......@@ -28,34 +28,34 @@
<el-form-item label="商品特性" prop="attrId" v-if="!$route.query.product_id">
// TODO
</el-form-item> -->
<el-form-item label="运输方式" prop="transportType">
<el-form-item :label="$t('运输方式')" prop="transportType">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" />
</el-form-item>
<el-form-item label="出货渠道" prop="shippingChannelId">
<el-form-item :label="$t('出货渠道')" prop="shippingChannelId">
<el-select v-model="queryParams.shippingChannelId" clearable>
<el-option v-for="item in channelList" :key="item.id" :label="item.nameZh" :value="item.channelId" />
</el-select>
</el-form-item>
<el-form-item label="始发地" prop="startCityId">
<el-form-item :label="$t('始发地')" prop="startCityId">
<el-select v-model="queryParams.startCityId" clearable>
<el-option v-for="city in startCityList" :key="city.id" :label="city.titleZh" :value="city.id" />
</el-select>
</el-form-item>
<el-form-item label="目的地" prop="destCityId">
<el-form-item :label="$t('目的地')" prop="destCityId">
<el-select v-model="queryParams.destCityId" clearable>
<el-option v-for="city in destCityList" :key="city.id" :label="city.titleZh" :value="city.id" />
</el-select>
</el-form-item>
<el-form-item label="状态" prop="destCityId" v-if="!$route.query.product_id">
<el-form-item :label="$t('状态')" prop="destCityId" v-if="!$route.query.product_id">
// TODO
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -63,16 +63,16 @@
<el-row :gutter="10" class="mb8">
<!--全部路线吗没有新增入口，指定商品的路线价格才有添加路线-->
<el-col :span="1.5" v-if="$route.query.product_id">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ecw:product-price:create']">新建价格</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ecw:product-price:create']">{{$t('新建价格')}}</el-button>
</el-col>
<el-col :span="1.5">
<!--未指定商品-->
<el-button v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="handleBatchEdit">批量设置价格</el-button>
<el-button v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchBlock" :disabled="multiple">批量加入黑名单</el-button>
<el-button v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchOff" :disabled="multiple">批量下架</el-button>
<el-button v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="handleBatchEdit">{{$t('批量设置价格')}}</el-button>
<el-button v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchBlock" :disabled="multiple">{{$t('批量加入黑名单')}}</el-button>
<el-button v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchOff" :disabled="multiple">{{$t('批量下架')}}</el-button>
<!--指定商品-->
<el-button v-if="$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchSetSingleProductPrice">批量设置单个商品的路线路线</el-button>
<el-button v-if="$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchSetSingleProductPrice">{{$t('批量设置单个商品的路线路线')}}</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
......@@ -84,53 +84,53 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column label="序号" prop="id" width="50" />
<el-table-column :label="$t('序号')" prop="id" width="50" />
<el-table-column label="商品编码" align="center" prop="productCode" >
<el-table-column :label="$t('商品编码')" align="center" prop="productCode" >
<template slot-scope="{row}">
<el-link type="primary" @click.native="handleUpdate(row)">
{{ row.productDO ? row.productDO.productCode : '无productDO字段' }}
{{ row.productDO ? row.productDO.productCode : $t('无productDO字段') }}
</el-link>
</template>
</el-table-column>
<el-table-column label="海关编码" align="center" prop="customsCode">
<el-table-column :label="$t('海关编码')" align="center" prop="customsCode">
<template slot-scope="{row}">
<div>
{{ row.productDO ? row.productDO.customsCode : '无productDO字段' }}
{{ row.productDO ? row.productDO.customsCode : $t('无productDO字段') }}
</div>
</template>
</el-table-column>
<el-table-column label="商品类型" align="center" prop="typeId">
<el-table-column :label="$t('商品类型')" align="center" prop="typeId">
<template slot-scope="{row}">
<span>{{ row.productDO ? getTypeName(row.productDO.typeId) : '无productDO字段' }}</span>
<span>{{ row.productDO ? getTypeName(row.productDO.typeId) : $t('无productDO字段') }}</span>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" prop="productName">
<el-table-column :label="$t('商品名称')" align="center" prop="productName">
<template slot-scope="{row}">
<el-link type="primary" @click.native="handleUpdate(row)">
{{ row.productDO ? row.productDO.titleZh + '/' + row.productDO.titleEn : '无productDO字段' }}
{{ row.productDO ? row.productDO.titleZh + '/' + row.productDO.titleEn : $t('无productDO字段') }}
</el-link>
</template>
</el-table-column>
<el-table-column prop="tansportType" label="运输方式" align="center" width="100">
<el-table-column prop="tansportType" :label="$t('运输方式')" align="center" width="100">
<template slot-scope="scope">
<div>
{{ transportName(scope.row.warehouseLineDO.transportType) }}
</div>
</template>
</el-table-column>
<el-table-column prop="tansportType" label="出货渠道" align="center" width="100">
<el-table-column prop="tansportType" :label="$t('出货渠道')" align="center" width="100">
<template slot-scope="{row}">
<div>
{{ channelName(row.shippingChannelId) }}
</div>
</template>
</el-table-column>
<el-table-column prop="startDestTitle" label="始发地/目的地" align="center">
<el-table-column prop="startDestTitle" :label="$t('始发地') + '/' + $t('目的地')" align="center">
<template slot-scope="scope">
<div>
{{ scope.row.warehouseLineDO.startTitleZh }}
......@@ -140,19 +140,19 @@
</template>
</el-table-column>
<el-table-column prop="price" label="价格" align="center">
<el-table-column prop="price" :label="$t('价格')" align="center">
<template slot-scope="scope">
<div>
海运费:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp;
{{$t('海运费')}}:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp;
{{ getCurrencyTitle(scope.row.transportPriceUnit) + '/' + getUnitTitle(scope.row.transportVolumeUnit)}}
<br />
清关费:{{ getCurrencySymbol(scope.row.clearancePriceUnit) + scope.row.clearancePrice}}&nbsp;
{{$t('清关费')}}:{{ getCurrencySymbol(scope.row.clearancePriceUnit) + scope.row.clearancePrice}}&nbsp;
{{ getCurrencyTitle(scope.row.clearancePriceUnit) + '/' + getUnitTitle(scope.row.clearanceVolumeUnit)}}
</div>
</template>
</el-table-column>
<el-table-column prop="auditStatus" align="center" label="状态" width="120">
<el-table-column prop="auditStatus" align="center" :label="$t('状态')" width="120">
<template slot-scope="scope">
<div>
{{ statusName(scope.row) }}
......@@ -160,7 +160,7 @@
</template>
</el-table-column>
<el-table-column prop="advanceStatus" label="预付" align="center" width="80">
<el-table-column prop="advanceStatus" :label="$t('预付')" align="center" width="80">
<template slot-scope="scope">
<div>
<!-- {{ getAdvanceStatuTitle(scope.row.advanceStatus) }} -->
......@@ -169,19 +169,19 @@
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="140">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
v-hasPermi="['ecw:product-price:update']">查看</el-button>
v-hasPermi="['ecw:product-price:update']">{{$t('查看')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:product-price:update']">编辑</el-button>
v-hasPermi="['ecw:product-price:update']">{{$t('编辑')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="updateStatus(scope.row, 'blacklist')"
>{{ scope.row.blacklist == 0 ? '加入黑名单' : '移除黑名单' }}</el-button>
>{{ scope.row.blacklist == 0 ? $t('加入黑名单') : $t('移除黑名单') }}</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="updateStatus(scope.row, 'auditStatus')"
>{{scope.row.auditStatus == AuditStatusEnum.PASS ? '下架' : '上架'}}</el-button>
>{{scope.row.auditStatus == AuditStatusEnum.PASS ? $t('下架') : $t('上架')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:product-price:delete']">删除</el-button>
v-hasPermi="['ecw:product-price:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -274,15 +274,15 @@ export default {
},
// 表单校验
rules: {
typeId: [{ required: true, message: "产品类型不能为空", trigger: "blur" }],
titleZh: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
titleEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
transportPrice: [{ required: true, message: "海运费不能为空", trigger: "blur" }],
clearancePrice: [{ required: true, message: "清关费不能为空", trigger: "blur" }],
advanceStatus: [{ required: true, message: "是否预付不能为空", trigger: "blur" }],
containerLocation:[{ required: true, message: "货柜位置不能为空", trigger: "blur" }],
square:[{ required: true, message: "方数不能为空", trigger: "blur" }],
needBook:[{ required: true, message: "预约入仓不能为空", trigger: "blur" }],
typeId: [{ required: true, message: this.$t("产品类型不能为空"), trigger: "blur" }],
titleZh: [{ required: true, message: this.$t("产品名称不能为空"), trigger: "blur" }],
titleEn: [{ required: true, message: this.$t("英文名称不能为空"), trigger: "blur" }],
transportPrice: [{ required: true, message: this.$t("海运费不能为空"), trigger: "blur" }],
clearancePrice: [{ required: true, message: this.$t("清关费不能为空"), trigger: "blur" }],
advanceStatus: [{ required: true, message: this.$t("是否预付不能为空"), trigger: "blur" }],
containerLocation:[{ required: true, message: this.$t("货柜位置不能为空"), trigger: "blur" }],
square:[{ required: true, message: this.$t("方数不能为空"), trigger: "blur" }],
needBook:[{ required: true, message: this.$t("预约入仓不能为空"), trigger: "blur" }],
},
lineList: [],
......@@ -516,7 +516,7 @@ export default {
handleStatusChange(row) {
updateProductPrice(row).then(() => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
}).catch(function() {
row.auditStatus = row.auditStatus === AuditStatusEnum.PASS ? AuditStatusEnum.NOT_PASS : AuditStatusEnum.PASS;
});
......@@ -594,7 +594,7 @@ export default {
row.auditStatus=row.auditStatus === AuditStatusEnum.PASS ? AuditStatusEnum.NOT_PASS : AuditStatusEnum.PASS;
}
updateProductPrice(row).then(() => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
}).catch(function() {
if(statusType == 'blacklist') {
row.blacklist = row.blacklist === 1 ? 0 : 1;
......@@ -629,7 +629,7 @@ export default {
}
if(!this.lineList || !this.lineList.length) {
this.$message.error('请选择线路');
this.$message.error(this.$t('请选择线路'));
return;
}
let lineChannelList = [];
......@@ -643,7 +643,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateProductPrice(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -652,7 +652,7 @@ export default {
// 添加的提交
this.form.productId = this.product.id;
createProductPrice(this.form).then(response => {
this.$modal.msgSuccess("请求成功");
this.$modal.msgSuccess(this.$t("请求成功"));
this.open = false;
this.getList();
});
......@@ -661,11 +661,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除产品价格编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除产品价格编号为{id}的数据项?', {id})).then(function() {
return deleteProductPrice(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -676,7 +676,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有产品价格数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有产品价格数据项?')).then(() => {
this.exportLoading = true;
return exportProductPriceExcel(params);
}).then(response => {
......@@ -692,13 +692,13 @@ export default {
},
batchBlock(){
batchBlock({ids: this.ids.join(',')}).then(res => {
this.$message.success(res.msg || '操作成功')
this.$message.success(res.msg || this.$t('操作成功'))
this.handleQuery()
})
},
batchOff(){
batchOff({ids: this.ids.join(',')}).then(res => {
this.$message.success(res.msg || '操作成功')
this.$message.success(res.msg || this.$t('操作成功'))
this.handleQuery()
})
},
......
src/views/ecw/supplier/edit.vue
View file @ aa6bc78c
......@@ -2,18 +2,18 @@
<div class="app-container">
<el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px"
label-position="left">
<el-form-item label="公司全称" prop="companyZh">
<el-input v-model="formData.companyZh" placeholder="请输入公司全称" show-word-limit clearable
<el-form-item :label="$t('公司全称')" prop="companyZh">
<el-input v-model="formData.companyZh" :placeholder="$t('请输入公司全称')" show-word-limit clearable
:style="{width: '100%'}"></el-input>
</el-form-item>
<el-form-item label="代理名称" prop="agentName">
<el-input v-model="formData.agentName" placeholder="请输入代理名称" clearable :style="{width: '100%'}">
<el-form-item :label="$t('代理名称')" prop="agentName">
<el-input v-model="formData.agentName" :placeholder="$t('请输入代理名称')" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
<el-form-item label="公司电话" prop="tell">
<el-input v-model="formData.tell" placeholder="请输入公司电话" clearable :style="{width: '100%'}"></el-input>
<el-form-item :label="$t('公司电话')" prop="tell">
<el-input v-model="formData.tell" :placeholder="$t('请输入公司电话')" clearable :style="{width: '100%'}"></el-input>
</el-form-item>
<el-form-item label="公司地址" prop="address">
<el-form-item :label="$t('公司地址')" prop="address">
<!-- <el-select v-model="formData.country">
<el-option v-for="(item, index) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" />
</el-select>
......@@ -31,69 +31,69 @@
@provinceChange="onAreaChange('province', $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-option v-for="(item, index) in regionList" :value="index" :label="item.titleZh" :key="item.id" />
</el-select> -->
<!-- <el-select v-model="formData.address" placeholder="请选择下拉选择公司地址" clearable :style="{width: '100%'}">
</el-select> -->
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注"
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="formData.remark" type="textarea" :placeholder="$t('请输入备注')"
:autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
</el-form-item>
<el-form-item label-width="0" prop="field110">
<table-form title="联系人" :fields="[
{ label: '部门', field: 'department'},
{ label: '职位', field: 'position'},
{ label: '名称*', field: 'name', required: true},
{ label: '电话*', field: 'phone', required: true},
<table-form :title="$t('联系人')" :fields="[
{ label: this.$t('部门'), field: 'department'},
{ label: this.$t('职位'), field: 'position'},
{ label: this.$t('名称') + '*', field: 'name', required: true},
{ label: this.$t('电话') + '*', field: 'phone', required: true},
]" v-model="formData.contactList">
</table-form>
</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 v-for="(item, index) in companyTypeOptions" :key="index" :label="item.value"
:disabled="item.disabled">{{item.label}}</el-checkbox>
</el-checkbox-group> -->
<dict-selector v-model="formData.companyType" type="company_type" multiple />
</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" />
</el-form-item>
<el-form-item label="营业执照" prop="license">
<el-form-item :label="$t('营业执照')" prop="license">
<upload v-model="formData.license" />
<!-- <el-upload ref="license" :file-list="licensefileList" :action="licenseAction"
:before-upload="licenseBeforeUpload">
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
</el-upload> -->
</el-form-item>
<el-form-item label="合同" prop="contract">
<el-form-item :label="$t('合同')" prop="contract">
<upload v-model="formData.contract" />
<!-- <el-upload ref="contract" :file-list="contractfileList" :action="contractAction"
:before-upload="contractBeforeUpload">
<el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
</el-upload> -->
</el-form-item>
<el-form-item label="统一信用代码" prop="licenseNumber">
<el-input v-model="formData.licenseNumber" placeholder="请输入统一社会信用代码" clearable
<el-form-item :label="$t('统一信用代码')" prop="licenseNumber">
<el-input v-model="formData.licenseNumber" :placeholder="$t('请输入统一社会信用代码')" clearable
:style="{width: '100%'}"></el-input>
</el-form-item>
<el-form-item label-width="0" prop="field110">
<table-form title="银行信息" :fields="[
{ label: '账户名称*', field: 'accountName', required: true},
{ label: '币别*', field: 'currency', required: true},
{ label: '银行名称*', field: 'bankName', required: true},
{ label: '银行账户*', field: 'bankAccount', required: true},
{ label: '银行代码', field: 'bankCode'},
{ label: '账户类型', field: 'accountType'},
{ label: '银行地址', field: 'bankAddress'},
<table-form :title="$t('银行信息')" :fields="[
{ label: this.$t('账户名称') + '*', field: 'accountName', required: true},
{ label: this.$t('币别') + '*', field: 'currency', required: true},
{ label: this.$t('银行名称*'), field: 'bankName', required: true},
{ label: this.$t('银行账户') + '*', field: 'bankAccount', required: true},
{ label: this.$t('银行代码'), field: 'bankCode'},
{ label: this.$t('账户类型'), field: 'accountType'},
{ label: this.$t('银行地址'), field: 'bankAddress'},
]" v-model="formData.bankList">
</table-form>
</el-form-item>
<el-form-item size="large">
<el-button type="primary" @click="submitForm">提交</el-button>
<el-button @click="resetForm">重置</el-button>
<el-button type="primary" @click="submitForm">{{$t('提交')}}</el-button>
<el-button @click="resetForm">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
</div>
......@@ -125,7 +125,7 @@ export default {
rules: {
companyZh: [{
required: true,
message: '请输入公司全称',
message: this.$t('请输入公司全称'),
trigger: 'blur'
}],
agentName: [],
......@@ -135,12 +135,12 @@ export default {
companyType: [{
required: true,
type: 'string',
message: '请至少选择一个供应商类别',
message: this.$t('请至少选择一个供应商类别'),
trigger: 'change'
}],
cooperationType: [{
required: true,
message: '请选择合作类型',
message: this.$t('请选择合作类型'),
trigger: 'change'
}],
licenseNumber: [],
......@@ -199,7 +199,7 @@ export default {
// 修改的提交
if (data.id != null) {
updateSupplier(data).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.$router.back()
});
......@@ -207,7 +207,7 @@ export default {
}
// 添加的提交
createSupplier(data).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.$router.back()
});
});
......
src/views/ecw/supplier/index.vue
View file @ aa6bc78c
......@@ -3,29 +3,29 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="公司名称" prop="companyZh">
<el-input v-model="queryParams.companyZh" placeholder="请输入公司名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('公司名称')" prop="companyZh">
<el-input v-model="queryParams.companyZh" :placeholder="$t('请输入公司名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="英文名称" prop="companyEn">
<el-input v-model="queryParams.companyEn" placeholder="请输入英文名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('英文名称')" prop="companyEn">
<el-input v-model="queryParams.companyEn" :placeholder="$t('请输入英文名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="供应商代码" prop="companyCode">
<el-input v-model="queryParams.companyCode" placeholder="请输入供应商代码" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('供应商代码')" prop="companyCode">
<el-input v-model="queryParams.companyCode" :placeholder="$t('请输入供应商代码')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="代理商名称" prop="agentName">
<el-input v-model="queryParams.agentName" placeholder="请输入代理商名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('代理商名称')" prop="agentName">
<el-input v-model="queryParams.agentName" :placeholder="$t('请输入代理商名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="公司电话" prop="tell">
<el-input v-model="queryParams.tell" placeholder="请输入公司电话" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('公司电话')" prop="tell">
<el-input v-model="queryParams.tell" :placeholder="$t('请输入公司电话')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="国家" prop="country">
<el-input v-model="queryParams.country" placeholder="请输入国家" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('国家')" prop="country">
<el-input v-model="queryParams.country" :placeholder="$t('请输入国家')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="省" prop="province">
<el-input v-model="queryParams.province" placeholder="请输入省" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('省')" prop="province">
<el-input v-model="queryParams.province" :placeholder="$t('请输入省')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="市" prop="city">
<el-input v-model="queryParams.city" placeholder="请输入市" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('市')" prop="city">
<el-input v-model="queryParams.city" :placeholder="$t('请输入市')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<!--el-form-item label="详细地址" prop="area">
<el-input v-model="queryParams.area" placeholder="请输入详细地址" clearable @keyup.enter.native="handleQuery"/>
......@@ -33,10 +33,10 @@
<el-form-item label="省市区+详细地址" prop="address">
<el-input v-model="queryParams.address" placeholder="请输入省市区+详细地址" clearable @keyup.enter.native="handleQuery"/>
</el-form-item-->
<el-form-item label="备注" prop="remark">
<el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('备注')" prop="remark">
<el-input v-model="queryParams.remark" :placeholder="$t('请输入备注')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="供应商类别" prop="companyType">
<el-form-item :label="$t('供应商类别')" prop="companyType">
<!--el-select v-model="queryParams.companyType" placeholder="请选择供应商类别" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select-->
......@@ -46,34 +46,34 @@
</el-select-->
<dict-selector :type="DICT_TYPE.COMPANY_TYPE" v-model="queryParams.companyType" />
</el-form-item>
<el-form-item label="合作类型" prop="cooperationType">
<el-form-item :label="$t('合作类型')" prop="cooperationType">
<dict-selector :type="DICT_TYPE.ECW_COOPERATION_TYPE" v-model="queryParams.cooperationType" />
<!--el-select v-model="queryParams.cooperationType" placeholder="请选择合作类型" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select-->
</el-form-item>
<el-form-item label="营业执照" prop="license">
<el-input v-model="queryParams.license" placeholder="请输入营业执照" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('营业执照')" prop="license">
<el-input v-model="queryParams.license" :placeholder="$t('请输入营业执照')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="合同" prop="contract">
<el-input v-model="queryParams.contract" placeholder="请输入合同" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('合同')" prop="contract">
<el-input v-model="queryParams.contract" :placeholder="$t('请输入合同')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="统一信用代码" prop="licenseNumber">
<el-input v-model="queryParams.licenseNumber" placeholder="请输入社会信用统一代码" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('统一信用代码')" prop="licenseNumber">
<el-input v-model="queryParams.licenseNumber" :placeholder="$t('请输入社会信用统一代码')" clearable @keyup.enter.native="handleQuery"/>
</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-option label="请选择字典生成" value="" />
</el-select> -->
<dict-selector :type="DICT_TYPE.ECW_YES_NO" v-model="queryParams.status" />
</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"
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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
</el-form-item>
</el-form>
......@@ -81,11 +81,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:supplier:create']">新增</el-button>
v-hasPermi="['ecw:supplier:create']">{{$t('新增')}}</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['ecw:supplier:export']">导出</el-button>
v-hasPermi="['ecw:supplier:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -93,44 +93,44 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="公司名称" align="center" prop="companyZh" />
<el-table-column :label="$t('公司名称')" align="center" prop="companyZh" />
<!--el-table-column label="英文名称" align="center" prop="companyEn" /-->
<el-table-column label="供应商代码" align="center" prop="companyCode" />
<el-table-column label="代理商名称" align="center" prop="agentName" />
<el-table-column label="公司电话" align="center" prop="tell" />
<el-table-column label="国家" align="center" prop="country" />
<el-table-column label="省" align="center" prop="province" />
<el-table-column label="市" align="center" prop="city" />
<el-table-column label="区" align="center" prop="area" />
<el-table-column label="详细地址" align="center" prop="address" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="供应商类别" align="center" prop="companyType" >
<el-table-column :label="$t('供应商代码')" align="center" prop="companyCode" />
<el-table-column :label="$t('代理商名称')" align="center" prop="agentName" />
<el-table-column :label="$t('公司电话')" align="center" prop="tell" />
<el-table-column :label="$t('国家')" align="center" prop="country" />
<el-table-column :label="$t('省')" align="center" prop="province" />
<el-table-column :label="$t('市')" align="center" prop="city" />
<el-table-column :label="$t('区')" align="center" prop="area" />
<el-table-column :label="$t('详细地址')" align="center" prop="address" />
<el-table-column :label="$t('备注')" align="center" prop="remark" />
<el-table-column :label="$t('供应商类别')" align="center" prop="companyType" >
<template slot-scope="{row}">
<template v-for="type in row.companyType.split(',')">
<dict-tag type="company_type" :value="type" :key="type" />
</template>
</template>
</el-table-column>
<el-table-column label="合作类型" align="center" prop="cooperationType">
<el-table-column :label="$t('合作类型')" align="center" prop="cooperationType">
<template slot-scope="{row}">
<dict-tag type="cooperation_type" :value="row.cooperationType" />
</template>
</el-table-column>
<!-- <el-table-column label="营业执照" align="center" prop="license" />
<el-table-column label="合同" align="center" prop="contract" /> -->
<el-table-column label="统一信用代码" align="center" prop="licenseNumber" />
<el-table-column label="是否展示" align="center" prop="status" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('统一信用代码')" align="center" prop="licenseNumber" />
<el-table-column :label="$t('是否展示')" align="center" prop="status" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column fixed="right" :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:supplier:update']">修改</el-button>
v-hasPermi="['ecw:supplier:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:supplier:delete']">删除</el-button>
v-hasPermi="['ecw:supplier:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -192,9 +192,9 @@ export default {
form: {},
// 表单校验
rules: {
companyZh: [{ required: true, message: "公司名称不能为空", trigger: "blur" }],
companyType: [{ required: true, message: "供应商类别不能为空", trigger: "change" }],
cooperationType: [{ required: true, message: "合作类型不能为空", trigger: "change" }],
companyZh: [{ required: true, message: this.$t("公司名称不能为空"), trigger: "blur" }],
companyType: [{ required: true, message: this.$t("供应商类别不能为空"), trigger: "change" }],
cooperationType: [{ required: true, message: this.$t("合作类型不能为空"), trigger: "change" }],
}
};
},
......@@ -258,9 +258,6 @@ export default {
/** 新增按钮操作 */
handleAdd() {
return this.$router.push('/supplier/edit')
this.reset();
this.open = true;
this.title = "添加供应商";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -278,7 +275,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateSupplier(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -286,7 +283,7 @@ export default {
}
// 添加的提交
createSupplier(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -295,11 +292,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除供应商编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除供应商编号为{id}的数据项?', {id})).then(function() {
return deleteSupplier(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -310,7 +307,7 @@ export default {
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有供应商数据项?').then(() => {
this.$modal.confirm(this.$t('是否确认导出所有供应商数据项?')).then(() => {
this.exportLoading = true;
return exportSupplierExcel(params);
}).then(response => {
......
src/views/index.vue
View file @ aa6bc78c
......@@ -13,7 +13,7 @@
</el-col>
<el-col :span="12">
<div v-html="html"></div>
<div class="">下面是通过watch更新</div>
<div class="" @click="$l">下面是通过watch更新</div>
<div v-html="watchHtml"></div>
</el-col>
</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