diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 4464d4d0..fed55e5d 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1729,9 +1729,9 @@ export default {
},
MoldManagement: {
MoldBrand: {
- code: '型号编码',
- name: '型号名称',
- moldType: '规格',
+ code: '编码',
+ name: '名称',
+ moldType: '规格型号',
orgType: '工序',
moldSize: '模穴数',
useTime: '预期寿命/次',
@@ -1741,15 +1741,15 @@ export default {
tabMold: '模具',
emptyTip: '请先点击上方列表选择一个模具型号',
exportFilename: '模具型号.xls',
- placeholderCode: '请输入型号编码',
- placeholderName: '请输入型号名称',
+ placeholderCode: '请输入编码',
+ placeholderName: '请输入名称',
placeholderOrgType: '请选择工序',
- placeholderMoldType: '请输入规格',
+ placeholderMoldType: '请输入规格型号',
placeholderMoldSize: '请输入模穴数',
placeholderUseTime: '输入预期寿命(次)',
placeholderRemark: '请输入备注',
- validatorCodeRequired: '型号编码不能为空',
- validatorNameRequired: '型号名称不能为空',
+ validatorCodeRequired: '编码不能为空',
+ validatorNameRequired: '名称不能为空',
validatorMoldTypeRequired: '规格不能为空',
validatorProductRequired: '产品ID不能为空',
validatorMoldSizeRequired: '出模数不能为空',
@@ -1757,13 +1757,13 @@ export default {
},
Mold: {
- code: '模具编码',
- name: '模具名称',
+ code: '编码',
+ name: '名称',
unit: '单位',
inTime: '入库时间',
status: '状态',
qrcode: '二维码/条形码',
- images: '模具图片',
+ images: '图片',
remark: '备注',
isEnable: '是否启用',
fileUrl: '资料',
@@ -1776,19 +1776,19 @@ export default {
add: '新增',
edit: '编辑',
delete: '删除',
- placeholderCode: '请输入模具编码',
- placeholderName: '请输入模具名称',
+ placeholderCode: '请输入编码',
+ placeholderName: '请输入名称',
placeholderUnit: '请选择单位',
placeholderInTime: '选择入库时间',
placeholderRemark: '请输入备注',
placeholderStatus: '请选择状态',
- validatorCodeRequired: '模具编码不能为空',
- validatorNameRequired: '模具名称不能为空',
+ validatorCodeRequired: '编码不能为空',
+ validatorNameRequired: '名称不能为空',
validatorUnitRequired: '单位不能为空',
validatorInTimeRequired: '入库时间不能为空',
validatorIsEnableRequired: '是否启用不能为空',
validatorBrandRequired: '型号不能为空',
- selectBrandTip: '请选择一个模具型号',
+ selectBrandTip: '请选择一个型号',
statusTooltip: '来源：数据字典-模具状态',
qrcodeLoadError: '二维码加载失败',
qrcodeEmpty: '暂无二维码'
@@ -1913,9 +1913,9 @@ export default {
moduleName: '检验项目',
code: '编码',
name: '名称',
- inspectionMethod: '检验方式',
- valueType: '值类型',
- judgmentCriteria: '判定基准',
+ inspectionMethod: '作业方式',
+ valueType: '结果类型',
+ judgmentCriteria: '作业内容',
isEnable: '是否启用',
creatorName: '创建人',
createTime: '创建时间',
@@ -1929,18 +1929,18 @@ export default {
exportFilename: '检验项目.xls',
placeholderCode: '请输入编码',
placeholderName: '请输入名称',
- placeholderJudgmentCriteria: '请输入判定基准',
+ placeholderJudgmentCriteria: '请输入作业内容',
placeholderSubjectCode: '请输入项目编码',
placeholderSubjectName: '请输入项目名称',
- placeholderInspectionMethod: '请选择检验方式',
- placeholderValueType: '请选择值类型',
+ placeholderInspectionMethod: '请选择作业方式',
+ placeholderValueType: '请选择结果类型',
placeholderIsEnable: '请选择是否启用',
- placeholderJudgmentCriteriaForm: '请输入判定基准',
+ placeholderJudgmentCriteriaForm: '请输入作业内容',
validatorSubjectCodeRequired: '项目编码不能为空',
validatorSubjectNameRequired: '项目名称不能为空',
- validatorInspectionMethodRequired: '检验方式不能为空',
- validatorValueTypeRequired: '值类型不能为空',
- validatorJudgmentCriteriaRequired: '判定基准不能为空',
+ validatorInspectionMethodRequired: '作业方式不能为空',
+ validatorValueTypeRequired: '结果类型不能为空',
+ validatorJudgmentCriteriaRequired: '作业内容不能为空',
validatorIsEnableRequired: '是否启用不能为空',
selectDeleteTip: '请选择需要删除的数据'
},
diff --git a/src/views/erp/component/product/index.vue b/src/views/erp/component/product/index.vue
index 53637cd2..8241faf9 100644
--- a/src/views/erp/component/product/index.vue
+++ b/src/views/erp/component/product/index.vue
@@ -11,6 +11,15 @@
:inline="true"
min-label-width="68px"
>
+
+
+
+
{{ t('common.query') }}
{{ t('common.reset') }}
@@ -177,6 +187,7 @@ const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
+ code: undefined,
categoryId: undefined
})
const queryFormRef = ref() // 搜索的表单
diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue
index ee14b64a..69c77769 100644
--- a/src/views/mes/deviceledger/DeviceLedgerForm.vue
+++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue
@@ -269,7 +269,7 @@
-
-
@@ -798,6 +798,11 @@ const handleSelect = (selection, row) => {
const handleSelectAll = (selection) => {
ids.value = selection?.map((row) => row.id).filter((id) => id !== undefined) ?? []
+
+/* let newVar = selection?.map((row) => row.id).filter((id) => id !== undefined) ?? [];
+ newVar.forEach(row => {
+ ids.value.push(row)
+ })*/
}
@@ -1088,4 +1093,8 @@ const resetForm = () => {
text-overflow: ellipsis;
white-space: nowrap;
}
+
+.no-select-all :deep(.el-table__header-wrapper .el-checkbox) {
+ display: none;
+}
diff --git a/src/views/mes/planMaintenance/PlanMaintenanceForm.vue b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
index fe3de242..1f37f140 100644
--- a/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
+++ b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue
@@ -89,7 +89,7 @@
@@ -400,5 +400,7 @@ const setDefaultSelections = () => {
:deep(.device-ledger-transfer-dialog){
height: 200px;
}
-
+.no-select-all :deep(.el-table__header-wrapper .el-checkbox) {
+ display: none;
+}
diff --git a/src/views/mes/zjschema/ZjSchemaForm.vue b/src/views/mes/zjschema/ZjSchemaForm.vue
index b667d46d..82755747 100644
--- a/src/views/mes/zjschema/ZjSchemaForm.vue
+++ b/src/views/mes/zjschema/ZjSchemaForm.vue
@@ -198,7 +198,9 @@
+ @selection-change="handleSelectionChange" @select="handleSelect" @select-all="handleSelectAll" :show-overflow-tooltip="true"
+ class="no-select-all"
+ row-key="id">
@@ -732,4 +734,8 @@ onMounted(async () => {
align-items: center;
gap: 12px;
}
+
+.no-select-all :deep(.el-table__header-wrapper .el-checkbox) {
+ display: none;
+}
diff --git a/src/views/mold/taskConfiguration/TaskConfigurationForm.vue b/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
index de801d6e..f43be3f0 100644
--- a/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
+++ b/src/views/mold/taskConfiguration/TaskConfigurationForm.vue
@@ -31,7 +31,7 @@
:placeholder="t('EquipmentManagement.TaskManagement.placeholderProjectForm')"
class="!w-full"
>
-
+