# Conflicts:
#	src/views/mes/energydevicecheck/index.vue
main
黄伟杰 2 weeks ago
commit 66340db212

@ -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"
>
<span class="text-14px">Copyright ©2026-BESURE-{{ title }}&nbsp;&nbsp;</span>
<el-link type="success" :href="docsUrl" target="_blank">操作手册</el-link>
<!-- <el-link type="success" :href="docsUrl" target="_blank">操作手册</el-link> -->
</div>
</template>

@ -65,6 +65,10 @@ const toProfile = async () => {
<Icon icon="ep:tools" />
<div @click="toProfile">{{ t('common.profile') }}</div>
</ElDropdownItem>
<!-- <ElDropdownItem>
<Icon icon="ep:menu" />
<div @click="toDocument">{{ t('common.document') }}</div>
</ElDropdownItem> -->
<ElDropdownItem divided>
<Icon icon="ep:lock" />
<div @click="lockScreen">{{ t('lock.lockScreen') }}</div>

@ -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',

@ -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: {

@ -59,9 +59,9 @@
{{ t('login.remember') }}
</el-checkbox>
</el-col>
<el-col :offset="6" :span="12">
<!-- <el-col :offset="6" :span="12">
<el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
</el-col>
</el-col> -->
</el-row>
</el-form-item>
</el-col>

@ -74,7 +74,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="t('common.file')" prop="fileUrl">
<el-form-item :label="t('SparePartsManagement.SpareIn.file')" prop="fileUrl">
<UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
</el-form-item>
</el-col>

@ -81,8 +81,7 @@
<el-input-number
v-model="row.count"
controls-position="right"
:min="0.001"
:precision="3"
:min="0"
class="!w-100%"
/>
</el-form-item>

@ -7,7 +7,7 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="110px"
label-width="68px"
>
<el-form-item :label="t('SparePartsManagement.SpareIn.product')" prop="productId">
<el-select

@ -81,8 +81,7 @@
<el-input-number
v-model="row.count"
controls-position="right"
:min="0.001"
:precision="3"
:min="0"
class="!w-100%"
/>
</el-form-item>

@ -108,6 +108,15 @@
>
<Icon icon="ep:plus" class="mr-5px" /> {{ t('action.add') }}
</el-button>
<el-button
type="danger"
plain
@click="handleDelete(selectionList.map((item) => item.id))"
v-hasPermi="['erp:stock-check:delete']"
:disabled="selectionList.length === 0"
>
<Icon icon="ep:delete" class="mr-5px" /> {{ t('action.batchDelete') }}
</el-button>
<el-button
type="success"
plain
@ -117,15 +126,6 @@
>
<Icon icon="ep:download" class="mr-5px" /> {{ t('action.export') }}
</el-button>
<el-button
type="danger"
plain
@click="handleDelete(selectionList.map((item) => item.id))"
v-hasPermi="['erp:stock-check:delete']"
:disabled="selectionList.length === 0"
>
<Icon icon="ep:delete" class="mr-5px" /> {{ t('action.del') }}
</el-button>
</el-form-item>
</el-form>
</ContentWrap>

@ -107,6 +107,15 @@
>
<Icon icon="ep:plus" class="mr-5px" /> {{ t('action.add') }}
</el-button>
<el-button
type="danger"
plain
@click="handleDelete(selectionList.map((item) => item.id))"
v-hasPermi="['erp:stock-move:delete']"
:disabled="selectionList.length === 0"
>
<Icon icon="ep:delete" class="mr-5px" /> {{ t('action.batchDelete') }}
</el-button>
<el-button
type="success"
plain
@ -116,15 +125,6 @@
>
<Icon icon="ep:download" class="mr-5px" /> {{ t('action.export') }}
</el-button>
<el-button
type="danger"
plain
@click="handleDelete(selectionList.map((item) => item.id))"
v-hasPermi="['erp:stock-move:delete']"
:disabled="selectionList.length === 0"
>
<Icon icon="ep:delete" class="mr-5px" /> {{ t('action.del') }}
</el-button>
</el-form-item>
</el-form>
</ContentWrap>

@ -282,6 +282,7 @@ onActivated(() => {
})
onMounted(async () => {
queryParams.categoryId = 2
await getList()
//
productList.value = await ProductApi.getProductSimpleList()

@ -67,7 +67,7 @@
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column width="30" :label="t('action.select')" type="selection" />
<!-- <el-table-column width="30" :label="t('action.select')" type="selection" /> -->
<el-table-column :label="t('ErpStock.Warehouse.name')" align="center" prop="name" />
<el-table-column :label="t('ErpStock.Warehouse.address')" align="center" prop="address" />
<!-- <el-table-column

@ -68,7 +68,7 @@
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column type="selection" width="55" reserve-selection />
<!-- <el-table-column type="selection" width="55" reserve-selection /> -->
<el-table-column
:label="t('RecipeManagement.RecipeConfig.tableRecipeCodeColumn')"
align="center"

@ -46,7 +46,7 @@ v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="datera
type="danger" plain @click="handleBatchDelete" :disabled="!selectedIds.length"
v-hasPermi="['mes:critical-component:delete']">
<Icon icon="ep:delete" class="mr-5px" />
{{ t('EquipmentManagement.EquipmentKeyItems.delete') }}
{{ t('EquipmentManagement.EquipmentKeyItems.batchDelete') }}
</el-button>
<el-button type="warning" plain @click="openImport" v-hasPermi="['mes:critical-component:import']">
<Icon icon="ep:upload" class="mr-5px" />

@ -1,19 +1,14 @@
<template>
<ContentWrap>
<el-form
class="-mb-15px energy-device-check-filter-form" :model="queryParams" ref="queryFormRef" :inline="true"
label-width="auto">
<el-form class="-mb-15px energy-device-check-filter-form" :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto">
<el-form-item :label="t('EnergyManagement.EnergyDeviceCheck.searchNameLabel')" prop="name">
<el-input
v-model="queryParams.name"
:placeholder="t('EnergyManagement.EnergyDeviceCheck.searchNamePlaceholder')" clearable
@keyup.enter="handleQuery" class="!w-240px" />
v-model="queryParams.name" :placeholder="t('EnergyManagement.EnergyDeviceCheck.searchNamePlaceholder')" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item :label="t('EnergyManagement.EnergyDeviceCheck.searchOrgLabel')" prop="orgId">
<el-select
v-model="queryParams.orgId" filterable clearable
:placeholder="t('EnergyManagement.EnergyDeviceCheck.searchOrgPlaceholder')" class="!w-240px">
<el-select v-model="queryParams.orgId" filterable clearable :placeholder="t('EnergyManagement.EnergyDeviceCheck.searchOrgPlaceholder')" class="!w-240px">
<el-option v-for="opt in orgOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
@ -46,31 +41,18 @@ v-model="queryParams.timeRange" type="datetimerange" value-format="YYYY-MM-DD HH
ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
:expand-row-keys="expandRowKeys" :row-class-name="getRowClassName" style=" min-height: 50vh;margin-top: 20px"
@row-click="handleRowClick" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<!-- <el-table-column type="selection" width="50" align="center" /> -->
<el-table-column type="expand" width="52">
<template #default="scope">
<el-table
v-if="getPointDetailsRows(scope.row).length" :data="getPointDetailsRows(scope.row)"
:show-overflow-tooltip="true" size="small" border
:header-cell-style="{ background: '#f5f7fa', color: '#909399' }">
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableExpandPointNameColumn')"
prop="pointName" min-width="140" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableExpandEarliestValueColumn')"
prop="earliestValue" min-width="120" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableExpandEarliestTimeColumn')"
prop="earliestTime" min-width="170" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableExpandLatestValueColumn')"
prop="latestValue" min-width="120" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableExpandLatestTimeColumn')"
prop="latestTime" min-width="170" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableExpandDifferenceColumn')"
prop="difference" min-width="120" />
:show-overflow-tooltip="true" size="small" border :header-cell-style="{ background: '#f5f7fa', color: '#909399' }">
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableExpandPointNameColumn')" prop="pointName" min-width="140" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableExpandEarliestValueColumn')" prop="earliestValue" min-width="120" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableExpandEarliestTimeColumn')" prop="earliestTime" min-width="170" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableExpandLatestValueColumn')" prop="latestValue" min-width="120" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableExpandLatestTimeColumn')" prop="latestTime" min-width="170" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableExpandDifferenceColumn')" prop="difference" min-width="120" />
</el-table>
</template>
</el-table-column>
@ -79,33 +61,21 @@ v-if="getPointDetailsRows(scope.row).length" :data="getPointDetailsRows(scope.ro
{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
</template>
</el-table-column> -->
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableNameColumn')" align="center" prop="name"
min-width="120" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableEnergyTypeColumn')" align="center"
prop="deviceTypeName" min-width="100" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableOrgColumn')" align="center" prop="orgName"
min-width="100" />
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableEnergyConsumptionColumn')" align="center"
prop="energyConsumption" min-width="120" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableNameColumn')" align="center" prop="name" min-width="120" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableEnergyTypeColumn')" align="center" prop="deviceTypeName" min-width="100" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableOrgColumn')" align="center" prop="orgName" min-width="100" />
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableEnergyConsumptionColumn')" align="center" prop="energyConsumption" min-width="120" />
<!-- <el-table-column label="班次" align="center" min-width="90">
<template #default>
<el-tag type="success">早班</el-tag>
</template>
</el-table-column> -->
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableStartTimeColumn')" align="center"
min-width="170">
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableStartTimeColumn')" align="center" min-width="170">
<template #default="scope">
{{ scope.row.startTime ?? scope.row.earliestDataTime ?? '-' }}
</template>
</el-table-column>
<el-table-column
:label="t('EnergyManagement.EnergyDeviceCheck.tableEndTimeColumn')" align="center"
min-width="170">
<el-table-column :label="t('EnergyManagement.EnergyDeviceCheck.tableEndTimeColumn')" align="center" min-width="170">
<template #default="scope">
{{ scope.row.endTime ?? scope.row.latestDataTime ?? '-' }}
</template>
@ -289,10 +259,6 @@ onMounted(async () => {
</script>
<style scoped lang="scss">
:global(.energydevicecheckPicker) {
z-index: 3000 !important;
}
:deep(.el-time-spinner__wrapper:nth-child(1)) {
width: 100%;
}

@ -89,7 +89,7 @@
@selection-change="handleSelectionChange"
>
<!-- <el-table-column label="ID" align="center" prop="id" /> -->
<el-table-column type="selection" width="55" reserve-selection />
<!-- <el-table-column type="selection" width="55" reserve-selection /> -->
<el-table-column
:label="t('EnergyManagement.EnergyType.tableCodeColumn')"
align="center"

@ -78,7 +78,7 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<!-- <el-table-column label="id" align="center" prop="id" /> -->
<el-table-column label="记录" align="center" prop="recordCode" />
<el-table-column label="记录明细" align="center" prop="recordDetailId" />
<el-table-column label="计划" align="center" prop="planCode" sortable/>

@ -6,7 +6,7 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="120px"
label-width="68px"
>
<!-- <el-form-item label="操作类型" prop="operateType">
<el-select

@ -248,7 +248,8 @@ const resetForm = () => {
status: undefined,
orgClass: undefined,
orgType: undefined,
isCode: true
isCode: true,
dvId: undefined
}
formRef.value?.resetFields()
}

@ -8,8 +8,6 @@
:inline="true"
label-width="68px"
>
<el-row>
<el-col :span="6">
<el-form-item label="工位" prop="orgId">
<el-tree-select
v-model="queryParams.orgId"
@ -22,8 +20,6 @@
class="!w-240px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班别" prop="groupType">
<el-select
v-model="queryParams.groupType"
@ -40,8 +36,6 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工人" prop="workerId">
<el-select
v-model="queryParams.workerId"
@ -59,8 +53,6 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工作日期" prop="workDate">
<el-date-picker
v-model="queryParams.workDate"
@ -71,8 +63,6 @@
class="!w-180px"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>

@ -4,21 +4,21 @@
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
label-width="120px"
v-loading="formLoading"
>
<el-form-item label="入库单id" prop="stockInId">
<!-- <el-form-item label="入库单id" prop="stockInId">
<el-input v-model="formData.stockInId" placeholder="请输入入库单id" />
</el-form-item>
</el-form-item> -->
<el-form-item label="入库单编号" prop="stockInNo">
<el-input v-model="formData.stockInNo" placeholder="请输入入库单编号" />
</el-form-item>
<el-form-item label="入库单项id" prop="stockInItemId">
<el-input v-model="formData.stockInItemId" placeholder="请输入入库单项id" />
</el-form-item>
<el-form-item label="计划id" prop="planId">
<!-- <el-form-item label="计划id" prop="planId">
<el-input v-model="formData.planId" placeholder="请输入计划id" />
</el-form-item>
</el-form-item> -->
<el-form-item label="产品" prop="productId">
<el-input v-model="formData.productId" placeholder="请输入产品" />
</el-form-item>

@ -6,9 +6,9 @@
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
label-width="90px"
>
<el-form-item label="入库单id" prop="stockInId">
<!-- <el-form-item label="入库单id" prop="stockInId">
<el-input
v-model="queryParams.stockInId"
placeholder="请输入入库单id"
@ -16,7 +16,7 @@
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="入库单编号" prop="stockInNo">
<el-input
v-model="queryParams.stockInNo"
@ -76,10 +76,10 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="入库单id" align="center" prop="stockInId" />
<!-- <el-table-column label="id" align="center" prop="id" /> -->
<!-- <el-table-column label="入库单id" align="center" prop="stockInId" /> -->
<el-table-column label="入库单编号" align="center" prop="stockInNo" sortable/>
<el-table-column label="入库单项id" align="center" prop="stockInItemId" />
<!-- <el-table-column label="入库单项id" align="center" prop="stockInItemId" /> -->
<el-table-column label="计划" align="center" prop="planId" />
<el-table-column label="产品" align="center" prop="productId" sortable/>
<el-table-column label="数量" align="center" prop="number" />

@ -53,7 +53,8 @@
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table
ref="tableRef"
v-loading="loading"
@ -184,7 +185,8 @@
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</ContentWrap>
<InspectionPlanForm ref="formRef" @success="getList" />
</template>

@ -1,6 +1,6 @@
<template>
<ContentWrap>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item :label="t('MoldManagement.MoldRepair.repairCode')" prop="repairCode">
<el-input
v-model="queryParams.repairCode"

@ -1,6 +1,6 @@
<template>
<ContentWrap>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item :label="t('MoldManagement.MoldRepairItems.subjectCode')" prop="subjectCode">
<el-input
v-model="queryParams.subjectCode"

@ -1,6 +1,6 @@
<template>
<ContentWrap>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item :label="t('MoldManagement.MoldWorkOrderInquiry.planNo')" prop="planNo">
<el-input
v-model="queryParams.planNo"

Loading…
Cancel
Save