From a14c542742e3460bee7b366b3c016f14192be192 Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Wed, 31 Jan 2024 15:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=A4=9A=E4=BA=BA=E7=AD=BE=E5=AD=97=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/select-tree/select-tree.vue | 4 +- pages/application/eight-assignments.vue | 4 +- pages/application/hotwork/home.vue | 22 ++--- .../hotwork-accept/hotwork-accept-detail.vue | 8 +- .../hotwork-acceptconfess-detail.vue | 2 +- .../hotwork-apply/hotwork-apply-detail.vue | 64 +++++++++---- .../hotwork-approve-detail.vue | 68 ++++++++----- .../hotwork-audit/hotwork-audit-detail.vue | 68 ++++++++----- .../hotwork-confess-detail.vue | 95 ++++++++++++++++++- .../hotwork-confirm-detail.vue | 6 +- .../hotwork/hotwork-detail/index.vue | 24 +++-- .../hotwork-endwork-detail.vue | 2 +- .../hotwork/hotwork-gas/gas-detail.vue | 10 +- .../hotwork/hotwork-gas/gas-list.vue | 2 +- .../hotwork-guardian-detail.vue | 2 +- .../hotwork-leader/hotwork-leader-detail.vue | 71 +++++++++----- .../hotwork/hotwork-list/index.vue | 20 ++-- .../hotwork-measures-confirm-detail.vue | 2 +- .../hotwork-measures-detail.vue | 2 +- .../hotwork-monitor-detail.vue | 6 +- .../hotwork-startwork-detail.vue | 2 +- 21 files changed, 339 insertions(+), 145 deletions(-) diff --git a/components/select-tree/select-tree.vue b/components/select-tree/select-tree.vue index 7ff0c95..a492956 100644 --- a/components/select-tree/select-tree.vue +++ b/components/select-tree/select-tree.vue @@ -29,7 +29,9 @@ - + diff --git a/pages/application/eight-assignments.vue b/pages/application/eight-assignments.vue index a6a2b1b..0eab208 100644 --- a/pages/application/eight-assignments.vue +++ b/pages/application/eight-assignments.vue @@ -48,10 +48,10 @@ 动土作业 - + - {{eight_work_count.HIGH_WORK_COUNT}} + {{eight_work_count.HIGHWORK_COUNT}} 高处作业 diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue index 2881d14..9c1299e 100644 --- a/pages/application/hotwork/home.vue +++ b/pages/application/hotwork/home.vue @@ -41,15 +41,15 @@ 措施确认人 - - - - {{count.MEASURES_CONFIRM}} - - - 安全措施确认 - - + + + + {{count.MEASURES_CONFIRM}} + + + 安全措施确认 + + @@ -232,8 +232,8 @@ }, data: { tm:new Date().getTime(), - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, }, success: (res) => { uni.hideLoading();//结束加载中动画 diff --git a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue index 154ae37..efa5183 100644 --- a/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue +++ b/pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue @@ -45,7 +45,7 @@ - + @@ -189,9 +189,9 @@ var signtime = []; this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime.join(",") - formData.ACCEPT_TIME = this.pd.ACCEPT_TIME - formData.HOTWORK_ID = this.pd.HOTWORK_ID - formData.DESCR = this.pd.DESCR + formData.ACCEPT_TIME = _this.pd.ACCEPT_TIME + formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue b/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue index 4026bfe..97641e4 100644 --- a/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue +++ b/pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue @@ -36,7 +36,7 @@ - + diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue index 3a1744c..b4ca171 100644 --- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue +++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue @@ -120,21 +120,21 @@ - + {{item.QUESTION1}} - + {{item.ANSWER1?item.ANSWER1:0}} - + {{item.QUESTION2}} - + {{item.ANSWER2?item.ANSWER2:0}} - + {{item.QUESTION3}} - + {{item.ANSWER3?item.ANSWER3:0}} - + {{item.QUESTION4}} - + {{item.ANSWER4?item.ANSWER4:0}} @@ -450,11 +450,15 @@ 作业区域 - - - {{pd.PLS_NAME?pd.PLS_NAME:'请选择'}} - - + + {{pd.PLS_NAME?pd.PLS_NAME:'请选择'}} + + @@ -480,6 +484,14 @@ 安全交底人 {{pd.CONFESS_USER_NAME}} + + + + + + + 动火审批人意见 - - 动火审批人 - - + - - - 签字照片： - - - - + 动火审批人 + + + - - + + + + 签字照片： + + + + + + + + + + + + - + @@ -160,9 +168,9 @@ const formData={} this.uploadImgFaults(files,signtime) - formData.SIGNTIME = signtime - formData.HOTWORK_ID = this.pd.HOTWORK_ID - formData.DESCR = this.pd.DESCR + formData.SIGNTIME = signtime.join(",") + formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ @@ -246,16 +254,18 @@ *手写板 */ showModal(e) { - this.modalName = e.currentTarget.dataset.target + this.modalName = 'Modal' + }, + DelImg(index){ + this.imgList.splice(index,1) }, hideModal(e) { this.modalName = null }, //完成 subCanvas(e) { - this.imgList.splice(0,this.imgList.length); this.imgList.push(e); - e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); + e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm') this.hideModal() }, ViewImage(e) { @@ -292,7 +302,19 @@ } } - - diff --git a/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue index 8a39800..5459d34 100644 --- a/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue +++ b/pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue @@ -12,29 +12,37 @@ 安全管理部门意见 - - 安全管理部门负责人 - - + - - - 签字照片： - - - - + 安全管理部门负责人 + + + - - + + + + 签字照片： + + + + + + + + + + + + - + @@ -160,9 +168,9 @@ var signtime = []; const formData={} this.uploadImgFaults(files,signtime) - formData.SIGNTIME = signtime - formData.HOTWORK_ID = this.pd.HOTWORK_ID - formData.DESCR = this.pd.DESCR + formData.SIGNTIME = signtime.join(",") + formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ @@ -252,16 +260,18 @@ *手写板 */ showModal(e) { - this.modalName = e.currentTarget.dataset.target + this.modalName = 'Modal' + }, + DelImg(index){ + this.imgList.splice(index,1) }, hideModal(e) { this.modalName = null }, //完成 subCanvas(e) { - this.imgList.splice(0,this.imgList.length); this.imgList.push(e); - e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); + e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm') this.hideModal() }, ViewImage(e) { @@ -298,7 +308,19 @@ } } - - diff --git a/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue index 91a7fac..a1a4d74 100644 --- a/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue +++ b/pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue @@ -8,6 +8,27 @@ + + + 上传图片 + + + {{ aqimgList.length }}/2 + + + + + + + + + + + + + + + 安全交底人 @@ -29,7 +50,7 @@ - + @@ -64,6 +85,7 @@ measuresList:[], modalName:null, imgList:[], + aqimgList: [], } }, onLoad(event){ @@ -140,6 +162,74 @@ signtime.push(item.SIGNER_TIME) }) }, + delImg(e) { + var _this = this; + uni.showModal({ + title: '秦安双控', + content: '确定要删除这张图片吗？', + cancelColor: "#000000", + cancelText: '取消', + confirmText: '确定', + success: res => { + if (res.confirm) { + uni.request({ + url: basePath+'/app/eightwork/deleteFile', + method: 'POST', + dataType: 'json', + header: { + 'Content-type':'application/x-www-form-urlencoded' + }, + data: { + FILE_PATH:_this.aqimgList[e.currentTarget.dataset.index].filePath + }, + success: (res) => { + uni.showToast({ + icon: 'none', + title: '删除成功', + duration: 1500 + }); + this.aqimgList.splice(e.currentTarget.dataset.index, 1) + }, + fail: (err) => { + uni.showModal({ + content: "删除失败", + showCancel: false + }); + } + }) + } + } + }) + }, + chooseImage() { + uni.chooseImage({ + count: 1, //默认9 + sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 + sourceType: ['camera', 'album'], //从相册选择 + success: (res) => { + uni.uploadFile({ + url: basePath+'/app/eightwork/saveFile', + filePath: res.tempFilePaths[0], + name: 'file', + formData: { + CORPINFO_ID:loginUser.CORPINFO_ID, + }, + success: ({data}) => { + let img = {}; + img.filePath = JSON.parse(data).FILE_PATH; + this.aqimgList.push(img) + console.log(this.aqimgList) + }, + fail: (err) => { + uni.showModal({ + content: "图片上传失败", + showCancel: false + }); + } + }) + } + }); + }, goSubmit(APPLY_STATUS){ var _this = this; let required = true @@ -163,6 +253,9 @@ formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS + formData.IMG_PATH = this.aqimgList.map(item => { + return item.filePath + }).join(",") uni.uploadFile({ url: basePath+'app/hotwork/nextStep', files: files, diff --git a/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue index e92d103..308e15b 100644 --- a/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue +++ b/pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue @@ -34,7 +34,7 @@ - + @@ -168,8 +168,8 @@ this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime - formData.HOTWORK_ID = this.pd.HOTWORK_ID - formData.DESCR = this.pd.DESCR + formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ diff --git a/pages/application/hotwork/hotwork-detail/index.vue b/pages/application/hotwork/hotwork-detail/index.vue index 47b6baf..1819b06 100644 --- a/pages/application/hotwork/hotwork-detail/index.vue +++ b/pages/application/hotwork/hotwork-detail/index.vue @@ -87,21 +87,21 @@ - + {{item.QUESTION1}} - + {{item.ANSWER1?item.ANSWER1:0}} - + {{item.QUESTION2}} - + {{item.ANSWER2?item.ANSWER2:0}} - + {{item.QUESTION3}} - + {{item.ANSWER3?item.ANSWER3:0}} - + {{item.QUESTION4}} - + {{item.ANSWER4?item.ANSWER4:0}} @@ -172,6 +172,14 @@ 安全交底人 {{pd.CONFESS_USER_NAME}} + + + + + + + - + diff --git a/pages/application/hotwork/hotwork-gas/gas-detail.vue b/pages/application/hotwork/hotwork-gas/gas-detail.vue index 748f70f..55f966b 100644 --- a/pages/application/hotwork/hotwork-gas/gas-detail.vue +++ b/pages/application/hotwork/hotwork-gas/gas-detail.vue @@ -154,11 +154,11 @@ duration: 2000 }); this.buttonloading = false - if(APPLY_STATUS === 1){ - uni.navigateBack({delta: 1}); - }else{ - uni.navigateBack({delta: 2}); - } + if(APPLY_STATUS === 1){ + uni.navigateBack({delta: 1}); + }else{ + uni.navigateBack({delta: 2}); + } // _this.goback() }, fail: (err) => { diff --git a/pages/application/hotwork/hotwork-gas/gas-list.vue b/pages/application/hotwork/hotwork-gas/gas-list.vue index 5ecfe94..00f7827 100644 --- a/pages/application/hotwork/hotwork-gas/gas-list.vue +++ b/pages/application/hotwork/hotwork-gas/gas-list.vue @@ -22,7 +22,7 @@ 分析人： - + diff --git a/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue index 52b7d34..ca81e98 100644 --- a/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue +++ b/pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue @@ -38,7 +38,7 @@ - + diff --git a/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue index 8d42b79..aca04e9 100644 --- a/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue +++ b/pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue @@ -8,33 +8,41 @@ - - 所在单位意见 + + 所在单位负责人意见 - - 所在单位负责人 - - + - - - 签字照片： - - - - + 所在单位负责人 + + + - - + + + + 签字照片： + + + + + + + + + + + + - + @@ -161,9 +169,9 @@ const formData={} this.uploadImgFaults(files,signtime) - formData.SIGNTIME = signtime - formData.HOTWORK_ID = this.pd.HOTWORK_ID - formData.DESCR = this.pd.DESCR + formData.SIGNTIME = signtime.join(",") + formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID formData.APPLY_STATUS = APPLY_STATUS uni.uploadFile({ @@ -272,16 +280,18 @@ *手写板 */ showModal(e) { - this.modalName = e.currentTarget.dataset.target + this.modalName = 'Modal' + }, + DelImg(index){ + this.imgList.splice(index,1) }, hideModal(e) { this.modalName = null }, //完成 subCanvas(e) { - this.imgList.splice(0,this.imgList.length); this.imgList.push(e); - e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); + e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm') this.hideModal() }, ViewImage(e) { @@ -318,6 +328,19 @@ } - diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue index 2d85313..e1a664c 100644 --- a/pages/application/hotwork/hotwork-list/index.vue +++ b/pages/application/hotwork/hotwork-list/index.vue @@ -38,21 +38,23 @@ 申请人:{{item.APPLY_USER_NAME}} 分析人:{{item.ANALYZE_USER_NAME}} - - 作业负责人：{{item.CONFIRM_USER_NAME}} - 动火点所在单位负责人：{{item.LEADER_USER_NAME}} - - - 安全管理部门负责人：{{item.AUDIT_USER_NAME}} - 审批部门负责人：{{item.APPROVE_USER_NAME}} - 监护人：{{item.GUARDIAN_USER_NAME}} 安全交底人：{{item.CONFESS_USER_NAME}} + + + + 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} + 作业负责人：{{item.CONFIRM_USER_NAME}} + + + + 动火点所在单位负责人：{{item.LEADER_USER_NAME}} - 接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}} + 安全管理部门负责人：{{item.AUDIT_USER_NAME}} + 审批部门负责人：{{item.APPROVE_USER_NAME}} 动火前在岗班长：{{item.MONITOR_USER_NAME}} 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 c7e4af1..6efa99c 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,7 +256,7 @@ this.uploadImgFaults(files,signtime) formData.APPLY_STATUS = APPLY_STATUS formData.HOTWORK_ID = _this.pd.HOTWORK_ID - formData.DESCR = _this.pd.DESCR + formData.DESCR = _this.pd.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-measures/hotwork-measures-detail.vue b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue index cb0ee79..b1afd4e 100644 --- a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue +++ b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue @@ -39,7 +39,7 @@ - 作业结束负责人 + 确认人 {{measuresList[index].USER_NAME?measuresList[index].USER_NAME:'请选择'}} diff --git a/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue index 28a8f7f..78d367a 100644 --- a/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue +++ b/pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue @@ -34,7 +34,7 @@ - + @@ -156,8 +156,8 @@ this.uploadImgFaults(files,signtime) formData.SIGNTIME = signtime formData.APPLY_STATUS = APPLY_STATUS - formData.HOTWORK_ID = this.pd.HOTWORK_ID - formData.DESCR = this.pd.DESCR + formData.HOTWORK_ID = _this.pd.HOTWORK_ID + formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无" formData.USER_ID = loginUser.USER_ID uni.uploadFile({ url: basePath+'app/hotwork/nextStep', diff --git a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue index c20232b..d468559 100644 --- a/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue +++ b/pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue @@ -39,7 +39,7 @@ - +