|
@@ -19,7 +19,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="借用人">
|
|
|
- <el-input v-model="formData.borrower_info.name" disabled />
|
|
|
+ <el-input v-model="name" disabled />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
@@ -45,7 +45,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<div style="margin: 16px 0 8px 0; font-weight: bold">借用明细表</div>
|
|
|
- <el-table :data="formData.items" border style="width: 100%">
|
|
|
+ <el-table :data="filteredItems" border style="width: 100%">
|
|
|
<el-table-column type="index" label="序号" width="60" align="center" />
|
|
|
<el-table-column prop="device_code" label="设备编号" align="center" />
|
|
|
<el-table-column prop="device_category_name" label="设备分类" align="center" />
|
|
@@ -111,20 +111,36 @@ watch(
|
|
|
if (val) {
|
|
|
/* formData.value.app_user_borrower = val.borrower_info.user_code; */
|
|
|
formData.value = val;
|
|
|
-
|
|
|
+ console.log("formData.value:::",formData.value);
|
|
|
}
|
|
|
},
|
|
|
{ immediate: true }
|
|
|
);
|
|
|
-
|
|
|
+const name = computed(() => {
|
|
|
+ return formData.value?.app_user_borrower?.name || formData.value?.borrower_info?.name || '';
|
|
|
+});
|
|
|
const userCode = computed(() => {
|
|
|
- return formData.value?.app_user_borrower || formData.value?.borrower_info?.user_code || '';
|
|
|
+ return formData.value?.app_user_borrower?.user_code || formData.value?.borrower_info?.user_code || '';
|
|
|
});
|
|
|
|
|
|
const borrowType=computed(() => {
|
|
|
return formData.value?.borrow_type_label || formData.value?.borrow_type || '';
|
|
|
});
|
|
|
|
|
|
+interface DeviceItem {
|
|
|
+ device_code: string;
|
|
|
+ device_category_name: string;
|
|
|
+ device_name: string;
|
|
|
+ quantity: number;
|
|
|
+ device_specification: string;
|
|
|
+ device_storage_location?: string;
|
|
|
+ remark?: string;
|
|
|
+}
|
|
|
+
|
|
|
+const filteredItems = computed(() => {
|
|
|
+ return formData.value?.items?.filter((item: DeviceItem | null) => item?.device !== null) || [];
|
|
|
+});
|
|
|
+
|
|
|
const handleClose = () => {
|
|
|
emit('update:visible', false);
|
|
|
emit('update:modelValue', formData.value);
|