diff --git a/src/api/tower/fall/model/index.ts b/src/api/tower/fall/model/index.ts
index 07eb50f..648b841 100644
--- a/src/api/tower/fall/model/index.ts
+++ b/src/api/tower/fall/model/index.ts
@@ -5,6 +5,7 @@ export interface TowerFall {
code?: string;
model?: string;
companyId?: number;
+ companyName: string;
factory?: string;
factoryDate?: string;
discardDate?: string;
diff --git a/src/views/tower/fall/components/search.vue b/src/views/tower/fall/components/search.vue
index 971d505..073480b 100644
--- a/src/views/tower/fall/components/search.vue
+++ b/src/views/tower/fall/components/search.vue
@@ -5,7 +5,7 @@
- 添加防坠器
+ 添加
- 导入设备
+ 导入
- 导出设备
+ 导出
- 报废
- 注销
- 恢复
- 转卖
+ 闲置
+ 在用
();
// 表单数据
- const { where, resetFields } = useSearch({
- equipmentId: undefined,
+ const { where, resetFields } = useSearch({
+ id: undefined,
name: undefined,
keywords: ''
});
@@ -114,50 +112,29 @@
}
const array: (string | number)[][] = [
[
- '设备状态',
- '设备名称',
+ '防坠器状态',
'出厂编号',
- '设备型号',
+ '防坠器型号',
'制造厂商',
- '采购日期',
- '备案编号',
- '出厂日期',
'产权单位',
- '设备来源',
- '所属仓库',
- '所属人员',
- '自编号',
- '额定载重',
- '最大起升高度(m)',
- '臂长',
- '当前位置',
- '楼号'
+ '出厂日期',
+ '报废日期'
]
];
- props.selection?.forEach((d: TowerEquipment) => {
+ props.selection?.forEach((d: TowerFall) => {
array.push([
- `${['闲置', '报废', '注销', '转卖'][Number(d.status)]}`,
- `${d.name}`,
- `${d.factoryNo}`,
+ `${['闲置', '在用'][Number(d.status)]}`,
+ `${d.code}`,
`${d.model}`,
- `${d.manufactor}`,
- `${d.buyDate ? d.buyDate : ''}`,
- `${d.filingNo}`,
- `${d.factoryDate ? d.factoryDate : ''}`,
- `${d.company}`,
- `${d.source}`,
- `${d.warehouse}`,
- `${d.users}`,
- `${d.equipmentNo}`,
- `${d.ratedLoad}`,
- `${d.maxLiftingHeight}`,
- `${d.armLength}`,
- `${d.currentLocation}`,
- `${d.machineNo}`
+ `${d.factory}`,
+ `${d.companyName}`,
+ `${d.factoryDate}`,
+ `${d.discardDate}`
+
]);
});
- const sheetName = '设备导出列表';
+ const sheetName = '防坠器导出列表';
const workbook = {
SheetNames: [sheetName],
Sheets: {}
@@ -174,7 +151,7 @@
{ wch: 40 },
{ wch: 10 }
];
- writeFile(workbook, '导出设备管理表.xlsx');
+ writeFile(workbook, '导出防坠器表.xlsx');
};
// 发布设备