组织-采集设备

main
kkk-ops 1 month ago
parent 59552f1b3c
commit 3c844c5fd4

@ -14,6 +14,7 @@ export interface OrganizationVO {
status: string // 组织状态
orgClass: string // 组织等级
orgType: string // 组织类型
dvId: number
}
export type DeviceParameterAnalysisNodeVO = {

@ -1916,6 +1916,7 @@ export default {
placeholderUnit: 'Please select unit',
placeholderInTime: 'Select stock in time',
placeholderRemark: 'Please input remark',
placeholderStatus: 'Please select status',
validatorCodeRequired: 'Mold code can not be empty',
validatorNameRequired: 'Mold name can not be empty',
validatorUnitRequired: 'Unit can not be empty',

@ -1499,6 +1499,7 @@ export default {
placeholderUnit: '请选择单位',
placeholderInTime: '选择入库时间',
placeholderRemark: '请输入备注',
placeholderStatus: '请选择状态',
validatorCodeRequired: '模具编码不能为空',
validatorNameRequired: '模具名称不能为空',
validatorUnitRequired: '单位不能为空',

@ -19,6 +19,21 @@ v-model="queryParams.code" :placeholder="t('MoldManagement.Mold.code')" clearabl
v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item :label="t('MoldManagement.Mold.status')" prop="status">
<el-select
v-model="queryParams.status"
:placeholder="t('MoldManagement.Mold.placeholderStatus')"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.ERP_MOLD_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') }}
@ -95,7 +110,6 @@ type="success" plain @click="handleExport" :loading="exportLoading"
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { DeviceLedgerApi } from '@/api/mes/deviceledger'
@ -104,6 +118,7 @@ import { MoldBrandApi, MoldBrandTreeVO,MoldVO } from '@/api/erp/mold'
import { useDictStoreWithOut } from '@/store/modules/dict'
import MoldForm from '@/views/erp/mold/components/MoldForm.vue'
import MoldRecordForm from "@/views/erp/mold/components/MoldRecordForm.vue";
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
/** 设备类型 列表 */
defineOptions({ name: 'DeviceLedger' })
@ -120,6 +135,7 @@ const queryParams = reactive({
code: undefined,
name: undefined,
brand: undefined,
status: undefined
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
@ -183,7 +199,8 @@ const getList = async () => {
pageSize: queryParams.pageSize,
code: queryParams.code,
name: queryParams.name,
brandId: queryParams.brand
brandId: queryParams.brand,
status: queryParams.status
})
list.value = data.list
total.value = data.total

@ -135,8 +135,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<el-form-item :label="t('EquipmentManagement.EquipmentLedger.dvName')" prop="dvId">
<el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')">
<el-option
@ -147,7 +146,7 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item :label="t('EquipmentManagement.EquipmentLedger.criticalComponent')" prop="componentIds">
<el-cascader

@ -66,23 +66,38 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="t('MoldManagement.MoldGet.remarkSingle')" prop="remark">
<el-input
type="textarea"
v-model="formData.remark"
:rows="1"
:placeholder="t('MoldManagement.MoldGet.placeholderRemark')"
<el-form-item :label="t('MoldManagement.MoldReturn.warehouse')" prop="warehouseId">
<el-select
v-model="formData.warehouseId"
clearable
filterable
:placeholder="t('MoldManagement.MoldReturn.placeholderWarehouse')"
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-col>
<el-col :span="8">
<el-form-item :label="t('MoldManagement.MoldGet.attachment')" prop="fileUrl">
<UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="t('MoldManagement.MoldGet.remarkSingle')" prop="remark">
<el-input
type="textarea"
v-model="formData.remark"
:placeholder="t('MoldManagement.MoldGet.placeholderRemark')"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 子表的表单 -->
@ -106,12 +121,14 @@ import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
import StockOutItemForm from './components/StockOutItemForm.vue'
import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
import {DICT_TYPE, getBoolDictOptions, getStrDictOptions} from "@/utils/dict";
import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
/** ERP 其它出库单表单 */
defineOptions({ name: 'MoldGetForm' })
const { t } = useI18n() //
const message = useMessage() //
const warehouseList = ref<WarehouseVO[]>([]) //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
@ -124,7 +141,8 @@ const formData = ref({
remark: undefined,
outType: undefined,
fileUrl: '',
items: []
items: [],
warehouseId: undefined
})
const formRules = reactive({
outTime: [
@ -164,6 +182,7 @@ const open = async (type: string, id?: number) => {
}
//
customerList.value = await CustomerApi.getCustomerSimpleList()
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
}
defineExpose({ open }) // open
@ -176,6 +195,16 @@ const submitForm = async () => {
//
formLoading.value = true
try {
itemFormRef.value.selectedRows.forEach((item, index) => {
const i = {
warehouseId : formData.value.warehouseId,
productId : item.id,
productPrice: 0,
count: 1,
}
formData.value.items.push(i)
console.log(formData.value.items)
});
const data = formData.value as unknown as StockOutVO
if (formType.value === 'create') {
await StockOutApi.createStockOut(data)

@ -1,278 +1,304 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
v-loading="formLoading"
label-width="0px"
:inline-message="true"
:disabled="disabled"
>
<el-table :data="formData" show-summary :summary-method="getSummaries" class="-mt-10px">
<el-table-column :label="t('MoldManagement.MoldGet.itemIndex')" type="index" align="center" width="60" />
<el-table-column :label="t('MoldManagement.MoldGet.itemWarehouseName')" min-width="125">
<template #default="{ row, $index }">
<el-form-item
:prop="`${$index}.warehouseId`"
:rules="formRules.warehouseId"
class="mb-0px!"
>
<el-select
v-model="row.warehouseId"
clearable
filterable
:placeholder="t('MoldManagement.MoldGet.placeholderWarehouse')"
@change="onChangeWarehouse($event, row)"
>
<el-option
v-for="item in warehouseList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<div class="device-ledger-layout">
<div class="device-ledger-right">
<ContentWrap>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item :label="t('MoldManagement.Mold.code')" prop="code">
<el-input
v-model="queryParams.code" :placeholder="t('MoldManagement.Mold.code')" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldGet.itemMoldName')" min-width="180">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
<el-select
v-model="row.productId"
clearable
filterable
@change="onChangeProduct($event, row)"
:placeholder="t('MoldManagement.MoldGet.placeholderMold')"
>
<el-option
v-for="item in productList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldGet.itemStockCount')" min-width="100">
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldGet.itemMoldCode')" min-width="150">
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.productBarCode" />
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldGet.itemUnitName')" min-width="80">
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.productUnitName" />
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldGet.itemCount')" prop="count" fixed="right" min-width="140">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.count`" :rules="formRules.count" class="mb-0px!">
<el-input-number
v-model="row.count"
controls-position="right"
:min="0"
:precision="0"
class="!w-100%"
/>
</el-form-item>
</template>
</el-table-column>
<!-- <el-table-column label="单价" fixed="right" min-width="120">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.productPrice`" class="mb-0px!">
<el-input-number
v-model="row.productPrice"
controls-position="right"
:min="0.01"
:precision="2"
class="!w-100%"
/>
</el-form-item>
</template>
</el-table-column> -->
<!-- <el-table-column label="合计金额" prop="totalPrice" fixed="right" min-width="100">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.totalPrice`" class="mb-0px!">
<el-input disabled v-model="row.totalPrice" :formatter="erpPriceInputFormatter" />
<el-form-item :label="t('MoldManagement.Mold.name')" prop="name">
<el-input
v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
</template>
</el-table-column> -->
<el-table-column :label="t('MoldManagement.MoldGet.itemRemark')" fixed="right" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.remark`" class="mb-0px!">
<el-input v-model="row.remark" placeholder="请输入备注" />
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> {{ t('common.query') }}
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> {{ t('common.reset') }}
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange" ref="tableRef" :row-key="row => row.id">
<el-table-column width="30" type="selection" />
<el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code" />
<el-table-column :label="t('MoldManagement.Mold.name')" align="left" prop="name" />
<el-table-column :label="t('MoldManagement.Mold.useTime')" align="center" prop="useTime" />
<el-table-column :label="t('MoldManagement.Mold.status')" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column align="center" fixed="right" :label="t('MoldManagement.MoldGet.itemOperate')" width="60">
<template #default="{ $index }">
<el-button type="danger" @click="handleDelete($index)" link>
<Icon icon="ep:delete" />
</el-button>
<el-table-column :label="t('MoldManagement.Mold.machineName')" align="center" prop="machineName" />
<el-table-column :label="t('MoldManagement.Mold.remark')" align="center" prop="remark" />
<el-table-column :label="t('MoldManagement.Mold.isEnable')" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.Mold.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
</el-table>
</el-form>
<el-row justify="center" class="mt-3" v-if="!disabled">
<el-button @click="handleAdd" round>+ {{ t('MoldManagement.MoldGet.itemAddButton') }}</el-button>
</el-row>
<Pagination
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
</div>
</div>
</template>
<script setup lang="ts">
import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
import { StockApi } from '@/api/erp/stock/stock'
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
import {
erpCountInputFormatter,
erpPriceInputFormatter,
erpPriceMultiply,
getSumValue
} from '@/utils'
const props = defineProps<{
items: undefined
disabled: false
}>()
const formLoading = ref(false) //
const formData = ref([])
const { t } = useI18n()
const formRules = reactive({
inId: [
{ required: true, message: t('MoldManagement.MoldGet.validatorItemOutIdRequired'), trigger: 'blur' }
],
warehouseId: [
{ required: true, message: t('MoldManagement.MoldGet.validatorItemWarehouseRequired'), trigger: 'blur' }
],
productId: [
{ required: true, message: t('MoldManagement.MoldGet.validatorItemMoldRequired'), trigger: 'blur' }
],
count: [
{ required: true, message: t('MoldManagement.MoldGet.validatorItemCountRequired'), trigger: 'blur' }
]
import { useDictStoreWithOut } from '@/store/modules/dict'
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(false) //
const list = ref<MoldVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
brand: undefined,
})
const formRef = ref([]) // Ref
const productList = ref<MoldVO[]>([]) //
const warehouseList = ref<WarehouseVO[]>([]) //
const defaultWarehouse = ref<WarehouseVO>() //
/** 初始化设置出库项 */
watch(
() => props.items,
async (val) => {
formData.value = val
},
{ immediate: true }
)
/** 监听合同产品变化,计算合同产品总价 */
watch(
() => formData.value,
(val) => {
if (!val || val.length === 0) {
return
}
//
val.forEach((item) => {
item.totalPrice = erpPriceMultiply(item.productPrice, item.count)
const queryFormRef = ref() //
const dictStore = useDictStoreWithOut()
const dictReady = ref(false)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await MoldBrandApi.getMoldPage({
pageNo: queryParams.pageNo,
pageSize: queryParams.pageSize,
code: queryParams.code,
name: queryParams.name,
brandId: queryParams.brand,
statuss: [1]
})
},
{ deep: true }
)
/** 合计 */
const getSummaries = (param: SummaryMethodProps) => {
const { columns, data } = param
const sums: string[] = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = t('MoldManagement.MoldGet.sumLabel')
return
}
if (['count', 'totalPrice'].includes(column.property)) {
const sum = getSumValue(data.map((item) => Number(item[column.property])))
sums[index] =
String(Math.trunc(Number(column.property === 'count' ? erpCountInputFormatter(sum) : erpPriceInputFormatter(sum))))
} else {
sums[index] = ''
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
})
return sums
}
/** 新增按钮操作 */
const handleAdd = () => {
const row = {
id: undefined,
warehouseId: defaultWarehouse.value?.id,
productId: undefined,
productUnitName: undefined, //
productBarCode: undefined, //
productPrice: undefined,
stockCount: undefined,
count: 1,
totalPrice: undefined,
remark: undefined
}
formData.value.push(row)
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 删除按钮操作 */
const handleDelete = (index) => {
formData.value.splice(index, 1)
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 处理仓库变更 */
const onChangeWarehouse = (warehouseId, row) => {
//
setStockCount(row)
}
const tableRef = ref()
const selectedRows = ref<any[]>([])
watch(list, async () => {
await nextTick()
restoreSelection()
})
/** 处理产品变更 */
const onChangeProduct = (productId, row) => {
const product = productList.value.find((item) => item.id === productId)
if (product) {
row.productUnitName = product.unitId
row.productBarCode = product.code
const restoreSelection = () => {
if (!tableRef.value || selectedRows.value.length === 0) return
tableRef.value.clearSelection?.()
selectedRows.value.forEach(selectedRow => {
const rowInTable = list.value.find(row => row.id === selectedRow.id)
if (rowInTable) {
tableRef.value.toggleRowSelection?.(rowInTable, true)
}
//
setStockCount(row)
})
}
/** 加载库存 */
const setStockCount = async (row) => {
if (!row.productId || !row.warehouseId) {
return
}
const stock = await StockApi.getStock2(row.productId, row.warehouseId)
row.stockCount = stock ? stock.count : 0
const handleSelectionChange = (rows: any[]) => {
selectedRows.value = rows
}
/** 表单校验 */
const validate = () => {
return formRef.value.validate()
const validate = async (): Promise<boolean> => {
if (!tableRef.value) return false
try {
await tableRef.value.validate()
return true
} catch (error) {
return false
}
}
defineExpose({ validate })
defineExpose({ validate,selectedRows: selectedRows })
/** 初始化 */
/** 初始化 **/
onMounted(async () => {
// productList.value = await ProductApi.getComponentSimpleList()
productList.value = await MoldBrandApi.getMoldListByStatus(1) //
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
defaultWarehouse.value = warehouseList.value.find((item) => item.defaultStatus)
//
if (formData.value.length === 0) {
handleAdd()
}
await dictStore.setDictMap()
dictReady.value = true
getList()
})
</script>
<style scoped>
.device-ledger-layout {
display: flex;
gap: 12px;
}
.device-ledger-left {
width: 280px;
flex: 0 0 auto;
}
.device-ledger-right {
flex: 1;
min-width: 0;
}
.device-ledger-detail-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 12px;
}
.device-ledger-detail-title {
font-size: 14px;
font-weight: 600;
}
.device-ledger-history-steps {
padding: 8px 8px 0;
}
.device-ledger-history-title {
display: flex;
align-items: center;
gap: 10px;
font-size: 13px;
}
.device-ledger-history-time {
font-weight: 600;
}
.device-ledger-history-operator {
color: var(--el-text-color-secondary);
}
.device-ledger-tab-toolbar {
margin-bottom: 8px;
text-align: right;
}
.device-ledger-history-items {
display: flex;
flex-direction: column;
gap: 6px;
margin-top: 8px;
}
.device-ledger-history-item {
display: flex;
padding: 10px;
background: var(--el-fill-color-blank);
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
flex-direction: column;
gap: 8px;
}
.device-ledger-history-item-head {
display: flex;
align-items: center;
gap: 10px;
}
.device-ledger-history-item-body {
display: flex;
flex-direction: column;
gap: 6px;
width: 100%;
}
.device-ledger-history-item-row {
display: flex;
gap: 10px;
}
.device-ledger-history-item-label {
width: 70px;
flex: 0 0 70px;
color: var(--el-text-color-secondary);
}
.device-ledger-history-item-value {
flex: 1;
color: var(--el-text-color-regular);
word-break: break-word;
}
.device-ledger-history-item-images {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 4px;
}
.device-ledger-history-item-image {
width: 76px;
height: 76px;
overflow: hidden;
border-radius: 6px;
}
.device-ledger-history-image-error {
display: flex;
width: 100%;
height: 100%;
font-size: 12px;
color: var(--el-text-color-secondary);
background: var(--el-fill-color);
align-items: center;
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);
}
</style>

@ -212,7 +212,7 @@
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['erp:stock-out:update']"
:disabled="scope.row.status === 20"
v-if="scope.row.status === 10"
>
{{ t('MoldManagement.MoldGet.edit') }}
</el-button>
@ -225,7 +225,7 @@
>
{{ t('MoldManagement.MoldGet.approve') }}
</el-button>
<el-button
<!-- <el-button
link
type="danger"
@click="handleUpdateStatus(scope.row.id, 10)"
@ -233,12 +233,13 @@
v-else
>
{{ t('MoldManagement.MoldGet.unapprove') }}
</el-button>
</el-button> -->
<el-button
link
type="danger"
@click="handleDelete([scope.row.id])"
v-hasPermi="['erp:stock-out:delete']"
v-if="scope.row.status === 10"
>
{{ t('MoldManagement.MoldGet.delete') }}
</el-button>

@ -37,24 +37,6 @@
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="客户" prop="customerId">
<el-select
v-model="formData.customerId"
clearable
filterable
placeholder="请选择客户"
class="!w-1/1"
>
<el-option
v-for="item in customerList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item :label="t('MoldManagement.MoldReturn.inTimeSingle')" prop="inTime">
<el-date-picker
@ -66,7 +48,6 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="t('MoldManagement.MoldReturn.warehouse')" prop="warehouseId">
<el-select
@ -195,17 +176,19 @@ const submitForm = async () => {
//
await formRef.value.validate()
await itemFormRef.value.validate()
console.log(itemFormRef.value)
itemFormRef.value.selectedRows.forEach(item => {
console.log(item.id, item.name)
})
//
formLoading.value = true
try {
itemFormRef.value.selectedRows.forEach((item, index) => {
const i = {
warehouseId : formData.value.warehouseId,
productId : item.id,
productPrice: 0,
count: 1,
}
formData.value.items.push(i)
});
const data = formData.value as unknown as StockInVO
itemFormRef.value.selectedRows.forEach(item => {
console.log(item.id, item.name)})
formData.value.items = itemFormRef.value.selectedRows
if (formType.value === 'create') {
await StockInApi.createStockIn(data)
message.success(t('common.createSuccess'))

@ -24,7 +24,7 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange" ref="formRef">
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange" ref="tableRef" :row-key="row => row.id">
<el-table-column width="30" type="selection" />
<el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code" />
<el-table-column :label="t('MoldManagement.Mold.name')" align="left" prop="name" />
@ -56,12 +56,8 @@ import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
import { useDictStoreWithOut } from '@/store/modules/dict'
import type { FormInstance, FormRules } from 'element-plus'
/** 设备类型 列表 */
defineOptions({ name: 'DeviceLedger' })
const message = useMessage() //
const { t } = useI18n() //
@ -113,32 +109,34 @@ const resetQuery = () => {
handleQuery()
}
//
const tableRef = ref()
const selectedRows = ref<any[]>([])
// -
const formModel = reactive({
selectedItems: [] as any[]
})
//
watch(selectedRows, (newSelected) => {
formModel.selectedItems = [...newSelected]
}, { deep: true })
watch(list, async () => {
await nextTick()
restoreSelection()
})
const restoreSelection = () => {
if (!tableRef.value || selectedRows.value.length === 0) return
tableRef.value.clearSelection?.()
selectedRows.value.forEach(selectedRow => {
const rowInTable = list.value.find(row => row.id === selectedRow.id)
if (rowInTable) {
tableRef.value.toggleRowSelection?.(rowInTable, true)
}
})
}
//
const handleSelectionChange = (rows: any[]) => {
selectedRows.value = rows
// console.log(':', rows)
}
//
const formRef = ref<FormInstance>()
const validate = async (): Promise<boolean> => {
if (!formRef.value) return false
if (!tableRef.value) return false
try {
await formRef.value.validate()
await tableRef.value.validate()
return true
} catch (error) {
return false

@ -224,15 +224,14 @@
>
{{ t('MoldManagement.MoldReturn.approve') }}
</el-button>
<el-button
<!-- <el-button
link
type="danger"
@click="handleUpdateStatus(scope.row.id, 10)"
v-hasPermi="['erp:stock-out:update-status']"
v-else
>
{{ t('MoldManagement.MoldReturn.unapprove') }}
</el-button>
</el-button> -->
<el-button
link
type="danger"

@ -105,6 +105,16 @@
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="t('EquipmentManagement.EquipmentLedger.dvName')" prop="dvId" v-if="formData.orgClass == 'workplace'">
<el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')">
<el-option
v-for="item in dvList"
:key="item.id"
:label="item.deviceName"
:value="item.id"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="组织状态" prop="status">
<el-radio-group v-model="formData.status">
@ -130,6 +140,7 @@ import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
import { defaultProps, handleTree } from '@/utils/tree'
import {MachineComponentApi} from "@/api/mes/machine";
import {DeviceLedgerApi, DeviceLedgerVO} from "@/api/mes/deviceledger";
import { DeviceApi,DeviceVO } from '@/api/iot/device'
/** 产线工位 表单 */
defineOptions({ name: 'OrganizationForm' })
@ -137,7 +148,7 @@ defineOptions({ name: 'OrganizationForm' })
const { t } = useI18n() //
const message = useMessage() //
// const deviceList = ref<DeviceVO[]>([]) //
const dvList = ref<DeviceVO[]>([]) //
const deviceList = ref<DeviceLedgerVO[]>([]) //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
@ -157,7 +168,8 @@ const formData = ref({
status: undefined,
orgClass: undefined,
orgType: undefined,
isCode: undefined
isCode: undefined,
dvId: undefined
})
const formRules = reactive({
name: [{ required: true, message: t('FactoryModeling.FactoryStructure.validatorNameRequired'), trigger: 'blur' }],
@ -188,6 +200,11 @@ const open = async (type: string, id?: number) => {
deviceList.value = await DeviceLedgerApi.getDeviceLedgerList2ByNoUsed(formData.value.machineId)
}
//await getMachineComponentTree()
if (type == 'create' || typeof formData.value.dvId != 'number') {
dvList.value = await DeviceApi.getDeviceListByNoUsed()
} else {
dvList.value = await DeviceApi.getDeviceList2ByNoUsed(formData.value.dvId)
}
}
defineExpose({ open }) // open

Loading…
Cancel
Save