bugfix zentao

This commit is contained in:
lb 2024-03-27 16:46:06 +08:00
bovenliggende 1c301215d1
commit b367bfcbe4
4 gewijzigde bestanden met toevoegingen van 45 en 39 verwijderingen

Bestand weergeven

@ -19,7 +19,9 @@
<div class="drawer-body flex">
<div class="drawer-body__content">
<div class="form-part" style="margin-bottom: 32px">
<div
class="form-part"
style="margin-bottom: 32px">
<!-- <el-skeleton v-if="!showForm" animated /> -->
<el-form
class="equipment-info-form"
@ -30,37 +32,49 @@
v-loading="formLoading">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="巡检单名称" prop="name">
<el-form-item
label="巡检单名称"
prop="name">
<div style="">{{ form.name || '---' }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="部门" prop="department">
<el-form-item
label="部门"
prop="department">
<div style="">{{ form.department || '---' }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="班次" prop="groupClass">
<el-form-item
label="班次"
prop="groupClass">
<div style="">{{ form.groupClass || '---' }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡检人" prop="checkPerson">
<el-form-item
label="巡检人"
prop="checkPerson">
<div style="">{{ form.checkPerson || '---' }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="巡检时间" prop="planCheckTime">
<div style="">{{ form.planCheckTime | parseTime }}</div>
<el-form-item
label="巡检时间"
prop="planCheckTime">
<div style="">{{ form.actualCheckTime | parseTime }}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="确认人" prop="confirmPerson">
<el-form-item
label="确认人"
prop="confirmPerson">
<div style="">{{ form.confirmPerson || '---' }}</div>
</el-form-item>
</el-col>
@ -81,7 +95,9 @@
<div
v-if="!disableEdit"
style="position: absolute; top: -40px; right: 0">
<el-button @click="handleAddAttr" type="text">
<el-button
@click="handleAddAttr"
type="text">
<i class="el-icon-plus"></i>
添加内容
</el-button>
@ -112,7 +128,9 @@
</div>
<div class="drawer-body__footer">
<el-button v-if="!disableEdit" @click="handleCancel">
<el-button
v-if="!disableEdit"
@click="handleCancel">
{{ disableEdit ? '返回' : '取消' }}
</el-button>
<el-button

Bestand weergeven

@ -94,7 +94,7 @@ export default {
{ prop: 'name', label: '巡检单名称', showOverflowtooltip: true },
{ prop: 'department', label: '部门', showOverflowtooltip: true },
{
prop: 'planCheckTime',
prop: 'actualCheckTime',
label: '巡检时间',
width: 160,
filter: parseTime,
@ -130,26 +130,6 @@ export default {
{ prop: 'remark', label: '备注' },
],
searchBarFormConfig: [
// {
// type: 'select',
// label: '',
// placeholder: '',
// param: 'specialType',
// onchange: true,
// selectOptions: [
// { id: 1, name: '' },
// { id: 2, name: '' },
// { id: 3, name: '' },
// ],
// filterable: true,
// },
// {
// type: 'select',
// label: '',
// placeholder: '',
// param: 'equipmentId',
// filterable: true,
// },
{
type: 'input',
label: '巡检单名称',

Bestand weergeven

@ -105,7 +105,12 @@ export default {
: undefined,
].filter((v) => v),
tableProps: [
{ prop: 'name', label: '保养计划名称', showOverflowtooltip: true },
{
minWidth: 120,
prop: 'name',
label: '保养计划名称',
showOverflowtooltip: true,
},
{ prop: 'departmentName', label: '部门', showOverflowtooltip: true },
{
prop: 'lineName',
@ -113,7 +118,7 @@ export default {
showOverflowtooltip: true,
},
{
minWidth: 120,
minWidth: 160,
prop: 'maintenancePeriod',
label: '保养频率(天/次)',
showOverflowtooltip: true,

Bestand weergeven

@ -88,7 +88,8 @@ import {
import RecordDetail from './Record--detail.vue';
import { TableBtn } from '@/components/tableInnerComponents';
const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
const timeFilter = (val) =>
val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---';
export default {
name: 'SpecialEquipmentMaintainRecord',
@ -485,11 +486,13 @@ export default {
getList() {
this.loading = true;
//
this.recv({ ...this.queryParams, special: true }).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
this.recv({ ...this.queryParams, special: true, confirmed: true }).then(
(response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
}
);
},
/** 取消按钮 */
cancel() {