|
|
|
@ -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',
|
|
|
|
|