编辑关键件和备件改成弹出的表单

pull/1/head
liutao 2 months ago
parent b3d07e3c89
commit 662e1beef1

@ -256,18 +256,77 @@
<el-dialog <el-dialog
v-model="criticalComponentDialogVisible" v-model="criticalComponentDialogVisible"
title="选择关键件" title="选择关键件"
width="860px" width="1200px"
class="device-ledger-transfer-dialog" class="device-ledger-transfer-dialog"
append-to-body append-to-body
> >
<div class="device-ledger-transfer"> <!-- <div class="device-ledger-transfer">
<el-transfer <el-transfer
v-model="criticalComponentDraft" v-model="criticalComponentDraft"
:data="criticalComponentTransferData" :data="criticalComponentTransferData"
filterable filterable
:filter-placeholder="t('EquipmentManagement.EquipmentLedger.placeholderComponentIds')" :filter-placeholder="t('EquipmentManagement.EquipmentLedger.placeholderComponentIds')"
/> />
</div> </div>-->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" min-label-width="68px" style="margin-bottom: 10px">
<el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.code')" prop="code">
<el-input
v-model="queryParams.code" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderCode')"
clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.name')" prop="name">
<el-input
v-model="queryParams.name" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderName')"
clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.description')" prop="description">
<el-input
v-model="queryParams.description"
:placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderDescription')" clearable
@keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" />
{{ t('common.query') }}
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" />
{{ t('common.reset') }}
</el-button>
</el-form-item>
</el-form>
<ContentWrap>
<el-table
ref="multipleTableRef"
v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
@selection-change="handleSelectionChange" row-key="id">
<el-table-column type="selection" width="55" :reserve-selection="true" />
<el-table-column
:label="t('EquipmentManagement.EquipmentKeyItems.code')" align="center" prop="code"
min-width="140" sortable />
<el-table-column
:label="t('EquipmentManagement.EquipmentKeyItems.name')" align="center" prop="name"
min-width="140" sortable />
<el-table-column
:label="t('EquipmentManagement.EquipmentKeyItems.description')" align="center" prop="description"
min-width="180" />
<el-table-column
:label="t('EquipmentManagement.EquipmentKeyItems.count')" align="center" prop="count"
min-width="180" />
<el-table-column
:label="t('EquipmentManagement.EquipmentKeyItems.remark')" align="center" prop="remark"
min-width="180" />
<el-table-column
:label="t('EquipmentManagement.EquipmentKeyItems.createTime')" align="center" prop="createTime"
:formatter="dateFormatter" width="180" sortable />
</el-table>
<Pagination
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
<template #footer> <template #footer>
<el-button @click="criticalComponentDialogVisible = false">{{ t('common.cancel') }}</el-button> <el-button @click="criticalComponentDialogVisible = false">{{ t('common.cancel') }}</el-button>
<el-button type="primary" @click="confirmCriticalComponentDialog">{{ t('common.ok') }}</el-button> <el-button type="primary" @click="confirmCriticalComponentDialog">{{ t('common.ok') }}</el-button>
@ -281,14 +340,64 @@
class="device-ledger-transfer-dialog" class="device-ledger-transfer-dialog"
append-to-body append-to-body
> >
<div class="device-ledger-transfer"> <!-- <div class="device-ledger-transfer">
<el-transfer <el-transfer
v-model="beijianDraft" v-model="beijianDraft"
:data="beijianTransferData" :data="beijianTransferData"
filterable filterable
:filter-placeholder="t('EquipmentManagement.EquipmentLedger.placeholderBeijianIds')" :filter-placeholder="t('EquipmentManagement.EquipmentLedger.placeholderBeijianIds')"
/> />
</div> </div>-->
<!-- 列表 -->
<el-form class="-mb-15px" :model="bjQueryParams" ref="bjQueryFormRef" :inline="true" min-label-width="68px" style="margin-bottom: 10px">
<el-form-item :label="t('SparePartsManagement.SpareInfo.code')" prop="barCode">
<el-input
v-model="bjQueryParams.barCode" :placeholder="t('SparePartsManagement.SpareInfo.placeholderCode')"
clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item :label="t('SparePartsManagement.SpareInfo.name')" prop="name">
<el-input
v-model="bjQueryParams.name" :placeholder="t('SparePartsManagement.SpareInfo.placeholderName')"
clearable @keyup.enter="bjHandleQuery" class="!w-240px" />
</el-form-item>
<el-form-item>
<el-button @click="bjHandleQuery">
<Icon icon="ep:search" class="mr-5px" />
{{ t('common.query') }}
</el-button>
<el-button @click="bjResetQuery">
<Icon icon="ep:refresh" class="mr-5px" />
{{ t('common.reset') }}
</el-button>
</el-form-item>
</el-form>
<ContentWrap>
<el-table ref="bjMultipleTableRef" v-loading="loading" :data="bjList" :stripe="true" @selection-change="bjHandleSelectionChange" :show-overflow-tooltip="true" row-key="id">
<el-table-column type="selection" width="55" :reserve-selection="true" />
<el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" width="240px" sortable />
<el-table-column :label="t('SparePartsManagement.SpareInfo.name')" align="left" prop="name" width="220px" sortable />
<el-table-column :label="t('SparePartsManagement.SpareInfo.unit')" align="center" prop="unitName" sortable />
<el-table-column :label="t('SparePartsManagement.SpareInfo.status')" align="center" prop="status" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
:label="t('SparePartsManagement.SpareInfo.createTime')"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable />
</el-table>
<!-- 分页 -->
<Pagination
:total="bjTotal"
v-model:page="bjQueryParams.pageNo"
v-model:limit="bjQueryParams.pageSize"
@pagination="bjGetList"
/>
</ContentWrap>
<template #footer> <template #footer>
<el-button @click="beijianDialogVisible = false">{{ t('common.cancel') }}</el-button> <el-button @click="beijianDialogVisible = false">{{ t('common.cancel') }}</el-button>
<el-button type="primary" @click="confirmBeijianDialog">{{ t('common.ok') }}</el-button> <el-button type="primary" @click="confirmBeijianDialog">{{ t('common.ok') }}</el-button>
@ -298,27 +407,41 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger' import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
import { CriticalComponentApi } from '@/api/mes/criticalComponent' import {CriticalComponentApi, CriticalComponentVO} from '@/api/mes/criticalComponent'
import { DeviceTypeApi, DeviceTypeTreeVO } from '@/api/mes/devicetype' import { DeviceTypeApi, DeviceTypeTreeVO } from '@/api/mes/devicetype'
import { getSimpleUserList, UserVO } from '@/api/system/user' import { getSimpleUserList, UserVO } from '@/api/system/user'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import type { FormRules } from 'element-plus' import type { FormRules } from 'element-plus'
import { ProductApi } from '@/api/erp/product/product' import {ProductApi, ProductVO} from '@/api/erp/product/product'
import { DeviceApi,DeviceVO } from '@/api/iot/device' import { DeviceApi,DeviceVO } from '@/api/iot/device'
import QrcodeActionCard from '@/components/QrcodeActionCard/index.vue' import QrcodeActionCard from '@/components/QrcodeActionCard/index.vue'
import { dateFormatter } from '@/utils/formatTime'
import {ref} from "vue";
import {ElTable} from "element-plus";
import { DICT_TYPE } from '@/utils/dict'
/** 设备类型 表单 */ /** 设备类型 表单 */
defineOptions({ name: 'DeviceLedgerForm' }) defineOptions({ name: 'DeviceLedgerForm' })
const queryFormRef = ref()
const bjQueryFormRef = ref()
const { t } = useI18n() // const { t } = useI18n() //
const message = useMessage() // const message = useMessage() //
const loading = ref(true)
const total = ref(0)
const bjTotal = ref(0)
const selectedIds = ref<number[]>([])
const bjSelectedIds = ref<number[]>([])
const dialogVisible = ref(false) // const dialogVisible = ref(false) //
const dialogTitle = ref('') // const dialogTitle = ref('') //
const formLoading = ref(false) // 12 const formLoading = ref(false) // 12
const formType = ref('') // create - update - const formType = ref('') // create - update -
const deviceList = ref<DeviceVO[]>([]) // const deviceList = ref<DeviceVO[]>([]) //
const list = ref<CriticalComponentVO[]>([])
const bjList = ref<ProductVO[]>([])
const selectedRows = ref<any[]>([]) //
const bjSelectedRows = ref<any[]>([]) //
//
const multipleTableRef = ref<InstanceType<typeof ElTable>>()
const bjMultipleTableRef = ref<InstanceType<typeof ElTable>>()
const parseIdsValue = (value: any): number[] => { const parseIdsValue = (value: any): number[] => {
if (!value) return [] if (!value) return []
if (Array.isArray(value)) return value.map((v) => Number(v)).filter((v) => !Number.isNaN(v)) if (Array.isArray(value)) return value.map((v) => Number(v)).filter((v) => !Number.isNaN(v))
@ -510,15 +633,17 @@ const openBeijianDialog = () => {
} }
const confirmCriticalComponentDialog = () => { const confirmCriticalComponentDialog = () => {
const validMap = new Set(criticalComponentOptions.value.map((item) => item.value)) let ids = selectedRows.value.map(item => item.id);
const selected = Array.from(new Set(criticalComponentDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v)))) //const validMap = new Set(criticalComponentOptions.value.map((item) => item.value))
formData.value.componentIds = selected //const selected = Array.from(new Set(criticalComponentDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))
formData.value.componentIds = ids
criticalComponentDialogVisible.value = false criticalComponentDialogVisible.value = false
} }
const confirmBeijianDialog = () => { const confirmBeijianDialog = () => {
const validMap = new Set(beijianOptions.value.map((item) => item.value)) let ids = bjSelectedRows.value.map(item => item.id);
const selected = Array.from(new Set(beijianDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v)))) /* const validMap = new Set(beijianOptions.value.map((item) => item.value))
formData.value.beijianIds = selected const selected = Array.from(new Set(beijianDraft.value.map((v) => Number(v)).filter((v) => validMap.has(v))))*/
formData.value.beijianIds = ids
beijianDialogVisible.value = false beijianDialogVisible.value = false
} }
@ -606,8 +731,147 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) =>
} else { } else {
deviceList.value = await DeviceApi.getDeviceList2ByNoUsed(formData.value.dvId) deviceList.value = await DeviceApi.getDeviceList2ByNoUsed(formData.value.dvId)
} }
getList()
bjGetList()
} }
defineExpose({ open }) // open defineExpose({ open }) // open
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined as string | undefined,
name: undefined as string | undefined,
description: undefined as string | undefined,
remark: undefined as string | undefined,
createTime: [] as string[]
})
const bjQueryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
categoryId: undefined
})
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 配件搜索按钮操作 */
const bjHandleQuery = () => {
bjQueryParams.pageNo = 1
bjGetList()
}
/** 配件重置按钮操作 */
const bjResetQuery = () => {
bjQueryFormRef.value.resetFields()
bjHandleQuery()
}
const handleSelectionChange = (rows: CriticalComponentVO[]) => {
selectedIds.value = rows.map((r) => r.id).filter((id): id is number => typeof id === 'number')
// id
const currentPageIds = rows.map(item => item.id)
//
selectedRows.value = selectedRows.value.filter(
item => !currentPageIds.includes(item.id)
)
//
selectedRows.value.push(...rows)
}
const bjHandleSelectionChange = (rows: CriticalComponentVO[]) => {
bjSelectedIds.value = rows.map((r) => r.id).filter((id): id is number => typeof id === 'number')
// id
const currentPageIds = rows.map(item => item.id)
//
bjSelectedRows.value = bjSelectedRows.value.filter(
item => !currentPageIds.includes(item.id)
)
//
bjSelectedRows.value.push(...rows)
}
const getList = async () => {
loading.value = true
try {
const data = await CriticalComponentApi.getCriticalComponentPage(queryParams)
list.value = data.list
total.value = data.total
//
nextTick(() => {
toggleSelection()
})
} finally {
loading.value = false
}
}
/** 配件查询列表 */
const bjGetList = async () => {
loading.value = true
try {
bjQueryParams.categoryId = 5
const data = await ProductApi.getProductPage(bjQueryParams)
bjList.value = data.list
bjTotal.value = data.total
//
nextTick(() => {
bjToggleSelection()
})
} finally {
loading.value = false
}
}
//
const toggleSelection = () => {
if (!multipleTableRef.value || !selectedRows.value.length) return
//
list.value.forEach(row => {
//
const isSelected = selectedRows.value.some(item => item.id === row.id)
if (isSelected) {
//
multipleTableRef.value!.toggleRowSelection(row, true)
} else {
//
multipleTableRef.value!.toggleRowSelection(row, false)
}
})
}
//
const bjToggleSelection = () => {
if (!bjMultipleTableRef.value || !bjSelectedRows.value.length) return
//
bjList.value.forEach(row => {
//
const isSelected = bjSelectedRows.value.some(item => item.id === row.id)
if (isSelected) {
//
bjMultipleTableRef.value!.toggleRowSelection(row, true)
} else {
//
bjMultipleTableRef.value!.toggleRowSelection(row, false)
}
})
}
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) // success const emit = defineEmits(['success']) // success

Loading…
Cancel
Save