style:产能报表-字段调整

main
黄伟杰 4 days ago
parent e99351440d
commit 63d7ab3c8d

@ -1355,9 +1355,10 @@ export default {
workshop: 'Workshop', workshop: 'Workshop',
ratedCapacity: 'Rated Capacity (Planned Capacity)', ratedCapacity: 'Rated Capacity (Planned Capacity)',
reportCapacity: 'Report Capacity', reportCapacity: 'Report Capacity',
reportCapacityTooltip: 'Average of data from the last half year', reportCapacityTooltip: 'Average of data from the last half year (excluding today)',
reportCapacityViewDetail: 'View Detail', reportCapacityViewDetail: 'View Detail',
actualCapacity: 'Actual Capacity', actualCapacity: 'Actual Capacity',
actualCapacityTooltip: 'Average of data from the last half year (excluding today)',
placeholderDeviceCode: 'Please input device code', placeholderDeviceCode: 'Please input device code',
placeholderDeviceName: 'Please input device name', placeholderDeviceName: 'Please input device name',
placeholderDeviceType: 'Please input device type', placeholderDeviceType: 'Please input device type',

@ -1345,9 +1345,10 @@ export default {
workshop: '所属车间', workshop: '所属车间',
ratedCapacity: '额定产能(计划产能)', ratedCapacity: '额定产能(计划产能)',
reportCapacity: '报工产能', reportCapacity: '报工产能',
reportCapacityTooltip: '近半年的数据均值', reportCapacityTooltip: '近半年的数据均值(不包含今日)',
reportCapacityViewDetail: '查看明细', reportCapacityViewDetail: '查看明细',
actualCapacity: '实际产能', actualCapacity: '实际产能',
actualCapacityTooltip: '近半年的数据均值(不包含今日)',
placeholderDeviceCode: '请输入设备编码', placeholderDeviceCode: '请输入设备编码',
placeholderDeviceName: '请输入设备名称', placeholderDeviceName: '请输入设备名称',
placeholderDeviceType: '请输入设备类型', placeholderDeviceType: '请输入设备类型',

@ -19,15 +19,6 @@
class="!w-200px" class="!w-200px"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="t('EquipmentManagement.CapacityReport.dialogTaskCode')" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
:placeholder="t('EquipmentManagement.CapacityReport.dialogTaskCodePlaceholder')"
clearable
@keyup.enter="handleQuery"
class="!w-200px"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> <Icon icon="ep:search" class="mr-5px" />
@ -43,7 +34,6 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" style="margin-top: 16px"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" style="margin-top: 16px">
<el-table-column :label="t('EquipmentManagement.CapacityReport.dialogProductCode')" align="center" prop="productCode" /> <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogProductCode')" align="center" prop="productCode" />
<el-table-column :label="t('EquipmentManagement.CapacityReport.dialogProductName')" align="center" prop="productName" /> <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogProductName')" align="center" prop="productName" />
<el-table-column :label="t('EquipmentManagement.CapacityReport.dialogTaskCode')" align="center" prop="taskCode" />
<el-table-column :label="t('EquipmentManagement.CapacityReport.dialogBaogongTotal')" align="center" prop="baogongTotal" /> <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogBaogongTotal')" align="center" prop="baogongTotal" />
<el-table-column :label="t('EquipmentManagement.CapacityReport.dialogAvgCapacity')" align="center" prop="avgCapacity" /> <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogAvgCapacity')" align="center" prop="avgCapacity" />
</el-table> </el-table>
@ -93,8 +83,7 @@ const queryParams = reactive({
pageSize: 10, pageSize: 10,
deviceId: undefined as number | undefined, deviceId: undefined as number | undefined,
productCode: undefined as string | undefined, productCode: undefined as string | undefined,
productName: undefined as string | undefined, productName: undefined as string | undefined
taskCode: undefined as string | undefined
}) })
const queryFormRef = ref() const queryFormRef = ref()

@ -12,16 +12,6 @@
:placeholder="t('EquipmentManagement.CapacityReport.placeholderDeviceName')" clearable :placeholder="t('EquipmentManagement.CapacityReport.placeholderDeviceName')" clearable
@keyup.enter="handleQuery" class="!w-240px" /> @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item> </el-form-item>
<el-form-item :label="t('EquipmentManagement.CapacityReport.deviceType')" prop="deviceType">
<el-input v-model="queryParams.deviceType"
:placeholder="t('EquipmentManagement.CapacityReport.placeholderDeviceType')" clearable
@keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item :label="t('EquipmentManagement.CapacityReport.workshop')" prop="workshop" v-show="showAllFilters">
<el-input v-model="queryParams.workshop"
:placeholder="t('EquipmentManagement.CapacityReport.placeholderWorkshop')" clearable
@keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item v-if="filterCount > 3"> <el-form-item v-if="filterCount > 3">
<el-button type="text" class="text-primary" @click="toggleFilters"> <el-button type="text" class="text-primary" @click="toggleFilters">
@ -72,8 +62,15 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="t('EquipmentManagement.CapacityReport.actualCapacity')" align="center" <el-table-column align="center" prop="actualCapacity" sortable>
prop="actualCapacity" sortable /> <template #header>
<span>{{ t('EquipmentManagement.CapacityReport.actualCapacity') }}</span>
<el-tooltip :content="t('EquipmentManagement.CapacityReport.actualCapacityTooltip')" placement="top">
<Icon icon="ep:question-filled" class="ml-4px"
style="vertical-align: middle; color: var(--el-text-color-secondary)" />
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="t('EquipmentManagement.CapacityReport.workshop')" align="center" prop="workshopName" <el-table-column :label="t('EquipmentManagement.CapacityReport.workshop')" align="center" prop="workshopName"
sortable /> sortable />
</el-table> </el-table>
@ -109,8 +106,8 @@ const queryParams = reactive({
}) })
const queryFormRef = ref() const queryFormRef = ref()
const exportLoading = ref(false) const exportLoading = ref(false)
const showAllFilters = ref(false) // const showAllFilters = ref(false)
const filterCount = 4 // const filterCount = 2
const selectedIds = ref<number[]>([]) const selectedIds = ref<number[]>([])
const productCapacityVisible = ref(false) const productCapacityVisible = ref(false)
const productCapacityDeviceId = ref<number>() const productCapacityDeviceId = ref<number>()

Loading…
Cancel
Save