Merge remote-tracking branch 'origin/master'

master
夜笙歌 1 week ago
commit c4d7266d2f

@ -59,8 +59,9 @@ export interface DmsBillsInspectInstanceVO {
*/
remark: string;
}
routeName: string;
}
export interface DmsBillsInspectInstanceForm extends BaseEntity {
/**
*
@ -127,6 +128,8 @@ export interface DmsBillsInspectInstanceForm extends BaseEntity {
*/
status?: string;
routeName?: string;
}
export interface DmsBillsInspectInstanceQuery extends PageQuery {
@ -186,6 +189,8 @@ export interface DmsBillsInspectInstanceQuery extends PageQuery {
*/
inspectStatus?: string;
routeName?: string;
/**
*
*/

@ -56,7 +56,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="maintStationId" v-if="columns[0].visible"/>
<el-table-column label="设备类型" align="center" prop="deviceTypeName" v-if="columns[2].visible"/>
<el-table-column label="保养标准" align="center" prop="maintStandardCode" v-if="columns[3].visible"/>
<el-table-column label="保养标准编号" align="center" prop="maintStandardCode" v-if="columns[3].visible"/>
<el-table-column label="部位编号" align="center" prop="maintStationCode" v-if="columns[4].visible"/>
<el-table-column label="部位名称" align="center" prop="maintStationName" v-if="columns[5].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
@ -178,7 +178,7 @@ const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `设备类型`, visible: true },
{ key: 3, label: `保养标准ID`, visible: true },
{ key: 3, label: `保养标准编号`, visible: true },
{ key: 4, label: `部位编号`, visible: true },
{ key: 5, label: `部位名称`, visible: true },
{ key: 6, label: `激活标识`, visible: true },
@ -198,6 +198,7 @@ const initFormData: DmsBaseMaintStationForm = {
maintStationName: undefined,
activeFlag: '1',
remark: undefined,
maintStandardCode: undefined,
maintProjectIds: []
}
const data = reactive<PageData<DmsBaseMaintStationForm, DmsBaseMaintStationQuery>>({
@ -211,6 +212,7 @@ const data = reactive<PageData<DmsBaseMaintStationForm, DmsBaseMaintStationQuery
maintStationCode: undefined,
maintStationName: undefined,
activeFlag: undefined,
maintStandardCode: undefined,
params: {
}
},

@ -96,12 +96,12 @@
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsFaultInstance:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsFaultInstance:edit']"></el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsFaultInstance:add']"></el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsFaultInstance:edit']"></el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsFaultInstance:remove']"></el-button>
</el-col>
@ -115,63 +115,63 @@
<el-table v-loading="loading" :data="dmsBillsFaultInstanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="repairInstanceId" v-if="columns[0].visible"/>
<el-table-column label="工单编号" align="center" prop="billsFaultCode" v-if="columns[2].visible"/>
<el-table-column label="工单类型" align="center" prop="instanceType" v-if="columns[3].visible">
<el-table-column label="工单编号" align="center" prop="billsFaultCode" v-if="columns[1].visible"/>
<el-table-column label="工单类型" align="center" prop="instanceType" v-if="columns[2].visible">
<template #default="scope">
<dict-tag :options="instance_type" :value="scope.row.instanceType"/>
</template>
</el-table-column>
<el-table-column label="报修来源类型" align="center" prop="faultSourceType" v-if="columns[4].visible">
<!-- <el-table-column label="报修来源类型" align="center" prop="faultSourceType" v-if="columns[3].visible">
<template #default="scope">
<dict-tag :options="fault_source_type" :value="scope.row.faultSourceType"/>
</template>
</el-table-column>
<el-table-column label="报修来源ID" align="center" prop="faultSourceId" v-if="columns[5].visible"/>
<el-table-column label="流程定义" align="center" prop="wfDefinitionId" v-if="columns[6].visible"/>
<el-table-column label="设备" align="center" prop="machineName" v-if="columns[7].visible"/>
<el-table-column label="申请人" align="center" prop="applyUser" v-if="columns[8].visible"/>
<el-table-column label="申请时间" align="center" prop="applyTime" width="180" v-if="columns[9].visible">
</el-table-column> -->
<!-- <el-table-column label="报修来源ID" align="center" prop="faultSourceId" v-if="columns[5].visible"/>-->
<el-table-column label="流程定义" align="center" prop="wfDefinitionId" v-if="columns[3].visible"/>
<el-table-column label="设备" align="center" prop="machineName" v-if="columns[4].visible"/>
<el-table-column label="申请人" align="center" prop="applyUser" v-if="columns[5].visible"/>
<el-table-column label="申请时间" align="center" prop="applyTime" width="180" v-if="columns[6].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" prop="realBeginTime" width="180" v-if="columns[10].visible">
<el-table-column label="实际开始时间" align="center" prop="realBeginTime" width="180" v-if="columns[7].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际完成时间" align="center" prop="realEndTime" width="180" v-if="columns[11].visible">
<el-table-column label="实际完成时间" align="center" prop="realEndTime" width="180" v-if="columns[8].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="要求完成时间" align="center" prop="requireEndTime" width="180" v-if="columns[12].visible">
<el-table-column label="要求完成时间" align="center" prop="requireEndTime" width="180" v-if="columns[9].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.requireEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="工单状态" align="center" prop="billsStatus" v-if="columns[13].visible">
<el-table-column label="工单状态" align="center" prop="billsStatus" v-if="columns[10].visible">
<template #default="scope">
<dict-tag :options="bills_status" :value="scope.row.billsStatus"/>
</template>
</el-table-column>
<el-table-column label="审批状态" align="center" prop="approveStatus" v-if="columns[14].visible">
<el-table-column label="审批状态" align="center" prop="approveStatus" v-if="columns[11].visible">
<template #default="scope">
<dict-tag :options="dms_approve_status" :value="scope.row.approveStatus"/>
</template>
</el-table-column>
<el-table-column label="确认状态" align="center" prop="repairConfirm" v-if="columns[15].visible">
<el-table-column label="确认状态" align="center" prop="repairConfirm" v-if="columns[12].visible">
<template #default="scope">
<dict-tag :options="repair_confirm" :value="scope.row.repairConfirm"/>
</template>
</el-table-column>
<el-table-column label="确认人" align="center" prop="confirmUser" v-if="columns[16].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[17].visible">
<el-table-column label="确认人" align="center" prop="confirmUser" v-if="columns[13].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[14].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[18].visible"/>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[15].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- 启动工单按钮 -->
@ -181,15 +181,15 @@
</el-tooltip>
<!-- 处理工单按钮根据工单状态跳转到相应的处理页面 -->
<el-tooltip content="处理工单" placement="top" v-if="needProcessButton(scope.row)">
<!-- <el-tooltip content="处理工单" placement="top" v-if="needProcessButton(scope.row)">
<el-button link type="primary" icon="Operation" @click="handleProcess(scope.row)"></el-button>
</el-tooltip>
</el-tooltip> -->
<!-- 查看工单进度按钮 -->
<el-tooltip content="查看进度" placement="top" v-if="scope.row.wfDefinitionId">
<!-- <el-tooltip content="查看进度" placement="top" v-if="scope.row.wfDefinitionId">
<el-button link type="info" icon="View" @click="handleWorkflowProgress(scope.row)"></el-button>
</el-tooltip>
</el-tooltip> -->
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsFaultInstance:edit']"></el-button>
</el-tooltip>
@ -370,29 +370,29 @@ const dialog = reactive<DialogOption>({
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `工单编号`, visible: true },
{ key: 3, label: `工单类型`, visible: true },
{ key: 4, label: `报修来源类型`, visible: true },
{ key: 5, label: `报修来源ID`, visible: false },
{ key: 6, label: `流程定义`, visible: false },
{ key: 7, label: `设备`, visible: true },
{ key: 8, label: `申请人`, visible: true },
{ key: 9, label: `申请时间`, visible: true },
{ key: 10, label: `实际开始时间`, visible: true },
{ key: 11, label: `实际完成时间`, visible: true },
{ key: 12, label: `要求完成时间`, visible: true },
{ key: 13, label: `工单状态`, visible: true },
{ key: 14, label: `审批状态`, visible: true },
{ key: 15, label: `确认状态`, visible: true },
{ key: 16, label: `确认人`, visible: true },
{ key: 17, label: `激活标识`, visible: true },
{ key: 18, label: `备注`, visible: true },
{ key: 19, label: `创建部门`, visible: false },
{ key: 20, label: `创建人`, visible: false },
{ key: 21, label: `创建时间`, visible: false },
{ key: 22, label: `更新人`, visible: false },
{ key: 23, label: `更新时间`, visible: false },
// { key: 1, label: ``, visible: false },
{ key: 1, label: `工单编号`, visible: true },
{ key: 2, label: `工单类型`, visible: true },
// { key: 3, label: ``, visible: true },
// { key: 5, label: `ID`, visible: false },
{ key: 3, label: `流程定义`, visible: false },
{ key: 4, label: `设备`, visible: true },
{ key: 5, label: `申请人`, visible: true },
{ key: 6, label: `申请时间`, visible: true },
{ key: 7, label: `实际开始时间`, visible: true },
{ key: 8, label: `实际完成时间`, visible: true },
{ key: 9, label: `要求完成时间`, visible: false },
{ key: 10, label: `工单状态`, visible: true },
{ key: 11, label: `审批状态`, visible: true },
{ key: 12, label: `确认状态`, visible: true },
{ key: 13, label: `确认人`, visible: true },
{ key: 14, label: `激活标识`, visible: true },
{ key: 15, label: `备注`, visible: false },
// { key: 19, label: ``, visible: false },
// { key: 20, label: ``, visible: false },
// { key: 21, label: ``, visible: false },
// { key: 22, label: ``, visible: false },
// { key: 23, label: ``, visible: false },
]);
const initFormData: DmsBillsFaultInstanceForm = {
@ -696,14 +696,14 @@ const needProcessButton = (row: DmsBillsFaultInstanceVO) => {
// dmsFaultInstanceActivity
const handleProcess = (row: DmsBillsFaultInstanceVO) => {
let processType = '';
//
if (row.approveStatus === '1') {
processType = 'approval'; //
} else if (row.billsStatus === '2' && row.repairConfirm === '0' && row.approveStatus === '2') {
processType = 'confirm'; //
}
if (processType) {
router.push({
path: '/dms/dmsFaultInstanceActivity',

@ -73,12 +73,12 @@
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsInspectInstance:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsInspectInstance:edit']"></el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsInspectInstance:add']"></el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsInspectInstance:edit']"></el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsInspectInstance:remove']"></el-button>
</el-col>
@ -99,7 +99,7 @@
<dict-tag :options="inspect_type" :value="scope.row.inspectType"/>
</template>
</el-table-column>
<el-table-column label="巡检线路" align="center" prop="inspectRouteId" v-if="columns[5].visible"/>
<el-table-column label="巡检线路" align="center" prop="routeName" v-if="columns[5].visible"/>
<el-table-column label="巡检编号" align="center" prop="billsInspectCode" v-if="columns[6].visible"/>
<el-table-column label="计划开始时间" align="center" prop="planBeginTime" width="180" v-if="columns[7].visible">
<template #default="scope">
@ -299,6 +299,7 @@ const initFormData: DmsBillsInspectInstanceForm = {
realEndTime: undefined,
inspectStatus: undefined,
remark: undefined,
routeName: undefined,
}
const data = reactive<PageData<DmsBillsInspectInstanceForm, DmsBillsInspectInstanceQuery>>({
form: {...initFormData},
@ -316,6 +317,7 @@ const data = reactive<PageData<DmsBillsInspectInstanceForm, DmsBillsInspectInsta
realBeginTime: undefined,
realEndTime: undefined,
inspectStatus: undefined,
routeName: undefined,
params: {
}
},

@ -79,12 +79,12 @@
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsMaintInstance:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsMaintInstance:edit']"></el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsMaintInstance:add']"></el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsMaintInstance:edit']"></el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsMaintInstance:remove']"></el-button>
</el-col>
@ -133,8 +133,8 @@
<dict-tag :options="maint_status" :value="scope.row.maintStatus"/>
</template>
</el-table-column>
<el-table-column label="保养完成率" align="center" prop="maintCompRate" v-if="columns[13].visible" width="100" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[14].visible"/>
<!-- <el-table-column label="保养完成率" align="center" prop="maintCompRate" v-if="columns[13].visible" width="100" /> -->
<el-table-column label="备注" align="center" prop="remark" v-if="columns[13].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- 启动工单按钮 -->
@ -255,11 +255,11 @@
</template>
<script setup name="DmsBillsMaintInstance" lang="ts">
import {
listDmsBillsMaintInstance,
getDmsBillsMaintInstance,
delDmsBillsMaintInstance,
addDmsBillsMaintInstance,
import {
listDmsBillsMaintInstance,
getDmsBillsMaintInstance,
delDmsBillsMaintInstance,
addDmsBillsMaintInstance,
updateDmsBillsMaintInstance,
updateWfDefinitionIdById
} from '@/api/dms/dmsBillsMaintInstance';
@ -293,7 +293,7 @@ const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `保养计划`, visible: true },
{ key: 3, label: `流程定义`, visible: true },
{ key: 3, label: `流程定义`, visible: false },
{ key: 4, label: `保养单号`, visible: true },
{ key: 5, label: `保养组别`, visible: true },
{ key: 6, label: `保养负责人`, visible: true },
@ -303,13 +303,13 @@ const columns = ref<FieldOption[]>([
{ key: 10, label: `计划完成时间`, visible: true },
{ key: 11, label: `实际完成时间`, visible: true },
{ key: 12, label: `保养状态`, visible: true },
{ key: 13, label: `保养完成率`, visible: true },
{ key: 14, label: `备注`, visible: true },
{ key: 15, label: `创建部门`, visible: false },
{ key: 16, label: `创建人`, visible: false },
{ key: 17, label: `创建时间`, visible: false },
{ key: 18, label: `更新人`, visible: false },
{ key: 19, label: `更新时间`, visible: false },
// { key: 13, label: ``, visible: true },
{ key: 13, label: `备注`, visible: true },
// { key: 15, label: ``, visible: false },
// { key: 16, label: ``, visible: false },
// { key: 17, label: ``, visible: false },
// { key: 18, label: ``, visible: false },
// { key: 19, label: ``, visible: false },
]);
const initFormData: DmsBillsMaintInstanceForm = {

@ -24,14 +24,14 @@
<el-form-item label="设备总数" prop="deviceAmount">
<el-input v-model="queryParams.deviceAmount" placeholder="请输入设备总数" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<el-form-item label="计划巡检时间" prop="planTime">
<el-date-picker clearable
v-model="queryParams.planTime"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择计划巡检时间"
/>
</el-form-item>
<!-- <el-form-item label="计划巡检时间" prop="planTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.planTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择计划巡检时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!--<el-form-item label="时限(秒)" prop="timeLimit">
<el-input v-model="queryParams.timeLimit" placeholder="请输入时限(秒)" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -102,7 +102,7 @@
</el-table-column>
<el-table-column label="关联sj_job主键id" align="center" prop="jobId" v-if="columns[9].visible"/>
<el-table-column label="循环周期" align="center" prop="cyclePeriod" v-if="columns[10].visible"/>
<el-table-column label="执行人员" align="center" prop="performer" v-if="columns[11].visible"/>
<el-table-column label="负责人员" align="center" prop="performer" v-if="columns[11].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[12].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
@ -216,7 +216,7 @@
<!-- <el-form-item label="循环周期" prop="cyclePeriod">
<el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />
</el-form-item>-->
<el-form-item label="执行人员" prop="performer">
<el-form-item label="负责人员" prop="performer">
<el-select v-model="form.performer" placeholder="请选择执行人">
<el-option
v-for="item in userList"
@ -313,7 +313,7 @@ const columns = ref<FieldOption[]>([
{ key: 8, label: `时限`, visible: true },
{ key: 9, label: `关联sj_job主键id`, visible: false },
{ key: 10, label: `循环周期`, visible: false },
{ key: 11, label: `执行人员`, visible: true },
{ key: 11, label: `负责人员`, visible: true },
{ key: 12, label: `激活标识`, visible: true },
{ key: 13, label: `备注`, visible: true },
{ key: 14, label: `创建部门`, visible: false },
@ -428,7 +428,7 @@ const data = reactive<PageData<DmsPlanInspectForm, DmsPlanInspectQuery>>({
}}
],
performer: [
{ required: true, message: "执行人员不能为空", trigger: "change" }
{ required: true, message: "负责人员不能为空", trigger: "change" }
],
hour: [
{ required: true, message: "小时不能为空", trigger: "blur" }

@ -43,11 +43,11 @@
<el-option v-for="dict in maint_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> -->
<el-form-item label="创建方式" prop="createMethod">
<!-- <el-form-item label="创建方式" prop="createMethod">
<el-select v-model="queryParams.createMethod" placeholder="请选择创建方式" clearable >
<el-option v-for="dict in create_method" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="激活标识" prop="activeFlag">
<el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
<el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
@ -85,39 +85,39 @@
<el-table v-loading="loading" :data="dmsPlanMaintList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="planMaintId" v-if="columns[0].visible"/>
<el-table-column label="计划编号" align="center" prop="planMaintCode" v-if="columns[2].visible"/>
<el-table-column label="保养级别" align="center" prop="maintLevel" v-if="columns[3].visible">
<el-table-column label="计划编号" align="center" prop="planMaintCode" v-if="columns[1].visible"/>
<el-table-column label="保养级别" align="center" prop="maintLevel" v-if="columns[2].visible">
<template #default="scope">
<dict-tag :options="maint_level" :value="scope.row.maintLevel"/>
</template>
</el-table-column>
<el-table-column label="保养组别" align="center" prop="maintGroup" v-if="columns[4].visible"/>
<el-table-column label="保养负责人" align="center" prop="maintSupervisor" v-if="columns[5].visible" width="100px"/>
<el-table-column label="本次保养时间" align="center" prop="maintTime" width="180" v-if="columns[6].visible">
<el-table-column label="保养组别" align="center" prop="maintGroup" v-if="columns[3].visible"/>
<el-table-column label="保养负责人" align="center" prop="maintSupervisor" v-if="columns[4].visible" width="100px"/>
<el-table-column label="本次保养时间" align="center" prop="maintTime" width="180" v-if="columns[5].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.maintTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="jobId" align="center" prop="jobId" v-if="columns[7].visible"/>
<el-table-column label="时限" align="center" prop="timeLimit" v-if="columns[8].visible">
<!-- <el-table-column label="jobId" align="center" prop="jobId" v-if="columns[7].visible"/> -->
<el-table-column label="时限" align="center" prop="timeLimit" v-if="columns[6].visible">
<template #default="scope">
<span v-if="scope.row.timeLimitDays && scope.row.timeLimitDays !== 0">{{scope.row.timeLimitDays}}</span>
<span v-if="scope.row.timeLimitHours && scope.row.timeLimitHours !== 0">{{scope.row.timeLimitHours}}</span>
</template>
</el-table-column>
<el-table-column label="循环周期" align="center" prop="cyclePeriod" v-if="columns[9].visible"/>
<el-table-column label="保养状态" align="center" prop="maintStatus" v-if="columns[10].visible">
<!-- <el-table-column label="循环周期" align="center" prop="cyclePeriod" v-if="columns[9].visible"/> -->
<!-- <el-table-column label="保养状态" align="center" prop="maintStatus" v-if="columns[7].visible">
<template #default="scope">
<dict-tag :options="maint_status" :value="scope.row.maintStatus"/>
</template>
</el-table-column>
<el-table-column label="创建方式" align="center" prop="createMethod" v-if="columns[11].visible">
</el-table-column> -->
<!-- <el-table-column label="创建方式" align="center" prop="createMethod" v-if="columns[11].visible">
<template #default="scope">
<dict-tag :options="create_method" :value="scope.row.createMethod"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[12].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[13].visible">
</el-table-column> -->
<el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[8].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
@ -296,24 +296,24 @@ const dialog = reactive<DialogOption>({
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `计划编号`, visible: true },
{ key: 3, label: `保养级别`, visible: true },
{ key: 4, label: `保养组别`, visible: true },
{ key: 5, label: `保养负责人`, visible: true },
{ key: 6, label: `本次保养时间`, visible: true },
{ key: 7, label: `关联sj_job主键id`, visible: false },
{ key: 8, label: `时限`, visible: true },
{ key: 9, label: `循环周期`, visible: true },
{ key: 10, label: `保养状态`, visible: true },
{ key: 11, label: `创建方式`, visible: true },
{ key: 12, label: `备注`, visible: true },
{ key: 13, label: `激活标识`, visible: true },
{ key: 14, label: `创建部门`, visible: false },
{ key: 15, label: `创建人`, visible: false },
{ key: 16, label: `创建时间`, visible: false },
{ key: 17, label: `更新人`, visible: false },
{ key: 18, label: `更新时间`, visible: false },
// { key: 1, label: ``, visible: false },
{ key: 1, label: `计划编号`, visible: true },
{ key: 2, label: `保养级别`, visible: true },
{ key: 3, label: `保养组别`, visible: true },
{ key: 4, label: `保养负责人`, visible: true },
{ key: 5, label: `本次保养时间`, visible: true },
// { key: 7, label: `sj_jobid`, visible: false },
{ key: 6, label: `时限`, visible: true },
// { key: 9, label: ``, visible: false },
// { key: 7, label: ``, visible: true },
// { key: 11, label: ``, visible: false },
{ key: 7, label: `备注`, visible: true },
{ key: 8, label: `激活标识`, visible: true },
// { key: 10, label: ``, visible: false },
// { key: 11, label: ``, visible: false },
// { key: 12, label: ``, visible: false },
// { key: 13, label: ``, visible: false },
// { key: 14, label: ``, visible: false },
]);
//

Loading…
Cancel
Save