diff --git a/src/api/machinery/machinery/types.ts b/src/api/machinery/machinery/types.ts index 554d674..ba9ab4c 100644 --- a/src/api/machinery/machinery/types.ts +++ b/src/api/machinery/machinery/types.ts @@ -33,6 +33,11 @@ export interface MachineryVO { * 备注 */ remark: string; + + /** + * 创建时间 + */ + createTime: string; } export interface MachineryForm extends BaseEntity { diff --git a/src/api/machinery/machineryDetail/types.ts b/src/api/machinery/machineryDetail/types.ts index 097df22..0bc0a70 100644 --- a/src/api/machinery/machineryDetail/types.ts +++ b/src/api/machinery/machineryDetail/types.ts @@ -55,6 +55,11 @@ export interface MachineryDetailVO { * 机械主键id */ machineryId: string | number; + + /** + * 创建时间 + */ + createTime: string; } export interface MachineryDetailForm extends BaseEntity { diff --git a/src/api/materials/company/types.ts b/src/api/materials/company/types.ts index 5c0a80f..4953b9f 100644 --- a/src/api/materials/company/types.ts +++ b/src/api/materials/company/types.ts @@ -28,6 +28,11 @@ export interface CompanyVO { * 资质情况 */ qualification: string; + + /** + * 创建时间 + */ + createTime: string; } export interface CompanyForm extends BaseEntity { diff --git a/src/api/materials/materials/types.ts b/src/api/materials/materials/types.ts index 87c39a5..84dff5d 100644 --- a/src/api/materials/materials/types.ts +++ b/src/api/materials/materials/types.ts @@ -60,6 +60,11 @@ export interface MaterialsVO { * 状态(0正常 1停用) */ status: string; + + /** + * 创建时间 + */ + createTime: string; } export interface MaterialsForm extends BaseEntity { diff --git a/src/api/materials/materialsInventory/types.ts b/src/api/materials/materialsInventory/types.ts index 3a44d7f..1f727ae 100644 --- a/src/api/materials/materialsInventory/types.ts +++ b/src/api/materials/materialsInventory/types.ts @@ -70,6 +70,11 @@ export interface MaterialsInventoryVO { * 备注 */ remark: string; + + /** + * 创建时间 + */ + createTime: string; } export interface MaterialsInventoryForm extends BaseEntity { diff --git a/src/api/project/constructionUser/types.ts b/src/api/project/constructionUser/types.ts index aa53f0b..7e85a84 100644 --- a/src/api/project/constructionUser/types.ts +++ b/src/api/project/constructionUser/types.ts @@ -176,6 +176,11 @@ export interface ConstructionUserVO { * 备注 */ remark: string; + + /** + * 创建时间 + */ + createTime: string; } export interface ConstructionUserForm extends BaseEntity { diff --git a/src/api/project/contractor/types.ts b/src/api/project/contractor/types.ts index bbb7c74..152127b 100644 --- a/src/api/project/contractor/types.ts +++ b/src/api/project/contractor/types.ts @@ -38,6 +38,11 @@ export interface ContractorVO { * 备注 */ remark: string; + + /** + * 创建时间 + */ + createTime: string; } export interface ContractorForm extends BaseEntity { diff --git a/src/api/project/project/types.ts b/src/api/project/project/types.ts index 53c8a8a..a789b4e 100644 --- a/src/api/project/project/types.ts +++ b/src/api/project/project/types.ts @@ -108,6 +108,11 @@ export interface ProjectVO { * 是否删除(0正常 1删除) */ isDelete: number; + + /** + * 创建时间 + */ + createTime: string; } export interface ProjectForm extends BaseEntity { diff --git a/src/api/project/projectRelevancy/types.ts b/src/api/project/projectRelevancy/types.ts index ff4190a..bc84b19 100644 --- a/src/api/project/projectRelevancy/types.ts +++ b/src/api/project/projectRelevancy/types.ts @@ -20,6 +20,11 @@ export interface ProjectRelevancyVO { * 项目详情 */ project: ProjectVO; + + /** + * 创建时间 + */ + createTime: string; } export interface ProjectRelevancyForm extends BaseEntity { diff --git a/src/api/project/projectTeam/types.ts b/src/api/project/projectTeam/types.ts index abc84da..8ef7fa2 100644 --- a/src/api/project/projectTeam/types.ts +++ b/src/api/project/projectTeam/types.ts @@ -23,6 +23,11 @@ export interface ProjectTeamVO { * 备注 */ remark: string; + + /** + * 创建时间 + */ + createTime: string; } export interface ProjectTeamForm extends BaseEntity { diff --git a/src/api/project/projectTeamMember/types.ts b/src/api/project/projectTeamMember/types.ts index 1ed133c..ab4f202 100644 --- a/src/api/project/projectTeamMember/types.ts +++ b/src/api/project/projectTeamMember/types.ts @@ -28,6 +28,11 @@ export interface ProjectTeamMemberVO { * 备注 */ remark: string; + + /** + * 创建时间 + */ + createTime: string; } export interface ProjectTeamMemberForm extends BaseEntity { diff --git a/src/api/system/oss/index.ts b/src/api/system/oss/index.ts index 4472112..5f7284b 100644 --- a/src/api/system/oss/index.ts +++ b/src/api/system/oss/index.ts @@ -12,7 +12,7 @@ export function listOss(query: OssQuery): AxiosPromise { } // 查询OSS对象基于id串 -export function listByIds(ossId: string | number): AxiosPromise { +export function listByIds(ossId: string | number | string[]): AxiosPromise { return request({ url: '/resource/oss/listByIds/' + ossId, method: 'get' diff --git a/src/views/machinery/index.vue b/src/views/machinery/index.vue index c8c47e6..af955ef 100644 --- a/src/views/machinery/index.vue +++ b/src/views/machinery/index.vue @@ -55,6 +55,7 @@ + @@ -141,6 +148,7 @@ import MaterialsInventoryTable from '@/views/materials/materials/component/Mater import MaterialsInventoryAddDialog from '@/views/materials/materials/component/MaterialsInventoryAddDialog.vue'; import { listCompany } from '@/api/materials/company'; import { CompanyVO } from '@/api/materials/company/types'; +import MaterialsDetailDrawer from '@/views/materials/materials/component/MaterialsDetailDrawer.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { sys_normal_disable, materials_file_type } = toRefs(proxy?.useDict('sys_normal_disable', 'materials_file_type')); @@ -257,6 +265,13 @@ const handleSelectionChange = (selection: MaterialsVO[]) => { multiple.value = !selection.length; }; +/** 展开材料详情抽屉操作 */ +const showDetailDrawer = ref(false); +const handleShowDrawer = (row?: MaterialsVO) => { + currentMaterialsId.value = row.id; + showDetailDrawer.value = true; +}; + /** 新增按钮操作 */ const handleAdd = () => { reset(); diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue index d6af575..5140395 100644 --- a/src/views/project/contractor/index.vue +++ b/src/views/project/contractor/index.vue @@ -48,6 +48,7 @@ + +