diff --git a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
index 52b914b..3158c06 100644
--- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
@@ -153,7 +153,7 @@
-
+
diff --git a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
index eea2afe..c8197bd 100644
--- a/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail.vue
@@ -712,7 +712,7 @@
-
-
-
-
-
动火人及证书编号：
@@ -85,30 +80,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -145,18 +116,18 @@
-
-
-
-
- 不涉及
-
-
-
- 涉 及
-
-
-
+
+
+
+
+ 不涉及
+
+
+
+ 涉 及
+
+
+
@@ -184,17 +155,20 @@
-
-
-
- 安全交底人
- {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
-
-
-
-
-
-
+
+
+
+
+ 安全交底人
+ {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
+
+
+
+
+
+
+
@@ -210,6 +184,19 @@
+
+
+
+ 安全项检查人
+ {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
+ {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
diff --git a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
index adc32a6..0d9331c 100644
--- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
@@ -198,10 +198,6 @@
作业负责人意见
-
-
-
-
作业负责人
@@ -217,10 +213,6 @@
属地监管单位意见
-
-
-
-
属地监管单位负责人
@@ -236,10 +228,6 @@
安全管理部门意见
-
-
-
-
安全管理部门负责人
@@ -255,10 +243,6 @@
动火审批人意见
-
-
-
-
动火审批人
@@ -274,10 +258,6 @@
动火前验票负责人意见
-
-
-
-
动火前验票负责人
@@ -293,10 +273,6 @@
完工验收
-
-
-
-
验收部门负责人
@@ -308,14 +284,9 @@
-
-
-
-
监护人
-
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
index 639f03e..02fd36a 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue
@@ -2,7 +2,7 @@
返回
- 作业负责人意见
+ 安全检查项人意见
@@ -63,11 +63,6 @@
{{pd.WORK_END_DATE}}
-
-
-
-
-
动火人及证书编号：
@@ -160,17 +155,20 @@
-
-
-
- 安全交底人
- {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
-
-
-
-
-
-
+
+
+
+
+ 安全交底人
+ {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
+
+
+
+
+
+
+
@@ -188,14 +186,9 @@
-
- 作业负责人意见
-
-
- 作业负责人
+ 安全检查项人
-
@@ -215,8 +208,8 @@
-
-
+
+
@@ -262,15 +255,15 @@
confirmindex:-1,
guardianUserList:[],
guardianindex:-1,
- leaderUserList:[],
- leaderindex:-1,
+ leaderUserList:[],
+ leaderindex:-1,
auditUserList:[],
auditindex:-1,
approveUserList:[],
approveindex:-1,
- monitorUserList:[],
- monitorindex:-1,
- acceptUserList:[],
+ monitorUserList:[],
+ monitorindex:-1,
+ acceptUserList:[],
acceptindex:-1,
pd:{},// 数据
measuresList:[],
@@ -347,6 +340,7 @@
HOTWORK_ID: _this.pd.HOTWORK_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
+ showInfo:'1'
},
success: (res) => {
if ("success" == res.data.result) {
@@ -400,96 +394,83 @@
formData.OPERATOR=loginUser.USER_ID
formData.ACTION_USER=loginUser.NAME
formData.APPLY_STATUS=STATUS
- if(STATUS==2){
- if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) {
- uni.showModal({
- title: '',
- content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!',
- cancelColor: "#000000",
- cancelText: '取消',
- confirmText: '确定',
- success: res => {
- this.buttonloading = false
- _this.goback()
- }
- })
- } else {
- formData.STATUS = STATUS
- for (let i = 0; i < this.measuresList.length; i++) {
- const measures = this.measuresList[i]
- if(!measures.STATUS){
- uni.showToast({
- icon: 'none',
- title: '第'+(i+1)+'项未勾选',
- duration: 1500
- });
- return;
- }
- if(measures.STATUS=='1' && measures.QUESTION1 && !measures.ANSWER1){
- uni.showToast({
- icon: 'none',
- title: '第'+(i+1)+'项未填写第一项',
- duration: 1500
- });
- return;
- }
- if(measures.STATUS=='1' && measures.QUESTION2 && !measures.ANSWER2){
- uni.showToast({
- icon: 'none',
- title: '第'+(i+1)+'项未填写第二项',
- duration: 1500
- });
- return;
- }
- if(measures.STATUS=='1' && measures.QUESTION3 && !measures.ANSWER3){
- uni.showToast({
- icon: 'none',
- title: '第'+(i+1)+'项未填写第三项',
- duration: 1500
- });
- return;
- }
- if(measures.STATUS=='1' && measures.QUESTION4 && !measures.ANSWER4){
- uni.showToast({
- icon: 'none',
- title: '第'+(i+1)+'项未填写第四项',
- duration: 1500
- });
- return;
- }
- }
- formData.measuresList = JSON.stringify(this.measuresList)
- formData.CORPINFO_ID = loginUser.CORPINFO_ID
- formData.USER_ID = loginUser.USER_ID
- this.buttonloading = true
- uni.uploadFile({
- url: basePath+'/app/hotwork/cfd/editStatus',
- filePath: _this.imgList[0].filePath,
- name: 'FFILE',
- formData:formData,
- success: (res) => {
- uni.showToast({
- icon:'none',
- title: '保存成功',
- duration: 2000
- });
- _this.goback()
- this.buttonloading = false
- },
- fail: (err) => {
- uni.hideLoading();
- uni.showModal({
- content: err.errMsg,
- showCancel: false
- });
- }
- })
- }
- }else{
+ if (STATUS == 2) {
+ formData.STATUS = STATUS
+ for (let i = 0; i < this.measuresList.length; i++) {
+ const measures = this.measuresList[i]
+ if (!measures.STATUS) {
+ uni.showToast({
+ icon: 'none',
+ title: '第' + (i + 1) + '项未勾选',
+ duration: 1500
+ });
+ return;
+ }
+ if (measures.STATUS == '1' && measures.QUESTION1 && !measures.ANSWER1) {
+ uni.showToast({
+ icon: 'none',
+ title: '第' + (i + 1) + '项未填写第一项',
+ duration: 1500
+ });
+ return;
+ }
+ if (measures.STATUS == '1' && measures.QUESTION2 && !measures.ANSWER2) {
+ uni.showToast({
+ icon: 'none',
+ title: '第' + (i + 1) + '项未填写第二项',
+ duration: 1500
+ });
+ return;
+ }
+ if (measures.STATUS == '1' && measures.QUESTION3 && !measures.ANSWER3) {
+ uni.showToast({
+ icon: 'none',
+ title: '第' + (i + 1) + '项未填写第三项',
+ duration: 1500
+ });
+ return;
+ }
+ if (measures.STATUS == '1' && measures.QUESTION4 && !measures.ANSWER4) {
+ uni.showToast({
+ icon: 'none',
+ title: '第' + (i + 1) + '项未填写第四项',
+ duration: 1500
+ });
+ return;
+ }
+
+ formData.measuresList = JSON.stringify(this.measuresList)
+ formData.CORPINFO_ID = loginUser.CORPINFO_ID
+ formData.USER_ID = loginUser.USER_ID
+ this.buttonloading = true
+ }
+ uni.uploadFile({
+ url: basePath + '/app/hotwork/cfd/safetyApproval',
+ filePath: _this.imgList[0].filePath,
+ name: 'FFILE',
+ formData: formData,
+ success: (res) => {
+ uni.showToast({
+ icon: 'none',
+ title: '保存成功',
+ duration: 2000
+ });
+ _this.goback()
+ this.buttonloading = false
+ },
+ fail: (err) => {
+ uni.hideLoading();
+ uni.showModal({
+ content: err.errMsg,
+ showCancel: false
+ });
+ }
+ })
+ } else {
formData.STATUS=STATUS
this.buttonloading = true
uni.request({
- url: basePath + "/app/hotwork/cfd/editStatus",
+ url: basePath + "/app/hotwork/cfd/safetyApproval",
method: 'POST',
dataType: 'json',
header:{
diff --git a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
index b2a6441..f8d9a7b 100644
--- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-list.vue
@@ -271,25 +271,11 @@
},
methods: {
//跳转事件
- goToDetail(item) {
- if(!item.ANALYZE_TIME || item.ANALYZE_TIME === '无'){
- uni.showModal({
- title:'提示',
- content:'请进行气体检测后在审核',
- showCancel:false
- })
- return
- }
- if(item.APPLY_STATUS == '0.9') {
- uni.navigateTo({
- url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail?HOTWORK_ID=' + item.HOTWORK_ID
- });
- }else{
- uni.navigateTo({
- url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
- });
- }
- },
+ goToDetail(item) {
+ uni.navigateTo({
+ url: '/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail?HOTWORK_ID=' + item.HOTWORK_ID
+ });
+ },
goToAdd(){
uni.navigateTo({
url: '/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail'
@@ -521,7 +507,7 @@
title:"加载中..."
});//加载中动画
uni.request({
- url: basePath +'/app/hotwork/cfd/list?showCount='+_this.showCount+'¤tPage='+_this.currentPage ,
+ url: basePath +'/app/hotwork/cfd/safetyList?showCount='+_this.showCount+'¤tPage='+_this.currentPage ,
method: 'POST',
dataType: 'json',
header: {
@@ -529,8 +515,8 @@
},
data: {
CONFIRM_USER_ID:loginUser.USER_ID,
- // CONFIRM_USER_ID:'6d6c37756530434382e2f14fbcafaa92',
- APPLY_STATUS:'0.9',
+ APPLY_STATUS:'2',
+ TYPE:'2',
tm:new Date().getTime(),
KEYWORDS : _this.NameLikes, //关键字模糊查询
CORPINFO_ID:loginUser.CORPINFO_ID,