Commit e8e6f11a authored by Smile's avatar Smile Committed by wux

客户端多语言,后台管理多语言的内容,添加法语项,例如:“客户端无法再后台添加修改仓库法语名称问题”修改

parent 14bb3986
...@@ -273,6 +273,7 @@ export const DICT_TYPE = { ...@@ -273,6 +273,7 @@ export const DICT_TYPE = {
MEMBER_SCORE_OPERATE_TYPE: "member_user_score_log_operate_type", //会员积分日志操作类型 MEMBER_SCORE_OPERATE_TYPE: "member_user_score_log_operate_type", //会员积分日志操作类型
SCORE_RULE_TYPE: "score_rule_type", //积分规则指标类型 SCORE_RULE_TYPE: "score_rule_type", //积分规则指标类型
YES_OR_NO: "yes_or_no", YES_OR_NO: "yes_or_no",
YES_OR_NO_OR_ALL: "yes_or_no_or_all",
CLIENT_PLATFORM: "client_platform", CLIENT_PLATFORM: "client_platform",
MEMBER_SCORE_SOURCE: "member_score_source", //会员积分来源 MEMBER_SCORE_SOURCE: "member_score_source", //会员积分来源
}; };
......
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
<el-input v-model="form.nameEn" :placeholder="$t('请输入名称-英文')"/> <el-input v-model="form.nameEn" :placeholder="$t('请输入名称-英文')"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item :label="$t('名称法文')" prop="nameFr">
<el-input v-model="form.nameFr" :placeholder="$t('请输入名称-英文')"/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('内部名称中文')" prop="internalNameZh"> <el-form-item :label="$t('内部名称中文')" prop="internalNameZh">
<el-input <el-input
...@@ -32,6 +37,14 @@ ...@@ -32,6 +37,14 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item :label="$t('内部名称法文')" prop="internalNameFr">
<el-input
v-model="form.internalNameFr"
:placeholder="$t('请输入内部名称-法文')"
/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('类型编码')" prop="typeNumber"> <el-form-item :label="$t('类型编码')" prop="typeNumber">
<el-input <el-input
...@@ -156,6 +169,13 @@ ...@@ -156,6 +169,13 @@
:placeholder="$t('请输入备注-英文')" :placeholder="$t('请输入备注-英文')"
/> />
</el-form-item></el-col> </el-form-item></el-col>
<el-col :span="12">
<el-form-item :label="$t('备注-法文')" prop="remarksFr">
<el-input
v-model="form.remarksFr"
:placeholder="$t('请输入备注-法文')"
/>
</el-form-item></el-col>
</el-row> </el-row>
...@@ -230,8 +250,10 @@ export default { ...@@ -230,8 +250,10 @@ export default {
rules: { rules: {
nameZh: {required: true, message: '请输入中文名称', trigger: 'blur'}, nameZh: {required: true, message: '请输入中文名称', trigger: 'blur'},
nameEn: {required: true, message: '请输入英文名称', trigger: 'blur'}, nameEn: {required: true, message: '请输入英文名称', trigger: 'blur'},
nameFr: {required: true, message: '请输入法文名称', trigger: 'blur'},
internalNameZh: {required: true, message: '请输入内部中文名称', trigger: 'blur'}, internalNameZh: {required: true, message: '请输入内部中文名称', trigger: 'blur'},
internalNameEn: {required: true, message: '请输入内部英文名称', trigger: 'blur'}, internalNameEn: {required: true, message: '请输入内部英文名称', trigger: 'blur'},
internalNameFr: {required: true, message: '请输入内部法文名称', trigger: 'blur'},
typeNumber: {required: true, message: '请输入编码类型', trigger: 'blur'}, typeNumber: {required: true, message: '请输入编码类型', trigger: 'blur'},
code: {required: true, message: '请输入简码', trigger: 'blur'}, code: {required: true, message: '请输入简码', trigger: 'blur'},
attrId: {required: true, message: '请选择可出商品特性', trigger: 'blur'}, attrId: {required: true, message: '请选择可出商品特性', trigger: 'blur'},
......
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('英文标题')" prop="titleEn"> <el-input style="width: 300px" v-model="queryParams.titleEn" :placeholder="$t('请输入查找')" clearable v-trim /> </el-form-item <el-form-item :label="$t('英文标题')" prop="titleEn"> <el-input style="width: 300px" v-model="queryParams.titleEn" :placeholder="$t('请输入查找')" clearable v-trim /> </el-form-item
></el-col> ></el-col>
<el-col :span="12">
<el-form-item :label="$t('法文标题')" prop="titleFr"> <el-input style="width: 300px" v-model="queryParams.titleFr" :placeholder="$t('请输入查找')" clearable v-trim /> </el-form-item
></el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12"> <el-col :span="12">
...@@ -26,6 +29,11 @@ ...@@ -26,6 +29,11 @@
<image-upload v-model="queryParams.coverImageEn" :isShowEditButton="!showViewTime" :fileType="['png', 'jpg', 'jpeg']" /> <image-upload v-model="queryParams.coverImageEn" :isShowEditButton="!showViewTime" :fileType="['png', 'jpg', 'jpeg']" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item :label="$t('法文封面图')" prop="coverImageFr">
<image-upload v-model="queryParams.coverImageFr" :isShowEditButton="!showViewTime" :fileType="['png', 'jpg', 'jpeg']" />
</el-form-item>
</el-col>
</el-row> </el-row>
<!--分享活动内容 --> <!--分享活动内容 -->
<el-form-item :label="$t('中文活动内容')" prop="extraShare.activityDescZh" v-if="queryParams.type == '4'"> <el-form-item :label="$t('中文活动内容')" prop="extraShare.activityDescZh" v-if="queryParams.type == '4'">
...@@ -156,6 +164,12 @@ ...@@ -156,6 +164,12 @@
</el-form-item> </el-form-item>
<span class="del-btn">{{ $t("注:此说明用于展示给会员查看积分原因,请规范填写") }}</span> <span class="del-btn">{{ $t("注:此说明用于展示给会员查看积分原因,请规范填写") }}</span>
</el-col> </el-col>
<el-col :span="12">
<el-form-item :label="$t('法文规则说明')" prop="descFr">
<el-input type="textarea" v-model="queryParams.descFr"></el-input>
</el-form-item>
<span class="del-btn">{{ $t("注:此说明用于展示给会员查看积分原因,请规范填写") }}</span>
</el-col>
</el-row> </el-row>
<el-form-item :label="$t('是否推送')" prop="pushActivity"> <el-form-item :label="$t('是否推送')" prop="pushActivity">
<el-radio-group v-model="queryParams.pushActivity"> <el-radio-group v-model="queryParams.pushActivity">
...@@ -340,6 +354,7 @@ export default { ...@@ -340,6 +354,7 @@ export default {
pageSize: 10, pageSize: 10,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
titleFr: null,
contentZh: null, contentZh: null,
contentEn: null, contentEn: null,
bannerUrlWeb: null, bannerUrlWeb: null,
...@@ -377,6 +392,13 @@ export default { ...@@ -377,6 +392,13 @@ export default {
trigger: "blur" trigger: "blur"
} }
], ],
descFr: [
{
required: true,
message: this.$t("请输入法文规则说明"),
trigger: "blur"
}
],
descZh: [ descZh: [
{ {
required: true, required: true,
...@@ -398,6 +420,13 @@ export default { ...@@ -398,6 +420,13 @@ export default {
trigger: "blur" trigger: "blur"
} }
], ],
titleFr: [
{
required: true,
message: this.$t("请输入法文标题"),
trigger: "blur"
}
],
orderNum: [ orderNum: [
{ {
required: true, required: true,
...@@ -549,8 +578,10 @@ export default { ...@@ -549,8 +578,10 @@ export default {
type: "", //指标类型 type: "", //指标类型
titleZh: "", titleZh: "",
titleEn: "", titleEn: "",
titleFr: "",
coverImageZh: "", coverImageZh: "",
coverImageEn: "", coverImageEn: "",
coverImageFr: "",
maxScoreTotal: "", maxScoreTotal: "",
endTime: "", endTime: "",
startTime: "", //活动开始时间 startTime: "", //活动开始时间
...@@ -559,6 +590,7 @@ export default { ...@@ -559,6 +590,7 @@ export default {
descZh: "", descZh: "",
pushActivity: "0", //是否推送(0是,1否)默认是 pushActivity: "0", //是否推送(0是,1否)默认是
descEn: "", descEn: "",
descFr: "",
getScoreOnce: "", //除v值之外的积分规则 getScoreOnce: "", //除v值之外的积分规则
showPlatform: "1,2,3", //展示平台 showPlatform: "1,2,3", //展示平台
registerUrl: "", //注册链接 registerUrl: "", //注册链接
...@@ -723,8 +755,10 @@ export default { ...@@ -723,8 +755,10 @@ export default {
this.dialogVisible = false this.dialogVisible = false
this.queryParams.titleZh = row.titleZh this.queryParams.titleZh = row.titleZh
this.queryParams.titleEn = row.titleEn this.queryParams.titleEn = row.titleEn
this.queryParams.titleFr = row.titleFr
this.queryParams.coverImageZh = row.bannerUrlApp this.queryParams.coverImageZh = row.bannerUrlApp
this.queryParams.coverImageEn = row.bannerUrlApp this.queryParams.coverImageEn = row.bannerUrlApp
this.queryParams.coverImageFr = row.bannerUrlApp
this.queryParams.extraShare.activityDescZh = row.contentEn this.queryParams.extraShare.activityDescZh = row.contentEn
this.queryParams.extraShare.activityDescEn = row.contentZh this.queryParams.extraShare.activityDescEn = row.contentZh
}, },
......
...@@ -234,6 +234,7 @@ ...@@ -234,6 +234,7 @@
/> />
<el-table-column :label="$t('中文标题')" align="center" prop="titleZh" /> <el-table-column :label="$t('中文标题')" align="center" prop="titleZh" />
<el-table-column :label="$t('英文标题')" align="center" prop="titleEn" /> <el-table-column :label="$t('英文标题')" align="center" prop="titleEn" />
<el-table-column :label="$t('法文标题')" align="center" prop="titleFr" />
<el-table-column :label="$t('商品特性')" align="center" prop="attrId"> <el-table-column :label="$t('商品特性')" align="center" prop="attrId">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getAttrName(scope.row.attrId) }}</span> <span>{{ getAttrName(scope.row.attrId) }}</span>
...@@ -426,6 +427,13 @@ ...@@ -426,6 +427,13 @@
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('法文标题')" prop="titleFr">
<el-input
v-model="form.titleFr"
:placeholder="$t('请输入英文标题')"
/>
</el-form-item>
<el-form-item :label="$t('商品图片')" prop="img"> <el-form-item :label="$t('商品图片')" prop="img">
<image-upload v-model="form.imgs" /> <image-upload v-model="form.imgs" />
</el-form-item> </el-form-item>
...@@ -690,6 +698,7 @@ export default { ...@@ -690,6 +698,7 @@ export default {
attrId: null, attrId: null,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
titleFr: null,
auditStatus: null, auditStatus: null,
status: null, status: null,
}, },
...@@ -732,6 +741,13 @@ export default { ...@@ -732,6 +741,13 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
titleFr: [
{
required: true,
message: this.$t("法文标题不能为空"),
trigger: "blur",
},
],
// materialType: [{ required: true, message: this.$t("商品材质不能为空"), trigger: "blur" }], // materialType: [{ required: true, message: this.$t("商品材质不能为空"), trigger: "blur" }],
// packaging: [{ required: true, message: this.$t("包装要求不能为空"), trigger: "blur" }], // packaging: [{ required: true, message: this.$t("包装要求不能为空"), trigger: "blur" }],
// containerLocation: [{ required: true, message: this.$t("默认货柜位置不能为空"), trigger: "blur" }], // containerLocation: [{ required: true, message: this.$t("默认货柜位置不能为空"), trigger: "blur" }],
...@@ -1005,6 +1021,7 @@ export default { ...@@ -1005,6 +1021,7 @@ export default {
attrId: undefined, attrId: undefined,
titleZh: undefined, titleZh: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
auditStatus: undefined, auditStatus: undefined,
status: undefined, status: undefined,
requirements: 0, requirements: 0,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-form-item :label="$t('关键字')" prop="attrName"> <el-form-item :label="$t('关键字')" prop="attrName">
<el-input v-model="queryParams.attrName" :placeholder="$t('请输入关键字')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.attrName" :placeholder="$t('请输入关键字')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</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-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['ecw:product-attr:create']">{{$t('新增')}}</el-button> v-hasPermi="['ecw:product-attr:create']">{{$t('新增')}}</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<el-switch v-model="scope.row.status" :active-value="CommonStatusEnum.ENABLE" :inactive-value="CommonStatusEnum.DISABLE" @change="handleStatusChange(scope.row)" /> <el-switch v-model="scope.row.status" :active-value="CommonStatusEnum.ENABLE" :inactive-value="CommonStatusEnum.DISABLE" @change="handleStatusChange(scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
...@@ -62,9 +62,12 @@ ...@@ -62,9 +62,12 @@
<el-form-item :label="$t('属性名称')" prop="attrName"> <el-form-item :label="$t('属性名称')" prop="attrName">
<el-input v-model="form.attrName" :placeholder="$t('请输入属性名称')" /> <el-input v-model="form.attrName" :placeholder="$t('请输入属性名称')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('属性英文名')" prop="attrName"> <el-form-item :label="$t('属性英文名')" prop="attrNameEn">
<el-input v-model="form.attrNameEn" :placeholder="$t('请输入属性英文名')" /> <el-input v-model="form.attrNameEn" :placeholder="$t('请输入属性英文名')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('属性法文名')" prop="attrNameFr">
<el-input v-model="form.attrNameFr" :placeholder="$t('请输入属性法文名')" />
</el-form-item>
<el-form-item :label="$t('属性代码')" prop="attrCode"> <el-form-item :label="$t('属性代码')" prop="attrCode">
<el-input v-model="form.attrCode" :placeholder="$t('请输入属性代码')" /> <el-input v-model="form.attrCode" :placeholder="$t('请输入属性代码')" />
</el-form-item> </el-form-item>
...@@ -93,7 +96,7 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict' ...@@ -93,7 +96,7 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict'
export default { export default {
name: "ProductAttr", name: "ProductAttr",
components: { components: {
}, },
data() { data() {
return { return {
...@@ -117,6 +120,8 @@ export default { ...@@ -117,6 +120,8 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
attrName: null, attrName: null,
attrNameEn: null,
attrNameFr: null,
attrCode: null, attrCode: null,
remark: null, remark: null,
content: null, content: null,
......
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
<el-form-item :label="$t('品牌英文标题')" prop="titleEn"> <el-form-item :label="$t('品牌英文标题')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入品牌英文标题')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入品牌英文标题')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('品牌法文标题')" prop="titleFr">
<el-input v-model="queryParams.titleFr" :placeholder="$t('请输入品牌法文标题')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('排序')" prop="aorder"> <el-form-item :label="$t('排序')" prop="aorder">
<el-input v-model="queryParams.aorder" :placeholder="$t('请输入排序')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.aorder" :placeholder="$t('请输入排序')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
...@@ -52,6 +55,7 @@ ...@@ -52,6 +55,7 @@
<el-table-column label="主键ID" align="center" prop="id" /> <el-table-column label="主键ID" align="center" prop="id" />
<el-table-column :label="$t('品牌中文标题')" align="center" prop="titleZh" /> <el-table-column :label="$t('品牌中文标题')" align="center" prop="titleZh" />
<el-table-column :label="$t('品牌英文标题')" align="center" prop="titleEn" /> <el-table-column :label="$t('品牌英文标题')" align="center" prop="titleEn" />
<el-table-column :label="$t('品牌法文标题')" align="center" prop="titleFr" />
<el-table-column :label="$t('排序')" align="center" prop="aorder" /> <el-table-column :label="$t('排序')" align="center" prop="aorder" />
<el-table-column :label="$t('是否备案')" align="center" prop="filing"> <el-table-column :label="$t('是否备案')" align="center" prop="filing">
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
...@@ -105,6 +109,9 @@ ...@@ -105,6 +109,9 @@
<el-form-item :label="$t('品牌英文标题')" prop="titleEn"> <el-form-item :label="$t('品牌英文标题')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入品牌英文标题')" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入品牌英文标题')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('品牌法文标题')" prop="titleFr">
<el-input v-model="form.titleFr" :placeholder="$t('请输入品牌法文标题')" />
</el-form-item>
<el-form-item :label="$t('排序')" prop="aorder"> <el-form-item :label="$t('排序')" prop="aorder">
<el-input v-model="form.aorder" :placeholder="$t('请输入排序')" /> <el-input v-model="form.aorder" :placeholder="$t('请输入排序')" />
</el-form-item> </el-form-item>
...@@ -192,6 +199,7 @@ export default { ...@@ -192,6 +199,7 @@ export default {
pageSize: 10, pageSize: 10,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
titleFr: null,
aorder: null, aorder: null,
filing: null, filing: null,
}, },
...@@ -201,6 +209,7 @@ export default { ...@@ -201,6 +209,7 @@ export default {
rules: { rules: {
titleZh: [{ required: true, message: this.$t('请输入品牌中文标题'), trigger: "blur" }], titleZh: [{ required: true, message: this.$t('请输入品牌中文标题'), trigger: "blur" }],
titleEn: [{ required: true, message: this.$t('请输入品牌英文标题'), trigger: "blur" }], titleEn: [{ required: true, message: this.$t('请输入品牌英文标题'), trigger: "blur" }],
titleFr: [{ required: true, message: this.$t('请输入品牌法文标题'), trigger: "blur" }],
// aorder: [{ required: true, message: this.$t('请输入排序'), trigger: "blur" }], // aorder: [{ required: true, message: this.$t('请输入排序'), trigger: "blur" }],
filing: [{ required: true, message: this.$t('请选择是否备案'), trigger: "change" }], filing: [{ required: true, message: this.$t('请选择是否备案'), trigger: "change" }],
}, },
...@@ -260,6 +269,7 @@ export default { ...@@ -260,6 +269,7 @@ export default {
id: undefined, id: undefined,
titleZh: undefined, titleZh: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
aorder: undefined, aorder: undefined,
filing: undefined, filing: undefined,
"trademarkList": [ "trademarkList": [
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<el-form-item :label="$t('英文名称')" prop="titleEn"> <el-form-item :label="$t('英文名称')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入英文名称')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入英文名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('法文名称')" prop="titleFr">
<el-input v-model="queryParams.titleFr" :placeholder="$t('请输入法文名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('语言')" prop="language"> <el-form-item :label="$t('语言')" prop="language">
<el-input v-model="queryParams.language" :placeholder="$t('请输入语言')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.language" :placeholder="$t('请输入语言')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
...@@ -42,6 +45,7 @@ ...@@ -42,6 +45,7 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column prop="titleZh" :label="$t('中文名称')" width="200"></el-table-column> <el-table-column prop="titleZh" :label="$t('中文名称')" width="200"></el-table-column>
<el-table-column prop="titleEn" :label="$t('英文名称')" width="200"></el-table-column> <el-table-column prop="titleEn" :label="$t('英文名称')" width="200"></el-table-column>
<el-table-column prop="titleFr" :label="$t('法文名称')" width="200"></el-table-column>
<el-table-column prop="shortName" :label="$t('简称')" width="120"/> <el-table-column prop="shortName" :label="$t('简称')" width="120"/>
<el-table-column prop="areaCode" :label="$t('区号')" width="120"> <el-table-column prop="areaCode" :label="$t('区号')" width="120">
<template slot-scope="scope" v-if="scope.row.areaCode"> <template slot-scope="scope" v-if="scope.row.areaCode">
...@@ -96,6 +100,9 @@ ...@@ -96,6 +100,9 @@
<el-form-item :label="$t('英文名称')" prop="titleEn"> <el-form-item :label="$t('英文名称')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入英文名称')" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入英文名称')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('法文名称')" prop="titleFr">
<el-input v-model="form.titleFr" :placeholder="$t('请输入法文名称')" />
</el-form-item>
<el-form-item :label="$t('简称')" prop="shortName"> <el-form-item :label="$t('简称')" prop="shortName">
<el-input v-model="form.shortName" :placeholder="$t('请输入简称')" /> <el-input v-model="form.shortName" :placeholder="$t('请输入简称')" />
</el-form-item> </el-form-item>
...@@ -243,6 +250,7 @@ export default { ...@@ -243,6 +250,7 @@ export default {
queryParams: { queryParams: {
titleZh: undefined, titleZh: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
shortName: undefined, shortName: undefined,
status: undefined status: undefined
}, },
......
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
<el-form-item :label="$t('英文名称')" prop="titleEn"> <el-form-item :label="$t('英文名称')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入英文名称')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入英文名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('法文名称')" prop="titleFr">
<el-input v-model="queryParams.titleFr" :placeholder="$t('请输入法文名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('单位符号')" prop="fuhao"> <el-form-item :label="$t('单位符号')" prop="fuhao">
<el-input v-model="queryParams.fuhao" :placeholder="$t('请输入单位符号')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.fuhao" :placeholder="$t('请输入单位符号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
...@@ -49,6 +52,7 @@ ...@@ -49,6 +52,7 @@
<el-table-column label="" align="center" prop="id" /> <el-table-column label="" align="center" prop="id" />
<el-table-column :label="$t('中文名称')" align="center" prop="titleZh" /> <el-table-column :label="$t('中文名称')" align="center" prop="titleZh" />
<el-table-column :label="$t('英文名称')" align="center" prop="titleEn" /> <el-table-column :label="$t('英文名称')" align="center" prop="titleEn" />
<el-table-column :label="$t('法文名称')" align="center" prop="titleFr" />
<el-table-column :label="$t('单位符号')" align="center" prop="fuhao" /> <el-table-column :label="$t('单位符号')" align="center" prop="fuhao" />
<el-table-column :label="$t('状态')" align="center" prop="show" > <el-table-column :label="$t('状态')" align="center" prop="show" >
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -83,6 +87,9 @@ ...@@ -83,6 +87,9 @@
<el-form-item :label="$t('英文名称')" prop="titleEn"> <el-form-item :label="$t('英文名称')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入英文名称')" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入英文名称')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('法文名称')" prop="titleFr">
<el-input v-model="form.titleFr" :placeholder="$t('请输入法文名称')" />
</el-form-item>
<el-form-item :label="$t('单位符号')" prop="fuhao"> <el-form-item :label="$t('单位符号')" prop="fuhao">
<el-input v-model="form.fuhao" :placeholder="$t('请输入单位符号')" /> <el-input v-model="form.fuhao" :placeholder="$t('请输入单位符号')" />
</el-form-item> </el-form-item>
...@@ -149,6 +156,7 @@ export default { ...@@ -149,6 +156,7 @@ export default {
pageSize: 10, pageSize: 10,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
titleFr: null,
fuhao: null, fuhao: null,
status: null, status: null,
aorder: null, aorder: null,
...@@ -190,6 +198,7 @@ export default { ...@@ -190,6 +198,7 @@ export default {
id: undefined, id: undefined,
titleZh: undefined, titleZh: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
fuhao: undefined, fuhao: undefined,
status: undefined, status: undefined,
aorder: undefined, aorder: undefined,
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
<el-table-column :label="$t('仓库编号')" align="center" prop="number" /> <el-table-column :label="$t('仓库编号')" align="center" prop="number" />
<el-table-column :label="$t('仓库名称')" align="center" prop="titleZh" /> <el-table-column :label="$t('仓库名称')" align="center" prop="titleZh" />
<el-table-column :label="$t('英文名称')" align="center" prop="titleEn" /> <el-table-column :label="$t('英文名称')" align="center" prop="titleEn" />
<el-table-column :label="$t('法文名称')" align="center" prop="titleFr" />
<el-table-column :label="$t('贸易属性')" align="center" prop="tradeType"> <el-table-column :label="$t('贸易属性')" align="center" prop="tradeType">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ tradeTypeName(scope.row.tradeType) }}</div> <div>{{ tradeTypeName(scope.row.tradeType) }}</div>
...@@ -429,6 +430,12 @@ ...@@ -429,6 +430,12 @@
:placeholder="$t('请输入英文名称')" :placeholder="$t('请输入英文名称')"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('法文名称')" prop="titleFr">
<el-input
v-model="form.titleFr"
:placeholder="$t('请输入法文名称')"
/>
</el-form-item>
<el-form-item :label="$t('负责人')" prop="head"> <el-form-item :label="$t('负责人')" prop="head">
<el-input v-model="form.head" :placeholder="$t('请输入负责人')" /> <el-input v-model="form.head" :placeholder="$t('请输入负责人')" />
</el-form-item> </el-form-item>
...@@ -452,6 +459,12 @@ ...@@ -452,6 +459,12 @@
:placeholder="$t('请输入英文地址')" :placeholder="$t('请输入英文地址')"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('法文地址')" prop="addressFr">
<el-input
v-model="form.addressFr"
:placeholder="$t('请输入法文地址')"
/>
</el-form-item>
<el-form-item :label="$t('贸易属性')" prop="tradeType"> <el-form-item :label="$t('贸易属性')" prop="tradeType">
<el-select v-model="form.tradeType" :placeholder="$t('请选择')"> <el-select v-model="form.tradeType" :placeholder="$t('请选择')">
...@@ -971,9 +984,11 @@ export default { ...@@ -971,9 +984,11 @@ export default {
number: null, number: null,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
titleFr: null,
volume: null, volume: null,
addressZh: null, addressZh: null,
addressEn: null, addressEn: null,
addressFr: null,
zhou: null, zhou: null,
guojia: null, guojia: null,
sheng: null, sheng: null,
...@@ -1057,6 +1072,13 @@ export default { ...@@ -1057,6 +1072,13 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
titleFr: [
{
required: true,
message: this.$t("法文名称不能为空"),
trigger: "blur",
},
],
head: [ head: [
{ {
required: true, required: true,
...@@ -1088,6 +1110,13 @@ export default { ...@@ -1088,6 +1110,13 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
addressFr: [
{
required: true,
message: this.$t("法文地址不能为空"),
trigger: "blur",
},
],
tradeType: [ tradeType: [
{ {
required: true, required: true,
...@@ -1636,9 +1665,11 @@ export default { ...@@ -1636,9 +1665,11 @@ export default {
qianzhui: undefined, qianzhui: undefined,
titleZh: undefined, titleZh: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
volume: undefined, volume: undefined,
addressZh: undefined, addressZh: undefined,
addressEn: undefined, addressEn: undefined,
addressFr: undefined,
zhou: undefined, zhou: undefined,
guojia: undefined, guojia: undefined,
sheng: undefined, sheng: undefined,
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
<el-form-item :label="$t('标题英文')" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('标题法文')" prop="titleFr">
<el-input v-model="queryParams.titleFr" :placeholder="$t('请输入标题法文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('状态')" prop="status"> <el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small"> <el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)"
...@@ -44,8 +46,10 @@ ...@@ -44,8 +46,10 @@
<el-table-column label="" align="center" prop="id" /> <el-table-column label="" align="center" prop="id" />
<el-table-column :label="$t('标题中文')" align="center" prop="titleZh" /> <el-table-column :label="$t('标题中文')" align="center" prop="titleZh" />
<el-table-column :label="$t('标题英文')" align="center" prop="titleEn" /> <el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<el-table-column :label="$t('标题法文')" align="center" prop="titleFr" />
<el-table-column :label="$t('内容中文')" align="center" prop="contentZh" /> <el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />
<el-table-column :label="$t('内容英语')" align="center" prop="contentEn" /> <el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />
<el-table-column :label="$t('内容法文')" align="center" prop="contentFr" />
<el-table-column :label="$t('状态')" align="center" prop="status"> <el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.HELP_DOC_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.HELP_DOC_STATUS" :value="scope.row.status" />
...@@ -78,12 +82,18 @@ ...@@ -78,12 +82,18 @@
<el-form-item :label="$t('标题英文')" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('标题法文')" prop="titleFr">
<el-input v-model="form.titleFr" :placeholder="$t('请输入标题法文')" />
</el-form-item>
<el-form-item :label="$t('内容中文')" prop="contentZh"> <el-form-item :label="$t('内容中文')" prop="contentZh">
<editor v-model="form.contentZh" :min-height="192"/> <editor v-model="form.contentZh" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('内容英语')" prop="contentEn"> <el-form-item :label="$t('内容英语')" prop="contentEn">
<editor v-model="form.contentEn" :min-height="192"/> <editor v-model="form.contentEn" :min-height="192"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('内容法文')" prop="contentFr">
<editor v-model="form.contentFr" :min-height="192"/>
</el-form-item>
<el-form-item :label="$t('状态')" prop="status"> <el-form-item :label="$t('状态')" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)" <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)"
...@@ -130,8 +140,10 @@ export default { ...@@ -130,8 +140,10 @@ export default {
pageSize: 10, pageSize: 10,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
titleFr: null,
contentZh: null, contentZh: null,
contentEn: null, contentEn: null,
contentFr: null,
status: null, status: null,
}, },
// 表单参数 // 表单参数
...@@ -169,8 +181,10 @@ export default { ...@@ -169,8 +181,10 @@ export default {
id: undefined, id: undefined,
titleZh: undefined, titleZh: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
contentZh: undefined, contentZh: undefined,
contentEn: undefined, contentEn: undefined,
contentFr: undefined,
status: undefined, status: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<el-form-item :label="$t('标题英文')" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('标题法文')" prop="titleFr">
<el-input v-model="queryParams.titleFr" :placeholder="$t('请输入标题法文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('状态')" prop="status"> <el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small"> <el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_STATUS)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_STATUS)"
...@@ -54,6 +57,7 @@ ...@@ -54,6 +57,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('标题中文')" align="center" prop="titleZh" /> <el-table-column :label="$t('标题中文')" align="center" prop="titleZh" />
<el-table-column :label="$t('标题英文')" align="center" prop="titleEn" /> <el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<el-table-column :label="$t('标题法文')" align="center" prop="titleFr" />
<!-- <el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />--> <!-- <el-table-column :label="$t('内容中文')" align="center" prop="contentZh" />-->
<!-- <el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />--> <!-- <el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />-->
<el-table-column :label="$t('状态')" align="center" prop="status"> <el-table-column :label="$t('状态')" align="center" prop="status">
...@@ -94,12 +98,18 @@ ...@@ -94,12 +98,18 @@
<el-form-item :label="$t('标题英文')" prop="titleEn"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('标题法文')" prop="titleFr">
<el-input v-model="form.titleFr" :placeholder="$t('请输入标题法文')" />
</el-form-item>
<el-form-item :label="$t('内容中文')" prop="contentZh"> <el-form-item :label="$t('内容中文')" prop="contentZh">
<ueditor v-model="form.contentZh" :min-height="192" :placeholder="$t('请输入内容中文')"/> <ueditor v-model="form.contentZh" :min-height="192" :placeholder="$t('请输入内容中文')"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('内容英语')" prop="contentEn"> <el-form-item :label="$t('内容英语')" prop="contentEn">
<ueditor v-model="form.contentEn" :min-height="192" placeholder="plese entry english"/> <ueditor v-model="form.contentEn" :min-height="192" placeholder="plese entry english"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('内容法语')" prop="contentFr">
<ueditor v-model="form.contentFr" :min-height="192" placeholder="plese entry english"/>
</el-form-item>
<el-form-item :label="$t('状态')" prop="status"> <el-form-item :label="$t('状态')" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_STATUS)" <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.NEED_KNOW_STATUS)"
...@@ -147,6 +157,7 @@ export default { ...@@ -147,6 +157,7 @@ export default {
knowType: null, knowType: null,
titleZh: null, titleZh: null,
titleEn: null, titleEn: null,
titleFr: null,
status: null, status: null,
}, },
// 表单参数 // 表单参数
...@@ -185,8 +196,10 @@ export default { ...@@ -185,8 +196,10 @@ export default {
knowType: undefined, knowType: undefined,
titleZh: undefined, titleZh: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
contentZh: undefined, contentZh: undefined,
contentEn: undefined, contentEn: undefined,
contentFr: undefined,
status: undefined, status: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
......
...@@ -73,10 +73,15 @@ ...@@ -73,10 +73,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('标题英文')" prop="title"> <el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" /> <el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item :label="$t('标题法文')" prop="titleFr">
<el-input v-model="form.titleFr" :placeholder="$t('请输入标题法文')" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('公告类型')" prop="type"> <el-form-item :label="$t('公告类型')" prop="type">
<el-select v-model="form.type" :placeholder="$t('请选择')"> <el-select v-model="form.type" :placeholder="$t('请选择')">
...@@ -117,6 +122,11 @@ ...@@ -117,6 +122,11 @@
<editor v-model="form.contentEn" :min-height="192"/> <editor v-model="form.contentEn" :min-height="192"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item :label="$t('内容法文')">
<editor v-model="form.contentFr" :min-height="192"/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -204,9 +214,11 @@ export default { ...@@ -204,9 +214,11 @@ export default {
id: undefined, id: undefined,
title: undefined, title: undefined,
titleEn: undefined, titleEn: undefined,
titleFr: undefined,
type: undefined, type: undefined,
content: undefined, content: undefined,
contentEn: undefined, contentEn: undefined,
contentFr: undefined,
status: CommonStatusEnum.ENABLE status: CommonStatusEnum.ENABLE
}; };
this.resetForm("form"); this.resetForm("form");
......
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