diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js index 07849e8..d93557d 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js @@ -131,10 +131,21 @@ Page({ hiddenDangeList:[...this.data.hiddenDangeList,{hazardStatus:2,hazardDesc:this.data.hazardDesc2}] , attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})), remark: '' - }).then(({ - data - }) => { - console.log('data', data) + }).then( + res => { + if(res.code == 0){ + wx.showToast({ + title: '新增成功', + duration:2000, + success:function(){ + setTimeout(()=>{ + wx.navigateBack({ + delta: 1 + }) + },2000) + } + }) + } }); }, @@ -242,8 +253,16 @@ Page({ }); // 点击按钮显示弹出层 }, onClose() { + let names = [] + this.data.arr.forEach(item=>{ + if(this.data.selectedOptions.findIndex(itemC=>itemC === item.staffId) != -1){ + names.push(item.name) + } + }) this.setData({ - showPopup: false + showPopup: false, + selectedNames: names, + checkPersonsIdList:this.data.selectedOptions }); // 关闭弹出层 }, onChange1(event) { diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml index 70de87b..f0f8545 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml @@ -61,8 +61,7 @@ - - * + 整改要求 @@ -139,12 +138,11 @@ - + - - {{item.name}} + + {{item.name}} - diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss index 499b5ae..fc6e03f 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss @@ -698,4 +698,15 @@ margin-bottom: 20rpx; text-align: left; white-space: nowrap; line-height: 42rpx; +} +.requirement{ + padding-left:20rpx ; +} +.popup-content{ + margin: 20rpx; + display: flex; + +} +.checkbox{ + margin: 40rpx; } \ No newline at end of file diff --git a/subpages/securityCheck/pages/securityCheck.wxml b/subpages/securityCheck/pages/securityCheck.wxml index 2f826b0..d1afb16 100644 --- a/subpages/securityCheck/pages/securityCheck.wxml +++ b/subpages/securityCheck/pages/securityCheck.wxml @@ -42,7 +42,7 @@ - +