diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue index 69ba5226..407cc1e2 100644 --- a/src/views/projectFront/laborManage/personModule/temporary.vue +++ b/src/views/projectFront/laborManage/personModule/temporary.vue @@ -3,18 +3,6 @@
- - - - - {{ - $t("message.laborMange.personnelEntry") - }} - {{$t("message.laborMange.export")}} - - @@ -62,6 +50,18 @@ {{$t('message.laborMange.export')}} + + + + + {{ + $t("message.laborMange.personnelEntry") + }} + {{$t("message.laborMange.export")}} + +
@@ -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; }, diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue index fb00c64c..31217844 100644 --- a/src/views/projectFront/specialWork/blindPlugWork.vue +++ b/src/views/projectFront/specialWork/blindPlugWork.vue @@ -3,6 +3,10 @@
+ + + + - - + + - - - + + + + + - + @@ -138,7 +146,7 @@ {{ workDetail.workTicketCode }} - + {{item}} @@ -160,12 +168,19 @@ {{ workDetail.assignmentPersonInChargeName }} - - {{ workDetail.jobApplicationTime }} + + {{ workDetail.organizerDate }} {{ workDetail.devPipelineName }} + + {{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('，')}} + + + {{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('，')}} + + - {{workDetail.blindPlatePic&& JSON.parse(workDetail.blindPlatePic) instanceof Array && JSON.parse(workDetail.blindPlatePic).map(item => item.name).join('、')}} + {{ workDetail.blindPlateNo }} @@ -216,14 +231,14 @@ {{ workDetail.riskIdentificationResult }} - + {{ workDetail.otherRelatedSpecialTask }} - + - @@ -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 diff --git a/src/views/projectFront/specialWork/confinedSpaceWork.vue b/src/views/projectFront/specialWork/confinedSpaceWork.vue index de9532f6..9abf7eef 100644 --- a/src/views/projectFront/specialWork/confinedSpaceWork.vue +++ b/src/views/projectFront/specialWork/confinedSpaceWork.vue @@ -3,6 +3,10 @@
+ + + + - - + + - + - - - + + + - + @@ -295,7 +299,7 @@ - @@ -403,10 +405,10 @@ 分析项目 - - 二氧化硫 + + {{item.name? item.name : '--'}} - + -- @@ -432,7 +434,10 @@ 合格标准 - + + {{item.standard? item.standard : '--'}} + + - 5% + 19.5%~21%
(体积分数) -- @@ -457,6 +459,35 @@ -- + + + 分析数据 + + + {{item.name1? item.name1 : '--'}} + + + {{item.name2? item.name2 : '--'}} + + + {{item.name3? item.name3 : '--'}} + + + {{item.name4? item.name4 : '--'}} + + + {{item.name5? item.name5 : '--'}} + + + {{item.time ? item.time : '--'}} + + + {{item.local ? item.local : '--'}} + + + {{item.person ? item.person : '--'}} + +
@@ -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 diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index 7444327c..36afcee5 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -38,12 +38,13 @@ - + - + - + - + @@ -317,6 +322,21 @@ :disabled="isDisabledDetail"> --> + + {{ workDetail.fireLocationAndFirePart }} + + + + {{ workDetail.jobContent }} + + - - {{ workDetail.fireLocationAndFirePart }} - - - {{ workDetail.jobContent }} - {{ workDetail.hotMethod }} @@ -397,28 +411,28 @@ 气体取样分析时间 {{ - item.gasAnalyzeTime }} + item.gasAnalyzeTime ? item.gasAnalyzeTime : '--' }} 代表性气体 {{ - item.representativeGas }} + item.representativeGas ? item.representativeGas : '--' }} 分析结果/% {{ - item.analyzeResult }} + item.analyzeResult ? item.analyzeResult : '--' }} 分析人 {{ - item.analyzer }} + item.analyzer ? item.analyzer : '--' }} @@ -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; diff --git a/src/views/projectFront/specialWork/towerOverWork.vue b/src/views/projectFront/specialWork/towerOverWork.vue index 6ed04efd..b27e2020 100644 --- a/src/views/projectFront/specialWork/towerOverWork.vue +++ b/src/views/projectFront/specialWork/towerOverWork.vue @@ -3,6 +3,10 @@
+ + + + - - + + - + - + @@ -178,7 +182,7 @@ {{ workDetail.riskIdentificationResult }} - + {{ workDetail.otherRelatedSpecialTask }} @@ -189,9 +193,9 @@ - +
@@ -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