diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue index ca8f8c0..3f08529 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue @@ -225,7 +225,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -239,7 +239,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -253,7 +253,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -265,7 +265,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -464,7 +464,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -488,7 +488,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -506,7 +506,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -525,7 +525,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -544,7 +544,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -563,7 +563,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -582,7 +582,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -811,6 +811,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(STATUS){ var _this = this; let required = true 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 ea99fa4..fedd3d7 100644 --- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue @@ -214,7 +214,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -227,7 +227,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -241,7 +241,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -287,7 +287,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -302,7 +302,7 @@ {{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}} - + @@ -317,7 +317,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -332,7 +332,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -347,7 +347,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -361,7 +361,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + 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 0c8c2fd..5cec7e4 100644 --- a/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue @@ -161,7 +161,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -175,7 +175,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -188,7 +188,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -200,7 +200,7 @@ {{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}} - + @@ -217,7 +217,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -248,7 +248,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -267,7 +267,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -286,7 +286,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -305,7 +305,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -320,7 +320,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -541,7 +541,17 @@ _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.files = res.data.imgList; _this.measuresList = res.data.measuresList - if(_this.pd.APPLY_STATUS < 1){ + if (_this.pd.acceptConfessList && _this.pd.acceptConfessList.length > 0) { + for (let i = 0; i < _this.pd.acceptConfessList.length; i++) { + if (_this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_SIGNER_PATH) { + _this.pd.ACCEPT_CONFESS_USER_SIGNER_PATH = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_SIGNER_PATH; + _this.pd.ACCEPT_CONFESS_USER_NAME = _this.pd.acceptConfessList[i].ACCEPT_CONFESS_USER_NAME; + _this.pd.ACCEPT_CONFESS_USER_SIGNER_TIME = _this.pd.acceptConfessList[i].CREATE_TIME; + break; + } + } + } + if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } } else if ("exception" == data.result) { @@ -561,6 +571,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(){ var _this = this; let required = true diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue index 1ed7599..97c8ffb 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue @@ -226,7 +226,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -240,7 +240,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -254,7 +254,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -266,7 +266,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -465,7 +465,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -481,7 +481,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -507,7 +507,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -526,7 +526,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -545,7 +545,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -564,7 +564,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -583,7 +583,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -812,6 +812,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(STATUS){ var _this = this; let required = true diff --git a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue index 0bcd9aa..8469cce 100644 --- a/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue @@ -221,7 +221,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -233,7 +233,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -246,7 +246,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -260,7 +260,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -291,7 +291,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -316,7 +316,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -330,7 +330,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + diff --git a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue index 82c3a5f..c3d1a7d 100644 --- a/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue @@ -225,7 +225,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -239,7 +239,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -253,7 +253,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -265,7 +265,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -464,7 +464,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -488,7 +488,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -506,7 +506,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -525,7 +525,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -544,7 +544,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -563,7 +563,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -582,7 +582,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -811,6 +811,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(STATUS){ var _this = this; let required = true diff --git a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue index 616e886..6534b82 100644 --- a/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue @@ -204,7 +204,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -218,7 +218,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -229,7 +229,7 @@ {{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}} - + @@ -242,7 +242,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -279,7 +279,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -310,7 +310,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -329,7 +329,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -348,7 +348,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -367,7 +367,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -386,7 +386,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -606,6 +606,14 @@ _this.pd.OTHER_PROTECTIVE_MEASURES = '' _this.files = res.data.imgList; _this.measuresList = res.data.measuresList + if (_this.pd.confessList && _this.pd.confessList.length > 0) { + for (let i = 0; i < _this.pd.confessList.length; i++) { + if (_this.pd.confessList[i].APPROVAL_SIGNATURE) { + _this.pd.CONFESS_USER_SIGNER_PATH = _this.pd.confessList[i].APPROVAL_SIGNATURE; + break; + } + } + } if(_this.pd.APPLY_STATUS < 1){ _this.forbidEdit = false; } diff --git a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue index dbc3a7f..b98e494 100644 --- a/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue @@ -218,7 +218,18 @@ {{ pd.MONITOR_USER_MEASURES}} - + + + + 安全项检查人 + {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} + + + + + + @@ -228,7 +239,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -242,22 +253,10 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> - - - - - 安全项检查人 - {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - - - - - @@ -266,7 +265,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -461,7 +460,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -477,7 +476,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -503,7 +502,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -522,7 +521,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -541,7 +540,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -560,7 +559,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -579,7 +578,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -807,6 +806,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(STATUS){ var _this = this; let required = true 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 1437d87..290e4c5 100644 --- a/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue @@ -180,7 +180,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -194,7 +194,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -207,7 +207,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -221,7 +221,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -239,7 +239,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -270,7 +270,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -289,7 +289,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -308,7 +308,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -327,7 +327,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -342,7 +342,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + diff --git a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue index cbb9c7d..28513f7 100644 --- a/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue @@ -225,7 +225,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -239,7 +239,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -253,7 +253,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -265,7 +265,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -464,7 +464,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -479,7 +479,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -506,7 +506,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -525,7 +525,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -544,7 +544,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -563,7 +563,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -582,7 +582,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -808,6 +808,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(STATUS){ var _this = this; let required = true diff --git a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue index ca8f8c0..3f08529 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue @@ -225,7 +225,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -239,7 +239,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -253,7 +253,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -265,7 +265,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -464,7 +464,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -488,7 +488,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -506,7 +506,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -525,7 +525,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -544,7 +544,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -563,7 +563,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -582,7 +582,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -811,6 +811,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(STATUS){ var _this = this; let required = true 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 64d1773..b860ad8 100644 --- a/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue @@ -221,7 +221,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -234,7 +234,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -248,7 +248,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -292,7 +292,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -319,7 +319,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -334,7 +334,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -349,7 +349,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -367,7 +367,7 @@ 签字照片： - + @@ -778,7 +778,7 @@ ViewImage(e) { let files =[]; files.push(e.currentTarget.dataset.url) - uni.previewImage({ + uni.f({ urls: files, current: e.currentTarget.dataset.url }); 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 42fa707..7ad38d8 100644 --- a/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue +++ b/pages/application/hotwork_cfd/hotwork-safety/hotwork-safety-detail.vue @@ -184,7 +184,7 @@ {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - @@ -196,7 +196,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -209,7 +209,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -223,7 +223,7 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> @@ -241,7 +241,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -257,7 +257,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -284,7 +284,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -303,7 +303,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -322,7 +322,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -341,7 +341,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -356,7 +356,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + diff --git a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue index 76a5bbe..cf0fd2c 100644 --- a/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue +++ b/pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue @@ -218,7 +218,18 @@ {{ pd.MONITOR_USER_MEASURES}} - + + + + 安全项检查人 + {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} + + + + + + @@ -228,7 +239,7 @@ + @click="ViewShowImage(baseImgPath + item.APPROVAL_SIGNATURE)" style="height: 100%;"> @@ -242,23 +253,11 @@ + @click="ViewShowImage(baseImgPath + item.ACCEPT_CONFESS_USER_SIGNER_PATH)" style="height: 100%;"> - - - - 安全项检查人 - {{pd.SAFETY_USER_NAME}}{{pd.SAFETY_SIGNATURE_TIME}} - - - - - - @@ -266,7 +265,7 @@ {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}} - + @@ -465,7 +464,7 @@ {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}} - + @@ -481,7 +480,7 @@ {{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}} - + @@ -507,7 +506,7 @@ {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}} - + @@ -526,7 +525,7 @@ {{pd.AUDIT_USER_NAME}} {{pd.AUDIT_USER_SIGNER_TIME}} - + @@ -545,7 +544,7 @@ {{pd.APPROVE_USER_NAME}} {{pd.APPROVE_USER_SIGNER_TIME}} - + @@ -564,7 +563,7 @@ {{pd.MONITOR_USER_NAME}} {{pd.MONITOR_USER_SIGNER_TIME}} - + @@ -583,7 +582,7 @@ {{pd.ACCEPT_USER_NAME}} {{pd.ACCEPT_USER_SIGNER_TIME}} - + @@ -812,6 +811,14 @@ } }); }, + ViewShowImage(url) { + let files = []; + files.push(url) + uni.previewImage({ + urls: files, + current: 0 + }); + }, goSubmit(STATUS){ var _this = this; let required = true