修复特种
This commit is contained in:
Vce
parent
bfa2d1f22e
commit
d0c5583f86
@ -3,18 +3,6 @@
|
||||
<div class="placeholder"></div>
|
||||
<div class="content">
|
||||
<div class="title_wrap flex">
|
||||
<el-form :inline="true" class="demo-form-inline" size="medium">
|
||||
<el-form-item>
|
||||
<!-- icon="el-icon-plus" -->
|
||||
<!-- 人员录入 -->
|
||||
<el-button v-permission="{key: 'rygl_inputPerson', menuPath: '/project/labor/personManage'}" type="primary" @click="addTemporary">{{
|
||||
$t("message.laborMange.personnelEntry")
|
||||
}}</el-button>
|
||||
<el-button type="primary" v-if="false" icon="el-icon-upload"
|
||||
>{{$t("message.laborMange.export")}}</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-form :inline="true" class="demo-form-inline" size="medium">
|
||||
<el-form-item :label='$t("message.laborMange.healthCodeStatus")' v-if="COMPANY == 'nanchang'">
|
||||
<el-select v-model="codeState" style="width: 120px">
|
||||
@ -62,6 +50,18 @@
|
||||
<el-button title="按班组导出" v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{$t('message.laborMange.export')}}</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-form :inline="true" class="demo-form-inline" size="medium">
|
||||
<el-form-item>
|
||||
<!-- icon="el-icon-plus" -->
|
||||
<!-- 人员录入 -->
|
||||
<el-button v-permission="{key: 'rygl_inputPerson', menuPath: '/project/labor/personManage'}" type="primary" @click="addTemporary">{{
|
||||
$t("message.laborMange.personnelEntry")
|
||||
}}</el-button>
|
||||
<el-button type="primary" v-if="false" icon="el-icon-upload"
|
||||
>{{$t("message.laborMange.export")}}</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<vue-scroll style="height: 86%">
|
||||
<el-table
|
||||
|
||||
@ -320,6 +320,7 @@
|
||||
@change="checkValue()"
|
||||
v-model="enterpriseForm.registeredCapital"
|
||||
placeholder="请输入数字类型"
|
||||
max="999999999999999"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -779,6 +780,12 @@ export default {
|
||||
methods: {
|
||||
checkValue() {
|
||||
var value = '' + this.enterpriseForm.registeredCapital.toString();
|
||||
const maxConut = 999999999999999;
|
||||
if(Number(this.enterpriseForm.registeredCapital) > maxConut){
|
||||
this.enterpriseForm.registeredCapital = maxConut.toFixed(2);
|
||||
return
|
||||
}
|
||||
console.log(this.enterpriseForm.registeredCapital.toString());
|
||||
value = value
|
||||
.replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符
|
||||
.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
|
||||
@ -793,7 +800,7 @@ export default {
|
||||
|
||||
}
|
||||
value = Number(value).toFixed(2); //不足补位
|
||||
console.log(value);
|
||||
console.log('1111111111111',value);
|
||||
this.enterpriseForm.registeredCapital = value;
|
||||
|
||||
},
|
||||
|
||||
@ -3,6 +3,10 @@
|
||||
<div v-if="dialogFormVisible">
|
||||
<div class="search-box">
|
||||
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
|
||||
<el-form-item label="作业票编号">
|
||||
<el-input placeholder="请输入" v-model="formInline.workTicketCode" clearable style="width: 200px">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="作业申请单位">
|
||||
<el-select v-model="formInline.enterpriseId" placeholder="请选择">
|
||||
<el-option :label="item.enterpriseName" :value="item.id"
|
||||
@ -34,8 +38,8 @@
|
||||
<el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
|
||||
@selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
|
||||
<!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
|
||||
<el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
|
||||
<el-table-column align="center" label="作业票编号" prop="workTicketCode">
|
||||
<el-table-column label="序号" type="index" align="center"></el-table-column>
|
||||
<el-table-column align="center" width="200" label="作业票编号" prop="workTicketCode">
|
||||
<template slot-scope="scope">
|
||||
<div class="" style="display: flex;justify-content:center;font-weight:bold">
|
||||
<div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
|
||||
@ -55,12 +59,16 @@
|
||||
{{ scope.row.jobApplicationUnitName }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"></el-table-column>
|
||||
<el-table-column align="center" label="作业类别" prop="jobType"></el-table-column>
|
||||
<el-table-column align="center" label="设备、管道名称" prop="certificateNo"></el-table-column>
|
||||
<el-table-column align="center" label="实际作业开始时间" prop="workExecutionBeginTime" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业类别" prop="jobType" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ JSON.parse(scope.row.jobType).map(item => item).join('、') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="设备、管道名称" prop="devPipelineName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业人" prop="jobPersonName"></el-table-column>
|
||||
<el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
|
||||
<!-- 状态 -->
|
||||
<el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
|
||||
@ -138,7 +146,7 @@
|
||||
{{ workDetail.workTicketCode }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业类别：" :label-width="formLabelWidthDetail">
|
||||
<span v-for="(item,i) in JSON.parse(workDetail.jobType)" :key="i">
|
||||
<span v-for="(item,i) in (workDetail.pipelineParameter&& JSON.parse(workDetail.pipelineParameter) instanceof Array && JSON.parse(workDetail.jobType))" :key="i">
|
||||
<span style="margin-right:5px">{{item}}</span>
|
||||
</span>
|
||||
<!-- {{ workDetail.jobType }} -->
|
||||
@ -160,12 +168,19 @@
|
||||
<el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.assignmentPersonInChargeName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业申请时间：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.jobApplicationTime }}
|
||||
<el-form-item label="编制时间：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.organizerDate }}
|
||||
</el-form-item>
|
||||
<el-form-item label="设备、管道名称：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.devPipelineName }}
|
||||
</el-form-item>
|
||||
<el-form-item label="管道参数：" :label-width="formLabelWidthDetail">
|
||||
{{workDetail.pipelineParameter&& JSON.parse(workDetail.pipelineParameter) instanceof Array && JSON.parse(workDetail.pipelineParameter).map(item => `介质(${item.materialQuality ? item.materialQuality : ''})、温度(${item.specifications ? item.specifications : ''})、压力(${item.number ? item.number : ''})`).join('，')}}
|
||||
</el-form-item>
|
||||
<el-form-item label="盲板参数：" :label-width="formLabelWidthDetail">
|
||||
{{workDetail.blindPlateParameter&& JSON.parse(workDetail.blindPlateParameter) instanceof Array && JSON.parse(workDetail.blindPlateParameter).map(item => `介质(${item.materialQuality? item.materialQuality : ''})、温度(${item.specifications? item.specifications : ''})、压力(${item.number? item.number : ''})`).join('，')}}
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="介质：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.jobContent }}
|
||||
</el-form-item>
|
||||
@ -196,7 +211,7 @@
|
||||
</div>
|
||||
</span>
|
||||
<!-- {{ workDetail.blindPlatePic }} -->
|
||||
{{workDetail.blindPlatePic&& JSON.parse(workDetail.blindPlatePic) instanceof Array && JSON.parse(workDetail.blindPlatePic).map(item => item.name).join('、')}}
|
||||
<!-- {{workDetail.blindPlatePic&& JSON.parse(workDetail.blindPlatePic) instanceof Array && JSON.parse(workDetail.blindPlatePic).map(item => item.name).join('、')}} -->
|
||||
</el-form-item>
|
||||
<el-form-item label="盲板编号：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.blindPlateNo }}
|
||||
@ -216,14 +231,14 @@
|
||||
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.riskIdentificationResult }}
|
||||
</el-form-item>
|
||||
<el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
|
||||
<el-form-item label="关联的其他特殊作业及安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
<!-- <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.safetyWorkTicketCode }}
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="实际作业开始时间：" :label-width="formLabelWidthDetail">
|
||||
<el-date-picker v-model="workDetail.actualJobBeginTime" type="date"
|
||||
<el-date-picker v-model="workDetail.workExecutionBeginTime" type="date"
|
||||
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
@ -329,8 +344,9 @@ export default {
|
||||
formInline: {
|
||||
firemanName: '',
|
||||
enterpriseId: '',
|
||||
workTicketCode:"",
|
||||
},
|
||||
formLabelWidthDetail: "180px",
|
||||
formLabelWidthDetail: "270px",
|
||||
detailData: {},
|
||||
responsibilityList: [],
|
||||
planDate: "",
|
||||
@ -462,6 +478,7 @@ export default {
|
||||
onRefresh() {
|
||||
this.formInline.enterpriseId = "";
|
||||
this.formInline.firemanName = "";
|
||||
this.formInline.workTicketCode = "";
|
||||
this.pageNo = 1;
|
||||
this.initData();
|
||||
},
|
||||
@ -479,6 +496,7 @@ export default {
|
||||
let data = {
|
||||
jobApplicationUnit: this.formInline.enterpriseId,
|
||||
firemanName: this.formInline.firemanName,
|
||||
workTicketCode: this.formInline.workTicketCode,
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn
|
||||
|
||||
@ -3,6 +3,10 @@
|
||||
<div v-if="dialogFormVisible">
|
||||
<div class="search-box">
|
||||
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
|
||||
<el-form-item label="作业票编号">
|
||||
<el-input placeholder="请输入" v-model="formInline.workTicketCode" clearable style="width: 200px">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="作业申请单位">
|
||||
<el-select v-model="formInline.enterpriseId" placeholder="请选择">
|
||||
<el-option :label="item.enterpriseName" :value="item.id"
|
||||
@ -34,8 +38,8 @@
|
||||
<el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
|
||||
@selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
|
||||
<!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
|
||||
<el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
|
||||
<el-table-column align="center" label="作业票编号" prop="workTicketCode">
|
||||
<el-table-column label="序号" type="index" align="center"></el-table-column>
|
||||
<el-table-column align="center" label="作业票编号" width="200" prop="workTicketCode">
|
||||
<template slot-scope="scope">
|
||||
<div class="" style="display: flex;justify-content:center;font-weight:bold">
|
||||
<div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
|
||||
@ -48,19 +52,19 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="受限空间名称" prop="limitSpaceName"></el-table-column>
|
||||
<el-table-column align="center" label="受限空间名称" prop="limitSpaceName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业申请单位" show-overflow-tooltip>
|
||||
<!-- 作业申请单位 -->
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.jobApplicationUnitName }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"></el-table-column>
|
||||
<el-table-column align="center" label="作业内容" prop="jobContent"></el-table-column>
|
||||
<el-table-column align="center" label="受限空间内原有介质名称" prop="limitSpaceMediumName"></el-table-column>
|
||||
<el-table-column align="center" label="作业申请时间" prop="jobApplicationTime" show-overflow-tooltip></el-table-column>
|
||||
<!-- <el-table-column align="center" label="作业内容" prop="jobContent" show-overflow-tooltip></el-table-column> -->
|
||||
<el-table-column align="center" label="受限空间内原有介质名称" prop="limitSpaceMediumName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业人" prop="jobPersonName"></el-table-column>
|
||||
<el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
|
||||
<!-- 状态 -->
|
||||
<el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
|
||||
@ -295,7 +299,7 @@
|
||||
<el-page-header @back="goBack" :content="dialogTitle" class="backText"
|
||||
:class="{ dark: styleType == 2 }"></el-page-header>
|
||||
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
|
||||
<detail :id="detailId" :isSuperDanger="isSuperDanger" @cancleSave="goBack" :workDetail="workDetail"
|
||||
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail"
|
||||
v-if="isEdit">
|
||||
<template v-slot:basicinfo>
|
||||
<div class="info-content">
|
||||
@ -339,10 +343,10 @@
|
||||
</el-date-picker>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="可燃气体信息：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.combustibleGasInformation && JSON.parse(workDetail.combustibleGasInformation).map(item => `${item.name}(${item.standard})`).join('、') }}
|
||||
{{ workDetail.combustibleGasInformation && JSON.parse(workDetail.combustibleGasInformation).map(item => `${item.name}(${item.standard ? item.standard : ''})`).join('、') }}
|
||||
</el-form-item>
|
||||
<el-form-item label="有毒有害气体：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.toxicAndHarmfulGasInformation && JSON.parse(workDetail.toxicAndHarmfulGasInformation).map(item => `${item.name}(${item.standard})`).join('、') }}
|
||||
{{ workDetail.toxicAndHarmfulGasInformation && JSON.parse(workDetail.toxicAndHarmfulGasInformation).map(item => `${item.name}(${item.standard ? item.standard : ''})`).join('、') }}
|
||||
</el-form-item>
|
||||
<el-form-item label="监护人：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.guardianName }}
|
||||
@ -357,7 +361,7 @@
|
||||
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.riskIdentificationResult }}
|
||||
</el-form-item>
|
||||
<el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
|
||||
<el-form-item label="关联的其他特殊作业及安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
@ -365,12 +369,10 @@
|
||||
value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
<!-- -->
|
||||
<!-- :picker-options="pickerOptions" -->
|
||||
</el-form-item>
|
||||
<el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
<!-- <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.safetyWorkTicketCode }}
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
@ -403,10 +405,10 @@
|
||||
<el-col :span="2">
|
||||
分析项目
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
二氧化硫
|
||||
<el-col :span="3" v-for="(item, index) in information" :key="index" >
|
||||
{{item.name? item.name : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<!-- <el-col :span="3">
|
||||
氧化硫
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
@ -414,7 +416,7 @@
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
氢气
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<el-col :span="2">
|
||||
--
|
||||
</el-col>
|
||||
@ -432,7 +434,10 @@
|
||||
<el-col :span="2">
|
||||
合格标准
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
<el-col :span="3" v-for="(item, index) in information" :key="index" >
|
||||
{{item.standard? item.standard : '--'}}
|
||||
</el-col>
|
||||
<!-- <el-col :span="3">
|
||||
5%
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
@ -440,12 +445,9 @@
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
5%
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
5%
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<el-col :span="2">
|
||||
5%
|
||||
19.5%~21%<br/>(体积分数)
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
--
|
||||
@ -457,6 +459,35 @@
|
||||
--
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row v-for="(item, index) in gasAnalysisDataUp" :key="index">
|
||||
<el-col :span="2">
|
||||
分析数据
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{item.name1? item.name1 : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{item.name2? item.name2 : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{item.name3? item.name3 : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="3">
|
||||
{{item.name4? item.name4 : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
{{item.name5? item.name5 : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
{{item.time ? item.time : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
{{item.local ? item.local : '--'}}
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
{{item.person ? item.person : '--'}}
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
</detail>
|
||||
@ -497,8 +528,9 @@ export default {
|
||||
formInline: {
|
||||
firemanName: '',
|
||||
enterpriseId: '',
|
||||
workTicketCode:"",
|
||||
},
|
||||
formLabelWidthDetail: "180px",
|
||||
formLabelWidthDetail: "270px",
|
||||
detailData: {},
|
||||
responsibilityList: [],
|
||||
planDate: "",
|
||||
@ -568,6 +600,26 @@ export default {
|
||||
isUpdate: false
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
information() {
|
||||
let newResult = [];
|
||||
if(this.workDetail.toxicAndHarmfulGasInformation && JSON.parse(this.workDetail.toxicAndHarmfulGasInformation) instanceof Array) {
|
||||
newResult = JSON.parse(this.workDetail.toxicAndHarmfulGasInformation)
|
||||
}
|
||||
if(this.workDetail.combustibleGasInformation && JSON.parse(this.workDetail.combustibleGasInformation) instanceof Array ) {
|
||||
newResult = [...newResult, ...JSON.parse(this.workDetail.combustibleGasInformation)]
|
||||
}
|
||||
return newResult;
|
||||
},
|
||||
gasAnalysisDataUp() {
|
||||
let newResult = [];
|
||||
if(this.workDetail.gasAnalysisData && JSON.parse(this.workDetail.gasAnalysisData) instanceof Array) {
|
||||
newResult = JSON.parse(this.workDetail.gasAnalysisData)
|
||||
}
|
||||
return newResult;
|
||||
},
|
||||
|
||||
},
|
||||
created() {
|
||||
this.projectSn = this.$store.state.projectSn
|
||||
this.styleType = this.$store.state.userInfo.styleType;
|
||||
@ -630,6 +682,7 @@ export default {
|
||||
onRefresh() {
|
||||
this.formInline.enterpriseId = "";
|
||||
this.formInline.firemanName = "";
|
||||
this.formInline.workTicketCode = "";
|
||||
this.pageNo = 1;
|
||||
this.initData();
|
||||
},
|
||||
@ -647,6 +700,7 @@ export default {
|
||||
let data = {
|
||||
jobApplicationUnit: this.formInline.enterpriseId,
|
||||
firemanName: this.formInline.firemanName,
|
||||
workTicketCode: this.formInline.workTicketCode,
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn
|
||||
|
||||
@ -38,12 +38,13 @@
|
||||
<el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
|
||||
@selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
|
||||
<!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
|
||||
<el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
|
||||
<el-table-column label="序号" type="index" align="center"></el-table-column>
|
||||
|
||||
<el-table-column align="center" label="作业票编号" prop="workTicketCode">
|
||||
<el-table-column align="center" label="作业票编号" width="200" prop="workTicketCode">
|
||||
<template slot-scope="scope">
|
||||
<div class="" style="display: flex;justify-content:center;font-weight:bold">
|
||||
<div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
|
||||
<div style="display: flex"
|
||||
:style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
|
||||
<el-tag type="danger" effect="dark" size="mini"
|
||||
v-if="scope.row.engineeringState === 3">超期</el-tag>
|
||||
<!-- <el-tag type="danger" effect="dark" size="mini">超期</el-tag> -->
|
||||
@ -59,15 +60,19 @@
|
||||
{{ scope.row.jobApplicationUnitName }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"></el-table-column>
|
||||
<el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"
|
||||
show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="动火作业级别" prop="hotWorkLevel">
|
||||
<template slot-scope="scope">
|
||||
<div :style="scope.row.hotWorkLevel == '特级' ?'color:#f56c6c' : scope.row.hotWorkLevel == '一级' ? 'color:#DAA520' : scope.row.hotWorkLevel == '二级' ? 'color:#5181F6' : ''"> {{ scope.row.hotWorkLevel }}</div>
|
||||
<div
|
||||
:style="scope.row.hotWorkLevel == '特级' ? 'color:#f56c6c' : scope.row.hotWorkLevel == '一级' ? 'color:#DAA520' : scope.row.hotWorkLevel == '二级' ? 'color:#5181F6' : ''">
|
||||
{{ scope.row.hotWorkLevel }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="动火人及证书编号" prop="firemanAndCertificateNo"></el-table-column>
|
||||
<!-- <el-table-column align="center" label="证书编号" prop="certificateNo"></el-table-column> -->
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName"
|
||||
show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
|
||||
<!-- 状态 -->
|
||||
<el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
|
||||
@ -317,6 +322,21 @@
|
||||
:disabled="isDisabledDetail">
|
||||
</el-date-picker> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="动火地点和动火部位：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.fireLocationAndFirePart }}
|
||||
<!-- <el-tooltip class="item" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" effect="dark"
|
||||
placement="top-start">
|
||||
<div slot="content">{{ workDetail.fireLocationAndFirePart }}</div>
|
||||
<div>{{ workDetail.fireLocationAndFirePart }}</div>
|
||||
</el-tooltip> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.jobContent }}
|
||||
<!-- <el-tooltip class="item" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" effect="dark" :content="workDetail.jobContent"
|
||||
placement="top-start">
|
||||
<div>{{ workDetail.jobContent }}</div>
|
||||
</el-tooltip> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="作业申请单位：" :label-width="formLabelWidthDetail">
|
||||
<el-select v-model="workDetail.jobApplicationUnit" placeholder="请选择作业申请单位" disabled>
|
||||
<el-option :label="item.enterpriseName" :value="item.id"
|
||||
@ -324,12 +344,6 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="动火地点和动火部位：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.fireLocationAndFirePart }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业内容：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.jobContent }}
|
||||
</el-form-item>
|
||||
<el-form-item label="动火方式：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.hotMethod }}
|
||||
</el-form-item>
|
||||
@ -397,28 +411,28 @@
|
||||
<el-row>
|
||||
<el-col :span="3">气体取样分析时间</el-col>
|
||||
<el-col :span="3" v-for="item in workDetail.xzGasAnalyzeList" :key="item.id">{{
|
||||
item.gasAnalyzeTime }}</el-col>
|
||||
item.gasAnalyzeTime ? item.gasAnalyzeTime : '--' }}</el-col>
|
||||
<!-- <el-col :span="3">12-03 12:00</el-col>
|
||||
<el-col :span="3">12-03 12:00</el-col> -->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="3">代表性气体</el-col>
|
||||
<el-col :span="3" v-for="item in workDetail.xzGasAnalyzeList" :key="item.id">{{
|
||||
item.representativeGas }}</el-col>
|
||||
item.representativeGas ? item.representativeGas : '--' }}</el-col>
|
||||
<!-- <el-col :span="3">一氧化氢</el-col>
|
||||
<el-col :span="3">一氧化氢</el-col> -->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="3">分析结果/%</el-col>
|
||||
<el-col :span="3" v-for="item in workDetail.xzGasAnalyzeList" :key="item.id">{{
|
||||
item.analyzeResult }}</el-col>
|
||||
item.analyzeResult ? item.analyzeResult : '--' }}</el-col>
|
||||
<!-- <el-col :span="3">50%</el-col>
|
||||
<el-col :span="3">50%</el-col> -->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="3">分析人</el-col>
|
||||
<el-col :span="3" v-for="item in workDetail.xzGasAnalyzeList" :key="item.id">{{
|
||||
item.analyzer }}</el-col>
|
||||
item.analyzer ? item.analyzer : '--' }}</el-col>
|
||||
<!-- <el-col :span="3">50%</el-col>
|
||||
<el-col :span="3">50%</el-col> -->
|
||||
</el-row>
|
||||
@ -462,9 +476,9 @@ export default {
|
||||
formInline: {
|
||||
firemanName: '',
|
||||
enterpriseId: '',
|
||||
workTicketCode:"",
|
||||
workTicketCode: "",
|
||||
},
|
||||
formLabelWidthDetail: "180px",
|
||||
formLabelWidthDetail: "270px",
|
||||
detailData: {},
|
||||
responsibilityList: [],
|
||||
planDate: "",
|
||||
@ -971,7 +985,7 @@ export default {
|
||||
}
|
||||
|
||||
.form-box {
|
||||
width: 70%;
|
||||
width: 90%;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
|
||||
@ -3,6 +3,10 @@
|
||||
<div v-if="dialogFormVisible">
|
||||
<div class="search-box">
|
||||
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
|
||||
<el-form-item label="作业票编号">
|
||||
<el-input placeholder="请输入" v-model="formInline.workTicketCode" clearable style="width: 200px">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="作业申请单位">
|
||||
<el-select v-model="formInline.enterpriseId" placeholder="请选择">
|
||||
<el-option :label="item.enterpriseName" :value="item.id"
|
||||
@ -34,8 +38,8 @@
|
||||
<el-table class="tables" :data="tableData" size="small" @cell-click="previewDetail"
|
||||
@selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }">
|
||||
<!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
|
||||
<el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
|
||||
<el-table-column align="center" label="作业票编号" prop="workTicketCode">
|
||||
<el-table-column label="序号" type="index" align="center"></el-table-column>
|
||||
<el-table-column align="center" label="作业票编号" width="200" prop="workTicketCode">
|
||||
<template slot-scope="scope">
|
||||
<div class="" style="display: flex;justify-content:center;font-weight:bold">
|
||||
<div style="display: flex" :style="tableData.some(item => item.engineeringState == 3) ? 'justify-content:flex-end' : 'justify-content:center;'">
|
||||
@ -54,13 +58,13 @@
|
||||
{{ scope.row.jobApplicationUnitName }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="作业申请时间" prop="jobApplicationTime"></el-table-column>
|
||||
<el-table-column align="center" label="作业申请时间" prop="jobApplicationTime" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="高出作业级别" prop="highJobLevel"></el-table-column>
|
||||
<el-table-column align="center" label="作业高度" prop="jobHigh"></el-table-column>
|
||||
<el-table-column align="center" label="作业地点" prop="workPlace"></el-table-column>
|
||||
<el-table-column align="center" label="作业人" prop="jobPersonName"></el-table-column>
|
||||
<el-table-column align="center" label="监护人" prop="guardianName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName"></el-table-column>
|
||||
<el-table-column align="center" label="作业单位" prop="operatingUnitName" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column align="center" label="作业负责人" prop="assignmentPersonInChargeName"></el-table-column>
|
||||
<!-- 状态 -->
|
||||
<el-table-column :label="$t('message.dangerousBigProject.finalAcceptanceStatus')" align="center">
|
||||
@ -178,7 +182,7 @@
|
||||
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.riskIdentificationResult }}
|
||||
</el-form-item>
|
||||
<el-form-item label="关联的其他特殊作业：" :label-width="formLabelWidthDetail">
|
||||
<el-form-item label="关联的其他特殊作业及安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.otherRelatedSpecialTask }}
|
||||
</el-form-item>
|
||||
<el-form-item label="作业实施时间：" :label-width="formLabelWidthDetail">
|
||||
@ -189,9 +193,9 @@
|
||||
<!-- -->
|
||||
<!-- :picker-options="pickerOptions" -->
|
||||
</el-form-item>
|
||||
<el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
<!-- <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
|
||||
{{ workDetail.safetyWorkTicketCode }}
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
@ -236,8 +240,9 @@ export default {
|
||||
formInline: {
|
||||
firemanName: '',
|
||||
enterpriseId: '',
|
||||
workTicketCode:"",
|
||||
},
|
||||
formLabelWidthDetail: "180px",
|
||||
formLabelWidthDetail: "270px",
|
||||
detailData: {},
|
||||
responsibilityList: [],
|
||||
planDate: "",
|
||||
@ -369,6 +374,7 @@ export default {
|
||||
onRefresh() {
|
||||
this.formInline.enterpriseId = "";
|
||||
this.formInline.firemanName = "";
|
||||
this.formInline.workTicketCode = "";
|
||||
this.pageNo = 1;
|
||||
this.initData();
|
||||
},
|
||||
@ -386,6 +392,7 @@ export default {
|
||||
let data = {
|
||||
jobApplicationUnit: this.formInline.enterpriseId,
|
||||
firemanName: this.formInline.firemanName,
|
||||
workTicketCode: this.formInline.workTicketCode,
|
||||
pageNo: this.pageNo,
|
||||
pageSize: this.pageSize,
|
||||
projectSn: this.projectSn
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user