From 92a14a3cba619fb52347ecac8f059be9382fc28c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 14 May 2024 17:13:51 +0800 Subject: [PATCH] bug#1156 --- .../resourceManagement/enterprise/addForm.vue | 227 ++++++++++-------- 1 file changed, 132 insertions(+), 95 deletions(-) diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index 7d2afeffd..93cebadbd 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -87,71 +87,6 @@
新增
- - - - ●{{item.checkTime}} - - - - - 检查人员: {{ - item.checkPersons }} - 检查结论: {{ - item.checkResultFlag === 1?'合格':'不合格' }} - 拟复查时间: {{ - item.reviewTime || '--' }} - - - {{item.flag?'已整改隐患':'隐患明细'}}: -
-

- {{index+1}}.{{itemC.hazardDesc}}

-
- -- - - - - 未整改隐患: -
-

- {{index+1}}.{{itemC.hazardDesc}}

-
- -- - - - - 整改要求: -

- {{index+1}}.{{item.hiddenDangeList.find(item=>item.hazardStatus == 2).hazardDesc}} -

- - - - - - 附件: - {{ - itemI.fileName }} - -
- -
- - 备注: {{ - item.remark || '--' }} - - -
- 暂无数据~ -
@@ -179,14 +114,14 @@ + placeholder="请选择" class="list_item_width_1" size="small" @change="handelChangeCheckResultFlag"> - + - + - + {{ @@ -208,23 +142,24 @@ - - - - + + + - - + - + @@ -249,6 +184,72 @@ + + + + ●{{item.checkTime}} + + + + + 检查人员: {{ + item.checkPersons }} + 检查结论: {{ + item.checkResultFlag === 1?'合格':'不合格' }} + 拟复查时间: {{ + item.reviewTime || '--' }} + + + {{item.flag?'已整改隐患':'隐患明细'}}: +
+

+ {{index+1}}.{{itemC.hazardDesc}}

+
+ -- + + + + 未整改隐患: +
+

+ {{index+1}}.{{itemC.hazardDesc}}

+
+ -- + + + + 整改要求: +

+ {{index+1}}.{{item.hiddenDangeList.find(item=>item.hazardStatus == 2).hazardDesc}} +

+ + + + + + 附件: + {{ + itemI.fileName }} + +
+ +
+ + 备注: {{ + item.remark || '--' }} + + +
+ 暂无数据~ +
+ @@ -379,7 +380,8 @@ export default { loading: false, searchOptions: [], preViewImage:null, - preViewImageFlag:false + preViewImageFlag:false, + messageFlag:false }; }, watch: {}, @@ -394,9 +396,6 @@ export default { if (this.pageType != 'add' && this.pageType != 'patrol') { this.getDetail(); }else if(this.pageType == 'patrol') { - if(this.checkResultFlag ===1){ - delete this.patrolRule.reviewTime - } this.getCompanyDetail() this.getStafflist() }else { @@ -406,6 +405,15 @@ export default { }, methods: { + handelChangeCheckResultFlag(val){ + if(val == 1){ + this.hiddenDangeArr = [] + delete this.patrolRule.reviewTime + }else{ + this.hiddenDangeArr = this.checkboxOptions.map(item=>item.value) + this.$set(this.patrolRule,'reviewTime',[{ required: true, message: '拟复查时间不能为空', trigger: 'blur' }]) + } + }, handelCLickImage(url){ this.preViewImageFlag = true; this.preViewImage = url; @@ -547,11 +555,17 @@ export default { }else if(this.pageType === 'patrol'){ this.$refs['form3'].validate(valid => { if (valid){ + if(this.checkboxOptions.length > 0 && this.hiddenDangeArr.length === 0){ + this.messageFlag = true; + return + }else{ + this.messageFlag = false; + } this.save(); } }); } - // this.save(); + this.save(); }, async save() { console.log('this.formData', this.formData); @@ -566,13 +580,15 @@ export default { }else if(this.pageType == 'patrol'){ url = '/actual/base/companyInfo/addRecord'; params = { ...this.patrolForm }; - for(let i in this.hiddenDangeArr){ - this.checkboxOptions.forEach(item => { - if(item.value == this.hiddenDangeArr[i]){ - this.$set(item,'hazardStatus', '1'); + console.log(this.hiddenDangeArr); + this.checkboxOptions.forEach(item => { + if(this.hiddenDangeArr.findIndex(itemC=>itemC === item.value) == -1){ + item.hazardStatus = '1'; + }else{ + item.hazardStatus = '0'; } }) - } + for (let i in this.inputList) { let option = this.inputList[i]; if (this.patrolForm.checkResultFlag === '1') { @@ -588,13 +604,14 @@ export default { params.companyId = this.detailId; params.attachmentUrls = this.fileList; } - const { data, code, msg } = await requestPost(url, params); - if (code === 0) { - this.$message.success('操作成功'); - this.handleCancle(); - } else if (code >= 8000) { - this.$message.error(msg); - } + console.log(params); + // const { data, code, msg } = await requestPost(url, params); + // if (code === 0) { + // this.$message.success('操作成功'); + // this.handleCancle(); + // } else if (code >= 8000) { + // this.$message.error(msg); + // } }, handleCancle() { @@ -737,4 +754,24 @@ export default { align-items: center; justify-content: center; } +.inputRequirt { + position: relative; + min-width: 300px; +} +.inputRequirt::after { + content: '*'; + color: #f56c6c; + position: absolute; + left: 8px; + top: 10px; +} +.inputRequirtSave::before { + content: '请选择未更改隐患'; + color: #f56c6c; + position: absolute; + left: 104px; + bottom: -1px; + width: 300px; +} +