|
|
@@ -133,23 +133,39 @@
|
|
|
batchHandle(){
|
|
|
let point=uni.getStorageSync('point')
|
|
|
if(this.handles.length<1){
|
|
|
- completeCheckTask(point.recordId).then(()=>{
|
|
|
+ const key=this.itemList.find(item=>item.checkResult===-1)
|
|
|
+ if(!key){
|
|
|
+ completeCheckTask(point.recordId).then(()=>{
|
|
|
+ uni.showToast({
|
|
|
+ icon:'none',
|
|
|
+ title:"处理完毕",
|
|
|
+ duration:1000,
|
|
|
+ complete() {
|
|
|
+ uni.redirectTo({
|
|
|
+ url:`/pages/index/detail/detail?type=task&name=待办任务`
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }).catch(()=>{
|
|
|
+ uni.showToast({
|
|
|
+ icon:"none",
|
|
|
+ title:"操作失败"
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ let cid=point.checklistId;
|
|
|
+ let rid=point.recordId;
|
|
|
uni.showToast({
|
|
|
icon:'none',
|
|
|
title:"处理完毕",
|
|
|
duration:1000,
|
|
|
complete() {
|
|
|
uni.redirectTo({
|
|
|
- url:`/pages/index/detail/detail?type=task&name=待办任务`
|
|
|
+ url:`/pages/index/handle/task/hazardRecord/hazardRecord?rid=${rid}&cid=${cid}&title=${measure.hazardTitle}`
|
|
|
})
|
|
|
}
|
|
|
- })
|
|
|
- }).catch(()=>{
|
|
|
- uni.showToast({
|
|
|
- icon:"none",
|
|
|
- title:"操作失败"
|
|
|
- })
|
|
|
- })
|
|
|
+ })
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
let nextPoint=this.handles[0]
|
|
|
@@ -162,35 +178,6 @@
|
|
|
uni.setStorageSync('point',nextPoint);
|
|
|
this.point=nextPoint;
|
|
|
},
|
|
|
- // 批量处理未处理的【按顺序走到最后一个】
|
|
|
- goOnNext(){
|
|
|
- let point=uni.getStorageSync('point')
|
|
|
- let pointIdex=this.itemList.findIndex(item=>point.pointId===item.pointId)
|
|
|
- let handles=this.itemList.slice(pointIdex+1);
|
|
|
- let nextPointIdx=handles.findIndex(item=>(!item.checkResult))
|
|
|
- nextPointIdx=nextPointIdx+pointIdex
|
|
|
- if(handles.length<1||nextPointIdx<0){
|
|
|
- uni.showToast({
|
|
|
- icon:'none',
|
|
|
- title:"处理完毕",
|
|
|
- duration:1000,
|
|
|
- complete() {
|
|
|
- uni.redirectTo({
|
|
|
- url:`/pages/app_views/checkList/index/index?type=form&id=${point.checklistId}&recordId=${point.recordId}`
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
- this.formData={
|
|
|
- checkResult:1,
|
|
|
- remark:"",
|
|
|
- attachList:[]
|
|
|
- }
|
|
|
- let nextPoint=this.itemList[nextPointIdx+1]
|
|
|
- uni.setStorageSync('point',nextPoint);//防止测试刷新数据丢失
|
|
|
- this.point=nextPoint;
|
|
|
- },
|
|
|
uploadSuccess(e){
|
|
|
let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
|
|
|
attachList.push(e.tempFiles[0])
|
