|
@@ -144,7 +144,7 @@
|
|
|
:on-remove="handleRemoves"
|
|
:on-remove="handleRemoves"
|
|
|
:file-list="attachmentFileList"
|
|
:file-list="attachmentFileList"
|
|
|
>
|
|
>
|
|
|
- <i class="el-icon-plus"></i>
|
|
|
|
|
|
|
+ <el-icon><Plus /></el-icon>
|
|
|
</el-upload>
|
|
</el-upload>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
<!-- 审批信息流程展示 -->
|
|
<!-- 审批信息流程展示 -->
|
|
@@ -202,7 +202,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
<el-table :data="deviceList" border style="width: 100%">
|
|
<el-table :data="deviceList" border style="width: 100%">
|
|
|
<el-table-column type="index" label="序号" width="60" align="center" />
|
|
<el-table-column type="index" label="序号" width="60" align="center" />
|
|
|
- <el-table-column prop="device_no" label="设备编号" align="center" />
|
|
|
|
|
|
|
+ <el-table-column prop="device_code" label="设备编号" align="center" />
|
|
|
<el-table-column prop="device_type" label="设备分类" align="center" />
|
|
<el-table-column prop="device_type" label="设备分类" align="center" />
|
|
|
<el-table-column prop="device_name" label="设备名称" align="center" />
|
|
<el-table-column prop="device_name" label="设备名称" align="center" />
|
|
|
<el-table-column prop="borrow_count" label="借用数量" align="center" width="150">
|
|
<el-table-column prop="borrow_count" label="借用数量" align="center" width="150">
|
|
@@ -271,8 +271,8 @@
|
|
|
<el-table :data="returnDeviceList" border style="width: 100%" >
|
|
<el-table :data="returnDeviceList" border style="width: 100%" >
|
|
|
<!-- <el-table-column type="selection" width="55" align="center" />@selection-change="handleSelectionChange" -->
|
|
<!-- <el-table-column type="selection" width="55" align="center" />@selection-change="handleSelectionChange" -->
|
|
|
<el-table-column type="index" label="序号" width="60" align="center" />
|
|
<el-table-column type="index" label="序号" width="60" align="center" />
|
|
|
- <el-table-column prop="device_no" label="设备编号" align="center" />
|
|
|
|
|
- <el-table-column prop="device_type" label="设备分类" align="center" />
|
|
|
|
|
|
|
+ <el-table-column prop="device_code" label="设备编号" align="center" />
|
|
|
|
|
+ <!-- <el-table-column prop="device_type" label="设备分类" align="center" /> -->
|
|
|
<el-table-column prop="device_name" label="设备名称" align="center" />
|
|
<el-table-column prop="device_name" label="设备名称" align="center" />
|
|
|
<el-table-column prop="borrow_count" label="借用数量" align="center" width="150">
|
|
<el-table-column prop="borrow_count" label="借用数量" align="center" width="150">
|
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
@@ -738,6 +738,7 @@ const handleScanSearch = async () => {
|
|
|
// 添加新设备到列表
|
|
// 添加新设备到列表
|
|
|
deviceList.value.push({
|
|
deviceList.value.push({
|
|
|
device_no: device.id,
|
|
device_no: device.id,
|
|
|
|
|
+ device_code: device.device_no,
|
|
|
device_type: device.category_name,
|
|
device_type: device.category_name,
|
|
|
device_name: device.name || '',
|
|
device_name: device.name || '',
|
|
|
borrow_count: 1,
|
|
borrow_count: 1,
|
|
@@ -784,6 +785,7 @@ const handleReturnScanSearch = async () => {
|
|
|
// 添加新设备到列表
|
|
// 添加新设备到列表
|
|
|
returnDeviceList.value.push({
|
|
returnDeviceList.value.push({
|
|
|
device_no: device.id,
|
|
device_no: device.id,
|
|
|
|
|
+ device_code: device.device_no,
|
|
|
device_type: device.category_name,
|
|
device_type: device.category_name,
|
|
|
device_name: device.name || '',
|
|
device_name: device.name || '',
|
|
|
borrow_count: 1,
|
|
borrow_count: 1,
|
|
@@ -793,6 +795,7 @@ const handleReturnScanSearch = async () => {
|
|
|
return_status:device.return_status,
|
|
return_status:device.return_status,
|
|
|
return_time:device.return_times
|
|
return_time:device.return_times
|
|
|
});
|
|
});
|
|
|
|
|
+ console.log("returnDeviceList.value:::",returnDeviceList.value);
|
|
|
ElMessage.success('设备已添加到列表');
|
|
ElMessage.success('设备已添加到列表');
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
@@ -858,6 +861,7 @@ function onDeviceSelected(devices: Device[]) {
|
|
|
form.value.items.push(
|
|
form.value.items.push(
|
|
|
...devices.map((d) => ({
|
|
...devices.map((d) => ({
|
|
|
device: d.id,
|
|
device: d.id,
|
|
|
|
|
+ device_code: d.code,
|
|
|
remark: d.category_name,
|
|
remark: d.category_name,
|
|
|
quantity: 1,
|
|
quantity: 1,
|
|
|
location: d.warehouse,
|
|
location: d.warehouse,
|
|
@@ -869,6 +873,7 @@ function onDeviceSelected(devices: Device[]) {
|
|
|
deviceList.value.push(
|
|
deviceList.value.push(
|
|
|
...devices.map(d => ({
|
|
...devices.map(d => ({
|
|
|
device_no: d.id,
|
|
device_no: d.id,
|
|
|
|
|
+ device_code: d.code,
|
|
|
device_type: d.category_name,
|
|
device_type: d.category_name,
|
|
|
device_name: d.name || '',
|
|
device_name: d.name || '',
|
|
|
borrow_count: 1,
|
|
borrow_count: 1,
|
|
@@ -1060,6 +1065,7 @@ watch(() => props.modelValue, async (val) => {
|
|
|
.filter(item => item.device !== null)
|
|
.filter(item => item.device !== null)
|
|
|
.map(item => ({
|
|
.map(item => ({
|
|
|
device_no: item.device,
|
|
device_no: item.device,
|
|
|
|
|
+ device_code: item.device_code,
|
|
|
device_type: item.remark,
|
|
device_type: item.remark,
|
|
|
device_name: item.device_name,
|
|
device_name: item.device_name,
|
|
|
borrow_count: item.quantity,
|
|
borrow_count: item.quantity,
|