|
|
@@ -800,7 +800,7 @@ const handleViewAbnormal = (index: number) => {
|
|
|
if (device) {
|
|
|
if(device.problem_records?.length){
|
|
|
currentAbnormalData.value = {
|
|
|
- damage_type:device.problem_records?.[0].damage_type ||device.damage_type ||'',
|
|
|
+ damage_type:device.problem_records?.[0].damage_type.value ||device.damage_type.value ||'',
|
|
|
condition: device.problem_records?.[0].device_condition_after ||'',
|
|
|
photos: device.problem_records?.[0].returned_images.map((item:any)=>item.image_url) ||[]
|
|
|
};
|
|
|
@@ -847,7 +847,7 @@ const handleScanSearch = async () => {
|
|
|
device_type: device.category_name,
|
|
|
device_name: device.name || '',
|
|
|
borrow_count: 1,
|
|
|
- brand: device.brand || '',
|
|
|
+ brand: device.brand ||device.device_brand || '',
|
|
|
device_specification: device.specification,
|
|
|
model: device.model || '',
|
|
|
warehouse: device.warehouse,
|
|
|
@@ -894,7 +894,7 @@ const handleReturnScanSearch = async () => {
|
|
|
device_type: device.category_name,
|
|
|
device_name: device.name || '',
|
|
|
borrow_count: 1,
|
|
|
- brand: device.brand || '',
|
|
|
+ brand: device.brand||device.device_brand || '',
|
|
|
model: device.model || '',
|
|
|
warehouse: device.warehouse,
|
|
|
return_status:device.return_status,
|
|
|
@@ -1183,7 +1183,7 @@ watch(() => props.modelValue, async (val) => {
|
|
|
device_type: item.remark,
|
|
|
device_name: item.device_name,
|
|
|
borrow_count: item.quantity,
|
|
|
- brand: item.brand || '',
|
|
|
+ brand: item.brand ||item.device_brand || '',
|
|
|
model: item.device_specification,
|
|
|
warehouse: item.location,
|
|
|
problem_records: item.problem_records,
|
|
|
@@ -1270,7 +1270,7 @@ watch(() => props.modelValue, async (val) => {
|
|
|
device_type: item.remark,
|
|
|
device_name: item.device_name,
|
|
|
borrow_count: item.quantity,
|
|
|
- brand: item.brand || '',
|
|
|
+ brand: item.brand ||item.device_brand || '',
|
|
|
model: item.device_specification,
|
|
|
warehouse: item.location,
|
|
|
problem_records: item.problem_records,
|