Skip to content

J
jiedao-app-operator-master
Commit 333b6f9c authored by 邓春圆's avatar 邓春圆
Browse files
Options

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

parents 0c8da645 c807ad19
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10885 additions and 10269 deletions
src/i18n/languages/en_US.json
View file @ 333b6f9c
......@@ -2173,6 +2173,96 @@
"是否确认删除昵称为{nickname}的会员?": "Are you sure to delete the member whose nickname is {nickname}?",
"取消删除": "Cancel Delete",
"重货标准(CBM)": "Heavy cargo standard (CBM)",
"应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种":"",
"实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率":""
"WEB端图片": "",
"APP端图片": "",
"WEB端广告图片（建议尺寸": "",
"请上传WEB端广告图片": "",
"APP端广告图片（建议尺寸": "",
"请上传APP端广告图片": "",
"web端广告图片不能为空": "",
"app端广告图片不能为空": "",
"禁用": "",
"添加广告设置": "",
"修改广告设置": "",
"是否确认删除广告设置编号为": "",
"是否确认导出所有广告设置数据项?": "",
"有效期开始时间": "",
"请输入有效期开始时间": "",
"有效期结束时间": "",
"请输入有效期结束时间": "",
"弹窗标题": "",
"弹窗时间": "",
"网页中文": "",
"网页英文": "",
"开始时间不能大于结束时间": "",
"结束时间不能小于开始时间": "",
"添加广告弹窗": "",
"修改广告弹窗": "",
"是否确认删除广告弹窗编号为": "",
"是否确认导出所有广告弹窗数据项?": "",
"已核销比例\\n（已核销基准币种总金额/应收总金额）": "",
"是否要删除昵称为": "",
"的会员": "",
"请输入标题中文": "",
"请输入标题英文": "",
"内容中文": "",
"内容英语": "",
"添加帮助文档": "",
"修改帮助文档": "",
"是否确认删除帮助文档编号为": "",
"是否确认导出所有帮助文档数据项?": "",
"请输入内容中文": "",
"请输入内容英语": "",
"添加对内帮助文档": "",
"修改对内帮助文档": "",
"是否确认删除对内帮助文档编号为": "",
"是否确认导出所有对内帮助文档数据项?": "",
"须知类型": "",
"请选择须知类型": "",
"添加须知": "",
"修改须知": "",
"是否确认删除须知编号为": "",
"是否确认导出所有须知数据项?": "",
"公告标题": "",
"请输入公告标题": "",
"操作人员": "",
"请输入操作人员": "",
"公告类型": "",
"有效日期": "",
"创建者": "",
"内容英文": "",
"公告标题不能为空": "",
"公告类型不能为空": "",
"添加公告": "",
"修改公告": "",
"是否确认删除公告编号为": "",
"中文名称": "",
"港口类型": "",
"省": "",
"城市": "",
"码头编号": "",
"码头类型": "",
"请输入中文名称": "",
"请输入码头编号": "",
"请输入码头类型": "",
"中文名称不能为空": "",
"添加码头信息": "",
"修改码头信息": "",
"是否确认删除码头信息编号为": "",
"是否确认导出所有码头信息数据项?": "",
"快递公司名称": "",
"请输入快递公司名称": "",
"请输入账户名称": "",
"查件key": "",
"请输入查件key": "",
"查询url": "",
"请输入查询url": "",
"快递公司名称不能为空": "",
"添加配送管理": "",
"修改配送管理": "",
"是否确认删除配送管理编号为": "",
"是否确认导出所有配送管理数据项?": "",
"是否确认删除公告编号为": "",
"应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种":"应收可能出现多个币种的情况，多个币种没法计算整个收款单的核销比例，所以增加一个中间币种，如果应收只有一个币种就使用应收币种，如果有多个币种就以美元为核销基准币种",
"实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率":"实收币种与核销基准币种一样时，无需填写汇率，不一样需要填写汇率"
}
src/views/ecw/banner/index.vue
View file @ 333b6f9c
This diff is collapsed.
src/views/ecw/bannerPop/index.vue
View file @ 333b6f9c
This diff is collapsed.
src/views/ecw/dock/index.vue
View file @ 333b6f9c
This diff is collapsed.
src/views/ecw/express/index.vue
View file @ 333b6f9c
......@@ -3,25 +3,25 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="快递公司名称" prop="companyName">
<el-input v-model="queryParams.companyName" placeholder="请输入快递公司名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('快递公司名称')" prop="companyName">
<el-input v-model="queryParams.companyName" :placeholder="$t('请输入快递公司名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="账户名称" prop="accountName">
<el-input v-model="queryParams.accountName" placeholder="请输入账户名称" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('账户名称')" prop="accountName">
<el-input v-model="queryParams.accountName" :placeholder="$t('请输入账户名称')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="查件key" prop="queryKey">
<el-input v-model="queryParams.queryKey" placeholder="请输入查件key" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('查件key')" prop="queryKey">
<el-input v-model="queryParams.queryKey" :placeholder="$t('请输入查件key')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="查询url" prop="queryUrl">
<el-input v-model="queryParams.queryUrl" placeholder="请输入查询url" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('查询url')" prop="queryUrl">
<el-input v-model="queryParams.queryUrl" :placeholder="$t('请输入查询url')" clearable @keyup.enter.native="handleQuery"/>
</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>
......@@ -29,33 +29,33 @@
<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:express:create']">新增</el-button>
v-hasPermi="['ecw:express: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:express:export']">导出</el-button>
v-hasPermi="['ecw:express:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="快递公司名称" align="center" prop="companyName" />
<el-table-column label="账户名称" align="center" prop="accountName" />
<el-table-column label="查件key" align="center" prop="queryKey" />
<el-table-column label="查询url" align="center" prop="queryUrl" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('主键')" align="center" prop="id" />
<el-table-column :label="$t('快递公司名称')" align="center" prop="companyName" />
<el-table-column :label="$t('账户名称')" align="center" prop="accountName" />
<el-table-column :label="$t('查件key')" align="center" prop="queryKey" />
<el-table-column :label="$t('查询url')" align="center" prop="queryUrl" />
<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 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">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:express:update']">修改</el-button>
v-hasPermi="['ecw:express:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:express:delete']">删除</el-button>
v-hasPermi="['ecw:express:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -66,22 +66,22 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="快递公司名称" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入快递公司名称" />
<el-form-item :label="$t('快递公司名称')" prop="companyName">
<el-input v-model="form.companyName" :placeholder="$t('请输入快递公司名称')" />
</el-form-item>
<el-form-item label="账户名称" prop="accountName">
<el-input v-model="form.accountName" placeholder="请输入账户名称" />
<el-form-item :label="$t('账户名称')" prop="accountName">
<el-input v-model="form.accountName" :placeholder="$t('请输入账户名称')" />
</el-form-item>
<el-form-item label="查件key" prop="queryKey">
<el-input v-model="form.queryKey" placeholder="请输入查件key" />
<el-form-item :label="$t('查件key')" prop="queryKey">
<el-input v-model="form.queryKey" :placeholder="$t('请输入查件key')" />
</el-form-item>
<el-form-item label="查询url" prop="queryUrl">
<el-input v-model="form.queryUrl" placeholder="请输入查询url" />
<el-form-item :label="$t('查询url')" prop="queryUrl">
<el-input v-model="form.queryUrl" :placeholder="$t('请输入查询url')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -124,7 +124,7 @@ export default {
form: {},
// 表单校验
rules: {
companyName: [{ required: true, message: "快递公司名称不能为空", trigger: "blur" }],
companyName: [{ required: true, message: this.$t("快递公司名称不能为空"), trigger: "blur" }],
}
};
},
......@@ -176,7 +176,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加配送管理";
this.title = this.$t("添加配送管理");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -185,7 +185,7 @@ export default {
getExpress(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改配送管理";
this.title = this.$t("修改配送管理");
});
},
/** 提交按钮 */
......@@ -197,7 +197,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateExpress(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -205,7 +205,7 @@ export default {
}
// 添加的提交
createExpress(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -214,11 +214,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除配送管理编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除配送管理编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteExpress(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -229,7 +229,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 exportExpressExcel(params);
}).then(response => {
......
src/views/ecw/financial/receiptDetail.vue
View file @ 333b6f9c
......@@ -145,7 +145,7 @@
<span>{{ scope.row.writeOffRate }}</span>
</template>
<template v-else>
{{ $t('应收总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
{{ $t('应核销总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
</template>
</template>
</el-table-column>
......@@ -159,6 +159,7 @@
{{ `${bankData.find(v => v.id == scope.row.platformAccountId).baAccountName}(${bankData.find(v => v.id == scope.row.platformAccountId).baAccountNum})` }}
</template>
</el-table-column>
<el-table-column :label="$t('期望收款币种')" align="center">
<template slot-scope="scope">
<!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.collectionCurrencyId" /> -->
......@@ -177,7 +178,10 @@
<el-input v-model="scope.row.collectionRate" @input="() => rateChange(scope.row, scope.$index)"></el-input>
</el-form-item> -->
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionRate }}</span>
<span v-else>{{ $t('期望收费金额') }}</span>
<span v-else>{{ $t('期望收费金额') }}
<span :title="$t('导出账单给客户时显示的收款金额与币种')"><i class="el-icon-question"></i></span>
</span>
</template>
</el-table-column>
<el-table-column :label="$t('期望收款金额')" align="center" prop="collectionAmount">
......@@ -263,10 +267,15 @@
</el-card>
<el-card class="card hexiaoCard">
<el-descriptions :column="3" border>
<el-descriptions-item :label="$t('已核销实收总金额')">
<el-descriptions-item >
<!-- <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
<el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag>
<el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag> -->
<template slot="label">
{{ $t('实收已核销总金额') }} <span :title="$t('所有银行收款明细中状态为已核销的实收金额，币种根据实收币种分类统计')"><i class="el-icon-question"></i></span>
</template>
<template v-if="!Object.keys(writeOffTotal).length">
0
</template>
......@@ -275,16 +284,22 @@
{{amount}}{{getCurrencyLabel(currency)}}
</div>
</div>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
{{ $t('已核销基准币种总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
{{ $t('核销基准币种已核销总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
<span :title="$t('为了方便统计收款单核销比例，将所有银行收款明细中状态为已核销的实收金额，转换为核销基准币种的金额累加')"><i class="el-icon-question"></i></span>
</template>
{{ writeOffAmount}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
{{ $t('已核销比例\n（已核销基准币种总金额/应收总金额）') }}（{{getCurrencyLabel(showCurrencyId)}}）
{{ $t('总核销比例') }}（{{getCurrencyLabel(showCurrencyId)}}）
<span :title="$t('总核销比例=核销基准币种已核销总金额/核销基准币种应收总金额')"><i class="el-icon-question"></i></span>
</template>
{{ WriteOffProportion }}%
</el-descriptions-item>
......
src/views/system/helpDoc/index.vue
View file @ 333b6f9c
......@@ -3,26 +3,26 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入标题中文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入标题中文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
<el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</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>
......@@ -30,11 +30,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="['system:help-doc:create']">新增</el-button>
v-hasPermi="['system:help-doc: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="['system:help-doc:export']">导出</el-button>
v-hasPermi="['system:help-doc:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -42,26 +42,26 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="标题中文" align="center" prop="titleZh" />
<el-table-column label="标题英文" align="center" prop="titleEn" />
<el-table-column label="内容中文" align="center" prop="contentZh" />
<el-table-column label="内容英语" align="center" prop="contentEn" />
<el-table-column label="状态" align="center" prop="status">
<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="contentZh" />
<el-table-column :label="$t('内容英语')" align="center" prop="contentEn" />
<el-table-column :label="$t('状态')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.HELP_DOC_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</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">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:help-doc:update']">修改</el-button>
v-hasPermi="['system:help-doc:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:help-doc:delete']">删除</el-button>
v-hasPermi="['system:help-doc:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -72,19 +72,19 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" />
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="form.titleZh" :placeholder="$t('请输入标题中文')" />
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" />
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item>
<el-form-item label="内容中文" prop="contentZh">
<el-form-item :label="$t('内容中文')" prop="contentZh">
<editor v-model="form.contentZh" :min-height="192"/>
</el-form-item>
<el-form-item label="内容英语" prop="contentEn">
<el-form-item :label="$t('内容英语')" prop="contentEn">
<editor v-model="form.contentEn" :min-height="192"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-form-item :label="$t('状态')" prop="status">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in this.getDictDatas(DICT_TYPE.HELP_DOC_STATUS)"
:key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
......@@ -92,8 +92,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
<el-button @click="cancel">{{$t('取 消')}}</el-button>
</div>
</el-dialog>
</div>
......@@ -190,7 +190,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加帮助文档";
this.title = this.$t("添加帮助文档");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -199,7 +199,7 @@ export default {
getHelpDoc(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改帮助文档";
this.title = this.$t("修改帮助文档");
});
},
/** 提交按钮 */
......@@ -211,7 +211,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -219,7 +219,7 @@ export default {
}
// 添加的提交
createHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -228,11 +228,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除帮助文档编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除帮助文档编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteHelpDoc(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -243,7 +243,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 exportHelpDocExcel(params);
}).then(response => {
......
src/views/system/internalHelpDoc/index.vue
View file @ 333b6f9c
......@@ -3,25 +3,25 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="queryParams.titleZh" placeholder="请输入标题中文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="queryParams.titleZh" :placeholder="$t('请输入标题中文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题英文')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
<el-form-item :label="$t('状态')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</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>
......@@ -29,11 +29,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="['system:internal-help-doc:create']">新增</el-button>
v-hasPermi="['system:internal-help-doc: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="['system:internal-help-doc:export']">导出</el-button>
v-hasPermi="['system:internal-help-doc:export']">{{$t('导出')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -41,22 +41,22 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="标题中文" align="center" prop="titleZh" />
<el-table-column label="标题英文" align="center" prop="titleEn" />
<!-- <el-table-column label="内容中文" align="center" prop="contentZh" />-->
<!-- <el-table-column label="内容英语" align="center" prop="contentEn" />-->
<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="titleZh" />
<el-table-column :label="$t('标题英文')" align="center" prop="titleEn" />
<!-- <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="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 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">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:internal-help-doc:update']">修改</el-button>
v-hasPermi="['system:internal-help-doc:update']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:internal-help-doc:delete']">删除</el-button>
v-hasPermi="['system:internal-help-doc:delete']">{{$t('删除')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -67,17 +67,17 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标题中文" prop="titleZh">
<el-input v-model="form.titleZh" placeholder="请输入标题中文" />
<el-form-item :label="$t('标题中文')" prop="titleZh">
<el-input v-model="form.titleZh" :placeholder="$t('请输入标题中文')" />
</el-form-item>
<el-form-item label="标题英文" prop="titleEn">
<el-input v-model="form.titleEn" placeholder="请输入标题英文" />
<el-form-item :label="$t('标题英文')" prop="titleEn">
<el-input v-model="form.titleEn" :placeholder="$t('请输入标题英文')" />
</el-form-item>
<el-form-item label="内容中文" prop="contentZh">
<editor v-model="form.contentZh" placeholder="请输入内容中文" />
<el-form-item :label="$t('内容中文')" prop="contentZh">
<editor v-model="form.contentZh" :placeholder="$t('请输入内容中文')" />
</el-form-item>
<el-form-item label="内容英语" prop="contentEn">
<editor v-model="form.contentEn" placeholder="请输入内容英语" />
<el-form-item :label="$t('内容英语')" prop="contentEn">
<editor v-model="form.contentEn" :placeholder="$t('请输入内容英语')" />
</el-form-item>
<el-form-item label="0-启用,1-停用" prop="status">
<el-radio-group v-model="form.status">
......@@ -185,7 +185,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加对内帮助文档";
this.title = this.$t("添加对内帮助文档");
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -194,7 +194,7 @@ export default {
getInternalHelpDoc(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改对内帮助文档";
this.title = this.$t("修改对内帮助文档");
});
},
/** 提交按钮 */
......@@ -206,7 +206,7 @@ export default {
// 修改的提交
if (this.form.id != null) {
updateInternalHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
this.getList();
});
......@@ -214,7 +214,7 @@ export default {
}
// 添加的提交
createInternalHelpDoc(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.$modal.msgSuccess(this.$t("新增成功"));
this.open = false;
this.getList();
});
......@@ -223,11 +223,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除对内帮助文档编号为"' + id + '"的数据项?').then(function() {
this.$modal.confirm(this.$t('是否确认删除对内帮助文档编号为"') + id + this.$t('"的数据项?')).then(function() {
return deleteInternalHelpDoc(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$modal.msgSuccess(this.$t("删除成功"));
}).catch(() => {});
},
/** 导出按钮操作 */
......@@ -238,7 +238,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 exportInternalHelpDocExcel(params);
}).then(response => {
......
src/views/system/needKnow/index.vue
View file @ 333b6f9c
This diff is collapsed.
src/views/system/notice/index.vue
View file @ 333b6f9c
This diff is collapsed.
yarn.lock
View file @ 333b6f9c
This diff is collapsed.
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