Skip to content

Y
yindong-tongbai-automation
Commit d0ac0705 authored by sxl's avatar sxl 💬
Browse files
Options

add:维修列表展示优化

parent a9e0e8d5
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 196 deletions
src/views/inspection/patrol/patrolLocation/index.vue
View file @ d0ac0705
......@@ -39,7 +39,6 @@
:data="placeList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="地点名称" align="center" prop="placeName" />
<el-table-column label="地点位置" align="center" prop="location" />
<el-table-column label="信息" align="center" prop="information" />
......
src/views/inspection/patrol/patrolLocationLog/index.vue
View file @ d0ac0705
......@@ -28,7 +28,6 @@
</el-row>
<el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" width="55" align="center" prop="id" />
<el-table-column label="巡检日期" align="center" prop="pollingData" width="180">
<template slot-scope="scope">
......
src/views/inspection/patrol/patrolLog/index.vue
View file @ d0ac0705
......@@ -21,7 +21,6 @@
</el-row>
<el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="报修单编号" align="center" prop="repairsId" />
<el-table-column label="巡检日期" align="center" prop="pollingData" width="180">
<template slot-scope="scope">
......@@ -31,6 +30,11 @@
<el-table-column label="巡检人" align="center" prop="inspectionUserName" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备状态" align="center" prop="deviceState">
<template slot-scope="scope">
<el-tag v-if="scope.row.deviceState == 1" type="success">正常</el-tag>
<el-tag v-else type="danger">异常</el-tag>
......
src/views/inspection/patrol/patrolProject/index.vue
View file @ d0ac0705
......@@ -31,7 +31,7 @@
<el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="报修单编号" align="center" prop="id" />
<el-table-column label="巡检日期" align="center" prop="pollingData" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.pollingData, '{y}-{m}-{d}') }}</span>
......
src/views/inspection/repair/repairLog/index.vue
View file @ d0ac0705
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="设备类型" prop="deviceType">
<el-select
v-model="queryParams.deviceType"
placeholder="请选择设备类型"
>
<el-option
v-for="item in deviceTypeList"
:key="item.id"
:label="item.typeName"
:value="item.id"
>
</el-option>
<el-select v-model="queryParams.deviceType" placeholder="请选择设备类型">
<el-option v-for="item in deviceTypeList" :key="item.id" :label="item.typeName" :value="item.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="deviceName">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入设备名称"
clearable
@keyup.enter="handleQuery"
/>
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"
>搜索</el-button
>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="maintainList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table v-loading="loading" :data="maintainList">
<el-table-column label="维修单编号" align="center" prop="id" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编码" align="center" prop="deviceNo" />
<el-table-column
label="巡检人"
align="center"
prop="inspectionUserName"
/>
<el-table-column
label="设备故障描述"
align="center"
prop="deviceErroDetail"
/>
<el-table-column
label="维修单日期"
align="center"
prop="repairsDate"
width="180"
>
<el-table-column label="巡检人" align="center" prop="inspectionUserName" />
<el-table-column label="设备故障描述" align="center" prop="deviceErroDetail" />
<el-table-column label="维修单日期" align="center" prop="repairsDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.repairsDate, "{y}-{m}-{d}") }}</span>
<span>{{ parseTime(scope.row.repairsDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="维修人" align="center" prop="maintainUserName" />
<el-table-column
label="维修情况描述"
align="center"
prop="maintainDetail"
/>
<el-table-column
label="维修日期"
align="center"
prop="maintainDate"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.maintainDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="维修状态" align="center" prop="maintainState">
<el-table-column label="维修情况描述" align="center" prop="maintainDetail" />
<el-table-column label="维修日期" align="center" prop="maintainDate" width="180">
<template slot-scope="scope">
<span>{{
selectDictLabels(orderStatesList, scope.row.maintainState)
}}</span>
<span>{{ parseTime(scope.row.maintainDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改维修历史对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
......@@ -122,55 +56,25 @@
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="巡检人id" prop="inspectionUserId">
<el-input
v-model="form.inspectionUserId"
placeholder="请输入巡检人id"
/>
<el-input v-model="form.inspectionUserId" placeholder="请输入巡检人id" />
</el-form-item>
<el-form-item label="设备故障描述" prop="deviceErroDetail">
<el-input
v-model="form.deviceErroDetail"
placeholder="请输入设备故障描述"
/>
<el-input v-model="form.deviceErroDetail" placeholder="请输入设备故障描述" />
</el-form-item>
<el-form-item label="维修单日期" prop="repairsDate">
<el-date-picker
clearable
v-model="form.repairsDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择维修单日期"
>
</el-date-picker>
<el-date-picker clearable v-model="form.repairsDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择维修单日期"> </el-date-picker>
</el-form-item>
<el-form-item label="维修人id" prop="maintainUserId">
<el-input
v-model="form.maintainUserId"
placeholder="请输入维修人id"
/>
<el-form-item label="维修人" prop="maintainUser">
<el-input v-model="form.maintainUserId" placeholder="请输入维修人" />
</el-form-item>
<el-form-item label="维修情况描述" prop="maintainDetail">
<el-input
v-model="form.maintainDetail"
placeholder="请输入维修情况描述"
/>
<el-input v-model="form.maintainDetail" placeholder="请输入维修情况描述" />
</el-form-item>
<el-form-item label="维修日期" prop="maintainDate">
<el-date-picker
clearable
v-model="form.maintainDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择维修日期"
>
</el-date-picker>
<el-date-picker clearable v-model="form.maintainDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择维修日期"> </el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -182,17 +86,11 @@
</template>
<script>
import {
listMaintain,
getMaintain,
delMaintain,
addMaintain,
updateMaintain,
} from "@/api/repair/repairLog";
import { listDevice as listDeviceType } from "@/api/device/deviceType";
import { listMaintain, getMaintain, delMaintain, addMaintain, updateMaintain } from '@/api/repair/repairLog'
import { listDevice as listDeviceType } from '@/api/device/deviceType'
export default {
name: "Maintain",
name: 'Maintain',
data() {
return {
// 遮罩层
......@@ -210,7 +108,7 @@ export default {
// 维修历史表格数据
maintainList: [],
// 弹出层标题
title: "",
title: '',
// 是否显示弹出层
open: false,
// 查询参数
......@@ -240,32 +138,30 @@ export default {
form: {},
// 表单校验
rules: {
repairsId: [
{ required: true, message: "维修单编号不能为空", trigger: "blur" },
],
repairsId: [{ required: true, message: '维修单编号不能为空', trigger: 'blur' }],
},
};
}
},
created() {
this.getList();
this.getList()
listDeviceType().then((response) => {
this.deviceTypeList = response.rows;
});
this.deviceTypeList = response.rows
})
},
methods: {
/** 查询维修历史列表 */
getList() {
this.loading = true;
this.loading = true
listMaintain(this.queryParams).then((response) => {
this.maintainList = response.rows;
this.total = response.total;
this.loading = false;
});
this.maintainList = response.rows
this.total = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
this.open = false
this.reset()
},
// 表单重置
reset() {
......@@ -287,85 +183,79 @@ export default {
updateBy: null,
updateTime: null,
remark: null,
};
this.resetForm("form");
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加维修历史";
this.reset()
this.open = true
this.title = '添加维修历史'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
this.reset()
const id = row.id || this.ids
getMaintain(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改维修历史";
});
this.form = response.data
this.open = true
this.title = '修改维修历史'
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
this.$refs['form'].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateMaintain(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addMaintain(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
});
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
const ids = row.id || this.ids
this.$modal
.confirm('是否确认删除维修历史编号为"' + ids + '"的数据项？')
.then(function () {
return delMaintain(ids);
return delMaintain(ids)
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {});
.catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
this.download(
"maintain/maintain/export",
'maintain/maintain/export',
{
...this.queryParams,
},
`maintain_${new Date().getTime()}.xlsx`
);
)
},
},
};
}
</script>
src/views/inspection/repair/repairProject/index.vue
View file @ d0ac0705
......@@ -21,12 +21,14 @@
</el-row>
<el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="维修单编号" align="center" prop="id" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编码" align="center" prop="deviceNo" />
<el-table-column label="巡检人" align="center" prop="inspectionUserName" />
<el-table-column label="维修人" align="center" prop="maintainUserName" />
<el-table-column label="巡检人" align="center" prop="inspectionUserName">
<template slot-scope="scope">
<span>{{ scope.row.inspectionUserName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="设备故障描述" align="center" prop="deviceErrorDetail" />
<el-table-column label="故障日期" align="center" prop="erroDate" width="180">
<template slot-scope="scope">
......@@ -38,7 +40,21 @@
<span>{{ selectDictLabels(orderStatesList, scope.row.orderStates) }}</span>
</template>
</el-table-column>
<el-table-column label="维修人" align="center" prop="maintainUserName">
<template slot-scope="scope">
<span>{{ scope.row.maintainUserName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="维修情况描述" align="center" prop="maintainDetail">
<template slot-scope="scope">
<span>{{ scope.row.maintainDetail || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="维修日期" align="center" prop="maintainDate" width="180">
<template slot-scope="scope">
<span>{{ scope.row.maintainDate ? parseTime(scope.row.maintainDate, '{y}-{m}-{d}') : '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['workOrder:workOrder:edit']" v-if="scope.row.orderStates == 0"
......@@ -164,7 +180,7 @@ export default {
deviceName: null,
inspectionUserId: null,
deviceErrorDetail: null,
deviceErroPhotos: null,
deviceErrorPhotos: null,
erroDate: null,
orderStates: null,
maintainUserId: null,
......@@ -191,7 +207,7 @@ export default {
// 表单校验
rules: {
repairsId: [{ required: true, message: '维修单编号不能为空', trigger: 'blur' }],
deviceErroPhotos: [{ required: true, message: '设备故障图片不能为空', trigger: 'blur' }],
deviceErrorPhotos: [{ required: true, message: '设备故障图片不能为空', trigger: 'blur' }],
deviceErrorDetail: [{ required: true, message: '设备故障描述不能为空', trigger: 'blur' }],
erroDate: [{ required: true, message: '故障日期不能为空', trigger: 'blur' }],
maintainEndDate: [{ required: true, message: '维修截止日期不能为空', trigger: 'blur' }],
......@@ -246,7 +262,7 @@ export default {
deviceName: null,
inspectionUserId: null,
deviceErrorDetail: null,
deviceErroPhotos: null,
deviceErrorPhotos: null,
erroDate: null,
orderStates: null,
maintainUserId: null,
......@@ -367,11 +383,11 @@ export default {
// 文件上传回调
fileSuccess(val) {
this.form.deviceErroPhotos = val
this.form.deviceErrorPhotos = val
},
// 文件删除
handleRemove(url) {
this.form.deviceErroPhotos = url
this.form.deviceErrorPhotos = url
},
},
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment