diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js index 1c79c01..3a340ba 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js @@ -8,13 +8,16 @@ const App = getApp() import { addRecord, securityCheckk, - inspectionStaff + inspectionStaff, + showRecord } from "../../../../utils/api" Page({ /** * 页面的初始数据 */ data: { + showtime:false, + checkboxOptions:[], hiddenDangeList: [], newObj:[], addRecord: [], @@ -58,6 +61,13 @@ Page({ imageId: 1, arr: [], arr1: [], + addHiddenDangeList:[], + checkboxValue:[], + newContent:'', + currentDate: new Date().getTime(), + minDate: new Date(2020, 0, 1).getTime(), + maxDate: new Date(2030, 11, 31).getTime(), + checkboxValue:[] }, /** * 生命周期函数--监听页面加载 @@ -71,6 +81,31 @@ Page({ }) this.reverseLocation() this.getList() + + }, + showTime(){ + this.setData({ + showtime:true + }) + }, + + showRecordData() { + this.setData({ + checkboxOptions:[] + }) + let parm = { + id: this.data.companyId + } + showRecord(parm).then(res => { + if(res.data[0].hiddenDangeList){ + let checkboxOptions = res.data[0].hiddenDangeList.filter(item=>item.hazardStatus === 0).map(item=>({hazardDesc:item.hazardDesc,hazardStatus:0})); + this.setData({ + checkboxOptions: checkboxOptions || [], + beforeFlag: res.data[0].checkResultFlag + }) + console.log(this.data.beforeFlag); + } + }) }, getCurrentDateTime() { const now = new Date(); @@ -104,35 +139,72 @@ Page({ }) return false } - if(this.data.checkResultFlag == 0 && !this.data.reviewTime){ + if(this.data.checkResultFlag == 0 && !this.data.getData){ wx.showToast({ title: '请选择拟复查时间', icon:'none' }) return false } - if(this.data.checkResultFlag == 0 && this.data.hiddenDangeList.length<0){ + + if(this.data.checkResultFlag == 0 && this.data.checkboxValue.length<1&&!this.data.newContent){ wx.showToast({ - title: '请填写隐患明细', + title: '隐患明细最少输入一条', icon:'none' }) return false } - const now = new Date(); - const hours = now.getHours().toString().padStart(2, '0'); - const minutes = now.getMinutes().toString().padStart(2, '0'); - const seconds = now.getSeconds().toString().padStart(2, '0'); - addRecord({ + if (this.data.checkboxOptions) { + console.log(this.data.checkboxOptions) + this.data.checkboxOptions.forEach(item => { + console.log(item) + console.log(this.data.checkboxValue) + if(this.data.checkboxValue.findIndex(itemC=>itemC === item.value) == -1){ + item.hazardStatus = '1'; + }else{ + item.hazardStatus = '0'; + } + }) + } + if (this.data.newContent) { + let newArr = this.data.addHiddenDangeList.concat({ + hazardDesc: this.data.newContent, + hazardStatus: 0 + }); + console.log(newArr) + this.setData({ + addHiddenDangeList: newArr, + }); + } + if (this.data.hazardDesc2) { + let newArr = this.data.addHiddenDangeList.concat({ + hazardDesc: this.data.hazardDesc2, + hazardStatus: 2 + }); + console.log(newArr) + this.setData({ + addHiddenDangeList: newArr, + }); + } + + let form={ companyId: this.data.companyId, checkTime: this.getCurrentDateTime(), checkPersonsIdList: this.data.checkPersonsIdList, checkResultFlag: this.data.checkResultFlag, - reviewTime:`${this.data.reviewTime} ${hours}:${minutes}:${seconds}`, - hiddenDangeList:[...this.data.hiddenDangeList,{hazardStatus:2,hazardDesc:this.data.hazardDesc2}] , + reviewTime:this.data.getData, + hiddenDangeList:this.data.checkboxOptions.concat(this.data.addHiddenDangeList), attachmentUrls:this.data.uploadImageList.map(item=>({fileName:item.originFileName,attachmentUrl:item.ossUrl.url})), - remark: '', + remark: this.data.remarks, reviewAddress:this.data.addressContent - }).then( + } + // if (!this.data.reviewTime) { + // form.reviewTime=null + // } + console.log(form) + addRecord( + form + ).then( res => { if(res.code == 0){ wx.showToast({ @@ -158,7 +230,7 @@ Page({ }).then(({ data }) => { - console.log(data) + console.log(data.list) this.setData({ companyList: data.list, }); @@ -212,13 +284,11 @@ Page({ */ onShareAppMessage() {}, onChange(event) { - console.log("111", event) + console.log(event); this.setData({ - result: event.detail + checkboxValue: event.detail }); - console.log(this.data.result); - console.log(this.data.hiddenDangeList); - + console.log(this.data.checkboxValue); }, afterRead(event) { const { @@ -266,6 +336,9 @@ Page({ selectedNames: names, checkPersonsIdList:this.data.selectedOptions }); // 关闭弹出层 + }, + onCloseTime(){ + }, onChange1(event) { console.log(event) @@ -298,28 +371,21 @@ Page({ this.setData({ hazardDesc2: e.detail.value }); + console.log(this.data.hazardDesc2) }, - addAnother() { - let newValue = this.data.arr1.length + 1; // 根据数组长度确定新值 - let newArr = this.data.arr1.concat({ - value: newValue.toString(), - name: this.data.hazardDesc - }); + changenewContent(e){ this.setData({ - arr1: newArr, - hazardDesc: '', // 清空输入框的值 + newContent: e.detail.value }); - const nameArray = this.data.arr1.map(item => item.name); - nameArray.forEach(value => { - // 创建一个新的对象，设置 hazardDesc 属性为当前值 - this.data.newObj = { - hazardStatus: '0', // 如果需要同时设置 hazardStatus 属性，可以在这里进行设置 - hazardDesc: value - }; - }); - - this.data.hiddenDangeList.push(this.data.newObj); - console.log(this.data.hiddenDangeList) + }, + addAnother() { + let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0, requirements:this.data.hazardDesc2}); + console.log() + this.setData({ + addHiddenDangeList: newArr, + newContent: '', // 清空输入框的值 + }); + console.log('添加后的数组:', this.data.addHiddenDangeList); }, pickerChange: function (e) { this.setData({ @@ -341,8 +407,10 @@ Page({ // 更新当前选中的索引 this.setData({ gridNName: this.data.companyList[e.detail.value].name, - companyId:this.data.companyList[e.detail.value].id + companyId:this.data.companyList[e.detail.value].id, + checkboxValue:[] }); + this.showRecordData() }, bindRemarkInput(e) { this.setData({ @@ -598,4 +666,36 @@ Page({ } }) }, + closePopup() { + this.setData({ showPopup: false }); + }, + + onInput(event) { + var date = new Date(event.detail); + var year = date.getFullYear(); + var month = ("0" + (date.getMonth() + 1)).slice(-2); + var day = ("0" + date.getDate()).slice(-2); + var hour = ("0" + date.getHours()).slice(-2); + var minute = ("0" + date.getMinutes()).slice(-2); + var second = ("0" + date.getSeconds()).slice(-2); + var formattedDateTime = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second; + console.log(formattedDateTime); + this.setData({ + getData:formattedDateTime + }) + + }, + + onConfirm(event) { + const { value } = event.detail; + this.setData({ + currentDate: value, + showtime: false + }); + console.log('选中的日期时间:', new Date(value)); + }, + + onCancel() { + this.setData({ showtime: false }); + } }) \ No newline at end of file diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json index 3e0357b..2068200 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json @@ -8,6 +8,7 @@ "van-checkbox": "@vant/weapp/checkbox/index", "van-checkbox-group": "@vant/weapp/checkbox-group/index", "van-popup": "@vant/weapp/popup/index", - "van-picker": "@vant/weapp/picker/index" + "van-picker": "@vant/weapp/picker/index", + "van-datetime-picker": "@vant/weapp/datetime-picker/index" } } \ No newline at end of file diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml index 57202fb..b18253b 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml @@ -44,38 +44,38 @@ * - 隐患明细 + {{beforeFlag == 1?'隐患明细':'未整改隐患'}} - - {{item.name}} + + {{index + 1}}. {{item.hazardDesc}} + + {{item.hazardDesc}} + - + - + - - + - + + 整改要求 - - - - + + + + @@ -97,14 +97,18 @@ * - + 拟复查时间 - + + {{getData?getData:'请选择'}} + + + @@ -133,7 +137,7 @@ 备注 -