DESKTOP-6LTVLN7\Liumouren 1 год назад
Родитель
Сommit
f70b5f55d6
1 измененных файлов с 20 добавлено и 23 удалено
  1. 20 23
      js/util.js

+ 20 - 23
js/util.js

@@ -412,18 +412,16 @@ mui.plusReady(function() {
 				let taskName = this.dataset.taskName;
 				if (myTaskListStateFalse[taskId]) {
 					let myTaskListStateFalseItem = myTaskListStateFalse[taskId];
+					console.log("myTaskListStateFalseItem",JSON.stringify(myTaskListStateFalseItem))
 					let columnId = Number(myTaskListStateFalseItem.column_id);
-					let modelId = Number(myTaskListStateFalseItem.model_id);
+					// let modelId = Number(myTaskListStateFalseItem.model_id);
 					let paramData2 = new FormData();
-					paramData2.append("content", JSON.stringify(myTaskListStateFalseItem.content));
 					paramData2.append("columnId", columnId);
-					paramData2.append("modelId", modelId);
 					paramData2.append("id", myTaskListStateFalseItem.id);
 					paramData2.append("state", 1);
-					updateContentData({
+					updateAuditState({
 						data: paramData2
 					}, function(res) {
-						console.log(JSON.stringify(res))
 						let resData = res;
 						if (resData.code == 200) {
 							// 我的任务详情页面跳转
@@ -573,12 +571,10 @@ mui.plusReady(function() {
 				paramData.append("content", JSON.stringify(content));
 				paramData.append("columnId", columnId);
 				paramData.append("modelId", modelId);
-				paramData.append("id", myMarkerData.id);
-				paramData.append("state", 1);
-				// let paramData2 = new FormData();
-				// paramData2.append("columnId", columnId);
-				// paramData2.append("id", myMarkerData.id);
-				// paramData2.append("state", 1);
+				let paramData2 = new FormData();
+				paramData2.append("columnId", columnId);
+				paramData2.append("id", myMarkerData.id);
+				paramData2.append("state", 1);
 				updateContentData({
 					data: paramData
 				}, function(res) {
@@ -587,17 +583,16 @@ mui.plusReady(function() {
 						document.getElementById('mapBottomBox').style.bottom = "-100%";
 						mui.toast('提交成功');
 						sessionStorage.clear();
-						window.history.back();
-						// updateAuditState({
-						// 	data: paramData2
-						// }, function(res) {
-						// 	let resData = res;
-						// 	if (resData.code == 200) {
-						// 		window.history.back();
-						// 	}
-						// }, function(e) {
-						// 	console.log(e)
-						// })
+						updateAuditState({
+							data: paramData2
+						}, function(res) {
+							let resData = res;
+							if (resData.code == 200) {
+								window.history.back();
+							}
+						}, function(e) {
+							console.log(e)
+						})
 					}
 				}, function(e) {
 					console.log(e)
@@ -841,7 +836,7 @@ mui.plusReady(function() {
 		}
 		// dms状态更新
 		function updateAuditState(setting, funSuccess, funError) {
-			newPostRequest(updateContent, setting, funSuccess, funError);
+			newPostRequest(updateAudit, setting, funSuccess, funError);
 			// requestSettins.success = funSuccess;
 			// requestSettins.error = funError;
 			// let newSetting = Object.assign(requestSettins, setting);
@@ -1191,8 +1186,10 @@ mui.plusReady(function() {
 							</div>`;
 							} else if (pageName === 'myTaskInfo') {
 								// 我的任务详情页面
+
 								let cDoubtfulPoints = JSON.parse(resJson.content.data[i]
 									.c_doubtful_points);
+								console.log(JSON.stringify(cDoubtfulPoints),JSON.stringify(resJson.content.data[i]))
 								cDoubtfulPoints.dataTitle = cDoubtfulPoints.name ? cDoubtfulPoints
 									.name :
 									cDoubtfulPoints.id;