diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue index dc6cb124..426daac7 100644 --- a/src/layout/components/Footer/src/Footer.vue +++ b/src/layout/components/Footer/src/Footer.vue @@ -21,6 +21,6 @@ const title = computed(() => appStore.getTitle) class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)] overflow-hidden" > Copyright ©2026-BESURE-{{ title }}   - 操作手册 + diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue index 3c88005f..3173e8be 100644 --- a/src/layout/components/UserInfo/src/UserInfo.vue +++ b/src/layout/components/UserInfo/src/UserInfo.vue @@ -65,6 +65,10 @@ const toProfile = async () => {
{{ t('common.profile') }}
+
{{ t('lock.lockScreen') }}
diff --git a/src/locales/en.ts b/src/locales/en.ts index 60e7d355..69b912c0 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -541,7 +541,8 @@ export default { dataCreate: 'Dict Data Create', dataUpdate: 'Dict Data Eidt', fileUpload: 'File Upload', - select: 'Select' + select: 'Select', + batchDelete: 'Batch Delete' }, dialog: { dialog: 'Dialog', @@ -1023,6 +1024,7 @@ export default { EquipmentKeyItems: { code: 'Code', name: 'Name', + batchDelete: 'Batch Delete', description: 'Description', remark: 'Remark', createTime: 'Create Time', @@ -1399,7 +1401,8 @@ export default { confirmApprove: 'Confirm to approve this stock in order?', confirmUnapprove: 'Confirm to unapprove this stock in order?', approveSuccess: 'Approve successfully', - unapproveSuccess: 'Unapprove successfully' + unapproveSuccess: 'Unapprove successfully', + file: 'File' }, SpareOut: { @@ -1410,6 +1413,7 @@ export default { remark: 'Remark', customer: 'Customer', status: 'Status', + outType: 'Stock Out Type', totalCount: 'Quantity', totalPrice: 'Amount', creatorName: 'Creator', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 4a6986f3..2700f26b 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -542,7 +542,8 @@ export default { typeUpdate: '字典类型编辑', dataCreate: '字典数据新增', dataUpdate: '字典数据编辑', - select: '选择' + select: '选择', + batchDelete: '批量删除' }, dialog: { dialog: '弹窗', @@ -1017,6 +1018,7 @@ export default { count: '数量', code: '编码', name: '名称', + batchDelete: '批量删除', description: '描述', remark: '备注', createTime: '创建时间', @@ -1395,7 +1397,8 @@ export default { confirmApprove: '确定审批该入库单吗？', confirmUnapprove: '确定反审批该入库单吗？', approveSuccess: '审批成功', - unapproveSuccess: '反审批成功' + unapproveSuccess: '反审批成功', + file: '附件' }, SpareOut: { @@ -1406,6 +1409,7 @@ export default { remark: '备注', customer: '客户', status: '状态', + outType: '出库类型', totalCount: '数量', totalPrice: '金额', creatorName: '创建人', @@ -1667,8 +1671,8 @@ export default { MoldInspectionPlan: { moduleName: '检验方案', - planName: '方案名称', - planType: '方案类型', + planName: '模板名称', + planType: '模板类型', planTypeMaintain: '保养', planTypeInspect: '点检', description: '描述', @@ -1686,16 +1690,16 @@ export default { delete: '删除', batchDelete: '批量删除', export: '导出', - placeholderPlanName: '请输入方案名称', + placeholderPlanName: '请输入模板名称', placeholderDescription: '请输入描述', - placeholderPlanType: '请选择方案类型', + placeholderPlanType: '请选择模板类型', placeholderSubjectName: '请输入项目名称', placeholderSubjectDescription: '请输入描述', placeholderSubjectSelect: '请选择关联项目', selectDeleteTip: '请选择需要删除的数据', - exportFilename: '模具检验方案.xls', - validatorPlanNameRequired: '方案名称不能为空', - validatorPlanTypeRequired: '方案类型不能为空' + exportFilename: '模具检验模板.xls', + validatorPlanNameRequired: '模板名称不能为空', + validatorPlanTypeRequired: '模板类型不能为空' }, MoldRepair: { diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 8caa69c4..85d775b3 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -59,9 +59,9 @@ {{ t('login.remember') }} - + diff --git a/src/views/erp/component/in/StockInForm.vue b/src/views/erp/component/in/StockInForm.vue index c033b94a..03cee405 100644 --- a/src/views/erp/component/in/StockInForm.vue +++ b/src/views/erp/component/in/StockInForm.vue @@ -74,7 +74,7 @@ - + diff --git a/src/views/erp/component/in/components/StockInItemForm.vue b/src/views/erp/component/in/components/StockInItemForm.vue index 1611b7f1..0df97a43 100644 --- a/src/views/erp/component/in/components/StockInItemForm.vue +++ b/src/views/erp/component/in/components/StockInItemForm.vue @@ -81,8 +81,7 @@ diff --git a/src/views/erp/component/in/index.vue b/src/views/erp/component/in/index.vue index ef1f96fc..b19f4188 100644 --- a/src/views/erp/component/in/index.vue +++ b/src/views/erp/component/in/index.vue @@ -7,7 +7,7 @@ :model="queryParams" ref="queryFormRef" :inline="true" - label-width="110px" + label-width="68px" > diff --git a/src/views/erp/stock/check/index.vue b/src/views/erp/stock/check/index.vue index f76faf05..8fcfcf26 100644 --- a/src/views/erp/stock/check/index.vue +++ b/src/views/erp/stock/check/index.vue @@ -108,6 +108,15 @@ > {{ t('action.add') }} + + {{ t('action.batchDelete') }} + {{ t('action.export') }} - - {{ t('action.del') }} - diff --git a/src/views/erp/stock/move/index.vue b/src/views/erp/stock/move/index.vue index 6b088e70..7aa80357 100644 --- a/src/views/erp/stock/move/index.vue +++ b/src/views/erp/stock/move/index.vue @@ -107,15 +107,6 @@ > {{ t('action.add') }} - - {{ t('action.export') }} - - {{ t('action.del') }} + {{ t('action.batchDelete') }} + + {{ t('action.export') }} + diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue index b6f9020e..0c5728a0 100644 --- a/src/views/erp/stock/record/index.vue +++ b/src/views/erp/stock/record/index.vue @@ -282,6 +282,7 @@ onActivated(() => { }) onMounted(async () => { + queryParams.categoryId = 2 await getList() // 加载产品、仓库列表 productList.value = await ProductApi.getProductSimpleList() diff --git a/src/views/erp/stock/warehouse/index.vue b/src/views/erp/stock/warehouse/index.vue index c4117df5..92b09a9f 100644 --- a/src/views/erp/stock/warehouse/index.vue +++ b/src/views/erp/stock/warehouse/index.vue @@ -67,7 +67,7 @@ row-key="id" @selection-change="handleSelectionChange" > - + - {{ t('EquipmentManagement.EquipmentKeyItems.delete') }} + {{ t('EquipmentManagement.EquipmentKeyItems.batchDelete') }} diff --git a/src/views/mes/energydevicecheck/index.vue b/src/views/mes/energydevicecheck/index.vue index c76320c2..58ce59fd 100644 --- a/src/views/mes/energydevicecheck/index.vue +++ b/src/views/mes/energydevicecheck/index.vue @@ -1,19 +1,14 @@ --> - - - - + + + + - + - + @@ -289,10 +259,6 @@ onMounted(async () => {