From 3b75798cc41993f9016610296907d2338545a345 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 16 八月 2024 15:43:01 +0800
Subject: [PATCH] Default Changelist
---
src/views/newSpecialWorkSystem/workTicket/wdsq/index.vue | 102 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 78 insertions(+), 24 deletions(-)
diff --git a/src/views/newSpecialWorkSystem/workTicket/wdsq/index.vue b/src/views/newSpecialWorkSystem/workTicket/wdsq/index.vue
index 7cfecd0..50bcae1 100644
--- a/src/views/newSpecialWorkSystem/workTicket/wdsq/index.vue
+++ b/src/views/newSpecialWorkSystem/workTicket/wdsq/index.vue
@@ -34,6 +34,13 @@
/>
</el-select>
</div>
+ <div class="basic-line" style="display:flex;white-space:nowrap;line-height: 40px">
+ <span>作业票编号：</span>
+ <el-input
+ v-model="searPara.workPermitNo"
+ placeholder="请输入作业票编号"
+ />
+ </div>
<div style="margin-left: 20px">
<el-button type="primary" @click="searchRecord">查询</el-button>
<el-button plain @click="clearSearch">重置</el-button>
@@ -49,11 +56,21 @@
<el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
</el-row>
<el-table ref="multipleTableRef" :data="applyData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
+ <el-table-column property="workPermitNo" label="作业编号" align="center">
+ <template #default="scope">
+ {{scope.row.workPermitNo?scope.row.workPermitNo:'—'}}
+ </template>
+ </el-table-column>
<el-table-column property="seDepName" label="事业部" align="center"/>
<el-table-column property="applyDepName" label="作业所在车间" align="center"/>
<el-table-column property="workContent" label="作业内容" align="center"/>
<el-table-column property="workTypeDesc" label="作业类型" align="center"/>
- <el-table-column property="workDepName" label="作业单位" align="center"/>
+ <el-table-column label="作业单位" align="center">
+ <template #default="scope">
+ <span v-if="scope.row.workDepList && scope.row.workDepList.length>0">{{scope.row.workDepList.map(i=>i.workDepName).join(',')}}</span>
+ <span v-else>{{scope.row.workDepName }}</span>
+ </template>
+ </el-table-column>
<el-table-column property="headList" label="负责人及电话" align="center">
<template #default="scope">
{{scope.row.headList.map(i=>{return i.userName + '(' + i.phone+ ')' }).join('，')}}
@@ -89,16 +106,18 @@
<el-table-column label="风险研判" align="center">
<template #default="scope">
<el-button v-if="scope.row.status == 0" link type="primary" size="small" @click="openReport('上传', scope.row)">上传研判报告</el-button>
- <el-tag type="danger" v-else-if="scope.row.status == -1">已废止</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.status == 15">已取消</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.status == 16">已废止</el-tag>
<el-button v-else link type="primary" size="small" @click="openReport('查看', scope.row)">查看研判报告</el-button>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="150">
<template #default="scope">
- <span v-if="scope.row.status == -1">已废止</span>
- <el-button v-if="scope.row.status == 0 || scope.row.status == 1" link type="danger" size="small" :icon="Delete" @click="abortRecordBtn(scope.row)">作废</el-button>
- <el-button v-if="scope.row.status !== -1" link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
- <el-button link type="primary" size="small" v-throttle :icon="Edit" @click="openEdit(scope.row)">修改</el-button>
+ <span v-if="scope.row.status == 16">已废止</span>
+ <span v-if="scope.row.status == 15">已取消</span>
+ <el-button v-if="scope.row.status == 0 || scope.row.status == 1" link type="danger" size="small" :icon="Delete" @click="abortRecordBtn(scope.row)">取消</el-button>
+ <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
+ <el-button v-if="scope.row.status == 0 || scope.row.status == 1" link type="primary" size="small" v-throttle :icon="Edit" @click="openEdit(scope.row)">修改</el-button>
<el-button link type="success" v-throttle v-if="scope.row.status == 0 || scope.row.status == 1" size="small" :icon="Download" @click="checkTicket(scope.row)">正式办票</el-button>
<!-- <el-button :disabled="scope.row.status == 7 ? false : true" link type="primary" size="small" :icon="Download" @click="downLoadBtn(scope.row)">导出作业票</el-button>-->
</template>
@@ -134,7 +153,8 @@
<ground-dialog ref="groundRef" :lists="lists" @refresh="getListByPage"></ground-dialog>
<broken-dialog ref="brokenRef" :lists="lists" @refresh="getListByPage"></broken-dialog>
<height-dialog ref="heightRef" :lists="lists" @refresh="getListByPage"></height-dialog>
- <power-dialog ref="powerRef" :lists="lists" @refresh="getListByPage"></power-dialog>
+ <power-dialog ref="powerRef" :lists="lists" @refresh="getListByPage"></power-dialog>
+ <open-dialog ref="openRef" :lists="lists" @refresh="getListByPage"></open-dialog>
</div>
</template>
@@ -203,7 +223,8 @@
groundDialog: defineAsyncComponent(() => import('/@/views/newSpecialWorkSystem/workTicket/wdsq/components/groundDialog.vue')),
brokenDialog: defineAsyncComponent(() => import('/@/views/newSpecialWorkSystem/workTicket/wdsq/components/brokenDialog.vue')),
heightDialog: defineAsyncComponent(() => import('/@/views/newSpecialWorkSystem/workTicket/wdsq/components/heightDialog.vue')),
- powerDialog: defineAsyncComponent(() => import('/@/views/newSpecialWorkSystem/workTicket/wdsq/components/powerDialog.vue'))
+ powerDialog: defineAsyncComponent(() => import('/@/views/newSpecialWorkSystem/workTicket/wdsq/components/powerDialog.vue')),
+ openDialog: defineAsyncComponent(() => import('/@/views/newSpecialWorkSystem/workTicket/wdsq/components/openDialog.vue'))
},
setup() {
const userInfo = useUserInfo();
@@ -218,6 +239,7 @@
const brokenRef = ref()
const heightRef = ref()
const powerRef = ref()
+ const openRef = ref()
const state = reactive<stateType>({
pageIndex1: 1,
pageSize1: 10,
@@ -230,6 +252,7 @@
searPara:{
startTime: '',
endTime: '',
+ workPermitNo: '',
workType: null,
headUserName: '',
secondDepId: null
@@ -258,7 +281,8 @@
{ id: 5, name: '断路作业' },
{ id: 6, name: '高处作业' },
{ id: 7, name: '临时用电作业' },
- { id: 8, name: '盲板抽堵作业' }
+ { id: 8, name: '盲板抽堵作业' },
+ { id: 9, name: '打开作业' }
],
lists: {
workerList: [],
@@ -277,48 +301,72 @@
],
statusList: [
{
- value: -1,
- label: '废止'
- },
- {
value: 0,
- label: '风险研判中'
+ label: '风险研判'
},
{
value: 1,
- label: '票证办理中'
+ label: '票证办理'
},
{
value: 2,
- label: '安全措施确认中'
+ label: '气体分析'
},
{
value: 3,
- label: '培训交底中'
+ label: '安全措施确认，培训交底'
},
{
value: 4,
- label: '气体分析中'
+ label: '安全措施确认'
},
{
value: 5,
- label: '作业开始'
+ label: '培训交底'
},
{
value: 6,
- label: '作业监护'
+ label: '部门审批'
},
{
value: 7,
- label: '作业结束'
+ label: '作业票填报结束'
},
{
value: 8,
- label: '作业验收'
+ label: '作业气体分析不合格'
},
{
value: 9,
- label: '安全措施确认，培训交底中'
+ label: '审批未通过'
+ },
+ {
+ value: 10,
+ label: '开始'
+ },
+ {
+ value: 11,
+ label: '监护'
+ },
+ {
+ value: 12,
+ label: '结束'
+ },
+ {
+ value: 13,
+ label: '待验收'
+ },
+ {
+ value: 14,
+ label: '验收完成'
+ },
+ {
+ value: 15,
+ label: '取消'
+ },
+ {
+ value: 16,
+ label: '废止作业票'
}
]
});
@@ -358,6 +406,9 @@
}
if(row.workType == 8){
plateRef.value.openDialog(row)
+ }
+ if(row.workType == 9){
+ openRef.value.openDialog(row)
}
}
@@ -551,10 +602,12 @@
state.searPara = {
startTime: '',
endTime: '',
+ workPermitNo: '',
workType: null,
headUserName: '',
secondDepId: null
};
+ state.pageIndex1 = 1
getListByPage();
};
@@ -714,6 +767,7 @@
brokenRef,
heightRef,
powerRef,
+ openRef,
openEdit,
getAllDepartment,
checkTicket,
@@ -791,7 +845,7 @@
}
}
&:last-of-type {
- height: calc(100% - 100px);
+ height: calc(100% - 130px);
}
}
.el-row {
--
Gitblit v1.9.2