Skip to content

J
jiedao-app-operator-master
Commit 534318aa authored by Smile's avatar Smile
Browse files
Options

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

# Conflicts:
#	src/utils/dict.js
parents c8ec428d 20ae6011
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 2 deletions
src/api/ecw/consLanguageTemplate.js 0 → 100644
View file @ 534318aa
import request from '@/utils/request'
// 创建集运业务的多语言模板
export function createConsLanguageTemplate(data) {
return request({
url: '/ecw/cons-language-template/create',
method: 'post',
data: data
})
}
// 更新集运业务的多语言模板
export function updateConsLanguageTemplate(data) {
return request({
url: '/ecw/cons-language-template/update',
method: 'put',
data: data
})
}
// 删除集运业务的多语言模板
export function deleteConsLanguageTemplate(id) {
return request({
url: '/ecw/cons-language-template/delete?id=' + id,
method: 'delete'
})
}
// 获得集运业务的多语言模板
export function getConsLanguageTemplate(id) {
return request({
url: '/ecw/cons-language-template/get?id=' + id,
method: 'get'
})
}
// 获得集运业务的多语言模板分页
export function getConsLanguageTemplatePage(query) {
return request({
url: '/ecw/cons-language-template/page',
method: 'get',
params: query
})
}
// 导出集运业务的多语言模板 Excel
export function exportConsLanguageTemplateExcel(query) {
return request({
url: '/ecw/cons-language-template/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
src/i18n/languages/en_US.json
View file @ 534318aa
......@@ -1577,6 +1577,7 @@
"收款数据": "payment data",
"代收货款": "?",
"集运仓库": "Consolidation Warehouse",
"集运": "Consolidation",
"装柜地址": "address of container loading",
"货物详情": "Cargo Details",
"填单件数": "number of cartons",
......@@ -3769,6 +3770,7 @@
"国家地区": "Country/region",
"供应商区域": "Supplier Area",
"会员控货下单要求": "Member Control Order Requirements",
"集运始发仓服务": "Cons Warehouse Service",
"系统类型": "System Type",
"请选择系统类型": "Please select a system type",
"强制更新": "Force updates",
......
src/utils/dict.js
View file @ 534318aa
......@@ -280,7 +280,9 @@ export const DICT_TYPE = {
MEMBERSHIP_LEVELS: "membership_levels", //会员等级
ENABLE_STATUS: "enable_status", //会员等级规则开启状态
MEMBER_USER_OPERATE_LOG: "member_user_operate_log", //会员等级操作日志
CONS_BUSINESS_NODE: "cons_business_node", //包裹业务节点
// ========== 集运模块 ==========
CONS_BUSINESS_NODE: "cons_business_node",//集运业务节点
ECW_LANGUAGE_CODE: "ecw_language_code",//语言编码
CONS_STATUS: "cons_status", //包裹状态
};
......
src/views/ecw/consLanguageTemplate/index.vue 0 → 100644
View file @ 534318aa
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="业务节点" prop="businessNode">
<el-select v-model="queryParams.businessNode" placeholder="请选择业务节点" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CRONS_BUSINESS_NODE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="表名" prop="tableName">
<el-input v-model="queryParams.tableName" placeholder="请输入表名" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="字段名" prop="columnName">
<el-input v-model="queryParams.columnName" placeholder="请输入字段名" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="语言编码" prop="lanCode">
<el-select v-model="queryParams.lanCode" placeholder="请选择语言编码" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_LANGUAGE_CODE)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</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-form-item>
</el-form>
<!-- 操作工具栏 -->
<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:cons-language-template:create']">新增</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="businessNode">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CONS_BUSINESS_NODE" :value="scope.row.businessNode" />
</template>
</el-table-column>
<el-table-column label="表名" align="center" prop="tableName" />
<el-table-column label="字段名" align="center" prop="columnName" />
<el-table-column label="语言编码" align="center" prop="lanCode">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_LANGUAGE_CODE" :value="scope.row.lanCode" />
</template>
</el-table-column>
<el-table-column label="语言内容模板" align="center" prop="lanTemplate" />
<el-table-column label="操作" 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:cons-language-template:update']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['ecw:cons-language-template:delete']">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
<!-- 对话框(添加 / 修改) -->
<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="businessNode">
<el-select v-model="form.businessNode" placeholder="请选择业务节点">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.CRONS_BUSINESS_NODE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="表名" prop="tableName">
<el-input v-model="form.tableName" placeholder="请输入表名" />
</el-form-item>
<el-form-item label="字段名" prop="columnName">
<el-input v-model="form.columnName" placeholder="请输入字段名" />
</el-form-item>
<el-form-item label="语言编码" prop="lanCode">
<el-select v-model="form.lanCode" placeholder="请选择语言编码">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.ECW_LANGUAGE_CODE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="语言内容模板(需要动态替换的使用${}框起来)" prop="lanTemplate">
<el-input v-model="form.lanTemplate" type="textarea" placeholder="请输入语言内容模板" :rows="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>
</div>
</el-dialog>
</div>
</template>
<script>
import { createConsLanguageTemplate, updateConsLanguageTemplate, deleteConsLanguageTemplate, getConsLanguageTemplate, getConsLanguageTemplatePage, exportConsLanguageTemplateExcel } from "@/api/ecw/consLanguageTemplate";
export default {
name: "ConsLanguageTemplate",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 集运业务的多语言模板列表
list: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
dateRangeCreateTime: [],
// 查询参数
queryParams: {
pageNo: 1,
pageSize: 10,
businessNode: null,
tableName: null,
columnName: null,
lanCode: null,
lanTemplate: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
businessNode: [{ required: true, message: "业务节点不能为空", trigger: "change" }],
tableName: [{ required: true, message: "表名不能为空", trigger: "blur" }],
columnName: [{ required: true, message: "字段名不能为空", trigger: "blur" }],
lanCode: [{ required: true, message: "语言编码", trigger: "blur" }],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
// 处理查询参数
let params = {...this.queryParams};
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getConsLanguageTemplatePage(params).then(response => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.form = {
id: undefined,
businessNode: undefined,
tableName: undefined,
columnName: undefined,
lanCode: undefined,
lanTemplate: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRangeCreateTime = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加集运业务的多语言模板";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getConsLanguageTemplate(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改集运业务的多语言模板";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (!valid) {
return;
}
// 修改的提交
if (this.form.id != null) {
updateConsLanguageTemplate(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return;
}
// 添加的提交
createConsLanguageTemplate(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal.confirm('是否确认删除集运业务的多语言模板编号为"' + id + '"的数据项?').then(function() {
return deleteConsLanguageTemplate(id);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
let params = {...this.queryParams};
params.pageNo = undefined;
params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行导出
this.$modal.confirm('是否确认导出所有集运业务的多语言模板数据项?').then(() => {
this.exportLoading = true;
return exportConsLanguageTemplateExcel(params);
}).then(response => {
this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
src/views/ecw/warehouse/index.vue
View file @ 534318aa
......@@ -528,6 +528,12 @@
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('集运始发仓服务')" prop="isConsService">
<el-checkbox-group v-model="form.isConsService">
<el-checkbox :label="1" :key="1" name="freight">{{ $t('集运') }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<!--lanbm 2024-06-04 添加控货需要的逻辑字段-->
<el-form-item :label="$t('仓库免租期')" prop="rentFreeDays">
<el-input-number
......@@ -1002,7 +1008,10 @@ export default {
status: null,
},
// 表单参数
form: { checkList: [] },
form: {
checkList: [],
isConsService: [],
},
ladingform: {
prefixCounter: null,
titleZh: null,
......@@ -1683,6 +1692,7 @@ export default {
status: undefined,
img: undefined,
checkList: [],
isConsService: [],
};
this.resetForm("form");
},
......@@ -1725,7 +1735,12 @@ export default {
this.reset();
const id = row.id;
getWarehouse(id).then((response) => {
response.data.isConsService = [response.data.isConsService];
this.form = response.data;
console.log('form.isConsService type:', typeof this.form.isConsService);
let ckList = response.data.freight.split(",");
this.$set(this.form, "checkList", ckList);
......@@ -1753,6 +1768,9 @@ export default {
freight = freight.substring(0, freight.length - 1);
this.form.freight = freight;
// 处理集运开通服务，把数组转成字符串
this.form.isConsService = this.form.isConsService.includes(1) ? 1 : 0;
// 修改的提交
if (this.form.id != null) {
updateWarehouse(this.form).then((response) => {
......
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