liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

修复设备分组bug,设备维修bug

Browse Source
This commit is contained in:
fengerli
2025-12-11 18:26:50 +08:00
parent e7d2cc94f8
commit 5139a112c5
4 changed files with 127 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/views/equipmentManagement/repairRecords/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="content" v-loading="Status.fullLoading">
<div class="main">
<div class="TopTool">
<div class ="TopTool">
<div class="button-row">
<el-button type="primary" icon="Plus" @click.stop="ShowEdit(null, true, formRef)">新增维修</el-button>
<el-button type="primary" plain icon="Download" @click.stop="ExportRecord()">导出</el-button>
@ -9,14 +9,8 @@
</div>
<div class="rightSearch">
<el-input
:suffix-icon="'Search'"
clearable
v-model="advanceSearch.searchValue"
class="responsive-input"
placeholder="名称"
@input="txtSearch"
>
<el-input :suffix-icon="'Search'" clearable v-model="advanceSearch.searchValue" class="responsive-input"
placeholder="名称" @input="txtSearch">
</el-input>
<el-button style="margin-left: 10px" type="primary" @click.stop="ToggleAdvance()">高级筛选</el-button>
@ -43,17 +37,9 @@
<el-input v-model="advanceSearch.repairReason" placeholder="请输入" clearable />
</el-form-item> -->
<el-form-item label="维修时间">
<el-date-picker
v-model="advanceSearch.Date"
type="daterange"
format="YYYY-MM-DD"
style="width: 240px"
value-format="YYYY-MM-DD"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:size="'default'"
/>
<el-date-picker v-model="advanceSearch.Date" type="daterange" format="YYYY-MM-DD" style="width: 240px"
value-format="YYYY-MM-DD" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
:size="'default'" />
<div>
<el-button style="margin-left: 5px" type="primary" @click.stop="Search()">查询</el-button>
<el-button type="primary" @click.stop="Reset()">重置</el-button>
@ -71,7 +57,8 @@
<el-table-column label="损坏原因" align="center" prop="repairReason" />
<el-table-column label="维修人员" align="center" prop="repairPerson" />
<el-table-column label="操作" align="center" fixed="right" width="280" class-name="small-padding fixed-width opt">
<el-table-column label="操作" align="center" fixed="right" width="280"
class-name="small-padding fixed-width opt">
<template #default="scope">
<div class="center">
<el-text class="mx-1" type="primary" @click.stop="ShowEdit(scope.row, true, formRef)">编辑</el-text>
@ -81,47 +68,29 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="pagin.total > 0"
v-model:page="advanceSearch.pageNum"
v-model:limit="advanceSearch.pageSize"
:total="pagin.total"
@pagination="getRecordList"
/>
<pagination v-show="pagin.total > 0" v-model:page="advanceSearch.pageNum" v-model:limit="advanceSearch.pageSize"
:total="pagin.total" @pagination="getRecordList" />
</div>
</div>
<!-- 新增、编辑弹出层 -->
<el-dialog
class="editPop"
v-model="Status.ShowEditPop"
:data-val="Status.ShowEditPop"
:title="!cEdit.isEdit ? '维修详情' : cEdit.recordId ? '编辑维修' : '新增维修'"
width="800"
:draggable="true"
>
<el-dialog class="editPop" v-model="Status.ShowEditPop" :data-val="Status.ShowEditPop"
:title="!cEdit.isEdit ? '维修详情' : cEdit.recordId ? '编辑维修' : '新增维修'" width="800" :draggable="true">
<div class="form">
<el-form :model="cEdit" ref="formRef" style="max-width: 750px" :rules="rules">
<el-form-item label="设备名称" label-position="right" prop="deviceId">
<!-- <el-input v-model="selectedRow['deviceName']" :readonly="true" @click.stop="ShowDevice('Edit', true)" placeholder="请选择设备" /> -->
<el-select v-model="cEdit.deviceId" placeholder="选择设备" clearable :disabled="!cEdit.isEdit" filterable>
<el-option v-for="item in deviceDist" :key="item.deviceId" :label="item.deviceName" :value="item.deviceId"
/></el-select>
<el-option v-for="item in deviceDist" :key="item.deviceId" :label="item.deviceName"
:value="item.deviceId" /></el-select>
</el-form-item>
<el-form-item label="维修人员" label-position="right" prop="repairPerson">
<el-input v-model="cEdit.repairPerson" :readonly="!cEdit.isEdit" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="维修时间" label-position="right" prop="repairTime">
<el-date-picker
v-model="cEdit.repairTime"
:readonly="!cEdit.isEdit"
type="datetime"
placeholder="请选择时间"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
<el-date-picker v-model="cEdit.repairTime" :readonly="!cEdit.isEdit" type="datetime" placeholder="请选择时间"
format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
</el-form-item>
<el-form-item label="维修部位" label-position="right" prop="repairPart">
<el-input v-model="cEdit.repairPart" :readonly="!cEdit.isEdit" placeholder="请输入维修部位" />
@ -131,19 +100,10 @@
</el-form-item>
<el-form-item label="损坏照片" label-position="right">
<el-upload
:disabled="!cEdit.isEdit"
ref="beforeUploadRef"
class="upload-demo"
action=""
:auto-upload="false"
:on-change="handleFileChange1"
:file-list="beforeFiles"
accept=".jpg,.jpeg,.png,.gif.webp"
:limit="9"
list-type="picture-card"
:class="{ 'hide-add-btn': !cEdit.isEdit }"
>
<el-upload :disabled="!cEdit.isEdit" ref="beforeUploadRef" class="upload-demo" action=""
:auto-upload="false" :on-change="handleFileChange1" :file-list="beforeFiles"
accept=".jpg,.jpeg,.png,.gif.webp" :limit="9" list-type="picture-card"
:class="{ 'hide-add-btn': !cEdit.isEdit }">
<el-icon>
<Plus />
</el-icon>
@ -168,19 +128,9 @@
</el-form-item>
<el-form-item label="修复照片" label-position="right">
<el-upload
:disabled="!cEdit.isEdit"
ref="afterUploadRef"
class="upload-demo"
action=""
:auto-upload="false"
:on-change="handleFileChange2"
:file-list="afterFiles"
accept=".jpg,.jpeg,.png,.gif.webp"
:limit="9"
list-type="picture-card"
:class="{ 'hide-add-btn': !cEdit.isEdit }"
>
<el-upload :disabled="!cEdit.isEdit" ref="afterUploadRef" class="upload-demo" action="" :auto-upload="false"
:on-change="handleFileChange2" :file-list="afterFiles" accept=".jpg,.jpeg,.png,.gif.webp" :limit="9"
list-type="picture-card" :class="{ 'hide-add-btn': !cEdit.isEdit }">
<el-icon>
<Plus />
</el-icon>
@ -321,7 +271,8 @@
</el-dialog> -->
<!-- 提示框 -->
<el-dialog :width="300" :draggable="true" v-model="Status.confirm.Visible" :title="Status.confirm.title" width="500" center>
<el-dialog :width="300" :draggable="true" v-model="Status.confirm.Visible" :title="Status.confirm.title" width="500"
center>
<span>
{{ Status.confirm.text }}
</span>
@ -509,18 +460,21 @@ function ToggleAdvance() {
//显示编辑
function ShowEdit(item = undefined, isEdit = true, formEl = undefined) {
// 先隐藏弹窗，避免提前渲染错误状态
Status.ShowEditPop = true;
let def = {
recordId: null, //维修记录id
deviceId: '', //设备id
repairTime: '', //维修时间
repairPart: '', //维修部位
repairReason: '', //维修原因
repairPerson: '', //维修人员,
recordId: null,
deviceId: '',
repairTime: '',
repairPart: '',
repairReason: '',
repairPerson: '',
imageIds: []
};
// 先重置表单和状态，避免残留
ResetFormData();
// 先赋值 isEdit 基础状态
cEdit.isEdit = isEdit;
let promise1 = new Promise((resolve, reject) => {
if (item) {
api
@ -542,60 +496,43 @@ function ShowEdit(item = undefined, isEdit = true, formEl = undefined) {
promise1
.then((res) => {
debugger;
item = res;
if (!item) {
// 新增场景，isEdit 保持 true
cEdit.isEdit = isEdit;
return;
}
let keys = Object.keys(cEdit);
keys.forEach((key, i) => {
if (item) {
//编辑
// 编辑/详情场景，赋值数据
if (item[key] !== undefined) {
cEdit[key] = item[key];
} else {
cEdit[key] = def[key];
}
} else {
//新增
// 新增场景
cEdit[key] = def[key];
}
});
debugger;
if (item.images && item.images.length) {
// 处理图片逻辑（保持原有代码）
beforeFiles.value = item.images
.filter((v) => {
if (v.imageType == 'BEFORE') {
return true;
}
return false;
})
.map((v) => {
return { name: v.imageId, url: v.imageUrl, id: v.imageId };
});
.filter((v) => v.imageType == 'BEFORE')
.map((v) => ({ name: v.imageId, url: v.imageUrl, id: v.imageId }));
afterFiles.value = item.images
.filter((v) => {
if (v.imageType == 'AFTER') {
return true;
}
return false;
})
.map((v) => {
return { name: v.imageId, url: v.imageUrl, id: v.imageId };
});
if (!formEl) return;
formEl.validate();
.filter((v) => v.imageType == 'AFTER')
.map((v) => ({ name: v.imageId, url: v.imageUrl, id: v.imageId }));
if (formEl) formEl.validate();
}
if (item) {
selectedRow.value['deviceName'] = item.deviceName;
}
// 确保 isEdit 最终赋值正确（覆盖异步过程中可能的异常）
cEdit.isEdit = isEdit;
// 所有状态赋值完成后，再显示弹窗
Status.ShowEditPop = true;
})
.finally(() => {});
}
@ -611,11 +548,9 @@ function ShowDevice(type, isvalid) {
if (isvalid && !cEdit.isEdit) {
return;
}
Status.CheckDeviceType = type;
Status.ShowCheckDevice = true;
selectedRowId.value = '';
if (total.value === 0) {
handleQuery();
}
@ -643,11 +578,8 @@ function ResetFormData() {
cEdit.repairPart = ''; //维修部位
cEdit.repairReason = ''; //维修原因
cEdit.repairPerson = ''; //维修人员
cEdit.imageIds = [];
selectedRow.value = { deviceName: '', deviceId: '' };
clearUploadFiles();
}
@ -749,7 +681,7 @@ function ExportRecord() {
proxy?.download('/equipment/repairRecords/export', advanceSearch, `维修记录_${new Date().getTime()}.xlsx`, 'post').finally(hideloading);
}
function RowSelectionChange(row) {}
function RowSelectionChange(row) { }
//获取已选中的行
var getSelectionRows = (gridInstance) => {
if (gridInstance.value) {
@ -950,8 +882,9 @@ const rules = reactive<FormRules<RuleForm>>({
:deep .el-form--inline .el-form-item {
margin-right: 15px !important;
}
:deep .el-dialog__body .form {
}
:deep .el-dialog__body .form {}
:deep .el-dialog__body,
.dialog__body {
position: relative;
@ -1064,6 +997,7 @@ input:focus {
margin-right: 10px;
cursor: pointer;
}
:deep .el-dialog__footer,
.el-dialog__footer {
padding-top: 0px !important;