Merge remote-tracking branch 'origin/main'

main
liutao 4 days ago
commit 152899fc5b

@ -2,13 +2,54 @@ import request from '@/config/axios'
// ERP 库存盘点单 VO
export interface StockCheckVO {
id: number // 出库编号
no: string // 出库单号
outTime: Date // 出库时间
id: number // 盘点编号
no: string // 盘点单号
checkTime: Date | string // 盘点时间
sourceType?: number | string // 生成来源类型1-按库存2-按产品
totalCount: number // 合计数量
totalPrice: number // 合计金额,单位:元
status: number // 状态
remark: string // 备注
auditUserId?: number // 审核人编号
auditUserName?: string // 审核人名称
remark?: string // 备注
fileUrl?: string // 附件 URL
creator?: string // 创建人
creatorName?: string // 创建人名称
createTime?: Date | string // 创建时间
productNames?: string // 产品信息
items?: StockCheckItemVO[] // 盘点项列表
approveRecords?: StockCheckApproveRecordVO[] // 审核记录
}
export interface StockCheckItemVO {
id?: number // 盘点项编号
warehouseId: number // 仓库编号
warehouseName?: string // 仓库名称
areaId?: number // 库区编号
areaName?: string // 库区名称
productId: number // 产品编号
productPrice: number // 产品单价
stockCount: number // 账面数量
actualCount: number // 实际数量
count: number // 盈亏数量
remark?: string // 备注
productName: string // 产品名称
productBarCode: string // 产品条码
productUnitName: string // 产品单位名称
}
export interface StockCheckApproveRecordVO {
id?: number // 编号
stockCheckId?: number // 盘点单编号
actionType?: string // 操作类型
fromStatus?: number // 变更前状态
toStatus?: number // 变更后状态
targetUserId?: number // 目标审核人编号
targetUserName?: string // 目标审核人名称
remark?: string // 备注
creator?: string // 操作人
creatorName?: string // 操作人名称
createTime?: Date | string // 创建时间
}
// ERP 库存盘点单 API
@ -23,6 +64,16 @@ export const StockCheckApi = {
return await request.get({ url: `/erp/stock-check/get?id=` + id })
},
// 按仓库/库区生成盘点项
generateItemsByLocation: async (data: any) => {
return await request.post({ url: `/erp/stock-check/generate-items/by-location`, data })
},
// 按产品生成盘点项
generateItemsByProduct: async (data: any) => {
return await request.post({ url: `/erp/stock-check/generate-items/by-product`, data })
},
// 新增库存盘点单
createStockCheck: async (data: StockCheckVO) => {
return await request.post({ url: `/erp/stock-check/create`, data })

@ -1,4 +1,21 @@
import request from '@/config/axios'
import qs from 'qs'
const normalizeStockQueryParams = (params: any) => {
if (!params) return params
const nextParams = { ...params }
if (Array.isArray(nextParams.statusList)) {
if (nextParams.statusList.length) {
nextParams.statusList = nextParams.statusList.join(',')
} else {
delete nextParams.statusList
}
}
return nextParams
}
const stockQueryParamsSerializer = (params: any) =>
qs.stringify(params, { allowDots: true, arrayFormat: 'repeat' })
// ERP 其它入库单 VO
export interface StockInVO {
@ -32,7 +49,12 @@ export interface StockInApproveRecordVO {
export const StockInApi = {
// 查询其它入库单分页
getStockInPage: async (params: any) => {
return await request.get({ url: `/erp/stock-in/page`, params })
const finalParams = normalizeStockQueryParams(params)
return await request.get({
url: `/erp/stock-in/page`,
params: finalParams,
paramsSerializer: stockQueryParamsSerializer
})
},
// 查询其它入库单详情
@ -88,7 +110,12 @@ export const StockInApi = {
// 导出其它入库单 Excel
exportStockIn: async (params) => {
return await request.download({ url: `/erp/stock-in/export-excel`, params })
const finalParams = normalizeStockQueryParams(params)
return await request.download({
url: `/erp/stock-in/export-excel`,
params: finalParams,
paramsSerializer: stockQueryParamsSerializer
})
},
// 查询生产入库单分页

@ -1,4 +1,21 @@
import request from '@/config/axios'
import qs from 'qs'
const normalizeStockQueryParams = (params: any) => {
if (!params) return params
const nextParams = { ...params }
if (Array.isArray(nextParams.statusList)) {
if (nextParams.statusList.length) {
nextParams.statusList = nextParams.statusList.join(',')
} else {
delete nextParams.statusList
}
}
return nextParams
}
const stockQueryParamsSerializer = (params: any) =>
qs.stringify(params, { allowDots: true, arrayFormat: 'repeat' })
// ERP 其它出库单 VO
export interface StockOutVO {
@ -32,7 +49,12 @@ export interface StockOutApproveRecordVO {
export const StockOutApi = {
// 查询其它出库单分页
getStockOutPage: async (params: any) => {
return await request.get({ url: `/erp/stock-out/page`, params })
const finalParams = normalizeStockQueryParams(params)
return await request.get({
url: `/erp/stock-out/page`,
params: finalParams,
paramsSerializer: stockQueryParamsSerializer
})
},
// 查询其它出库单详情
@ -85,7 +107,12 @@ export const StockOutApi = {
// 导出其它出库单 Excel
exportStockOut: async (params) => {
return await request.download({ url: `/erp/stock-out/export-excel`, params })
const finalParams = normalizeStockQueryParams(params)
return await request.download({
url: `/erp/stock-out/export-excel`,
params: finalParams,
paramsSerializer: stockQueryParamsSerializer
})
},
// 查询其它出库单分页
getMesStockOutPage: async (params: any) => {

@ -4,6 +4,7 @@ import request from '@/config/axios'
export interface WarehouseVO {
id: number // 仓库编号
name: string // 仓库名称
categoryType?: number // 仓库分类
address: string // 仓库地址
sort: number // 排序
remark: string // 备注
@ -49,8 +50,8 @@ export const WarehouseApi = {
},
// 查询仓库精简列表
getWarehouseSimpleList: async () => {
return await request.get({ url: `/erp/warehouse/simple-list` })
getWarehouseSimpleList: async (params?: any) => {
return await request.get({ url: `/erp/warehouse/simple-list`, params })
},
// 查询仓库详情

@ -267,6 +267,7 @@
ErpStock: {
Warehouse: {
name: 'Warehouse Name',
categoryType: 'Warehouse Category',
status: 'Warehouse Status',
address: 'Warehouse Address',
warehousePrice: 'Storage Fee',
@ -277,12 +278,14 @@
defaultStatus: 'Default Status',
createTime: 'Create Time',
placeholderName: 'Please enter warehouse name',
placeholderCategoryType: 'Please select warehouse category',
placeholderStatus: 'Please select warehouse status',
placeholderAddress: 'Please enter warehouse address',
placeholderPrincipal: 'Please enter principal',
placeholderSort: 'Please enter sort',
placeholderRemark: 'Please enter remark',
validatorNameRequired: 'Warehouse name is required',
validatorCategoryTypeRequired: 'Warehouse category is required',
validatorSortRequired: 'Sort is required',
validatorStatusRequired: 'Status is required',
confirmDefaultStatus: 'Are you sure to {action} "{name}" as default?',
@ -541,15 +544,41 @@
count: 'Quantity',
price: 'Amount',
totalPrice: 'Total Price',
sourceType: 'Source Type',
sourceTypeStock: 'By Stock',
sourceTypeProduct: 'By Product',
area: 'Area',
checkItem: 'Check Item',
stockCount: 'Stock Quantity',
actualCount: 'Actual Count',
inventoryCheck: 'Check',
materialCategory: 'Material Category',
materialSubCategory: 'Material Subcategory',
standard: 'Standard',
selectWarehouseDialogTitle: 'Select Warehouse',
selectAreaDialogTitle: 'Select Area',
selectProductDialogTitle: 'Select Product',
selectCheckItemDialogTitle: 'Select Check Item',
selectedItemCount: '{count} selected',
selectedTextSeparator: ', ',
placeholderNo: 'Please enter check no',
placeholderNoAuto: 'Auto-generated on save',
placeholderProduct: 'Please select product',
placeholderWarehouse: 'Please select warehouse',
placeholderArea: 'Please select area',
placeholderCheckItem: 'Please select check item',
placeholderProductBarCode: 'Please enter material code',
placeholderProductName: 'Please enter material name',
placeholderCreator: 'Please select creator',
placeholderStatus: 'Please select status',
placeholderRemark: 'Please enter remark',
placeholderCheckTime: 'Select check time',
validatorCheckTimeRequired: 'Check time is required',
validatorSourceTypeRequired: 'Please select source type',
validatorSelectWarehouseFirst: 'Please select warehouse first',
validatorSelectAreaFirst: 'Please select area first',
validatorSelectProductFirst: 'Please select product first',
validatorSelectCheckItem: 'Please select check item',
confirmApprove: 'Are you sure to approve this check order?',
confirmReverseApprove: 'Are you sure to reverse approve this check order?',
approveSuccess: 'Approve success',

@ -267,6 +267,7 @@
ErpStock: {
Warehouse: {
name: '仓库名称',
categoryType: '仓库分类',
status: '仓库状态',
address: '仓库地址',
warehousePrice: '仓储费',
@ -277,12 +278,14 @@
defaultStatus: '是否默认',
createTime: '创建时间',
placeholderName: '请输入仓库名称',
placeholderCategoryType: '请选择仓库分类',
placeholderStatus: '请选择仓库状态',
placeholderAddress: '请输入仓库地址',
placeholderPrincipal: '请输入负责人',
placeholderSort: '请输入排序',
placeholderRemark: '请输入备注',
validatorNameRequired: '仓库名称不能为空',
validatorCategoryTypeRequired: '仓库分类不能为空',
validatorSortRequired: '排序不能为空',
validatorStatusRequired: '开启状态不能为空',
confirmDefaultStatus: '确认要{action}"{name}"默认吗?',
@ -541,15 +544,41 @@
count: '数量',
price: '金额',
totalPrice: '合计金额',
sourceType: '生成来源',
sourceTypeStock: '按库存',
sourceTypeProduct: '按产品',
area: '库区',
checkItem: '盘点项',
stockCount: '库存数量',
actualCount: '实盘数量',
inventoryCheck: '盘点',
materialCategory: '物料大类',
materialSubCategory: '物料小类',
standard: '规格',
selectWarehouseDialogTitle: '选择仓库',
selectAreaDialogTitle: '选择库区',
selectProductDialogTitle: '选择产品',
selectCheckItemDialogTitle: '选择盘点项',
selectedItemCount: '已选择 {count} 项',
selectedTextSeparator: '、',
placeholderNo: '请输入盘点单号',
placeholderNoAuto: '保存时自动生成',
placeholderProduct: '请选择产品',
placeholderWarehouse: '请选择仓库',
placeholderArea: '请选择库区',
placeholderCheckItem: '请选择盘点项',
placeholderProductBarCode: '请输入物料编码',
placeholderProductName: '请输入物料名称',
placeholderCreator: '请选择创建人',
placeholderStatus: '请选择状态',
placeholderRemark: '请输入备注',
placeholderCheckTime: '选择盘点时间',
validatorCheckTimeRequired: '盘点时间不能为空',
validatorSourceTypeRequired: '请选择生成来源',
validatorSelectWarehouseFirst: '请先选择仓库',
validatorSelectAreaFirst: '请先选择库区',
validatorSelectProductFirst: '请先选择产品',
validatorSelectCheckItem: '请选择盘点项',
confirmApprove: '确定审批该盘点单吗?',
confirmReverseApprove: '确定反审批该盘点单吗?',
approveSuccess: '审批成功',

@ -157,7 +157,12 @@
</el-form>
<el-empty v-if="!repairList.length" />
<el-collapse v-else v-model="repairActiveNames" class="device-ledger-repair-collapse">
<el-collapse-item v-for="row in repairList" :key="row.id ?? row.repairCode" :name="String(row.id ?? row.repairCode)">
<el-collapse-item
v-for="row in repairList"
:key="row.id ?? row.repairCode"
:name="String(row.id ?? row.repairCode)"
class="device-ledger-repair-collapse-item"
>
<template #title>
<div class="device-ledger-repair-title">
<span class="device-ledger-repair-name">{{ row.repairCode ?? '-' }}</span>
@ -165,42 +170,143 @@
</template>
<div class="device-ledger-history-items">
<div class="device-ledger-history-item">
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.moldCode') }}</span><span
class="device-ledger-history-item-value">{{ row.moldCode ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.repairStatus') }}</span><span
class="device-ledger-history-item-value"><el-tag
:type="getRepairStatusTagType(row.status)">{{
getRepairStatusLabel(row.status) }}</el-tag></span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.repairStatus') }}</span><span
class="device-ledger-history-item-value"><el-tag
<div class="device-ledger-repair-overview">
<div class="device-ledger-history-item-body">
<div class="device-ledger-repair-section-title">基本信息</div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.repairCode') }}</span><span
class="device-ledger-history-item-value">{{ row.repairCode ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.repairName') }}</span><span
class="device-ledger-history-item-value">{{ row.repairName ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.requireDate') }}</span><span
class="device-ledger-history-item-value">{{ formatHistoryTime(row.requireDate) }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.repairUser') }}</span><span
class="device-ledger-history-item-value">{{ row.acceptedByName ?? row.acceptedName ?? row.acceptedBy ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.confirmUser') }}</span><span
class="device-ledger-history-item-value">{{ row.confirmByName ?? row.confirmName ?? row.confirmBy ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.repairStatus') }}</span><span
class="device-ledger-history-item-value"><el-tag
:type="getRepairStatusTagType(row.status)">{{
getRepairStatusLabel(row.status) }}</el-tag></span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.repairStatus') }}</span><span
class="device-ledger-history-item-value"><el-tag
:type="getRepairResultTagType(row.repairStatus)">{{
getRepairResultLabel(row.repairStatus) }}</el-tag></span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.requireDate') }}</span><span
class="device-ledger-history-item-value">{{ formatHistoryTime(row.requireDate) }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.finishDate') }}</span><span
class="device-ledger-history-item-value">{{ formatHistoryTime(row.finishDate) }}</span></div>
<div class="device-ledger-history-item-row device-ledger-history-item-row--images"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.faultImages') }}</span><span
class="device-ledger-history-item-value">
<div v-if="parseImages(row.faultImages).length" class="device-ledger-repair-images">
<el-image
v-for="image in parseImages(row.faultImages)"
:key="image"
:src="image"
:preview-src-list="parseImages(row.faultImages)"
preview-teleported
fit="cover"
class="device-ledger-repair-image"
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-repair-section-title">维修对象</div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.moldName') }}</span><span
class="device-ledger-history-item-value">{{ row.moldName ?? row.machineryName ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.moldCode') }}</span><span
class="device-ledger-history-item-value">{{ row.moldCode ?? row.machineryCode ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">规格型号</span><span
class="device-ledger-history-item-value">{{ row.machinerySpec ?? row.moldSpec ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">品牌</span><span
class="device-ledger-history-item-value">{{ row.machineryBrand ?? row.moldBrand ?? '-' }}</span></div>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-repair-section-title">故障信息</div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.faultLevel') }}</span><span
class="device-ledger-history-item-value">
<dict-tag
v-if="row.faultLevel !== undefined && row.faultLevel !== null && row.faultLevel !== ''"
:type="DICT_TYPE.FAILURE_LEVEL"
:value="row.faultLevel"
/>
</div>
<div v-else class="device-ledger-repair-image-placeholder">-</div>
</span></div>
<span v-else>-</span>
</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.isShutdown') }}</span><span
class="device-ledger-history-item-value">{{ formatBooleanLabel(row.shutdown ?? row.isShutdown) }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.faultPhenomenon') }}</span><span
class="device-ledger-history-item-value">{{ row.faultPhenomenon ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.faultDescription') }}</span><span
class="device-ledger-history-item-value">{{ row.faultDescription ?? '-' }}</span></div>
<div class="device-ledger-history-item-row device-ledger-history-item-row--images"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.faultImages') }}</span><span
class="device-ledger-history-item-value">
<div v-if="parseImages(row.faultImages).length" class="device-ledger-repair-images">
<el-image
v-for="image in parseImages(row.faultImages)"
:key="image"
:src="image"
:preview-src-list="parseImages(row.faultImages)"
preview-teleported
fit="cover"
class="device-ledger-repair-image"
/>
</div>
<div v-else class="device-ledger-repair-image-placeholder">-</div>
</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.remark') }}</span><span
class="device-ledger-history-item-value">{{ row.remark ?? '-' }}</span></div>
</div>
</div>
<div v-if="shouldShowRepairResult(row)" class="device-ledger-repair-result">
<div class="device-ledger-repair-result-head">
<span class="device-ledger-repair-section-title">处理结果</span>
<el-button link type="primary" @click="toggleRepairResult(row)">
{{ isRepairResultExpanded(row) ? '收起' : '展开' }}
</el-button>
</div>
<div v-show="isRepairResultExpanded(row)" class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.repairResult') }}</span><span
class="device-ledger-history-item-value"><el-tag
:type="getRepairResultTagType(row.repairStatus)">{{
getRepairResultLabel(row.repairStatus) }}</el-tag></span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldBrandDetail.finishDate') }}</span><span
class="device-ledger-history-item-value">{{ formatHistoryTime(row.finishDate) }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.confirmDate') }}</span><span
class="device-ledger-history-item-value">{{ formatHistoryTime(row.confirmDate) }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.downtimeDuration') }}</span><span
class="device-ledger-history-item-value">{{ formatDowntimeDuration(row.downtimeDuration) }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.faultReason') }}</span><span
class="device-ledger-history-item-value">{{ row.faultReason ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.handlingMeasures') }}</span><span
class="device-ledger-history-item-value">{{ row.handlingMeasures ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.replacementParts') }}</span><span
class="device-ledger-history-item-value">{{ row.replacementParts ?? '-' }}</span></div>
<div class="device-ledger-history-item-row"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.repairContent') }}</span><span
class="device-ledger-history-item-value">{{ row.repairContent ?? '-' }}</span></div>
<div class="device-ledger-history-item-row device-ledger-history-item-row--images"><span
class="device-ledger-history-item-label">{{ t('MoldManagement.MoldRepair.repairedImages') }}</span><span
class="device-ledger-history-item-value">
<div v-if="parseImages(row.repairedImages).length" class="device-ledger-repair-images">
<el-image
v-for="image in parseImages(row.repairedImages)"
:key="image"
:src="image"
:preview-src-list="parseImages(row.repairedImages)"
preview-teleported
fit="cover"
class="device-ledger-repair-image"
/>
</div>
<div v-else class="device-ledger-repair-image-placeholder">-</div>
</span></div>
</div>
</div>
</div>
</div>
@ -443,6 +549,7 @@ const installDateRange = ref<string[] | undefined>()
const installOperateType = ref<string | undefined>()
const moldList = ref<any[]>([])
const repairActiveNames = ref<string[]>([])
const repairResultActiveNames = ref<string[]>([])
const inspectionDateRange = ref<string[] | undefined>()
const maintainDateRange = ref<string[] | undefined>()
const repairDateRange = ref<string[] | undefined>()
@ -485,6 +592,36 @@ const formatHistoryTime = (value: any) => {
return String(raw)
}
const formatBooleanLabel = (value: any) => {
if (value === undefined || value === null || value === '') return '-'
if (value === true || value === 1 || value === '1' || value === 'true') return t('common.yes')
if (value === false || value === 0 || value === '0' || value === 'false') return t('common.no')
return String(value)
}
const formatDowntimeDuration = (value: any) => {
if (value === undefined || value === null || value === '') return '-'
return `${value}小时`
}
const shouldShowRepairResult = (row: any) => {
const value = row?.repairStatus ?? row?.repairResult
const status = value === undefined || value === null || value === '' ? '0' : String(value)
return status !== '0'
}
const getRepairRowKey = (row: any) => String(row?.id ?? row?.repairCode ?? '')
const isRepairResultExpanded = (row: any) => repairResultActiveNames.value.includes(getRepairRowKey(row))
const toggleRepairResult = (row: any) => {
const key = getRepairRowKey(row)
if (!key) return
repairResultActiveNames.value = isRepairResultExpanded(row)
? repairResultActiveNames.value.filter((item) => item !== key)
: [...repairResultActiveNames.value, key]
}
const parseImages = (value: any): string[] => {
if (!value) return []
if (Array.isArray(value)) return value.map(String).filter(Boolean)
@ -782,6 +919,7 @@ const fetchRepairHistory = async () => {
const data = await MoldRepairApi.getMoldRepairList(params)
repairList.value = Array.isArray(data) ? data : []
repairActiveNames.value = repairList.value.map((row: any) => String(row.id ?? row.repairCode))
repairResultActiveNames.value = []
} finally {
repairLoading.value = false
}
@ -1092,6 +1230,39 @@ onMounted(() => {
margin-top: 10px;
}
.device-ledger-repair-collapse {
border-top: 0;
border-bottom: 0;
}
.device-ledger-repair-collapse :deep(.device-ledger-repair-collapse-item) {
overflow: hidden;
margin-bottom: 14px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 10px;
background: #fff;
box-shadow: 0 2px 8px rgb(31 45 61 / 6%);
}
.device-ledger-repair-collapse :deep(.device-ledger-repair-collapse-item:nth-child(even)) {
background: #fbfdff;
}
.device-ledger-repair-collapse :deep(.device-ledger-repair-collapse-item:last-child) {
margin-bottom: 0;
}
.device-ledger-repair-collapse :deep(.device-ledger-repair-collapse-item .el-collapse-item__header) {
height: 46px;
padding: 0 14px;
border-bottom-color: var(--el-border-color-lighter);
}
.device-ledger-repair-collapse :deep(.device-ledger-repair-collapse-item .el-collapse-item__content) {
padding: 14px;
}
.device-ledger-history-title,
.device-ledger-repair-title {
display: flex;
@ -1117,6 +1288,24 @@ onMounted(() => {
border-radius: 12px;
}
.device-ledger-repair-collapse .device-ledger-history-item {
position: relative;
padding: 16px;
border-color: var(--el-border-color);
background: #fff;
}
.device-ledger-repair-collapse .device-ledger-history-item::before {
position: absolute;
top: 16px;
bottom: 16px;
left: 0;
width: 4px;
border-radius: 0 4px 4px 0;
background: var(--el-color-primary);
content: '';
}
.device-ledger-history-item-head {
display: flex;
align-items: center;
@ -1129,6 +1318,50 @@ onMounted(() => {
gap: 8px;
}
.device-ledger-repair-overview {
display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr));
gap: 12px;
}
.device-ledger-repair-overview > .device-ledger-history-item-body {
padding: 12px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
background: var(--el-fill-color-lighter);
}
.device-ledger-repair-overview .device-ledger-history-item-row,
.device-ledger-repair-result .device-ledger-history-item-row {
grid-template-columns: 128px minmax(0, 1fr);
}
.device-ledger-repair-result {
margin-top: 14px;
padding: 12px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
background: var(--el-fill-color-lighter);
}
.device-ledger-repair-result-head {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
}
.device-ledger-repair-section-title {
margin-top: 4px;
padding-bottom: 2px;
font-weight: 600;
color: var(--el-text-color-primary);
}
.device-ledger-repair-section-title:first-child {
margin-top: 0;
}
.device-ledger-history-item-row {
display: grid;
grid-template-columns: 88px minmax(0, 1fr);
@ -1143,6 +1376,11 @@ onMounted(() => {
color: var(--el-text-color-secondary);
}
.device-ledger-history-item-value {
min-width: 0;
word-break: break-word;
}
.device-ledger-repair-images {
display: flex;
flex-wrap: wrap;
@ -1192,5 +1430,9 @@ onMounted(() => {
.mold-brand-detail__grid {
grid-template-columns: 1fr;
}
.device-ledger-repair-overview {
grid-template-columns: 1fr;
}
}
</style>

@ -0,0 +1,846 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1000">
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="auto" v-loading="formLoading"
:disabled="formDisabled">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item :label="t('ErpStock.Check.no')" prop="no">
<el-input v-model="formData.no" disabled :placeholder="t('ErpStock.Check.placeholderNoAuto')" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="t('ErpStock.Check.checkTime')" prop="checkTime">
<el-date-picker v-model="formData.checkTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
:placeholder="t('ErpStock.Check.placeholderCheckTime')" class="!w-1/1" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="t('ErpStock.Check.sourceType')" prop="sourceType">
<el-radio-group v-model="formData.sourceType" @change="handleSourceTypeChange">
<el-radio :value="1">{{ t('ErpStock.Check.sourceTypeStock') }}</el-radio>
<el-radio :value="2">{{ t('ErpStock.Check.sourceTypeProduct') }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ContentWrap>
<el-form class="stock-check-selector-form" label-width="auto" :disabled="selectionDisabled">
<template v-if="formData.sourceType === 1">
<el-form-item :label="t('ErpStock.Check.warehouse')">
<el-input :model-value="selectedWarehouseText" readonly
:placeholder="t('ErpStock.Check.placeholderWarehouse')">
<template #append>
<el-button :disabled="selectionDisabled" @click="openWarehouseDialog">{{ t('common.select')
}}</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item v-if="selectedWarehouseIds.length > 0" :label="t('ErpStock.Check.area')">
<el-input :model-value="selectedAreaText" readonly :placeholder="t('ErpStock.Check.placeholderArea')">
<template #append>
<el-button :disabled="selectionDisabled" @click="openAreaDialog">{{ t('common.select') }}</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item v-if="selectedAreaIds.length > 0" :label="t('ErpStock.Check.checkItem')">
<el-input :model-value="selectedItemText" readonly :placeholder="t('ErpStock.Check.placeholderCheckItem')">
<template #append>
<el-button :disabled="selectionDisabled" @click="openGeneratedItemDialog">{{ t('common.select')
}}</el-button>
</template>
</el-input>
</el-form-item>
</template>
<template v-else>
<el-form-item :label="t('ErpStock.Check.product')">
<el-input :model-value="selectedProductText" readonly :placeholder="t('ErpStock.Check.placeholderProduct')">
<template #append>
<el-button :disabled="selectionDisabled" @click="openProductDialog">{{ t('common.select') }}</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item v-if="selectedProductIds.length > 0" :label="t('ErpStock.Check.checkItem')">
<el-input :model-value="selectedItemText" readonly :placeholder="t('ErpStock.Check.placeholderCheckItem')">
<template #append>
<el-button :disabled="selectionDisabled" @click="openGeneratedItemDialog">{{ t('common.select')
}}</el-button>
</template>
</el-input>
</el-form-item>
</template>
</el-form>
<el-table :data="formData.items || []" border size="small" class="mt-12px">
<el-table-column :label="t('ErpStock.Item.warehouse')" prop="warehouseName" min-width="120" />
<el-table-column :label="t('ErpStock.Item.area')" prop="areaName" min-width="100" />
<el-table-column :label="t('ErpStock.Item.barcode')" prop="productBarCode" min-width="150" />
<el-table-column :label="t('ErpStock.Item.product')" prop="productName" min-width="160" />
<el-table-column :label="t('ErpStock.Check.stockCount')" prop="stockCount" min-width="100" />
<el-table-column v-if="isInventoryCheck" :label="t('ErpStock.Check.actualCount')" align="right" min-width="140">
<template #default="{ row }">
<el-input-number v-model="row.actualCount" controls-position="right" :precision="0" :step="1"
step-strictly :min="0" class="!w-100%" @change="(value) => (row.actualCount = normalizeActualCount(value))" />
</template>
</el-table-column>
<el-table-column v-if="formType === 'update'" :label="t('common.operate')" align="center" fixed="right"
width="80">
<template #default="{ $index }">
<el-button link type="danger" @click="handleDeleteItem($index)">
{{ t('action.delete') }}
</el-button>
</template>
</el-table-column>
</el-table>
</ContentWrap>
<el-form :model="formData" label-width="auto" :disabled="formDisabled" class="stock-check-bottom-form">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item :label="t('ErpStock.Check.remark')" prop="remark">
<el-input v-model="formData.remark" type="textarea" :rows="2"
:placeholder="t('ErpStock.Check.placeholderRemark')" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button type="primary" :disabled="formLoading" @click="submitForm">
{{ t('common.save') }}
</el-button>
<el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
</template>
</Dialog>
<Dialog :title="t('ErpStock.Check.selectWarehouseDialogTitle')" v-model="warehouseDialogVisible" width="1000">
<el-form :model="warehouseQueryParams" :inline="true" label-width="auto" class="-mb-15px">
<el-form-item :label="t('ErpStock.Warehouse.name')">
<el-input v-model="warehouseQueryParams.name" clearable :placeholder="t('ErpStock.Warehouse.placeholderName')"
class="!w-240px" @keyup.enter="getWarehouseList" />
</el-form-item>
<el-form-item>
<el-button @click="handleWarehouseQuery">
<Icon icon="ep:search" class="mr-5px" />{{ t('common.query') }}
</el-button>
<el-button @click="resetWarehouseQuery">
<Icon icon="ep:refresh" class="mr-5px" />{{ t('common.reset') }}
</el-button>
</el-form-item>
</el-form>
<el-table ref="warehouseTableRef" v-loading="warehouseLoading" :data="warehouseList" row-key="id"
@row-click="handleWarehouseRowClick" @selection-change="warehouseSelection = $event">
<el-table-column type="selection" width="55" reserve-selection />
<el-table-column :label="t('ErpStock.Warehouse.name')" align="center" prop="name" min-width="160" sortable />
<el-table-column :label="t('ErpStock.Warehouse.categoryType')" align="center" prop="categoryType" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="scope.row.categoryType" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Warehouse.address')" align="center" prop="address" min-width="180"
show-overflow-tooltip />
<el-table-column :label="t('ErpStock.Warehouse.principal')" align="center" prop="principal" min-width="110" />
<el-table-column :label="t('ErpStock.Warehouse.remark')" align="center" prop="remark" min-width="150"
show-overflow-tooltip />
<el-table-column :label="t('ErpStock.Warehouse.sort')" align="center" prop="sort" min-width="90" sortable />
<el-table-column :label="t('ErpStock.Warehouse.status')" align="center" prop="status" min-width="100" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Warehouse.defaultStatus')" align="center" prop="defaultStatus"
min-width="110" sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.defaultStatus" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Warehouse.createTime')" align="center" prop="createTime"
:formatter="dateFormatter" min-width="180" sortable />
</el-table>
<div class="stock-check-dialog-pagination">
<Pagination :total="warehouseTotal" v-model:page="warehouseQueryParams.pageNo"
v-model:limit="warehouseQueryParams.pageSize" @pagination="getWarehouseList" />
</div>
<template #footer>
<el-button type="primary" @click="confirmWarehouseSelection">{{ t('common.ok') }}</el-button>
<el-button @click="warehouseDialogVisible = false">{{ t('common.cancel') }}</el-button>
</template>
</Dialog>
<Dialog :title="t('ErpStock.Check.selectAreaDialogTitle')" v-model="areaDialogVisible" width="1000">
<el-form :model="areaQueryParams" :inline="true" label-width="auto" class="-mb-15px">
<el-form-item :label="t('ErpStock.WarehouseArea.areaCode')">
<el-input v-model="areaQueryParams.areaCode" clearable
:placeholder="t('ErpStock.WarehouseArea.placeholderAreaCode')" class="!w-240px" @keyup.enter="getAreaList" />
</el-form-item>
<el-form-item :label="t('ErpStock.WarehouseArea.areaName')">
<el-input v-model="areaQueryParams.areaName" clearable
:placeholder="t('ErpStock.WarehouseArea.placeholderAreaName')" class="!w-240px" @keyup.enter="getAreaList" />
</el-form-item>
<el-form-item>
<el-button @click="handleAreaQuery">
<Icon icon="ep:search" class="mr-5px" />{{ t('common.query') }}
</el-button>
<el-button @click="resetAreaQuery">
<Icon icon="ep:refresh" class="mr-5px" />{{ t('common.reset') }}
</el-button>
</el-form-item>
</el-form>
<el-table ref="areaTableRef" v-loading="areaLoading" :data="areaList" row-key="id" @row-click="handleAreaRowClick"
@selection-change="areaSelection = $event">
<el-table-column type="selection" width="55" reserve-selection />
<el-table-column :label="t('ErpStock.WarehouseArea.warehouseId')" align="center" prop="warehouseId"
min-width="140" sortable>
<template #default="scope">
{{ getWarehouseName(scope.row.warehouseId) }}
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.WarehouseArea.areaCode')" align="center" prop="areaCode" min-width="130"
sortable />
<el-table-column :label="t('ErpStock.WarehouseArea.areaName')" align="center" prop="areaName" min-width="130"
sortable />
<el-table-column :label="t('ErpStock.WarehouseArea.areaSize')" align="center" prop="areaSize" min-width="100" />
<el-table-column :label="t('ErpStock.WarehouseArea.description')" align="center" prop="description"
min-width="160" show-overflow-tooltip />
<el-table-column :label="t('ErpStock.WarehouseArea.status')" align="center" prop="status" min-width="100"
sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.WarehouseArea.createTime')" align="center" prop="createTime"
:formatter="dateFormatter" min-width="180" sortable />
</el-table>
<div class="stock-check-dialog-pagination">
<Pagination :total="areaTotal" v-model:page="areaQueryParams.pageNo" v-model:limit="areaQueryParams.pageSize"
@pagination="getAreaList" />
</div>
<template #footer>
<el-button type="primary" @click="confirmAreaSelection">{{ t('common.ok') }}</el-button>
<el-button @click="areaDialogVisible = false">{{ t('common.cancel') }}</el-button>
</template>
</Dialog>
<Dialog :title="t('ErpStock.Check.selectProductDialogTitle')" v-model="productDialogVisible" width="1100">
<el-form :model="productQueryParams" :inline="true" label-width="auto" class="-mb-15px">
<el-form-item :label="t('ErpStock.Item.barcode')">
<el-input v-model="productQueryParams.barCode" clearable
:placeholder="t('ErpStock.Check.placeholderProductBarCode')" class="!w-240px" @keyup.enter="getProductList" />
</el-form-item>
<el-form-item :label="t('ErpStock.Item.product')">
<el-input v-model="productQueryParams.name" clearable :placeholder="t('ErpStock.Check.placeholderProductName')"
class="!w-240px" @keyup.enter="getProductList" />
</el-form-item>
<el-form-item>
<el-button @click="handleProductQuery">
<Icon icon="ep:search" class="mr-5px" />{{ t('common.query') }}
</el-button>
<el-button @click="resetProductQuery">
<Icon icon="ep:refresh" class="mr-5px" />{{ t('common.reset') }}
</el-button>
</el-form-item>
</el-form>
<el-table ref="productTableRef" v-loading="productLoading" :data="productList" row-key="id"
@row-click="handleProductRowClick" @selection-change="productSelection = $event">
<el-table-column type="selection" width="55" reserve-selection />
<el-table-column :label="t('ErpStock.Item.barcode')" prop="barCode" min-width="160" />
<el-table-column :label="t('ErpStock.Item.product')" prop="name" min-width="180" />
<el-table-column :label="t('ErpStock.Check.materialCategory')" prop="categoryType" align="center" min-width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="scope.row.categoryType" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Check.materialSubCategory')" prop="subCategoryName" min-width="120" />
<el-table-column :label="t('ErpStock.Item.unit')" prop="unitName" align="center" min-width="80" />
<el-table-column :label="t('ErpStock.Check.standard')" prop="standard" min-width="120" show-overflow-tooltip />
</el-table>
<div class="stock-check-dialog-pagination">
<Pagination :total="productTotal" v-model:page="productQueryParams.pageNo"
v-model:limit="productQueryParams.pageSize" @pagination="getProductList" />
</div>
<template #footer>
<el-button type="primary" @click="confirmProductSelection">{{ t('common.ok') }}</el-button>
<el-button @click="productDialogVisible = false">{{ t('common.cancel') }}</el-button>
</template>
</Dialog>
<Dialog :title="t('ErpStock.Check.selectCheckItemDialogTitle')" v-model="generatedItemDialogVisible" width="1200">
<el-table ref="generatedItemTableRef" v-loading="generatedItemLoading" :data="generatedItemList"
:row-key="getGeneratedItemRowKey" max-height="560" @row-click="handleGeneratedItemRowClick"
@selection-change="generatedItemSelection = $event">
<el-table-column type="selection" width="55" reserve-selection />
<el-table-column :label="t('ErpStock.Item.warehouse')" prop="warehouseName" min-width="120" />
<el-table-column :label="t('ErpStock.Item.area')" prop="areaName" min-width="100" />
<el-table-column :label="t('ErpStock.Item.barcode')" prop="productBarCode" min-width="150" />
<el-table-column :label="t('ErpStock.Item.product')" prop="productName" min-width="160" />
<el-table-column :label="t('ErpStock.Check.stockCount')" prop="stockCount" align="right" min-width="100" />
</el-table>
<template #footer>
<el-button type="primary" @click="confirmGeneratedItemSelection">{{ t('common.ok') }}</el-button>
<el-button @click="generatedItemDialogVisible = false">{{ t('common.cancel') }}</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import { StockCheckApi, type StockCheckVO, type StockCheckItemVO } from '@/api/erp/stock/check'
import { WarehouseApi, type WarehouseVO } from '@/api/erp/stock/warehouse'
import { WarehouseAreaApi, type WarehouseAreaVO } from '@/api/erp/stock/warehousearea'
import { ProductApi, type ProductVO } from '@/api/erp/product/product'
type FormData = Partial<StockCheckVO> & {
items: StockCheckItemVO[]
}
defineOptions({ name: 'StockCheckExecutionForm' })
const { t } = useI18n()
const message = useMessage()
const dialogVisible = ref(false)
const dialogTitle = ref('')
const formLoading = ref(false)
const formType = ref('')
const formRef = ref()
const isInventoryCheck = computed(() => formType.value === 'check')
const formDisabled = computed(() => formType.value === 'detail' || isInventoryCheck.value)
const selectionDisabled = computed(() => formType.value === 'detail')
const formData = ref<FormData>({
id: undefined,
no: undefined,
checkTime: undefined,
sourceType: 1,
remark: undefined,
items: []
})
const formRules = reactive({
checkTime: [{ required: true, message: t('ErpStock.Check.validatorCheckTimeRequired'), trigger: 'change' }],
sourceType: [{ required: true, message: t('ErpStock.Check.validatorSourceTypeRequired'), trigger: 'change' }]
})
const getCurrentTime = () => formatDate(new Date())
const normalizeActualCount = (value: number | string | null | undefined) => {
const numericValue = Number(value ?? 0)
return Number.isFinite(numericValue) ? Math.trunc(numericValue) : 0
}
const selectedWarehouses = ref<WarehouseVO[]>([])
const selectedAreas = ref<WarehouseAreaVO[]>([])
const selectedProducts = ref<ProductVO[]>([])
const selectedWarehouseIds = computed(() => selectedWarehouses.value.map((item) => item.id))
const selectedAreaIds = computed(() => selectedAreas.value.map((item) => item.id))
const selectedProductIds = computed(() => selectedProducts.value.map((item) => item.id))
const selectedTextSeparator = computed(() => t('ErpStock.Check.selectedTextSeparator'))
const selectedWarehouseText = computed(() =>
selectedWarehouses.value.map((item) => item.name).join(selectedTextSeparator.value)
)
const selectedAreaText = computed(() =>
selectedAreas.value.map((item) => item.areaName).join(selectedTextSeparator.value)
)
const selectedProductText = computed(() =>
selectedProducts.value.map((item) => item.name).join(selectedTextSeparator.value)
)
const selectedItemText = computed(() => {
const count = formData.value.items?.length || 0
return count ? t('ErpStock.Check.selectedItemCount', { count }) : ''
})
const warehouseDialogVisible = ref(false)
const warehouseLoading = ref(false)
const warehouseTableRef = ref()
const warehouseList = ref<WarehouseVO[]>([])
const warehouseTotal = ref(0)
const warehouseSelection = ref<WarehouseVO[]>([])
const warehouseQueryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined as string | undefined
})
const areaDialogVisible = ref(false)
const areaLoading = ref(false)
const areaTableRef = ref()
const areaList = ref<WarehouseAreaVO[]>([])
const areaTotal = ref(0)
const areaSelection = ref<WarehouseAreaVO[]>([])
const areaQueryParams = reactive({
pageNo: 1,
pageSize: 10,
areaCode: undefined as string | undefined,
areaName: undefined as string | undefined
})
const productDialogVisible = ref(false)
const productLoading = ref(false)
const productTableRef = ref()
const productList = ref<ProductVO[]>([])
const productTotal = ref(0)
const productSelection = ref<ProductVO[]>([])
const productQueryParams = reactive({
pageNo: 1,
pageSize: 10,
barCode: undefined as string | undefined,
name: undefined as string | undefined
})
const generatedItemDialogVisible = ref(false)
const generatedItemLoading = ref(false)
const generatedItemTableRef = ref()
const generatedItemList = ref<StockCheckItemVO[]>([])
const generatedItemSelection = ref<StockCheckItemVO[]>([])
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = type === 'check' ? t('ErpStock.Check.inventoryCheck') : t('action.' + type)
formType.value = type
resetForm()
if (!id) {
return
}
formLoading.value = true
try {
const data = await StockCheckApi.getStockCheck(id)
formData.value = {
...data,
sourceType: Number(data?.sourceType ?? 1),
checkTime: data?.checkTime ? formatDate(data.checkTime as Date) : undefined,
items: data?.items || []
}
if (type === 'detail') {
await enrichItemsForDisplay()
hydrateSelectionsFromItems()
}
} finally {
formLoading.value = false
}
}
defineExpose({ open })
const emit = defineEmits(['success'])
const handleDeleteItem = (index: number) => {
formData.value.items?.splice(index, 1)
}
const handleSourceTypeChange = () => {
clearSelections()
}
const clearSelections = () => {
selectedWarehouses.value = []
selectedAreas.value = []
selectedProducts.value = []
formData.value.items = []
}
const enrichItemsForDisplay = async () => {
const items = formData.value.items || []
if (items.length === 0) {
return
}
const warehouseIds = Array.from(new Set(items.map((item) => item.warehouseId).filter(Boolean))) as number[]
const [warehouses, products, areaData] = await Promise.all([
WarehouseApi.getWarehouseSimpleList(),
ProductApi.getProductSimpleList(),
WarehouseAreaApi.getWarehouseAreaPage({
pageNo: 1,
pageSize: 10,
warehouseId: warehouseIds.length === 1 ? warehouseIds[0] : undefined,
warehouseIds: warehouseIds.join(',')
})
])
const warehouseMap = new Map((warehouses || []).map((item) => [item.id, item]))
const productMap = new Map((products || []).map((item) => [item.id, item]))
const areaMap = new Map(((areaData?.list || []) as WarehouseAreaVO[]).map((item) => [item.id, item]))
items.forEach((item) => {
const warehouse = warehouseMap.get(item.warehouseId)
const product = productMap.get(item.productId)
const area = item.areaId ? areaMap.get(item.areaId) : undefined
item.warehouseName = item.warehouseName || warehouse?.name
item.areaName = item.areaName || area?.areaName
item.productName = item.productName || product?.name
item.productBarCode = item.productBarCode || product?.barCode
item.productUnitName = item.productUnitName || product?.unitName
item.productPrice = item.productPrice ?? product?.minPrice ?? product?.purchasePrice
})
}
const hydrateSelectionsFromItems = () => {
const items = formData.value.items || []
if (formData.value.sourceType === 1) {
selectedWarehouses.value = uniqBy(
items
.filter((item) => item.warehouseId)
.map((item) => ({ id: item.warehouseId, name: item.warehouseName }) as WarehouseVO),
'id'
)
selectedAreas.value = uniqBy(
items
.filter((item) => item.areaId)
.map(
(item) =>
({
id: item.areaId,
warehouseId: item.warehouseId,
areaName: item.areaName
}) as WarehouseAreaVO
),
'id'
)
} else {
selectedProducts.value = uniqBy(
items
.filter((item) => item.productId)
.map((item) => ({ id: item.productId, name: item.productName }) as ProductVO),
'id'
)
}
}
const uniqBy = <T extends Record<string, any>>(list: T[], key: string) => {
const map = new Map()
list.forEach((item) => {
if (item[key] !== undefined && item[key] !== null && !map.has(item[key])) {
map.set(item[key], item)
}
})
return Array.from(map.values())
}
const sameIds = (left: number[], right: number[]) =>
left.length === right.length && left.every((id) => right.includes(id))
const syncTableSelection = async (tableRef, rows: any[], selectedIds: number[]) => {
await nextTick()
tableRef.value?.clearSelection()
rows.forEach((row) => {
if (selectedIds.includes(row.id)) {
tableRef.value?.toggleRowSelection(row, true)
}
})
}
const getWarehouseList = async () => {
warehouseLoading.value = true
try {
const data = await WarehouseApi.getWarehousePage(warehouseQueryParams)
warehouseList.value = data?.list || []
warehouseTotal.value = data?.total || 0
await syncTableSelection(warehouseTableRef, warehouseList.value, selectedWarehouseIds.value)
} finally {
warehouseLoading.value = false
}
}
const openWarehouseDialog = async () => {
warehouseDialogVisible.value = true
warehouseSelection.value = [...selectedWarehouses.value]
await getWarehouseList()
}
const handleWarehouseQuery = () => {
warehouseQueryParams.pageNo = 1
getWarehouseList()
}
const resetWarehouseQuery = () => {
warehouseQueryParams.pageNo = 1
warehouseQueryParams.name = undefined
getWarehouseList()
}
const confirmWarehouseSelection = () => {
const oldIds = selectedWarehouseIds.value
selectedWarehouses.value = [...warehouseSelection.value]
warehouseDialogVisible.value = false
if (!sameIds(oldIds, selectedWarehouseIds.value)) {
selectedAreas.value = []
formData.value.items = []
}
}
const handleWarehouseRowClick = (row: WarehouseVO) => {
warehouseTableRef.value?.toggleRowSelection(row)
}
const getAreaList = async () => {
areaLoading.value = true
try {
const warehouseIds = selectedWarehouseIds.value
const data = await WarehouseAreaApi.getWarehouseAreaPage({
...areaQueryParams,
warehouseId: warehouseIds.length === 1 ? warehouseIds[0] : undefined,
warehouseIds: warehouseIds.join(',')
})
areaList.value = data?.list || []
areaTotal.value = data?.total || 0
await syncTableSelection(areaTableRef, areaList.value, selectedAreaIds.value)
} finally {
areaLoading.value = false
}
}
const openAreaDialog = async () => {
if (selectedWarehouseIds.value.length === 0) {
message.warning(t('ErpStock.Check.validatorSelectWarehouseFirst'))
return
}
areaDialogVisible.value = true
areaSelection.value = [...selectedAreas.value]
await getAreaList()
}
const handleAreaQuery = () => {
areaQueryParams.pageNo = 1
getAreaList()
}
const resetAreaQuery = () => {
areaQueryParams.pageNo = 1
areaQueryParams.areaCode = undefined
areaQueryParams.areaName = undefined
getAreaList()
}
const confirmAreaSelection = () => {
const oldIds = selectedAreaIds.value
selectedAreas.value = [...areaSelection.value]
areaDialogVisible.value = false
if (!sameIds(oldIds, selectedAreaIds.value)) {
formData.value.items = []
}
}
const handleAreaRowClick = (row: WarehouseAreaVO) => {
areaTableRef.value?.toggleRowSelection(row)
}
const getProductList = async () => {
productLoading.value = true
try {
const data = await ProductApi.getProductPage(productQueryParams)
productList.value = data?.list || []
productTotal.value = data?.total || 0
await syncTableSelection(productTableRef, productList.value, selectedProductIds.value)
} finally {
productLoading.value = false
}
}
const openProductDialog = async () => {
productDialogVisible.value = true
productSelection.value = [...selectedProducts.value]
await getProductList()
}
const handleProductQuery = () => {
productQueryParams.pageNo = 1
getProductList()
}
const resetProductQuery = () => {
productQueryParams.pageNo = 1
productQueryParams.barCode = undefined
productQueryParams.name = undefined
getProductList()
}
const confirmProductSelection = () => {
const oldIds = selectedProductIds.value
selectedProducts.value = [...productSelection.value]
productDialogVisible.value = false
if (!sameIds(oldIds, selectedProductIds.value)) {
formData.value.items = []
}
}
const handleProductRowClick = (row: ProductVO) => {
productTableRef.value?.toggleRowSelection(row)
}
const normalizeGeneratedItems = (data: any) => {
if (Array.isArray(data)) {
return data
}
return data?.list || []
}
const openGeneratedItemDialog = async () => {
if (formData.value.sourceType === 1 && selectedAreaIds.value.length === 0) {
message.warning(t('ErpStock.Check.validatorSelectAreaFirst'))
return
}
if (formData.value.sourceType === 2 && selectedProductIds.value.length === 0) {
message.warning(t('ErpStock.Check.validatorSelectProductFirst'))
return
}
generatedItemDialogVisible.value = true
generatedItemLoading.value = true
try {
const data =
formData.value.sourceType === 1
? await StockCheckApi.generateItemsByLocation({
warehouseIds: selectedWarehouseIds.value,
areaIds: selectedAreaIds.value,
allowEmpty: true
})
: await StockCheckApi.generateItemsByProduct({
productIds: selectedProductIds.value,
allowEmpty: true
})
generatedItemList.value = normalizeGeneratedItems(data)
generatedItemSelection.value = [...(formData.value.items || [])]
await syncGeneratedItemSelection()
} finally {
generatedItemLoading.value = false
}
}
const getGeneratedItemRowKey = (row: StockCheckItemVO) =>
[row.id, row.warehouseId, row.areaId, row.productId].filter((item) => item !== undefined).join('_')
const syncGeneratedItemSelection = async () => {
const selectedKeys = new Set((formData.value.items || []).map((item) => getGeneratedItemRowKey(item)))
await nextTick()
generatedItemTableRef.value?.clearSelection()
generatedItemList.value.forEach((row) => {
if (selectedKeys.has(getGeneratedItemRowKey(row))) {
generatedItemTableRef.value?.toggleRowSelection(row, true)
}
})
}
const handleGeneratedItemRowClick = (row: StockCheckItemVO) => {
generatedItemTableRef.value?.toggleRowSelection(row)
}
const confirmGeneratedItemSelection = () => {
formData.value.items = generatedItemSelection.value.map((item) => ({
...item,
actualCount: normalizeActualCount(item.actualCount ?? item.stockCount),
count: item.count ?? 0
}))
generatedItemDialogVisible.value = false
}
const getWarehouseName = (warehouseId?: number) => {
return (
selectedWarehouses.value.find((item) => item.id === warehouseId)?.name ||
warehouseList.value.find((item) => item.id === warehouseId)?.name ||
'-'
)
}
const getSubmitData = () => {
const items = (formData.value.items || []).map((item) => {
const submitItem = {
id: item.id,
warehouseId: item.warehouseId,
areaId: item.areaId,
productId: item.productId,
productPrice: item.productPrice,
stockCount: item.stockCount,
count: item.count,
remark: item.remark
} as Record<string, unknown>
if (formType.value !== 'create') {
submitItem.actualCount = normalizeActualCount(item.actualCount)
}
return submitItem
})
return {
id: formData.value.id,
checkTime: formData.value.checkTime,
sourceType: formData.value.sourceType,
remark: formData.value.remark,
items
} as StockCheckVO
}
const submitForm = async () => {
await formRef.value.validate()
if (!formData.value.items?.length) {
message.warning(t('ErpStock.Check.validatorSelectCheckItem'))
return
}
if (isInventoryCheck.value) {
formData.value.items.forEach((item) => {
const actualCount = normalizeActualCount(item.actualCount)
item.actualCount = actualCount
const stockCount = Number(item.stockCount ?? 0)
item.count = actualCount - stockCount
})
}
formLoading.value = true
try {
const data = getSubmitData()
if (formType.value === 'create') {
await StockCheckApi.createStockCheck(data)
message.success(t('common.createSuccess'))
} else {
await StockCheckApi.updateStockCheck(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
const resetForm = () => {
formData.value = {
id: undefined,
no: undefined,
checkTime: getCurrentTime(),
sourceType: 1,
remark: undefined,
items: []
}
clearSelections()
formRef.value?.resetFields()
}
</script>
<style scoped>
.stock-check-selector-form {
max-width: 760px;
}
.stock-check-selector-form :deep(.el-form-item) {
width: 100%;
}
.stock-check-selector-form :deep(.el-form-item__content) {
min-width: 0;
}
.stock-check-selector-form :deep(.el-input) {
width: 100%;
}
.stock-check-bottom-form {
margin-top: 16px;
}
.stock-check-bottom-form :deep(.el-form-item) {
margin-bottom: 0;
}
.stock-check-dialog-pagination {
padding-top: 12px;
padding-bottom: 56px;
}
</style>

@ -0,0 +1,356 @@
<template>
<ContentWrap>
<el-form
ref="queryFormRef"
:model="queryParams"
:inline="true"
label-width="auto"
class="-mb-15px"
>
<el-form-item :label="t('ErpStock.Check.no')" prop="no">
<el-input
v-model="queryParams.no"
:placeholder="t('ErpStock.Check.placeholderNo')"
clearable
class="!w-240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('ErpStock.Check.warehouse')" prop="warehouseId">
<el-select
v-model="queryParams.warehouseId"
:placeholder="t('ErpStock.Check.placeholderWarehouse')"
clearable
filterable
class="!w-240px"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.Check.checkTime')" prop="checkTime">
<el-date-picker
v-model="queryParams.checkTime"
type="daterange"
value-format="YYYY-MM-DD HH:mm:ss"
:start-placeholder="t('common.startTimeText')"
:end-placeholder="t('common.endTimeText')"
class="!w-240px"
/>
</el-form-item>
<el-form-item :label="t('ErpStock.Check.status')" prop="status">
<el-select
v-model="queryParams.status"
:placeholder="t('ErpStock.Check.placeholderStatus')"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.ERP_AUDIT_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['erp:stock-check:create']"
>
<Icon icon="ep:plus" class="mr-5px" />
{{ t('action.create') }}
</el-button>
<el-button
type="danger"
plain
:disabled="selectionList.length === 0"
@click="handleDelete(selectionList.map((item) => item.id))"
>
<Icon icon="ep:delete" class="mr-5px" />
{{ t('action.batchDelete') }}
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
stripe
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="45" />
<el-table-column type="expand">
<template #default="{ row }">
<div class="stock-check-execution-expand">
<div class="stock-check-execution-expand__section">
<div class="stock-check-execution-expand__title">{{ t('ErpStock.Check.list') }}</div>
<el-table :data="row.items || []" size="small" border>
<el-table-column
:label="t('ErpStock.Item.warehouse')"
prop="warehouseName"
min-width="120"
/>
<el-table-column :label="t('ErpStock.Item.area')" prop="areaName" min-width="100" />
<el-table-column
:label="t('ErpStock.Item.barcode')"
prop="productBarCode"
min-width="150"
/>
<el-table-column
:label="t('ErpStock.Item.product')"
prop="productName"
min-width="160"
/>
<el-table-column
:label="t('ErpStock.Check.stockCount')"
prop="stockCount"
align="right"
min-width="100"
/>
</el-table>
</div>
<div class="stock-check-execution-expand__section">
<div class="stock-check-execution-expand__title">审核记录</div>
<el-table :data="row.approveRecords || []" size="small" border>
<el-table-column label="操作类型" prop="actionType" min-width="110" />
<el-table-column label="变更前状态" prop="fromStatus" align="center" min-width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.fromStatus" />
</template>
</el-table-column>
<el-table-column label="变更后状态" prop="toStatus" align="center" min-width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.toStatus" />
</template>
</el-table-column>
<el-table-column label="目标审核人" prop="targetUserName" min-width="120" />
<el-table-column label="操作人" prop="creatorName" min-width="120" />
<el-table-column
label="操作时间"
prop="createTime"
:formatter="dateFormatter"
min-width="170"
/>
<el-table-column
:label="t('ErpStock.Check.remark')"
prop="remark"
min-width="160"
show-overflow-tooltip
/>
</el-table>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Check.no')" prop="no" align="center" min-width="150" />
<el-table-column
:label="t('ErpStock.Check.productNames')"
prop="productNames"
min-width="180"
show-overflow-tooltip
/>
<el-table-column :label="t('ErpStock.Check.warehouse')" min-width="140" show-overflow-tooltip>
<template #default="{ row }">
{{ getWarehouseNames(row) }}
</template>
</el-table-column>
<el-table-column
:label="t('ErpStock.Check.checkTime')"
prop="checkTime"
:formatter="dateFormatter"
min-width="170"
/>
<el-table-column :label="t('ErpStock.Check.status')" prop="status" align="center" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="审核人" prop="auditUserName" align="center" min-width="120" />
<el-table-column
:label="t('ErpStock.Check.creator')"
prop="creatorName"
align="center"
min-width="120"
/>
<el-table-column
label="创建时间"
prop="createTime"
:formatter="dateFormatter"
min-width="170"
/>
<el-table-column
:label="t('ErpStock.Check.remark')"
prop="remark"
min-width="160"
show-overflow-tooltip
/>
<el-table-column :label="t('common.operate')" align="center" fixed="right" width="200">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('detail', scope.row.id)"
v-hasPermi="['erp:stock-check:query']"
>
{{ t('action.detail') }}
</el-button>
<el-button
link
type="primary"
:disabled="scope.row.status === 20"
@click="openForm('update', scope.row.id)"
>
{{ t('action.edit') }}
</el-button>
<el-button
link
type="primary"
:disabled="scope.row.status === 20"
@click="openForm('check', scope.row.id)"
>
{{ t('ErpStock.Check.inventoryCheck') }}
</el-button>
<el-button
link
type="danger"
:disabled="scope.row.status === 20"
@click="handleDelete([scope.row.id])"
>
{{ t('action.delete') }}
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<StockCheckExecutionForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { StockCheckApi, type StockCheckVO } from '@/api/erp/stock/check'
import { WarehouseApi, type WarehouseVO } from '@/api/erp/stock/warehouse'
import StockCheckExecutionForm from './components/StockCheckExecutionForm.vue'
defineOptions({ name: 'ErpStockCheckExecution' })
const { t } = useI18n()
const message = useMessage()
const loading = ref(false)
const list = ref<StockCheckVO[]>([])
const total = ref(0)
const warehouseList = ref<WarehouseVO[]>([])
const selectionList = ref<StockCheckVO[]>([])
const queryFormRef = ref()
const formRef = ref()
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
no: undefined as string | undefined,
warehouseId: undefined as number | undefined,
checkTime: [] as string[],
status: undefined as number | undefined
})
const getList = async () => {
loading.value = true
try {
const data = await StockCheckApi.getStockCheckPage(queryParams)
list.value = data?.list || []
total.value = data?.total || 0
} finally {
loading.value = false
}
}
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
const resetQuery = () => {
queryFormRef.value?.resetFields()
handleQuery()
}
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
const handleDelete = async (ids: number[]) => {
if (ids.length === 0) {
return
}
try {
await message.delConfirm()
await StockCheckApi.deleteStockCheck(ids)
message.success(t('common.delSuccess'))
selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id))
await getList()
} catch {}
}
const handleSelectionChange = (rows: StockCheckVO[]) => {
selectionList.value = rows
}
const getWarehouseNames = (row: StockCheckVO) => {
const names = Array.from(new Set((row.items || []).map((item) => item.warehouseName).filter(Boolean)))
return names.length ? names.join('、') : '-'
}
onMounted(async () => {
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
await getList()
})
</script>
<style scoped>
.stock-check-execution-expand {
display: grid;
gap: 14px;
padding: 12px 24px 16px;
background: var(--el-fill-color-lighter);
}
.stock-check-execution-expand__section {
padding: 12px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 6px;
background: #fff;
}
.stock-check-execution-expand__title {
margin-bottom: 10px;
font-weight: 600;
color: var(--el-text-color-primary);
}
</style>

@ -301,6 +301,27 @@ const productCascaderOptions = computed(() => {
return Array.from(map.values())
})
const loadWarehouseList = async () => {
const categoryType = activeCategoryType.value
warehouseList.value = await WarehouseApi.getWarehouseSimpleList(categoryType ? { categoryType } : undefined)
const firstWarehouse = warehouseList.value[0]
defaultWarehouse.value = firstWarehouse
const warehouseIds = new Set((warehouseList.value || []).map((item) => item.id))
formData.value.forEach((row) => {
if (row.warehouseId && !warehouseIds.has(row.warehouseId)) {
row.warehouseId = undefined
row.areaId = undefined
row.stockCount = 0
}
if (!row.warehouseId && firstWarehouse?.id) {
row.warehouseId = firstWarehouse.id
row.areaId = undefined
row.stockCount = 0
}
})
warehouseAreaMap.value = {}
}
/** 初始化设置入库项 */
watch(
() => props.items,
@ -317,6 +338,7 @@ watch(
watch(
() => props.inType,
async () => {
await loadWarehouseList()
if (isProductMaterialStockIn.value) {
formData.value.forEach((row) => {
row.inputCount = row.inputCount ?? row.count ?? 1
@ -601,8 +623,7 @@ defineExpose({ validate, resetItems })
/** 初始化 */
onMounted(async () => {
productList.value = await ProductApi.getProductSimpleList()
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
await loadWarehouseList()
fillProductNames(formData.value)
if (isProductMaterialStockIn.value) {
await loadRowsWarehouseAreas(formData.value)

@ -78,11 +78,14 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.In.status')" prop="status" v-show="showAllFilters">
<el-form-item :label="t('ErpStock.In.status')" prop="statusList" v-show="showAllFilters">
<el-select
v-model="queryParams.status"
v-model="queryParams.statusList"
:placeholder="t('ErpStock.In.placeholderStatus')"
clearable
multiple
collapse-tags
collapse-tags-tooltip
class="!w-240px"
>
<el-option
@ -357,7 +360,7 @@ const queryParams = reactive({
productId: undefined,
supplierId: undefined,
inTime: [],
status: undefined,
statusList: [0, 1, 10],
remark: undefined,
inType: undefined,
creator: undefined
@ -440,6 +443,7 @@ const handleQuery = () => {
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
queryParams.statusList = []
queryParams.inType = activeName.value || stockInTypeOptions.value[0]?.value
handleQuery()
}

@ -498,6 +498,27 @@ const productCascaderOptions = computed(() => {
return Array.from(map.values())
})
const loadWarehouseList = async () => {
const categoryType = activeCategoryType.value
warehouseList.value = await WarehouseApi.getWarehouseSimpleList(categoryType ? { categoryType } : undefined)
const firstWarehouse = warehouseList.value[0]
defaultWarehouse.value = firstWarehouse
const warehouseIds = new Set((warehouseList.value || []).map((item) => item.id))
formData.value.forEach((row) => {
if (row.warehouseId && !warehouseIds.has(row.warehouseId)) {
row.warehouseId = undefined
row.areaId = undefined
row.stockCount = 0
}
if (!row.warehouseId && firstWarehouse?.id) {
row.warehouseId = firstWarehouse.id
row.areaId = undefined
row.stockCount = 0
}
})
warehouseAreaMap.value = {}
}
/** 初始化设置入库项 */
watch(
() => props.items,
@ -516,6 +537,7 @@ watch(
watch(
() => props.outType,
async () => {
await loadWarehouseList()
if (isProductMaterialStockOut.value) {
formData.value.forEach((row) => {
normalizeRow(row)
@ -986,8 +1008,7 @@ defineExpose({ validate, resetItems })
/** 初始化 */
onMounted(async () => {
productList.value = await ProductApi.getProductSimpleList()
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
await loadWarehouseList()
fillProductNames(formData.value)
if (isProductMaterialStockOut.value) {
await loadRowsWarehouseAreas(formData.value)

@ -78,11 +78,14 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.Out.status')" prop="status" v-show="showAllFilters">
<el-form-item :label="t('ErpStock.Out.status')" prop="statusList" v-show="showAllFilters">
<el-select
v-model="queryParams.status"
v-model="queryParams.statusList"
:placeholder="t('ErpStock.Out.placeholderStatus')"
clearable
multiple
collapse-tags
collapse-tags-tooltip
class="!w-240px"
>
<el-option
@ -355,6 +358,7 @@ const queryParams = reactive({
no: undefined,
productId: undefined,
outTime: [],
statusList: [0, 1, 10],
remark: undefined,
outType: undefined,
creator: undefined
@ -438,6 +442,7 @@ const handleQuery = () => {
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
queryFormRef.value.resetFields()
queryParams.statusList = []
queryParams.outType = activeName.value || stockOutTypeOptions.value[0]?.value
handleQuery()
}

@ -16,12 +16,6 @@
<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.Record.materialCategory')" prop="categoryType">
<el-select v-model="queryParams.categoryType" clearable
:placeholder="t('ErpStock.Record.placeholderMaterialCategory')" class="!w-240px">
<el-option v-for="item in categoryTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.Record.bizNo')" prop="bizNo" v-show="showAllFilters">
<el-input v-model="queryParams.bizNo" :placeholder="t('ErpStock.Record.placeholderBizNo')" clearable
@keyup.enter="handleQuery" class="!w-240px" />
@ -66,6 +60,15 @@
<!-- 列表 -->
<ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="全部" name="" />
<el-tab-pane
v-for="item in categoryTypeOptions"
:key="item.value"
:label="item.label"
:name="String(item.value)"
/>
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
@selection-change="handleSelectionChange">
<el-table-column width="30" :label="t('action.select')" type="selection" />
@ -83,12 +86,6 @@
sortable />
<el-table-column :label="t('ErpStock.Record.productName')" align="center" sortable prop="productName"
min-width="160" />
<el-table-column :label="t('ErpStock.Record.materialCategory')" align="center" prop="categoryType" min-width="120"
sortable>
<template #default="scope">
<dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="scope.row.categoryType" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Record.categoryName')" align="center" prop="categoryName" min-width="120"
sortable />
<el-table-column :label="t('ErpStock.Record.warehouseName')" align="center" prop="warehouseName" min-width="140"
@ -159,6 +156,7 @@ const queryParams = reactive<{
const queryFormRef = ref() //
const exportLoading = ref(false) //
const showAllFilters = ref(false)
const activeName = ref('')
const filterCount = 5
const toggleFilters = () => {
showAllFilters.value = !showAllFilters.value
@ -229,6 +227,15 @@ const handleQuery = () => {
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
activeName.value = ''
queryParams.categoryType = undefined
handleQuery()
}
const handleTabClick = (tab: any) => {
const value = String(tab.paneName || '')
activeName.value = value
queryParams.categoryType = value ? Number(value) : undefined
handleQuery()
}

@ -27,21 +27,6 @@
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.Stock.category')" prop="categoryType">
<el-select
v-model="queryParams.categoryType"
clearable
:placeholder="t('ErpStock.Stock.placeholderCategory')"
class="!w-240px"
>
<el-option
v-for="item in categoryTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.Stock.warehouse')" prop="warehouseId">
<el-select
@ -85,6 +70,15 @@
<!-- 列表 -->
<ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="全部" name="" />
<el-tab-pane
v-for="item in categoryTypeOptions"
:key="item.value"
:label="item.label"
:name="String(item.value)"
/>
</el-tabs>
<el-table
v-loading="loading"
:data="list"
@ -100,11 +94,6 @@
{{ row.name || row.productName || '-' }}
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Stock.category')" align="center" prop="categoryType" min-width="120" sortable>
<template #default="{ row }">
<dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="row.categoryType" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Stock.subCategory')" align="center" prop="categoryName" min-width="120" sortable />
<el-table-column :label="t('ErpStock.Stock.packagingRule')" align="center" prop="packagingRule" min-width="180" />
<el-table-column :label="t('ErpStock.Stock.warehouse')" align="center" prop="warehouseName" min-width="140" sortable />
@ -188,6 +177,7 @@ const queryParams = reactive<{
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
const activeName = ref('')
const productList = ref<ProductVO[]>([]) //
const warehouseList = ref<WarehouseVO[]>([]) //
const categoryTypeOptions = computed(() => getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE))
@ -256,6 +246,15 @@ const handleQuery = () => {
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
activeName.value = ''
queryParams.categoryType = undefined
handleQuery()
}
const handleTabClick = (tab: any) => {
const value = String(tab.paneName || '')
activeName.value = value
queryParams.categoryType = value ? Number(value) : undefined
handleQuery()
}

@ -14,6 +14,17 @@
<el-form-item :label="t('ErpStock.Warehouse.address')" prop="address">
<el-input v-model="formData.address" :placeholder="t('ErpStock.Warehouse.placeholderAddress')" />
</el-form-item>
<el-form-item :label="t('ErpStock.Warehouse.categoryType')" prop="categoryType">
<el-radio-group v-model="formData.categoryType">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="t('ErpStock.Warehouse.status')" prop="status">
<el-radio-group v-model="formData.status">
<el-radio
@ -82,6 +93,7 @@ const formType = ref('') // 表单的类型create - 新增update - 修改
const formData = ref({
id: undefined,
name: undefined,
categoryType: undefined,
address: undefined,
sort: undefined,
remark: undefined,
@ -92,6 +104,7 @@ const formData = ref({
})
const formRules = reactive({
name: [{ required: true, message: t('ErpStock.Warehouse.validatorNameRequired'), trigger: 'blur' }],
categoryType: [{ required: true, message: t('ErpStock.Warehouse.validatorCategoryTypeRequired'), trigger: 'change' }],
sort: [{ required: true, message: t('ErpStock.Warehouse.validatorSortRequired'), trigger: 'blur' }],
status: [{ required: true, message: t('ErpStock.Warehouse.validatorStatusRequired'), trigger: 'blur' }]
})
@ -141,9 +154,11 @@ const submitForm = async () => {
/** 重置表单 */
const resetForm = () => {
const categoryTypeOptions = getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)
formData.value = {
id: undefined,
name: undefined,
categoryType: categoryTypeOptions[0]?.value,
address: undefined,
sort: undefined,
remark: undefined,

@ -18,6 +18,21 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item :label="t('ErpStock.Warehouse.categoryType')" prop="categoryType">
<el-select
v-model="queryParams.categoryType"
:placeholder="t('ErpStock.Warehouse.placeholderCategoryType')"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('ErpStock.Warehouse.status')" prop="status">
<el-select
v-model="queryParams.status"
@ -76,6 +91,11 @@
>
<!-- <el-table-column width="30" :label="t('action.select')" type="selection" /> -->
<el-table-column :label="t('ErpStock.Warehouse.name')" align="center" prop="name" sortable />
<el-table-column :label="t('ErpStock.Warehouse.categoryType')" align="center" prop="categoryType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="scope.row.categoryType" />
</template>
</el-table-column>
<el-table-column :label="t('ErpStock.Warehouse.address')" align="center" prop="address" />
<!-- <el-table-column
label="仓储费"
@ -159,6 +179,9 @@
<div v-if="detailData">
<el-descriptions :column="2" border>
<el-descriptions-item :label="t('ErpStock.Warehouse.name')">{{ detailData.name }}</el-descriptions-item>
<el-descriptions-item :label="t('ErpStock.Warehouse.categoryType')">
<dict-tag :type="DICT_TYPE.MATERIAL_CLASSIFICATION_TYPE" :value="detailData.categoryType" />
</el-descriptions-item>
<el-descriptions-item :label="t('ErpStock.Warehouse.address')">{{ detailData.address }}</el-descriptions-item>
<el-descriptions-item :label="t('ErpStock.Warehouse.principal')">{{ detailData.principal }}</el-descriptions-item>
<el-descriptions-item :label="t('ErpStock.Warehouse.remark')">{{ detailData.remark || '-' }}</el-descriptions-item>
@ -248,6 +271,7 @@ const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
categoryType: undefined,
status: undefined
})
const queryFormRef = ref() //

@ -317,34 +317,54 @@
<Icon icon="ep:download" class="mr-5px" /> {{ t('action.export') }}
</el-button>
</div>
<el-empty v-if="!repairGroups.length" />
<el-collapse v-else v-model="repairActiveNames" class="device-ledger-repair-collapse">
<el-collapse-item v-for="group in repairGroups" :key="group.key" :name="group.key">
<el-empty v-if="!repairStepRows.length" />
<el-steps
v-else
direction="vertical"
class="device-ledger-history-steps"
:active="repairStepRows.length"
>
<el-step v-for="row in repairStepRows" :key="row.key" style="margin-top:8px">
<template #title>
<div class="device-ledger-repair-title">
<span class="device-ledger-repair-name">{{ group.name }}</span>
<span class="device-ledger-repair-meta">{{ group.items.length }}</span>
<div class="device-ledger-history-title">
<span class="device-ledger-history-time">[{{ row.time }}]</span>
<span class="device-ledger-history-operator">
{{ t('EquipmentManagement.DvRepair.acceptedBy') }}: {{ row.operator }}
</span>
</div>
</template>
<template #description>
<div class="device-ledger-history-items">
<div
v-for="row in group.items"
:key="String(row.id ?? row.subjectId ?? row.subjectCode)"
class="device-ledger-history-item"
>
<div class="device-ledger-history-item">
<div class="device-ledger-history-item-head">
<el-tag type="info" effect="light">{{ row.subjectCode ?? '-' }}</el-tag>
<span class="device-ledger-history-item-text">{{ row.subjectName ?? '-' }}</span>
<el-tag type="info" effect="light">{{ row.repairCode ?? '-' }}</el-tag>
<span class="device-ledger-history-item-text">{{ row.repairName ?? '-' }}</span>
</div>
<div class="device-ledger-history-item-body">
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.EquipmentLedger.projectName') }}</span>
<span class="device-ledger-history-item-value">{{ row.subjectContent ?? '-' }}</span>
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.faultPhenomenon') }}</span>
<span class="device-ledger-history-item-value">{{ row.faultPhenomenon || '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.faultDescription') }}</span>
<span class="device-ledger-history-item-value">{{ row.faultDescription || '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.handlingMeasures') }}</span>
<span class="device-ledger-history-item-value">{{ row.handlingMeasures || '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.replacementParts') }}</span>
<span class="device-ledger-history-item-value">{{ row.replacementParts || '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.DvRepair.repairContent') }}</span>
<span class="device-ledger-history-item-value">{{ row.repairContent || '-' }}</span>
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.EquipmentLedger.repairResult') }}</span>
<span class="device-ledger-history-item-value">
<el-tag :type="getResultTagType(row.result ?? row.repairResult)">
<el-tag :type="getResultTagType(row.repairResult ?? row.result)">
{{ getResultLabel(row.repairResult ?? row.result) }}
</el-tag>
</span>
@ -355,28 +375,50 @@
</div>
<div class="device-ledger-history-item-row">
<span class="device-ledger-history-item-label">{{ t('EquipmentManagement.EquipmentLedger.finishDate') }}</span>
<span class="device-ledger-history-item-value">{{ String(formatHistoryTime(row.finishDate)).split(' ')[0] }}</span>
<span class="device-ledger-history-item-value">{{ row.time }}</span>
</div>
<div v-if="row.malfunctionImages?.length" class="device-ledger-history-item-images">
<el-image
v-for="img in row.malfunctionImages"
:key="img"
:src="img"
:preview-src-list="row.malfunctionImages"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
<div v-if="row.faultImageList.length" class="device-ledger-history-image-group">
<div class="device-ledger-history-image-title">{{ t('EquipmentManagement.DvRepair.faultImages') }}</div>
<div class="device-ledger-history-item-images">
<el-image
v-for="img in row.faultImageList"
:key="img"
:src="img"
:preview-src-list="row.faultImageList"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
<div v-if="row.repairedImageList.length" class="device-ledger-history-image-group">
<div class="device-ledger-history-image-title">{{ t('EquipmentManagement.DvRepair.repairedImages') }}</div>
<div class="device-ledger-history-item-images">
<el-image
v-for="img in row.repairedImageList"
:key="img"
:src="img"
:preview-src-list="row.repairedImageList"
preview-teleported
fit="cover"
class="device-ledger-history-item-image"
>
<template #error>
<div class="device-ledger-history-image-error">图片加载失败</div>
</template>
</el-image>
</div>
</div>
</div>
</div>
</div>
</el-collapse-item>
</el-collapse>
</template>
</el-step>
</el-steps>
</el-tab-pane>
<el-tab-pane :label="t('EquipmentManagement.EquipmentLedger.criticalComponent')" name="criticalComponent">
@ -731,6 +773,10 @@ type RepairHistoryRow = {
repairId?: any
repairCode?: any
repairName?: any
acceptedBy?: any
confirmBy?: any
creator?: any
creatorName?: any
subjectId?: any
subjectCode?: any
subjectName?: any
@ -739,41 +785,43 @@ type RepairHistoryRow = {
malfunction?: any
malfunctionUrl?: any
repairDes?: any
faultPhenomenon?: any
faultDescription?: any
faultImages?: any
handlingMeasures?: any
replacementParts?: any
repairContent?: any
repairedImages?: any
remark?: any
createTime?: any
finishDate?: any
result?: any
repairResult?: any
malfunctionImages?: string[]
}
type RepairHistoryGroup = { key: string; name: string; items: RepairHistoryRow[] }
type RepairHistoryStepRow = RepairHistoryRow & {
key: string
time: string
operator: string
faultImageList: string[]
repairedImageList: string[]
}
const repairActiveNames = ref<string[]>([])
const repairList = ref<RepairHistoryRow[]>([])
const repairGroups = computed<RepairHistoryGroup[]>(() => {
const groupsMap = new Map<string, RepairHistoryGroup>()
for (const row of repairList.value ?? []) {
const key = String(row.repairCode ?? row.repairId ?? row.subjectName ?? '-')
if (!groupsMap.has(key)) {
groupsMap.set(key, {
key,
name: String(row.repairName ?? row.repairCode ?? key),
items: []
})
}
const group = groupsMap.get(key)!
group.items.push({
...row,
malfunctionImages: parseImages(row?.malfunctionUrl)
const repairStepRows = computed<RepairHistoryStepRow[]>(() => {
return (repairList.value ?? [])
.map((row) => {
const time = formatHistoryTime(row.finishDate ?? row.createTime)
return {
...row,
key: String(row.id ?? row.repairId ?? row.repairCode ?? `${row.repairName ?? '-'}__${time}`),
time,
operator: String(row.acceptedBy ?? row.confirmBy ?? row.creatorName ?? row.creator ?? '-'),
faultImageList: parseImages(row.faultImages),
repairedImageList: parseImages(row.repairedImages)
}
})
}
const groups = Array.from(groupsMap.values()).filter((g) => g.items.length)
return groups.sort((a, b) => {
const at = formatHistoryTime(a.items?.[0]?.finishDate ?? a.items?.[0]?.createTime)
const bt = formatHistoryTime(b.items?.[0]?.finishDate ?? b.items?.[0]?.createTime)
return String(bt).localeCompare(String(at))
})
.sort((a, b) => String(b.time).localeCompare(String(a.time)))
})
const inspectionExportLoading = ref(false)
@ -943,8 +991,6 @@ const getDetail = async () => {
await fetchInspectionHistory()
await fetchMaintainHistory()
await fetchRepairHistory()
const keys = repairGroups.value.map((g) => g.key)
repairActiveNames.value = keys.length ? [keys[0]] : []
} finally {
detailLoading.value = false
}
@ -1217,6 +1263,16 @@ onMounted(async () => {
margin-top: 4px;
}
.device-ledger-history-image-group {
margin-top: 4px;
}
.device-ledger-history-image-title {
margin-bottom: 6px;
color: var(--el-text-color-secondary);
font-size: 13px;
}
.device-ledger-history-item-image {
width: 76px;
height: 76px;
@ -1235,27 +1291,6 @@ onMounted(async () => {
justify-content: center;
}
.device-ledger-repair-collapse {
padding: 8px 8px 0;
}
.device-ledger-repair-title {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
}
.device-ledger-repair-name {
font-weight: 600;
color: var(--el-text-color-primary);
}
.device-ledger-repair-meta {
font-size: 12px;
color: var(--el-text-color-secondary);
}
.device-ledger-history-item-text {
color: var(--el-text-color-regular);
}

Loading…
Cancel
Save