diff --git a/colorui/unit.css b/colorui/unit.css index 9bb7e92..e1562b0 100644 --- a/colorui/unit.css +++ b/colorui/unit.css @@ -1087,6 +1087,7 @@ font-weight: bold; color: #000000; font-size: 28upx; + height: auto; /* white-space: nowrap; */ } diff --git a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue index 9706c09..154ae37 100644 --- a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue @@ -11,10 +11,11 @@ 完工验收 - + + + 验收时间 - diff --git a/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue index 6f3cef9..cd405c0 100644 --- a/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue +++ b/pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue @@ -8,7 +8,7 @@ - + 作业结束时间 + @click="showDrawer('showRight',item.HOTWORK_ID)">查看流程图 @@ -139,7 +139,7 @@ stepList:[], sindex:-1, STEP_ID:'', - flowList:[], + flowList:[], } }, onReady() { @@ -167,7 +167,7 @@ _this.list = []; _this.isEnd = false; _this.getData(); - _this.getSetps(); + _this.getSetps(); // _this.getDept(); loginSession(); }, @@ -194,10 +194,10 @@ url: '/pages/application/hotwork/hotwork-measures/hotwork-measures-detail?HOTWORK_ID='+e }); }else if(this.flow === '安全措施确认'){ - uni.navigateTo({ - url: '/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail?HOTWORK_ID='+e - }); - }else if(this.flow === '监护人签字'){ + uni.navigateTo({ + url: '/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail?HOTWORK_ID='+e + }); + }else if(this.flow === '监护人签字'){ uni.navigateTo({ url: '/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail?HOTWORK_ID='+e }); @@ -314,9 +314,10 @@ }, data: { CREATOR:_this.flow === '提交申请'?loginUser.USER_ID : '', - GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '', - STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow, - STEP_ID: _this.STEP_ID, + GASCHECK:_this.flow === '气体检测'?loginUser.USER_ID : '', + STEP_NAME: (_this.flow === '提交申请' || _this.flow === '气体检测')?'' : _this.flow, + measures: _this.flow === '安全措施确认'?1 : '', // 如果是多个安全措施确认人,某个人打回,则其他确认人不显示打回作业 + STEP_ID: _this.STEP_ID, KEYWORDS : _this.KEYWORDS, //关键字模糊查询 CORPINFO_ID:loginUser.CORPINFO_ID, USER_ID:loginUser.USER_ID, diff --git a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue index d2579dc..c7e4af1 100644 --- a/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue +++ b/pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue @@ -256,6 +256,7 @@ this.uploadImgFaults(files,signtime) formData.APPLY_STATUS = APPLY_STATUS formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.DESCR = _this.pd.DESCR formData.SIGNTIME = signtime.join(",") formData.USER_ID = loginUser.USER_ID formData.MEASURES = JSON.stringify(this.measuresList) diff --git a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue index 8868a2d..c20232b 100644 --- a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue +++ b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue @@ -2,12 +2,21 @@ 返回 - 完工验收 + 作业开始时间选择 + + + 作业开始时间 + + + 填写作业开始时间负责人