瀏覽代碼

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao 1 年之前
父節點
當前提交
d808c6b613

+ 44 - 0
api/aqpt/task.js

@@ -30,3 +30,47 @@ export function waitHandleStatistics() {
     url: "/myCounter"
   })
 }
+/**
+ * 列表查询我的待办Task:
+ * @param limit待办数目
+ * @returns
+ */
+export function getMyWaitingTaskTop(limit) {
+  return request({
+    url: `/task/myWaiting/top/${limit}`,
+    method: 'GET'
+  })
+}
+/**
+ * Transfer CheckTask
+ * @param data
+ */
+export function transferCheckTask(data) {
+  return request({
+    url: `/check/task/transfer`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * Cancel CheckTask
+
+ * @param taskId
+ */
+export function cancelCheckTask(taskId) {
+  return request({
+    url: `/check/task/cancel/${taskId}`,
+    method: 'PUT'
+  })
+}
+/**
+ * Complete CheckTask
+ * @param taskId
+ */
+export function completeCheckTask(taskId) {
+  return request({
+    url: `/check/task/complete/${taskId}`,
+    method: 'PUT'
+  })
+}

+ 2 - 0
pages/index/detail/detail.vue

@@ -261,6 +261,8 @@
 			  }
 			},			
 			getData(){
+				let handleAccountId=uni.getStorageSync('wxId')
+				this.conditions.handleAccountId=handleAccountId
 				if(this.type==='task'){
 					this.getTaskByPage()
 				}

+ 4 - 7
pages/index/handle/task/hazardRecord/form.vue

@@ -141,10 +141,6 @@ import {completeCheckTask} from '@/api/aqpt/task.js'
 				this.handles=handles
 				if(handles.length<1){
 					const key=this.itemList.find(item=>item.checkResult===-1)
-					console.log({
-						"this.itemList":this.itemList,
-						key
-					})
 					if(!key){
 						completeCheckTask(measure.recordId).then(()=>{
 							uni.showToast({
@@ -152,12 +148,13 @@ import {completeCheckTask} from '@/api/aqpt/task.js'
 								title:"处理完毕",
 								duration:1000,
 								complete() {
-									uni.redirectTo({
+									uni.reLaunch({
 										url:`/pages/index/detail/detail?type=task&name=待办任务`
 									})
 								}
 							})	
-						}).catch(()=>{
+						})
+						.catch(()=>{
 							uni.showToast({
 								icon:"none",
 								title:"操作失败"
@@ -171,7 +168,7 @@ import {completeCheckTask} from '@/api/aqpt/task.js'
 							title:"处理完毕",
 							duration:1000,
 							complete() {
-								uni.redirectTo({
+								uni.reLaunch({
 									url:`/pages/index/handle/task/hazardRecord/hazardRecord?rid=${rid}&cid=${cid}&title=${measure.hazardTitle}`
 								})
 							}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


+ 48 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -24076,8 +24076,12 @@ module.exports = _unsupportedIterableToArray, module.exports.__esModule = true,
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.cancelCheckTask = cancelCheckTask;
+exports.completeCheckTask = completeCheckTask;
+exports.getMyWaitingTaskTop = getMyWaitingTaskTop;
 exports.getTaskMyHandlingByList = getTaskMyHandlingByList;
 exports.handleCheckTask = handleCheckTask;
+exports.transferCheckTask = transferCheckTask;
 exports.waitHandleStatistics = waitHandleStatistics;
 var _request = __webpack_require__(/*! @/utils/request.js */ 48);
 /**
@@ -24111,6 +24115,50 @@ function waitHandleStatistics() {
     url: "/myCounter"
   });
 }
+/**
+ * 列表查询我的待办Task:
+ * @param limit待办数目
+ * @returns
+ */
+function getMyWaitingTaskTop(limit) {
+  return (0, _request.request)({
+    url: "/task/myWaiting/top/".concat(limit),
+    method: 'GET'
+  });
+}
+/**
+ * Transfer CheckTask
+ * @param data
+ */
+function transferCheckTask(data) {
+  return (0, _request.request)({
+    url: "/check/task/transfer",
+    method: 'PUT',
+    data: data
+  });
+}
+
+/**
+ * Cancel CheckTask
+
+ * @param taskId
+ */
+function cancelCheckTask(taskId) {
+  return (0, _request.request)({
+    url: "/check/task/cancel/".concat(taskId),
+    method: 'PUT'
+  });
+}
+/**
+ * Complete CheckTask
+ * @param taskId
+ */
+function completeCheckTask(taskId) {
+  return (0, _request.request)({
+    url: "/check/task/complete/".concat(taskId),
+    method: 'PUT'
+  });
+}
 
 /***/ }),
 

Some files were not shown because too many files changed in this diff