diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
index dbc37b0..b5ace25 100644
--- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
@@ -184,7 +184,7 @@
-
+
安全项检查人
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
index 6eaf46f..1f3e2e3 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
@@ -174,15 +174,17 @@
-
-
-
- 安全交底人
- {{ pd.CONFESS_USER_NAME }} {{ pd.CONFESS_USER_SIGNER_TIME }}
-
-
-
+
+
+
+
+ 安全交底人
+ {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
+
+
+
+
@@ -204,7 +206,21 @@
+
+
+
+ 安全项检查人
+ {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
+ {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
+
作业负责人意见
@@ -251,7 +267,7 @@
@@ -430,7 +446,7 @@ export default {
uni.showLoading({
title: '请稍候'
})
- if (STATUS === 1.5) {
+ if (STATUS === 2) {
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
@@ -447,7 +463,7 @@ export default {
formData.CREATOR = loginUser.USER_ID
formData.OPERATOR = loginUser.USER_ID
formData.ACTION_USER = loginUser.NAME
- formData.APPLY_STATUS = '2'
+ formData.APPLY_STATUS = STATUS
formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID
diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
index 1cc913a..a1dab75 100644
--- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
+++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
@@ -2,7 +2,7 @@
返回
- 作业负责人意见
+ 项目主管部门意见
@@ -273,11 +273,11 @@
goToDetail(item) {
if(item.APPLY_STATUS == '1.5') {
uni.navigateTo({
- url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-detail?HOTWORK_ID=' + item.HOTWORK_ID
+ url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail?HOTWORK_ID=' + item.HOTWORK_ID
});
}else{
uni.navigateTo({
- url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-confirm-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
+ url: '/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail?HOTWORK_ID=' + item.HOTWORK_ID
});
}
},