diff --git a/src/components/ImpordFile/index.vue b/src/components/ImpordFile/index.vue index 4a6b854..95f4fb6 100644 --- a/src/components/ImpordFile/index.vue +++ b/src/components/ImpordFile/index.vue @@ -37,9 +37,9 @@ - + @@ -79,6 +79,8 @@ const acceptParams = (params: ExcelParameterProps) => { dialogVisible.value = true; }; +const emits = defineEmits(['endFileUpload']); + // 文件上传 const uploadExcel = async (param: UploadRequestOptions) => { let excelFormData = new FormData(); @@ -87,6 +89,7 @@ const uploadExcel = async (param: UploadRequestOptions) => { await parameter.value.importApi!(excelFormData); parameter.value.getTableList && parameter.value.getTableList(); dialogVisible.value = false; + emits('endFileUpload'); }; /** diff --git a/src/components/RemoteSelect/select.vue b/src/components/RemoteSelect/select.vue new file mode 100644 index 0000000..fc4b429 --- /dev/null +++ b/src/components/RemoteSelect/select.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/types/boatInfo.ts b/src/types/boatInfo.ts index e664a05..7121788 100644 --- a/src/types/boatInfo.ts +++ b/src/types/boatInfo.ts @@ -1,5 +1,14 @@ import { PageRowsType } from '.'; +/** + * 发布人 + */ +export interface CreateUserType { + id: number; + name: string; + phone: string; +} + /** * 船舶信息类型 */ @@ -7,6 +16,7 @@ export interface BoatInfoType { id: number; createBy: number; createDate: string; + createUser: CreateUserType; updateBy: number; updateDate: string; version: number; @@ -201,6 +211,8 @@ export interface ShipType { seaworthiness: string; regular: string; status: string; + layer: number; + fragment: number; } /** diff --git a/src/views/Boat/components/BoatDialog.vue b/src/views/Boat/components/BoatDialog.vue index 494e2e3..3e05ed0 100644 --- a/src/views/Boat/components/BoatDialog.vue +++ b/src/views/Boat/components/BoatDialog.vue @@ -48,11 +48,11 @@
发布单位:
-
{{ userInfo.enterpriseName }}
+
{{ dialogProps.enterprise?.name }}
发布人:
-
{{ userInfo.username }}
+
{{ dialogProps.createUser?.name }}
发布时间:
@@ -64,7 +64,7 @@
联系电话:
-
暂无
+
{{ dialogProps.createUser?.phone }}