diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
index 1e8b792..fa6d80c 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -62,12 +62,6 @@
>
{{pd.WORK_END_DATE}}
-
-
-
-
-
-
动火人及证书编号：
@@ -85,30 +79,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -217,17 +187,20 @@
-
-
-
- 安全交底人
- {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
-
-
-
-
-
-
+
+
+
+
+ 安全交底人
+ {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
+
+
+
+
+
+
+
@@ -243,6 +216,19 @@
+
+
+
+ 安全项检查人
+ {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
+ {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
@@ -251,10 +237,6 @@
作业负责人意见
-
-
-
-
作业负责人
@@ -265,23 +247,25 @@
-
-
-
-
-
-
-
-
+
+ 项目主管部门负责人意见
+
+
+
+
+ 项目主管部门负责人
+ {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
+
+
+
+
+
-
+
+
属地监管单位意见
-
-
-
-
属地监管单位负责人
@@ -296,10 +280,6 @@
安全管理部门意见
-
-
-
-
安全管理部门负责人
@@ -315,10 +295,6 @@
动火审批人意见
-
-
-
-
动火审批人
@@ -333,10 +309,6 @@
动火前验票负责人意见
-
-
-
-
动火前验票负责人
@@ -355,7 +327,6 @@
验收部门负责人
-
@@ -548,119 +519,104 @@
current: 0
});
},
- async goSubmit(STATUS){
- var _this = this;
- let required = true
- uni.showLoading({
- title: '请稍候'
- })
- if(STATUS==8) {
+ async goSubmit(STATUS) {
+ var _this = this;
+ let required = true
+ uni.showLoading({
+ title: '请稍候'
+ })
+ if (STATUS == 8) {
- if (_this.imgList.length <= 0) {
- uni.showToast({
- icon: 'none',
- title: '请签字',
- duration: 1500
- });
- return;
- }
- }
- var fileList = [];
- var signtime = [];
- const formData={}
- Object.keys(this.pd).map(key => {
- formData[key]=this.pd[key]
- })
- this.uploadImgFaults(fileList,signtime)
- formData.SIGNTIME = signtime.join(",")
- formData.CORPINFO_ID=corpinfoId
- formData.CREATOR=loginUser.USER_ID
- formData.OPERATOR=loginUser.USER_ID
- formData.ACTION_USER=loginUser.NAME
- formData.APPLY_STATUS=STATUS
- if(STATUS==8){
- // if (await this.getGasFlag()) {
- 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 {
- if(new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() >0){
- uni.showModal({
- title: '',
- content: '作业未开始之前不能进行验收',
- cancelColor: "#000000",
- cancelText: '取消',
- confirmText: '确定',
- success: res => {
- this.buttonloading = false
- _this.goback()
- }
- })
- }else{
- formData.STATUS = STATUS
- this.buttonloading = true
- uni.uploadFile({
- url: basePath + '/app/hotwork/cfd/editAcceptStatus',
- files: fileList,
- 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",
- method: 'POST',
- dataType: 'json',
- header:{
- 'Content-type':'application/x-www-form-urlencoded'
- },
- data: 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
- });
- }
- })
- }
- },
+ if (_this.imgList.length <= 0) {
+ uni.showToast({
+ icon: 'none',
+ title: '请签字',
+ duration: 1500
+ });
+ return;
+ }
+ }
+ var fileList = [];
+ var signtime = [];
+ const formData = {}
+ Object.keys(this.pd).map(key => {
+ formData[key] = this.pd[key]
+ })
+ this.uploadImgFaults(fileList, signtime)
+ formData.SIGNTIME = signtime.join(",")
+ formData.CORPINFO_ID = corpinfoId
+ formData.CREATOR = loginUser.USER_ID
+ formData.OPERATOR = loginUser.USER_ID
+ formData.ACTION_USER = loginUser.NAME
+ formData.APPLY_STATUS = STATUS
+ if (STATUS == 8) {
+ if (new Date(this.pd.WORK_START_DATE).getTime() - new Date().getTime() > 0) {
+ uni.showModal({
+ title: '',
+ content: '作业未开始之前不能进行验收',
+ cancelColor: "#000000",
+ cancelText: '取消',
+ confirmText: '确定',
+ success: res => {
+ this.buttonloading = false
+ _this.goback()
+ }
+ })
+ } else {
+ formData.STATUS = STATUS
+ this.buttonloading = true
+ uni.uploadFile({
+ url: basePath + '/app/hotwork/cfd/editAcceptStatus',
+ files: fileList,
+ 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",
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ },
+ data: 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
+ });
+ }
+ })
+ }
+ },
getGasFlag(){
return new Promise((resolve,reject)=> {
if (this.gasList.length < 1) {
diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
index 4d721ef..d34f822 100644
--- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
@@ -63,11 +63,6 @@
{{pd.WORK_END_DATE}}
-
-
-
-
-
动火人及证书编号：
@@ -85,30 +80,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -210,6 +181,19 @@
+
+
+
+
+ 安全项检查人
+ {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
+ {{pd.SAFETY_SIGNATURE_TIME}}
+
+
@@ -264,7 +248,6 @@
属地监管单位负责人
-
diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
index 7dae74c..4aaa27e 100644
--- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
@@ -85,30 +85,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -212,17 +188,20 @@
-
-
-
- 安全交底人
- {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
-
-
-
-
-
-
+
+
+
+
+ 安全交底人
+ {{ item.CONFESS_USER_NAME }} {{ item.APPROVAL_SIGNATURE_TIME }}
+
+
+
+
+
+
+
@@ -238,16 +217,26 @@
+
+
+
+ 安全项检查人
+ {{pd.SAFETY_USER_NAME}} {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
+ {{pd.SAFETY_SIGNATURE_TIME}}
+
+
+
+
作业负责人意见
-
-
-
-
作业负责人
@@ -258,32 +247,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 项目主管部门负责人意见
+
+
+
+
+ 项目主管部门负责人
+ {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
+
+
+
+
+
属地监管单位意见
-
-
-
-
属地监管单位负责人
@@ -298,10 +279,6 @@
安全管理部门意见
-
-
-
-
安全管理部门负责人
@@ -317,10 +294,6 @@
动火审批意见
-
-
-
-
动火审批人
@@ -338,7 +311,6 @@
动火前验票负责人
-
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 383881b..6f207bc 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
@@ -2,7 +2,7 @@
返回
- 所在单位意见
+ 项目主管部门意见
@@ -237,13 +237,12 @@
-
- 所在单位意见
+ 项目主管部门意见
- 所在单位负责人
+ 项目主管部门负责人