diff --git a/src/assets/i18n/langs/cn/quality.js b/src/assets/i18n/langs/cn/quality.js index 604bd484..ea232a51 100644 --- a/src/assets/i18n/langs/cn/quality.js +++ b/src/assets/i18n/langs/cn/quality.js @@ -119,6 +119,9 @@ export default { inspectTime: [ { required: true, message: "请选择检查时间", trigger: "change" }, ], + enterpriseName: [ + { required: true, message: "请选择分包单位", trigger: "change" }, + ], changeLimitTime: [ { required: true, message: "请选择整改时限", trigger: "change" }, ], diff --git a/src/assets/js/http.js b/src/assets/js/http.js index ce1e3e00..9194fc40 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue index 893cb271..3cfe5a6c 100644 --- a/src/views/projectFront/quality/inspectionLedger.vue +++ b/src/views/projectFront/quality/inspectionLedger.vue @@ -688,7 +688,7 @@ :placeholder="$t('message.quality.pleaseSelect')" >
- {{ $t('message.quality.lborSubcontractor') }} - + --> { + if (res.code == 200) { + this.crewUpdateList = res.result + } + }) + }, //获取问题描述 handleChange(value) { @@ -2739,7 +2755,7 @@ export default { this.showEnterpriseDialog = true } let data = { - enterpriseTypeId: this.subcontractType, + // enterpriseTypeId: this.subcontractType, pageNo: 1, pageSize: 999, projectSn: this.projectSn @@ -2761,10 +2777,15 @@ export default { if (this.recordType == 1) { this.addForm1.enterpriseSn = val.enterpriseSn this.addForm1.enterpriseName = val.enterpriseName + this.unitEnterpriseId = val.id } else { this.addForm2.enterpriseSn = val.enterpriseSn this.addForm2.enterpriseName = val.enterpriseName + this.unitEnterpriseId = val.id } + this.addForm1.changeId = ""; + this.getPeopleList(); + this.getPeopleUpdateList(); this.showEnterpriseDialog = false }, diff --git a/src/views/projectFront/quality/v2/inspectionRecord.vue b/src/views/projectFront/quality/v2/inspectionRecord.vue index e5ee488c..0c190924 100644 --- a/src/views/projectFront/quality/v2/inspectionRecord.vue +++ b/src/views/projectFront/quality/v2/inspectionRecord.vue @@ -1,477 +1,888 @@ + + + + + + + + + + + + + - - - - {{ - $t('message.safeMangeCheck.query') - }} - {{ - $t('message.safeMangeCheck.add') - }} - {{ - $t('message.safeMangeCheck.out') - }} - {{ - $t('message.safeMangeCheck.fresh') - }} -
-
- - - --> + + - + + + + -
- -
- - {{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.dialog.records') - }} - {{ - $t('message.safeMangeCheck.delay') + - $t('message.safeMangeCheck.dialog.change') - }} +
+ + {{ $t('message.quality.qualityProblem') }} - -
- - - -
- {{ - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.result') + - ':' - }} - {{ - detailData.status ? statusArr[detailData.status - 1] : '' - }} + {{ $t('message.quality.recordsOfTheFebruary') }} + +
+ + + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + + + + + + + + + {{ + $t('message.quality.stair') + }} + {{ + $t('message.quality.second') + }} + {{ + $t('message.quality.three') + }} + {{ + $t('message.quality.four') + }} + + + + + {{ + $t('message.quality.ordinary') + }} + {{ + $t('message.quality.severity') + }} + {{ + $t('message.quality.critical') + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('message.quality.uploadHint') }} + + + + {{ $t('message.quality.uploadAttachment') }} + +
+ {{ $t('message.quality.uploadHint2') }}
- - -
- - {{ - $t('message.safeMangeCheck.dialog.duty') + - $t('message.safeMangeCheck.dialog.area') + - ':' - }} - {{ detailData.dutyRegion }} -
-
- - - -
- {{ - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.people') + - ':' - }} - {{ detailData.createUserName }} -
-
- -
- {{ - $t('message.safeMangeCheck.checked') + - $t('message.safeMangeCheck.time') + - ':' - }} - {{ detailData.inspectTime }} -
-
-
-
- - - -
- {{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.level') + - ':' - }} - {{ detailData.checkItem }}/{{ - detailData.checkSubitem - }} -
-
- - -
- {{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.list') + - ':' - }} - {{ detailData.checkContent }} -
-
-
- - - -
- {{ - $t('message.safeMangeCheck.hiddenDanger') + - $t('message.safeMangeCheck.level2') + - ':' - }} - {{ - detailData.hiddenDangerLevel - }} -
-
- - -
- {{ - $t('message.safeMangeCheck.dialog.allInstruction') + - ':' - }} - {{ detailData.dangerDesc }} -
-
-
- - - -
- {{ - $t('message.safeMangeCheck.changeCompany') + ':' - }} - {{ detailData.enterpriseName }} -
-
- - -
- {{ - $t('message.safeMangeCheck.changePeople') + ':' - }} - {{ detailData.changeUserName }} -
-
-
- - - -
- {{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.timeLimit') + - ':' - }} - {{ - detailData.changeLimitTime - }} -
-
- - -
- {{ - $t('message.safeMangeCheck.dialog.event') + - $t('message.safeMangeCheck.hiddenDanger') + - ':' - }} - {{ - detailData.faultLevel == 1 - ? $t('message.safeMangeCheck.common') - : $t('message.safeMangeCheck.great') - }} -
-
-
- - - -
- {{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.ask') + - ':' - }} - {{ detailData.rectifyRequire }} -
-
-
-
- - -
- - {{ - $t('message.safeMangeCheck.dialog.about') + - $t('message.safeMangeCheck.dialog.photo') + - ':' - }} - - - - -
-
-
-
- - + + +

{{ - item.type == 1 - ? $t('message.safeMangeCheck.changePeople') - : $t('message.safeMangeCheck.examinePeople') - }}:{{ item.type == 1 ? '整改人' : '复查人' }}:{{ item.createUserName }}

-

- {{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.status') + - ':' - }}整改状态:{{ - item.status == 2 - ? $t('message.safeMangeCheck.alreadyChange') - : $t('message.safeMangeCheck.unChange') + item.status == 2 ? '已整改' : '未整改' }}

-

- {{ - $t('message.safeMangeCheck.dialog.examin') + - $t('message.safeMangeCheck.status') + - ':' - }}复查状态:{{ - item.status == 2 - ? $t('message.safeMangeCheck.upToStandard') - : $t('message.safeMangeCheck.not') + - $t('message.safeMangeCheck.upToStandard') + item.status == 2 ? '合格' : '不合格' }}

-

- {{ - $t('message.safeMangeCheck.dialog.about') + - $t('message.safeMangeCheck.dialog.explain') + - ':' - }}相关说明:{{ item.additionalRemarks }}

- -
- {{ - $t('message.safeMangeCheck.dialog.about') + - $t('message.safeMangeCheck.dialog.photo') + - ':' - }} +
+ 相关照片:
- - - {{ - $t('message.safeMangeCheck.dialog.change') + - $t('message.safeMangeCheck.dialog.anser') + - ':' - }} - - {{ - $t('message.safeMangeCheck.dialog.examin') + - $t('message.safeMangeCheck.dialog.anser') + - ':' - }} - + --> +
+
- + + + + + + + + + + + + + + + + + + - - - + - + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + + {{ $t('message.quality.uploadHint') }} + + + + {{ $t('message.quality.uploadAttachment') }} +
+ {{ $t('message.quality.uploadHint2') }} +
+
- -
-
- - {{ - detailData.reviewId == $store.state.userInfo.userId && - detailData.status == 3 - ? $t('message.safeMangeCheck.dialog.pass') - : $t('message.safeMangeCheck.dialog.confirm') - }} - {{ $t('message.safeMangeCheck.dialog.back') }} - {{ - $t('message.safeMangeCheck.dialog.cancel') - }} -
- - - - - -
- - - - - - - - +
- - - - - - - - - - - - - - 无需整改 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
-
- - {{ - $t('message.safeMangeCheck.dialog.confirm') - }} - {{ - $t('message.safeMangeCheck.dialog.cancel') - }} + + + + +
+ + + + +
+ + + + +
+
+
+ +
+
+
+ + + + +
+ + + {{ $t('message.personnelPosition.mapManage.re_upload') }} + + +
+ +
+
+ + +
+ +
+

+ {{ $t('message.quality.coordinate') }}:X: + {{ item.coordinateX }};Y: + {{ item.coordinateY }} +

+

+ + {{ + $t('message.personnelPosition.mapManage.delete') + }} +

+
+ +
+
+
+
+
+
+
+ +

+ {{ $t('message.personnelPosition.mapManage.no_drawings') }} + + {{ + $t('message.personnelPosition.mapManage.click_upload') + }} + + +

+
+
+
+
+
+ + +
+ + + +
+ + + +
+ +
+ + + + + +
+ +
+ +
隐患记录
+ 超期整改 +
+ + +
+ 检查类型: + {{ + detailData.recordType == 1 ? '质量问题' : '排查记录' + }} +
+
+ +
+ 分包单位: + {{ detailData.enterpriseName }} +
+
+
+ + +
+ 整改结果: + + + + + {{ + detailData.status == 2 + ? '待整改' + : detailData.status == 3 + ? '待复查' + : detailData.status == 4 + ? '待核验' + : detailData.status == 5 + ? '合格' + : '' + }} + + +
+
+ +
+ 检查时间: + {{ detailData.inspectTime }} +
+
+
+ + +
+ 检查人: + {{ + detailData.inspectManName + }} +
+
+ +
+ 补充说明: + + {{ detailData.dangerDesc }} + +
+
+
+
+ + +
+ 分部工程: + + {{ detailData.subsectionName }} + +
+
+ +
+ 分项工程: + + {{ detailData.subentryName }} + +
+
+
+ + +
+ 核验人: + {{ + detailData.verifyManName + }} +
+
+ +
+ 问题等级: + {{ + detailData.level == 1 + ? '一级' + : detailData.level == 2 + ? '二级' + : detailData.level == 3 + ? '三级' + : '四级' + }} +
+
+
+ + + +
+ 检查部位: + {{ + detailData.regionName + }} +
+
+ +
+ 事件描述: + + {{ detailData.addedDescription }} + +
+
+
+ + +
+ 现场整改: + {{ + detailData.status == 1 || detailData.status == 5 + ? '已完成' + : '未完成' + }} +
+
+ +
+ 紧急程度: + {{ + detailData.urgentLevel == 1 + ? '一般' + : detailData.urgentLevel == 2 + ? '严重' + : '紧要' + }} +
+
+
+
+ + +
+ 问题分类: + + {{ detailData.dangerItemContent }} + +
+
+ +
+ 整改人: + {{ + detailData.changeName + }} +
+
+
+ + +
+ 整改要求: + + {{ detailData.remark }} + +
+
+ +
+ 整改时限: + {{ detailData.changeLimitTime }} +
+
+
+ + + +
+ 问题描述: + + {{ detailData.problemDescription }} + +
+
+ +
+ 复查人: + {{ + detailData.reviewName + }} +
+
+
+ + + +
+ 巡检楼层: + + {{ detailData.floor }} + +
+
+ +
+ 现场视频: + + {{ videoName }} + +
+
+
+ + +
+ 排查分类: + {{ + detailData.dangerItemContent + }} +
+
+ + +
+ 现场照片: + + + + +
+
+
+ + + +
+ 整改&复核记录 +
+ + + +

+ {{ + item.type == 1 + ? '整改人:' + : item.type == 2 + ? '复查人:' + : item.type == 3 + ? '核验人:' + : '无' + }}{{ item.createUserName }} +

+

+ 整改状态:{{ + item.status == 2 ? '已整改' : '未整改' + }} +

+

+ 复查状态:{{ + item.status == 2 ? '合格' : '不合格' + }} +

+

+ 核验状态:{{ + item.status == 2 ? '合格' : '不合格' + }} +

+

+ 驳回说明:{{ item.additionalRemarks }} +

+

+ 补充说明:{{ item.additionalRemarks }} +

+
+ {{ + item.type == 1 + ? '整改照片:' + : item.type == 2 + ? '复查照片:' + : '核验照片:' + }} + + + + +
+
+
+
+
+
+
+
+
+ + + +
diff --git a/src/views/projectFront/quality/v2/inspectionRecordOld.vue b/src/views/projectFront/quality/v2/inspectionRecordOld.vue new file mode 100644 index 00000000..e5ee488c --- /dev/null +++ b/src/views/projectFront/quality/v2/inspectionRecordOld.vue @@ -0,0 +1,1782 @@ + + +