|
|
|
|
@ -14,37 +14,11 @@
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item :label="t('MoldManagement.MoldOperate.device')" prop="deviceId" v-if="formData.operateType != null">
|
|
|
|
|
<!-- <el-select
|
|
|
|
|
v-model="formData.deviceId"
|
|
|
|
|
filterable
|
|
|
|
|
clearable
|
|
|
|
|
:loading="deviceLoading"
|
|
|
|
|
:placeholder="t('MoldManagement.MoldOperate.placeholderDevice')"
|
|
|
|
|
class="!w-full"
|
|
|
|
|
@change="deviceChange(formData.deviceId)"
|
|
|
|
|
>
|
|
|
|
|
<el-option v-for="opt in deviceOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
|
|
|
|
|
</el-select>-->
|
|
|
|
|
<el-input :model-value="displayItemDevice" readonly clearable class="device-ledger-selection-input"
|
|
|
|
|
:placeholder="t('MoldManagement.MoldOperate.placeholderDevice')"
|
|
|
|
|
@click="openCriticalComponentDialog" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item :label="t('MoldManagement.MoldOperate.mold')" prop="moldId" v-if="formData.operateType == '1'">
|
|
|
|
|
<!-- <el-select
|
|
|
|
|
v-model="formData.moldId"
|
|
|
|
|
multiple
|
|
|
|
|
clearable
|
|
|
|
|
filterable
|
|
|
|
|
:placeholder="t('MoldManagement.MoldOperate.placeholderMold')"
|
|
|
|
|
class="!w-full"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in moldList"
|
|
|
|
|
:key="item.id"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.id"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>-->
|
|
|
|
|
<el-form-item :label="t('MoldManagement.MoldOperate.mold')" prop="moldId" v-if="formData.operateType != null">
|
|
|
|
|
<el-input
|
|
|
|
|
:model-value="moldDisplayText"
|
|
|
|
|
:placeholder="t('MoldManagement.MoldOperate.placeholderMold')"
|
|
|
|
|
@ -52,25 +26,23 @@
|
|
|
|
|
@click="openMoldSelectDialog"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item
|
|
|
|
|
v-if="formData.operateType == '2' && formData.deviceId"
|
|
|
|
|
:label="t('MoldManagement.MoldOperate.lowerMold')"
|
|
|
|
|
prop="lowerMoldId"
|
|
|
|
|
>
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="formData.lowerMoldId"
|
|
|
|
|
multiple
|
|
|
|
|
clearable
|
|
|
|
|
filterable
|
|
|
|
|
:placeholder="t('MoldManagement.MoldOperate.placeholderLowerMold')"
|
|
|
|
|
<el-form-item :label="t('MoldManagement.MoldOperate.productionLine')" prop="lineId">
|
|
|
|
|
<el-select v-model="formData.lineId" filterable clearable :placeholder="t('MoldManagement.MoldOperate.placeholderProductionLine')" class="!w-full">
|
|
|
|
|
<el-option v-for="line in lineOptions" :key="line.id" :label="line.name" :value="line.id" />
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item :label="t('MoldManagement.MoldOperate.operateTime')" prop="operateTime">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="formData.operateTime"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
|
|
:placeholder="t('MoldManagement.MoldOperate.placeholderOperateTime')"
|
|
|
|
|
class="!w-full"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in lowerMoldList"
|
|
|
|
|
:key="item.id"
|
|
|
|
|
:label="item.name || item.moldName || `ID:${item.id}`"
|
|
|
|
|
:value="item.id"
|
|
|
|
|
/>
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item :label="t('MoldManagement.MoldOperate.operatorName')" prop="operatorId">
|
|
|
|
|
<el-select v-model="formData.operatorId" filterable clearable :placeholder="t('MoldManagement.MoldOperate.placeholderOperatorName')" class="!w-full">
|
|
|
|
|
<el-option v-for="item in operatorOptions" :key="item.id" :label="item.nickname" :value="item.id" />
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item :label="t('MoldManagement.MoldOperate.remark')" prop="remark">
|
|
|
|
|
@ -89,6 +61,7 @@
|
|
|
|
|
:columns="deviceColumns"
|
|
|
|
|
:fetch-api="fetchDeviceLedgerPage"
|
|
|
|
|
row-key="id"
|
|
|
|
|
selection-type="single"
|
|
|
|
|
@confirm="handleDeviceSelectConfirm"
|
|
|
|
|
:query-params="mergedQueryParams"
|
|
|
|
|
>
|
|
|
|
|
@ -113,8 +86,9 @@
|
|
|
|
|
ref="moldSelectDialogRef"
|
|
|
|
|
title="选择模具"
|
|
|
|
|
:columns="moldColumns"
|
|
|
|
|
:fetch-api="MoldBrandApi.getMoldPage"
|
|
|
|
|
:fetch-api="fetchMoldBrandPage"
|
|
|
|
|
row-key="id"
|
|
|
|
|
selection-type="single"
|
|
|
|
|
@confirm="handleMoldSelectConfirm"
|
|
|
|
|
:query-params="mergedMoldQueryParams"
|
|
|
|
|
>
|
|
|
|
|
@ -139,6 +113,8 @@
|
|
|
|
|
import { MoldOperateApi } from '@/api/mes/moldoperate'
|
|
|
|
|
import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
|
|
|
|
|
import { DeviceLedgerApi, DeviceLedgerVO } from '@/api/mes/deviceledger'
|
|
|
|
|
import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
|
|
|
|
|
import { getSimpleUserList, type UserVO } from '@/api/system/user'
|
|
|
|
|
import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
|
|
|
|
|
|
|
|
|
|
/** 模具上下模 表单 */
|
|
|
|
|
@ -146,29 +122,24 @@ defineOptions({ name: 'MoldOperateForm' })
|
|
|
|
|
|
|
|
|
|
const { t } = useI18n() // 国际化
|
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
|
const moldList = ref<MoldVO[]>([]) // 上模可选模具列表（在途）
|
|
|
|
|
const lowerMoldList = ref<any[]>([]) // 下模可选模具列表
|
|
|
|
|
|
|
|
|
|
const deviceLoading = ref(false)
|
|
|
|
|
const deviceOptions = ref<{ label: string; value: number; raw?: DeviceLedgerVO }[]>([])
|
|
|
|
|
const deviceOptionsLoaded = ref(false)
|
|
|
|
|
const lineOptions = ref<OrganizationVO[]>([])
|
|
|
|
|
const operatorOptions = ref<UserVO[]>([])
|
|
|
|
|
const initializingOperateType = ref(false)
|
|
|
|
|
|
|
|
|
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
|
|
|
const dialogTitle = ref('') // 弹窗的标题
|
|
|
|
|
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
|
|
|
|
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
|
|
|
|
type SelectIdValue = string | number | number[] | undefined
|
|
|
|
|
type NamedSelection = { id: number; name: string }
|
|
|
|
|
type MoldOperateFormData = {
|
|
|
|
|
id: number | undefined
|
|
|
|
|
operateType: string | number | undefined
|
|
|
|
|
moldId: SelectIdValue
|
|
|
|
|
deviceId: string | undefined
|
|
|
|
|
moldId: number | undefined
|
|
|
|
|
deviceId: number | undefined
|
|
|
|
|
lineId: number | undefined
|
|
|
|
|
operateTime: string | undefined
|
|
|
|
|
operatorId: number | undefined
|
|
|
|
|
remark: string | undefined
|
|
|
|
|
lowerMoldId: SelectIdValue
|
|
|
|
|
devices?: NamedSelection[]
|
|
|
|
|
molds?: NamedSelection[]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const formData = ref<MoldOperateFormData>({
|
|
|
|
|
@ -176,29 +147,18 @@ const formData = ref<MoldOperateFormData>({
|
|
|
|
|
operateType: undefined,
|
|
|
|
|
moldId: undefined,
|
|
|
|
|
deviceId: undefined,
|
|
|
|
|
lineId: undefined,
|
|
|
|
|
operateTime: undefined,
|
|
|
|
|
operatorId: undefined,
|
|
|
|
|
remark: undefined,
|
|
|
|
|
lowerMoldId: undefined,
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
const normalizeIdList = (value: SelectIdValue) => {
|
|
|
|
|
if (Array.isArray(value)) {
|
|
|
|
|
return value.map((item) => Number(item)).filter((item) => Number.isFinite(item))
|
|
|
|
|
}
|
|
|
|
|
if (value === undefined || value === null || value === '') {
|
|
|
|
|
return []
|
|
|
|
|
}
|
|
|
|
|
return String(value)
|
|
|
|
|
.split(',')
|
|
|
|
|
.map((item) => Number(item))
|
|
|
|
|
.filter((item) => Number.isFinite(item))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const validateMoldId = (_rule: any, value: any, callback: (error?: Error) => void) => {
|
|
|
|
|
if (String(formData.value.operateType) !== '1') {
|
|
|
|
|
if (formData.value.operateType == null) {
|
|
|
|
|
callback()
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
const hasValue = Array.isArray(value) ? value.length > 0 : value !== undefined && value !== null && value !== ''
|
|
|
|
|
const hasValue = value !== undefined && value !== null && value !== ''
|
|
|
|
|
if (!hasValue) {
|
|
|
|
|
callback(new Error(t('MoldManagement.MoldOperate.validatorMoldRequired')))
|
|
|
|
|
} else {
|
|
|
|
|
@ -206,24 +166,11 @@ const validateMoldId = (_rule: any, value: any, callback: (error?: Error) => voi
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const validateLowerMoldId = (_rule: any, value: any, callback: (error?: Error) => void) => {
|
|
|
|
|
if (String(formData.value.operateType) !== '2') {
|
|
|
|
|
callback()
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
const hasValue = Array.isArray(value) ? value.length > 0 : value !== undefined && value !== null && value !== ''
|
|
|
|
|
if (!hasValue) {
|
|
|
|
|
callback(new Error(t('MoldManagement.MoldOperate.validatorLowerMoldRequired')))
|
|
|
|
|
} else {
|
|
|
|
|
callback()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const formRules = reactive({
|
|
|
|
|
operateType: [{ required: true, message: t('MoldManagement.MoldOperate.validatorOperateTypeRequired'), trigger: 'blur' }],
|
|
|
|
|
deviceId: [{ required: true, message: t('MoldManagement.MoldOperate.validatorDeviceRequired'), trigger: 'change' }],
|
|
|
|
|
lineId: [{ required: true, message: t('MoldManagement.MoldOperate.validatorProductionLineRequired'), trigger: 'change' }],
|
|
|
|
|
moldId: [{ required: true, validator: validateMoldId, trigger: 'change' }],
|
|
|
|
|
lowerMoldId: [{ required: true, validator: validateLowerMoldId, trigger: 'change' }],
|
|
|
|
|
})
|
|
|
|
|
const formRef = ref() // 表单 Ref
|
|
|
|
|
|
|
|
|
|
@ -234,7 +181,13 @@ const open = async (type: string, id?: number) => {
|
|
|
|
|
formType.value = type
|
|
|
|
|
resetForm()
|
|
|
|
|
initSelectedItems()
|
|
|
|
|
await ensureDeviceOptionsLoaded()
|
|
|
|
|
// 新增时默认设置操作时间为当前时间
|
|
|
|
|
if (type === 'create') {
|
|
|
|
|
const now = new Date()
|
|
|
|
|
const pad = (n: number) => String(n).padStart(2, '0')
|
|
|
|
|
formData.value.operateTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
|
|
|
|
|
}
|
|
|
|
|
await ensureLineOptionsLoaded()
|
|
|
|
|
// 修改时，设置数据
|
|
|
|
|
if (id) {
|
|
|
|
|
formLoading.value = true
|
|
|
|
|
@ -244,24 +197,12 @@ const open = async (type: string, id?: number) => {
|
|
|
|
|
formData.value = {
|
|
|
|
|
...formData.value,
|
|
|
|
|
...data,
|
|
|
|
|
lowerMoldId: (data as any).lowerMoldId,
|
|
|
|
|
}
|
|
|
|
|
ids.value = normalizeIdList(formData.value.deviceId)
|
|
|
|
|
// 编辑时根据类型格式化模具字段
|
|
|
|
|
if (String(formData.value.operateType) === '1') {
|
|
|
|
|
if (typeof formData.value.moldId === 'string') {
|
|
|
|
|
const parts = formData.value.moldId.split(',').map((v: string) => Number(v)).filter((v) => !Number.isNaN(v))
|
|
|
|
|
formData.value.moldId = parts as any
|
|
|
|
|
}
|
|
|
|
|
moldIds.value = normalizeIdList(formData.value.moldId)
|
|
|
|
|
await loadUpMoldList()
|
|
|
|
|
} else if (String(formData.value.operateType) === '2') {
|
|
|
|
|
const rawLower = (formData.value as any).lowerMoldId
|
|
|
|
|
if (typeof rawLower === 'string') {
|
|
|
|
|
const parts = rawLower.split(',').map((v: string) => Number(v)).filter((v) => !Number.isNaN(v))
|
|
|
|
|
;(formData.value as any).lowerMoldId = parts
|
|
|
|
|
}
|
|
|
|
|
await loadLowerMoldList()
|
|
|
|
|
if (formData.value.deviceId != null) {
|
|
|
|
|
ids.value = [Number(formData.value.deviceId)].filter((v) => Number.isFinite(v))
|
|
|
|
|
}
|
|
|
|
|
if (formData.value.moldId != null) {
|
|
|
|
|
moldIds.value = [Number(formData.value.moldId)].filter((v) => Number.isFinite(v))
|
|
|
|
|
}
|
|
|
|
|
} finally {
|
|
|
|
|
initializingOperateType.value = false
|
|
|
|
|
@ -320,25 +261,12 @@ const submitForm = async () => {
|
|
|
|
|
id: raw.id,
|
|
|
|
|
operateType: raw.operateType,
|
|
|
|
|
deviceId: raw.deviceId,
|
|
|
|
|
moldId: raw.moldId,
|
|
|
|
|
lineId: raw.lineId,
|
|
|
|
|
operateTime: raw.operateTime,
|
|
|
|
|
operatorId: raw.operatorId,
|
|
|
|
|
remark: raw.remark,
|
|
|
|
|
}
|
|
|
|
|
if (String(raw.operateType) === '1') {
|
|
|
|
|
const ids = Array.isArray(raw.moldId) ? raw.moldId : raw.moldId != null ? [raw.moldId] : []
|
|
|
|
|
submitData.moldId = ids.map((v: any) => v).join(',')
|
|
|
|
|
} else if (String(raw.operateType) === '2') {
|
|
|
|
|
const allIds = lowerMoldList.value
|
|
|
|
|
.map((item: any) => item?.id)
|
|
|
|
|
.filter((id: any) => id !== undefined && id !== null)
|
|
|
|
|
const lowerIds = Array.isArray(raw.lowerMoldId)
|
|
|
|
|
? raw.lowerMoldId
|
|
|
|
|
: raw.lowerMoldId != null
|
|
|
|
|
? [raw.lowerMoldId]
|
|
|
|
|
: []
|
|
|
|
|
submitData.lowerMoldId = lowerIds.map((v: any) => v).join(',')
|
|
|
|
|
const lowerIdSet = new Set(lowerIds.map((v: any) => String(v)))
|
|
|
|
|
const remainIds = allIds.filter((id: any) => !lowerIdSet.has(String(id)))
|
|
|
|
|
submitData.moldId = remainIds.join(',')
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 3. 提交数据
|
|
|
|
|
if (formType.value === 'create') {
|
|
|
|
|
@ -361,40 +289,26 @@ const submitForm = async () => {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const ensureDeviceOptionsLoaded = async () => {
|
|
|
|
|
if (deviceOptionsLoaded.value) return
|
|
|
|
|
deviceLoading.value = true
|
|
|
|
|
const ensureLineOptionsLoaded = async () => {
|
|
|
|
|
if (lineOptions.value.length) return
|
|
|
|
|
try {
|
|
|
|
|
const data = await DeviceLedgerApi.getDeviceLedgerPage({})
|
|
|
|
|
const rows = (data?.list ?? []) as DeviceLedgerVO[]
|
|
|
|
|
deviceOptions.value = rows
|
|
|
|
|
.filter((r) => typeof r?.id === 'number')
|
|
|
|
|
.map((r) => ({ label: `${r.deviceCode ?? ''} ${r.deviceName ?? ''}`.trim(), value: r.id, raw: r }))
|
|
|
|
|
deviceOptionsLoaded.value = true
|
|
|
|
|
} finally {
|
|
|
|
|
deviceLoading.value = false
|
|
|
|
|
const data = await OrganizationApi.getOrganizationList()
|
|
|
|
|
lineOptions.value = Array.isArray(data) ? data : []
|
|
|
|
|
} catch {
|
|
|
|
|
lineOptions.value = []
|
|
|
|
|
}
|
|
|
|
|
try {
|
|
|
|
|
operatorOptions.value = (await getSimpleUserList()) ?? []
|
|
|
|
|
} catch {
|
|
|
|
|
operatorOptions.value = []
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 设备更改
|
|
|
|
|
const deviceChange = async (deviceId:number) => {
|
|
|
|
|
if (String(formData.value.operateType) === '2' && deviceId) {
|
|
|
|
|
await loadLowerMoldList()
|
|
|
|
|
formData.value.lowerMoldId = undefined as any
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const loadUpMoldList = async () => {
|
|
|
|
|
moldList.value = await MoldBrandApi.getInTransitMoldAllList()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const loadLowerMoldList = async () => {
|
|
|
|
|
if (!formData.value.deviceId) {
|
|
|
|
|
lowerMoldList.value = []
|
|
|
|
|
return
|
|
|
|
|
formData.value.moldId = undefined as any
|
|
|
|
|
}
|
|
|
|
|
const list = await MoldOperateApi.getLowerMoldList(formData.value.deviceId)
|
|
|
|
|
lowerMoldList.value = Array.isArray(list) ? list : []
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
watch(
|
|
|
|
|
@ -405,17 +319,13 @@ watch(
|
|
|
|
|
}
|
|
|
|
|
formData.value.deviceId = undefined as any
|
|
|
|
|
formData.value.moldId = undefined as any
|
|
|
|
|
formData.value.lowerMoldId = undefined as any
|
|
|
|
|
moldList.value = []
|
|
|
|
|
lowerMoldList.value = []
|
|
|
|
|
ids.value = []
|
|
|
|
|
moldIds.value = []
|
|
|
|
|
selectedDeviceRows.value = []
|
|
|
|
|
selectedMoldRows.value = []
|
|
|
|
|
if (!val) {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
if (String(val) === '1') {
|
|
|
|
|
await loadUpMoldList()
|
|
|
|
|
} else if (String(val) === '2') {
|
|
|
|
|
await loadLowerMoldList()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
@ -426,8 +336,10 @@ const resetForm = () => {
|
|
|
|
|
operateType: undefined,
|
|
|
|
|
moldId: undefined,
|
|
|
|
|
deviceId: undefined,
|
|
|
|
|
lineId: undefined,
|
|
|
|
|
operateTime: undefined,
|
|
|
|
|
operatorId: undefined,
|
|
|
|
|
remark: undefined,
|
|
|
|
|
lowerMoldId: undefined,
|
|
|
|
|
}
|
|
|
|
|
selectedDeviceRows.value = []
|
|
|
|
|
selectedMoldRows.value = []
|
|
|
|
|
@ -445,7 +357,7 @@ const deviceColumns = [
|
|
|
|
|
const moldColumns = [
|
|
|
|
|
{ label: '模具编码', prop: 'code', minWidth: 140 },
|
|
|
|
|
{ label: '模具名称', prop: 'name', minWidth: 160 },
|
|
|
|
|
{ label: '模具型号', prop: 'brandName', minWidth: 140 },
|
|
|
|
|
{ label: '版本', prop: 'version', minWidth: 100 },
|
|
|
|
|
{ label: '状态', prop: 'status', minWidth: 100 }
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
@ -455,41 +367,41 @@ const fetchDeviceLedgerPage = (params: Record<string, any>) => {
|
|
|
|
|
isScheduled: 1
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const fetchMoldBrandPage = async (params: Record<string, any>) => {
|
|
|
|
|
const data = await MoldBrandApi.getMoldBrandPage(params)
|
|
|
|
|
const pageResult = data?.pageResult ?? data ?? {}
|
|
|
|
|
return { list: pageResult.list ?? [], total: pageResult.total ?? 0 }
|
|
|
|
|
}
|
|
|
|
|
const selectedDeviceRows = ref<any[]>([])
|
|
|
|
|
const selectedMoldRows = ref<any[]>([])
|
|
|
|
|
const handleDeviceSelectConfirm = (payload: { ids: (number | string)[]; rows: any[] }) => {
|
|
|
|
|
formData.value.devices = payload.rows
|
|
|
|
|
.map((item) => {
|
|
|
|
|
const id = Number(item.id)
|
|
|
|
|
if (!Number.isFinite(id)) return undefined
|
|
|
|
|
return {
|
|
|
|
|
id,
|
|
|
|
|
name: item.deviceName || item.name || item.code || `设备ID:${id}`
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.filter((item): item is { id: number; name: string } => Boolean(item))
|
|
|
|
|
selectedDeviceRows.value = payload.rows
|
|
|
|
|
formData.value.deviceId = payload.ids.join(',')
|
|
|
|
|
ids.value = payload.ids.map((id) => Number(id))
|
|
|
|
|
const row = payload.rows[0]
|
|
|
|
|
if (row) {
|
|
|
|
|
selectedDeviceRows.value = [row]
|
|
|
|
|
formData.value.deviceId = Number(row.id)
|
|
|
|
|
ids.value = [Number(row.id)]
|
|
|
|
|
} else {
|
|
|
|
|
selectedDeviceRows.value = []
|
|
|
|
|
formData.value.deviceId = undefined
|
|
|
|
|
ids.value = []
|
|
|
|
|
}
|
|
|
|
|
nextTick(() => {
|
|
|
|
|
formRef.value?.clearValidate?.('deviceId')
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const handleMoldSelectConfirm = (payload: { ids: (number | string)[]; rows: any[] }) => {
|
|
|
|
|
formData.value.molds = payload.rows
|
|
|
|
|
.map((item) => {
|
|
|
|
|
const id = Number(item.id)
|
|
|
|
|
if (!Number.isFinite(id)) return undefined
|
|
|
|
|
return {
|
|
|
|
|
id,
|
|
|
|
|
name: item.name || item.code || `模具ID:${id}`
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.filter((item): item is { id: number; name: string } => Boolean(item))
|
|
|
|
|
selectedMoldRows.value = payload.rows
|
|
|
|
|
formData.value.moldId = payload.ids.map((id) => Number(id))
|
|
|
|
|
moldIds.value = payload.ids.map((id) => Number(id))
|
|
|
|
|
const row = payload.rows[0]
|
|
|
|
|
if (row) {
|
|
|
|
|
selectedMoldRows.value = [row]
|
|
|
|
|
formData.value.moldId = Number(row.id)
|
|
|
|
|
moldIds.value = [Number(row.id)]
|
|
|
|
|
} else {
|
|
|
|
|
selectedMoldRows.value = []
|
|
|
|
|
formData.value.moldId = undefined
|
|
|
|
|
moldIds.value = []
|
|
|
|
|
}
|
|
|
|
|
nextTick(() => {
|
|
|
|
|
formRef.value?.clearValidate?.('moldId')
|
|
|
|
|
})
|
|
|
|
|
@ -527,7 +439,10 @@ const resetMoldSearch = () => {
|
|
|
|
|
const moldSelectDialogRef = ref<InstanceType<typeof TableSelectDialog> | null>(null)
|
|
|
|
|
// 2. 合并参数：将表单参数与组件内部的分页参数合并
|
|
|
|
|
const mergedQueryParams = computed(() => ({ ...searchParams }))
|
|
|
|
|
const mergedMoldQueryParams = computed(() => ({ ...searchMoldParams }))
|
|
|
|
|
const mergedMoldQueryParams = computed(() => {
|
|
|
|
|
const status = String(formData.value.operateType) === '1' ? 1 : String(formData.value.operateType) === '2' ? 0 : undefined
|
|
|
|
|
return { ...searchMoldParams, ...(status !== undefined ? { status } : {}) }
|
|
|
|
|
})
|
|
|
|
|
const ids = ref<number[]>([])
|
|
|
|
|
const moldIds= ref<number[]>([])
|
|
|
|
|
const itemList = ref<DeviceLedgerVO[]>([])
|
|
|
|
|
@ -539,55 +454,43 @@ const total = ref(0)
|
|
|
|
|
const queryFormRef = ref()
|
|
|
|
|
const loading = ref(true)
|
|
|
|
|
const displayItemDevice = computed( () => {
|
|
|
|
|
if (!ids.value.length)return ''
|
|
|
|
|
if (formData.value.deviceId == null) return ''
|
|
|
|
|
if (selectedDeviceRows.value.length) {
|
|
|
|
|
return selectedDeviceRows.value
|
|
|
|
|
.map((item) => item.deviceName || item.name || item.deviceCode || '')
|
|
|
|
|
.filter((name) => name)
|
|
|
|
|
.join(',')
|
|
|
|
|
const row = selectedDeviceRows.value[0]
|
|
|
|
|
return row.deviceName || row.name || row.deviceCode || ''
|
|
|
|
|
}
|
|
|
|
|
if (!itemList.value.length) {
|
|
|
|
|
return formData.value.deviceId ? String(formData.value.deviceId) : ''
|
|
|
|
|
return String(formData.value.deviceId)
|
|
|
|
|
}
|
|
|
|
|
const map = new Map(itemList.value.map((item) => [item.id, item.deviceName]))
|
|
|
|
|
const names = ids.value
|
|
|
|
|
.map((id) => map.get(id))
|
|
|
|
|
.filter((name) => name)
|
|
|
|
|
return names.join(',')
|
|
|
|
|
return map.get(formData.value.deviceId) || ''
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
const moldDisplayText = computed(() => {
|
|
|
|
|
if (!moldIds.value.length)return ''
|
|
|
|
|
if (formData.value.moldId == null) return ''
|
|
|
|
|
if (selectedMoldRows.value.length) {
|
|
|
|
|
return selectedMoldRows.value
|
|
|
|
|
.map((item) => item.name || item.code || '')
|
|
|
|
|
.filter((name) => name)
|
|
|
|
|
.join(',')
|
|
|
|
|
const row = selectedMoldRows.value[0]
|
|
|
|
|
return row.name || row.code || ''
|
|
|
|
|
}
|
|
|
|
|
if (!moldItemList.value.length) {
|
|
|
|
|
return formData.value.moldId ? String(formData.value.moldId) : ''
|
|
|
|
|
return String(formData.value.moldId)
|
|
|
|
|
}
|
|
|
|
|
const map = new Map(moldItemList.value.map((item) => [item.id, item.name]))
|
|
|
|
|
const names = moldIds.value
|
|
|
|
|
.map((id) => map.get(id))
|
|
|
|
|
.filter((name) => name)
|
|
|
|
|
return names.join(',')
|
|
|
|
|
return map.get(formData.value.moldId) || ''
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const openCriticalComponentDialog = async () => {
|
|
|
|
|
searchParams.deviceCode=''
|
|
|
|
|
searchParams.deviceName=''
|
|
|
|
|
searchMoldParams.code=''
|
|
|
|
|
searchMoldParams.name=''
|
|
|
|
|
const rows = selectedDeviceRows.value.map((item) => ({ ...item, id: Number(item.id) }))
|
|
|
|
|
deviceSelectDialogRef.value?.open(rows)
|
|
|
|
|
ids.value = normalizeIdList(formData.value.deviceId)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const openMoldSelectDialog = () => {
|
|
|
|
|
searchMoldParams.code=''
|
|
|
|
|
searchMoldParams.name=''
|
|
|
|
|
const rows = selectedMoldRows.value.map((item) => ({ ...item, id: Number(item.id) }))
|
|
|
|
|
moldIds.value = normalizeIdList(formData.value.moldId)
|
|
|
|
|
moldSelectDialogRef.value?.open(rows)
|
|
|
|
|
}
|
|
|
|
|
const toDeviceRows = (split: any) => {
|
|
|
|
|
|
