diff --git a/lms/nladmin-system/src/main/resources/language/i18n/zh.js b/lms/nladmin-system/src/main/resources/language/i18n/zh.js
index a69b4ca..c009cd0 100644
--- a/lms/nladmin-system/src/main/resources/language/i18n/zh.js
+++ b/lms/nladmin-system/src/main/resources/language/i18n/zh.js
@@ -232,7 +232,8 @@ var config = {
"edit": "编辑成功",
"del": "删除成功",
"close": "确认关闭",
- "save": "保存成功",
+ "save": "保存",
+ "save_success": "保存成功",
"datas": "数据",
"Tips": "提示",
"Tip1": "确认删除选中的{count}条数据?",
@@ -313,6 +314,8 @@ var config = {
"changePerson": "变更人",
"changeDate": "变更日期",
"taskDistribution": "任务下发"
+ "code_name": "输入账号或名称",
+ "fuzzy_search": "模糊搜索",
},
"task": {
@@ -2556,14 +2559,18 @@ var config = {
"dept_id": "ID",
"dept_sort": "排序",
"is_used": "状态",
- "name": "名称",
+ "name": "部门名称",
"pid": "上级部门",
"sub_count": "子部门数目",
"update_name": "修改者",
- "update_time": "更新时间"
+ "update_time": "更新时间",
+ "ext_id": "外部标识",
+ "top_dept": "顶级部门"
},
"sys_dict": {
"code": "编码",
+ "click_dict_detail": "点击字典查看详情",
+ "search_by_label": "输入字典标签查询",
"create_id": "创建人",
"create_name": "创建人",
"create_time": "创建时间",
@@ -2578,7 +2585,9 @@ var config = {
"update_id": "修改人",
"update_name": "修改人",
"update_time": "修改时间",
- "value": "字典值"
+ "value": "字典值",
+ "dict_detail": "字典详情",
+ "belong_dict": "所属字典"
},
"sys_dict_detail": {
"create_by": "创建者",
@@ -2636,7 +2645,7 @@ var config = {
"request_ip": "请求ip",
"return_result": "返回结果",
"time": "时间",
- "username": "用户名字"
+ "username": "用户名"
},
"sys_log": {
"log_id": "ID"
@@ -2662,7 +2671,19 @@ var config = {
"title": "菜单标题",
"type": "菜单类型",
"update_name": "修改者",
- "update_time": "更新时间"
+ "update_time": "更新时间",
+ "menu_assignment": "菜单分配",
+ "owned_system": "所属系统",
+ "type_system": "系统",
+ "type_directory": "目录",
+ "type_menu": "菜单",
+ "type_button": "按钮",
+ "click_select_icon": "点击选择图标",
+ "button_name": "按钮名称",
+ "match_component_name": "匹配组件内Name字段",
+ "parent_category": "上级类目",
+ "select_parent_category": "选择上级类目",
+ "confirm_delete_msg": "确定删除吗,如果存在下级节点则一并删除,此操作不能撤销!"
},
"sys_notice": {
"create_time": "创建时间",
@@ -2676,6 +2697,8 @@ var config = {
},
"sys_param": {
"code": "编码",
+ "fuzzy_query": "模糊查询",
+ "code_name": "编码/名称",
"create_id": "创建者ID",
"create_name": "创建者",
"create_time": "创建时间",
@@ -2707,7 +2730,24 @@ var config = {
"sub_task": "子任务ID",
"update_id": "修改人标识",
"update_name": "修改人",
- "update_time": "修改时间"
+ "update_time": "修改时间",
+ "search_by_job_name": "输入任务名称搜索",
+ "log": "日志",
+ "enter_cron_expression": "请输入CRON 表达式",
+ "generate_expression": "生成表达式",
+ "multiple_comma_separated": "多个用逗号隔开,按顺序执行",
+ "multiple_email_comma_separated": "多个邮箱用逗号隔开",
+ "job_ip": "调度IP",
+ "execute_timer_ip": "执行定时器的ip地址",
+ "status": "状态",
+ "enable": "启用",
+ "pause": "暂停",
+ "paused": "已暂停",
+ "running": "运行中",
+ "execute": "执行",
+ "resume": "恢复",
+ "confirm_stop_delete_task": "确定停止并删除该任务吗?",
+ "cron_expression_generator": "Cron表达式生成器"
},
"sys_quartz_log": {
"log_id": "ID"
@@ -2719,13 +2759,14 @@ var config = {
"is_delete": "是否删除",
"is_used": "是否启用",
"level": "角色级别",
- "name": "名称",
+ "name": "角色名称",
"order_seq": "排序",
"remark": "备注",
"role_id": "ID",
"update_id": "修改人标识",
"update_name": "修改人",
- "update_time": "修改时间"
+ "update_time": "修改时间",
+ "role_list": "角色列表"
},
"sys_roles_depts": {},
"sys_roles_menus": {
@@ -2763,6 +2804,7 @@ var config = {
"sys_user_dept": {
"dept_id": "部门标识",
"user_id": "用户标识"
+
},
"sys_users_roles": {
"role_id": "角色ID",
diff --git a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue
index 4c27fb7..2caae9b 100644
--- a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue
+++ b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue
@@ -12,7 +12,7 @@
icon="el-icon-plus"
@click="crud.toAdd"
>
- {{ $t('common.Create') }}
+ {{ $t('common.Create') }}
- {{ $t('common.Update') }}
+ {{ $t('common.Update') }}
- {{ $t('common.Delete') }}
+ {{ $t('common.Delete') }}
-
-
-
-
-
-
+
+
+
+
+
+
{{ dict.label.BCUT_POINT_TYPE[scope.row.point_type] }}
@@ -197,24 +197,24 @@
{{ dict.label.CUT_POINT_STATUS[scope.row.point_status] }}
-
+
{{ dict.label.point_location[scope.row.point_location] }}
-
+
{{ dict.label.IS_OR_NOT[scope.row.is_used] }}
-
-
-
-
-
-
+
+
+
+
+
+
import crudBstIvtCutpointivt from './bstIvtCutpointivt'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
index 262e162..459e484 100644
--- a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
+++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue
@@ -152,7 +152,7 @@
@selection-change="crud.selectionChangeHandler"
>
-
+
diff --git a/lms/nladmin-ui/src/views/b_lms/pdm/ivt/stpointivt/index.vue b/lms/nladmin-ui/src/views/b_lms/pdm/ivt/stpointivt/index.vue
index 6c1a622..e25edaa 100644
--- a/lms/nladmin-ui/src/views/b_lms/pdm/ivt/stpointivt/index.vue
+++ b/lms/nladmin-ui/src/views/b_lms/pdm/ivt/stpointivt/index.vue
@@ -133,7 +133,7 @@
-
+
diff --git a/lms/nladmin-ui/src/views/system/dept/index.vue b/lms/nladmin-ui/src/views/system/dept/index.vue
index ec8e430..d482ef5 100644
--- a/lms/nladmin-ui/src/views/system/dept/index.vue
+++ b/lms/nladmin-ui/src/views/system/dept/index.vue
@@ -8,7 +8,7 @@
v-model="query.name"
clearable
size="mini"
- placeholder="输入部门名称搜索"
+ :placeholder="$t('sys_dept.name')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
@@ -17,12 +17,12 @@
v-model="query.is_used"
clearable
size="mini"
- placeholder="状态"
+ :placeholder="$t('common.status')"
class="filter-item"
style="width: 90px"
@change="crud.toQuery"
>
-
+
@@ -37,13 +37,13 @@
width="500px"
>
-
+
-
+
-
+
-
+
-
+
- 是
- 否
+ {{ $t('common.Yes') }}
+ {{ $t('common.No') }}
-
+
-
+
@@ -102,9 +102,9 @@
>
-
-
-
+
+
+
-
+
diff --git a/lms/nladmin-ui/src/views/system/dict/dictDetail.vue b/lms/nladmin-ui/src/views/system/dict/dictDetail.vue
index 77faea6..8e2c9e8 100644
--- a/lms/nladmin-ui/src/views/system/dict/dictDetail.vue
+++ b/lms/nladmin-ui/src/views/system/dict/dictDetail.vue
@@ -1,7 +1,7 @@
-
点击字典查看详情
+
{{ $t('sys_dict.click_dict_detail') }}
@@ -12,7 +12,7 @@
v-model="query.label"
clearable
size="mini"
- placeholder="输入字典标签查询"
+ :placeholder="$t('sys_dict.search_by_label')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="toQuery"
@@ -30,13 +30,13 @@
width="500px"
>
-
+
-
+
-
+
-
+
-
+
-
+
@@ -69,18 +69,18 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
-
+
{{ query.code }}
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
@@ -34,7 +34,7 @@
v-model="query.blurry"
clearable
size="mini"
- placeholder="输入名称或者描述搜索"
+ :placeholder="$t('common.inputCodeOrName')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
@@ -54,11 +54,11 @@
@current-change="handleCurrentChange"
>
-
-
+
+
- 字典详情
+ {{ $t('sys_dict.dict_detail') }}
新增
+ >{{ $t('common.Create') }}
diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue
index 8026270..8752275 100644
--- a/lms/nladmin-ui/src/views/system/menu/index.vue
+++ b/lms/nladmin-ui/src/views/system/menu/index.vue
@@ -8,7 +8,7 @@
v-model="query.blurry"
clearable
size="mini"
- placeholder="模糊搜索"
+ :placeholder="$t('common.fuzzy_search')"
style="width: 200px;margin-bottom: 10px"
class="filter-item"
@keyup.enter.native="queryBlurry"
@@ -16,7 +16,7 @@
-
+
- 系统
- 目录
- 菜单
- 按钮
+ {{ $t('sys_menu.type_system') }}
+ {{ $t('sys_menu.type_directory') }}
+ {{ $t('sys_menu.type_menu') }}
+ {{ $t('sys_menu.type_button') }}
-
+
-
+
-
+
- 是
- 否
+ {{ $t('common.Yes') }}
+ {{ $t('common.No') }}
-
+
- 是
- 否
+ {{ $t('common.Yes') }}
+ {{ $t('common.No') }}
-
+
- 是
- 否
+ {{ $t('common.Yes') }}
+ {{ $t('common.No') }}
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -149,46 +149,46 @@
@selection-change="crud.selectionChangeHandler"
>
-
-
+
+
- {{ dict.label.system_type[scope.row.system_type] }} : {{scope.row.system_type}}
+ {{ dict.label.system_type[scope.row.system_type] }} : {{ scope.row.system_type }}
-
+
-
+
{{ scope.row.menu_sort }}
-
-
-
+
+
+
- 是
- 否
+ {{ $t('common.Yes') }}
+ {{ $t('common.No') }}
-
+
- 是
- 否
+ {{ $t('common.Yes') }}
+ {{ $t('common.No') }}
-
+
- 否
- 是
+ {{ $t('common.No') }}
+ {{ $t('common.Yes') }}
-
+
diff --git a/lms/nladmin-ui/src/views/system/param/index.vue b/lms/nladmin-ui/src/views/system/param/index.vue
index 92dff65..aa86ad7 100644
--- a/lms/nladmin-ui/src/views/system/param/index.vue
+++ b/lms/nladmin-ui/src/views/system/param/index.vue
@@ -10,12 +10,12 @@
label-width="80px"
label-suffix=":"
>
-
+
@@ -32,22 +32,22 @@
width="500px"
>
-
+
-
+
-
+
-
+
@@ -61,11 +61,11 @@
>
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -44,7 +44,7 @@
- 角色列表
+ {{ $t('sys_role.role_list') }}
-
-
-
-
+
+
+
+
{{ parseTime(scope.row.create_time) }}
-
+
-
- 菜单分配
+
+ {{ $t('sys_menu.menu_assignment') }}
保存
+ >{{ $t('common.save') }}
@@ -136,7 +136,7 @@ export default {
name: 'Role',
components: { pagination, crudOperation, rrOperation, udOperation, crudMenu },
cruds() {
- return CRUD({ idField: 'role_id', title: '角色', url: 'api/sysRole', crudMethod: { ...crudRoles } })
+ return CRUD({ idField: 'role_id', title: '角色', url: 'api/sysRole', crudMethod: { ...crudRoles }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
data() {
diff --git a/lms/nladmin-ui/src/views/system/timing/index.vue b/lms/nladmin-ui/src/views/system/timing/index.vue
index 54e021c..be0f263 100644
--- a/lms/nladmin-ui/src/views/system/timing/index.vue
+++ b/lms/nladmin-ui/src/views/system/timing/index.vue
@@ -8,7 +8,7 @@
v-model="query.job_name"
clearable
size="mini"
- placeholder="输入任务名称搜索"
+ :placeholder="$t('sys_quartz_job.search_by_job_name')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="toQuery"
@@ -24,7 +24,7 @@
type="info"
icon="el-icon-tickets"
@click="doLog"
- >日志
+ >{{ $t('sys_quartz_job.log') }}
@@ -39,60 +39,60 @@
width="730px"
>
-
+
-
+
-
+
-
+
-
+
-
+
- 生成表达式
+ {{ $t('sys_quartz_job.generate_expression') }}
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
- 是
- 否
+ {{ $t('common.Yes') }}
+ {{ $t('common.No') }}
-
+
- 启用
- 暂停
+ {{ $t('sys_quartz_job.enable') }}
+ {{ $t('sys_quartz_job.pause') }}
-
+
@@ -104,36 +104,36 @@
@selection-change="crud.selectionChangeHandler"
>
-
-
-
-
-
-
+
+
+
+
+
+
-
+
{{
- scope.row.is_pause ? '已暂停' : '运行中'
+ scope.row.is_pause ? $t('sys_quartz_job.paused') : $t('sys_quartz_job.running')
}}
-
-
+
+
{{ parseTime(scope.row.create_time) }}
编辑
+ >{{ $t('common.Update') }}
执行
+ >{{ $t('sys_quartz_job.execute') }}
- {{ scope.row.is_pause ? '恢复' : '暂停' }}
+ {{ scope.row.is_pause ? $t('sys_quartz_job.resume') : $t('sys_quartz_job.pause') }}
- 确定停止并删除该任务吗?
+ {{ $t('sys_quartz_job.confirm_stop_delete_task') }}
- 取消
- 确定
+ {{ $t('common.Cancel') }}
+ {{ $t('common.Confirm') }}
- 删除
+ {{ $t('common.Delete') }}
-
+
diff --git a/lms/nladmin-ui/src/views/system/user/index.vue b/lms/nladmin-ui/src/views/system/user/index.vue
index b420630..fd46b13 100644
--- a/lms/nladmin-ui/src/views/system/user/index.vue
+++ b/lms/nladmin-ui/src/views/system/user/index.vue
@@ -8,7 +8,7 @@
v-model="deptName"
clearable
size="mini"
- placeholder="请输入部门名称"
+ :placeholder="$t('sys_dept.name')"
prefix-icon="el-icon-search"
class="filter-item"
@input="getDeptDatas"
@@ -30,7 +30,7 @@
v-model="query.blurry"
clearable
size="mini"
- placeholder="输入账号或者名称"
+ :placeholder="$t('common.inputCodeOrName')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
@@ -39,7 +39,7 @@
v-model="query.is_used"
clearable
size="mini"
- placeholder="状态"
+ :placeholder="$t('common.status')"
class="filter-item"
style="width: 90px"
@change="crud.toQuery"
@@ -65,20 +65,20 @@
width="700px"
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- 男
- 女
+ {{ $t('common.sex_male') }}
+ {{ $t('common.sex_female') }}
-
+
-
+
-
@@ -142,51 +141,51 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
-
-
+
+
-
-
-
-
+
+
+
+
{{ item.name }}、
-
+
- {{ enabledTypeOptions.find(item => {return item.key == scope.row.is_used}).display_name }}
+ {{ $t('system.' + enabledTypeOptions.find(item => {return item.key == scope.row.is_used}).display_name.toLowerCase()) }}
-
+
- 修改
- 删除
+ {{ $t('common.Update') }}
+ {{ $t('common.Delete') }}
- 更多
+ {{ $t('common.More') }}
- 重置密码
+ {{ $t('system.reset_password') }}
- 部门权限
+ {{ $t('system.dept_permission') }}
- 数据权限
+ {{ $t('system.data_permission') }}
- {{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}账号
+ {{ $t('system.' + enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name.toLowerCase()) }}{{ $t('system.account') }}
- 分配角色
+ {{ $t('system.assign_role') }}
@@ -232,12 +231,12 @@
@selection-change="crud.selectionChangeHandler"
>
-
+
- 取 消
- 保 存
+ {{ $t('common.Cancel') }}
+ {{ $t('common.Save') }}
@@ -248,10 +247,10 @@
width="700px"
>
-
+
-
+
-
-
+
+
- 查看明细
+ {{ $t('system.view_details') }}
-
+
{{ dict.label.permission_scope_type[scope.row.permission_scope_type] }}
-
-
-
+
+
+
diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
index 55bcbc2..a94fce2 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
@@ -105,7 +105,7 @@
-
+
@@ -193,10 +193,10 @@
-
+
-
-
+
+
diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue
index 714003a..c7aebca 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue
@@ -91,7 +91,7 @@
-
+
@@ -105,10 +105,10 @@
-
-
-
-
+
+
+
+
-
- {{ $t('wms.basedata.master.material.materialCategory') }}:
-
-
-
-
-
-
-
+
+ {{ $t('wms.basedata.master.material.materialCategory') }}:
+
+
+
+
+
+
+
{{ $t('wms.basedata.master.material.fuzzyQuery') }}:
@@ -44,7 +44,7 @@
-
+
diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue
index b1a2d79..130be62 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue
@@ -53,7 +53,7 @@
-
+
-
+
@@ -68,7 +68,7 @@
width="450px"
>
-
+
-
-
+
+
-
-
+
+
-
-
+
+
{{ $t('wms.basedata.master.storagevehicleinfo.no') }}
@@ -107,17 +107,17 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue
index 99f4e6c..7c8c543 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue
@@ -13,9 +13,9 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
-
+
-
+
@@ -34,9 +34,9 @@
@selection-change="crud.selectionChangeHandler"
@current-change="handleCurrentChange"
>
-
-
-
+
+
+
-
+
@@ -71,11 +71,12 @@
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
- @selection-change="handleSelectionChange">
+ @selection-change="handleSelectionChange"
+ >
-
+ width="55"
+ />
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue
index 2ad600b..f3b858e 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue
@@ -21,23 +21,24 @@
/>
-
-
+ clearable
+ class="filter-item"
+ :placeholder="$t('common.pleaseSelect')"
+ @change="crud.toQuery"
+ >
+
-
+
@@ -65,32 +66,47 @@
-
+
-
+
-
+
-
+
@@ -111,14 +127,15 @@
form.box_weight = val"
:precision="2"
:step="0.1"
:min="0"
:max="1000"
size="mini"
- :controls="false" style="width: 200px;"
+ :controls="false"
+ style="width: 200px;"
clearable
+ @input="val => form.box_weight = val"
/>
@@ -154,20 +171,28 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
import crudBoxinfo from '@/views/wms/basedata/st/boxInfo/boxinfo'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -206,7 +231,6 @@ import pagination from '@crud/Pagination'
import MaterDialog from '@/views/wms/basedata/st/boxInfo/MaterDialog'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
-
const defaultForm = {
box_id: null,
box_no: null,
@@ -226,16 +250,16 @@ const defaultForm = {
export default {
name: 'BoxInfo',
dicts: ['IS_OR_NOT'],
- components: {pagination, crudOperation, rrOperation, udOperation, MaterDialog},
+ components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '木箱信息',
- optShow: {add: true, edit: true, del: true, reset: true},
+ optShow: { add: true, edit: true, del: true, reset: true },
url: 'api/boxinfo',
idField: 'box_id',
sort: 'box_no,desc',
- crudMethod: {...crudBoxinfo}
+ crudMethod: { ...crudBoxinfo }
})
},
data() {
@@ -247,32 +271,32 @@ export default {
del: ['admin', 'user:del']
},
packingList: [
- {'label': '是', 'value': '1'},
- {'label': '否', 'value': '0'}
+ { 'label': '是', 'value': '1' },
+ { 'label': '否', 'value': '0' }
],
vehicleTypeList: [
- {'label': '小托盘', 'value': '1'},
- {'label': '大托盘', 'value': '2'}
+ { 'label': '小托盘', 'value': '1' },
+ { 'label': '大托盘', 'value': '2' }
],
dialogMaterialVisible: false,
rules: {
material_code: [
- {required: true, message: '木箱规格编码不能为空', trigger: 'blur'}
+ { required: true, message: '木箱规格编码不能为空', trigger: 'blur' }
],
material_name: [
- {required: true, message: '木箱规格名称不能为空', trigger: 'blur'}
+ { required: true, message: '木箱规格名称不能为空', trigger: 'blur' }
],
box_num: [
- {required: true, message: '生成木箱号数量不能为空', trigger: 'blur'}
+ { required: true, message: '生成木箱号数量不能为空', trigger: 'blur' }
],
num: [
- {required: true, message: '最大子卷数量不能为空', trigger: 'blur'}
+ { required: true, message: '最大子卷数量不能为空', trigger: 'blur' }
],
vehicle_type: [
- {required: true, message: '载具类型不能为空', trigger: 'blur'}
+ { required: true, message: '载具类型不能为空', trigger: 'blur' }
],
is_packing: [
- {required: true, message: '是否装箱不能为空', trigger: 'blur'}
+ { required: true, message: '是否装箱不能为空', trigger: 'blur' }
]
}
}
@@ -362,7 +386,7 @@ export default {
this.crud.toQuery()
this.crud.notify($t('common.operationSuccess'), CRUD.NOTIFICATION_TYPE.SUCCESS)
})
- },
+ }
}
}
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
index 1110ad7..163aeee 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
@@ -73,19 +73,19 @@
-
+
-
+
-
+
@@ -93,8 +93,8 @@
-
+
@@ -160,7 +160,7 @@
- {{ $t('common.confirm') }}
+ {{ $t('common.confirm') }}
@@ -184,8 +184,8 @@
-
-
+
+
-
+
-
+
@@ -34,9 +34,9 @@
@selection-change="crud.selectionChangeHandler"
@current-change="handleCurrentChange"
>
-
-
-
+
+
+
-
+
@@ -71,14 +71,15 @@
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
- @selection-change="handleSelectionChange">
+ @selection-change="handleSelectionChange"
+ >
-
+ width="55"
+ />
-
-
+
+
diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
index b6bd989..cac3433 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
@@ -71,13 +71,13 @@
-
+
-
+
-
+
-
+
-
+
-
+
{{ dict.label.io_type[scope.row.io_type] }}
-
-
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
index ef1cd91..f3f96e9 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
@@ -229,7 +229,7 @@
-
+
@@ -241,9 +241,9 @@
-
+
-
+