From a24e6ad3dd99b50e29af6f74c57fa646bca86d43 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 02 一月 2025 17:15:48 +0800
Subject: [PATCH] 提交配置

---
 igds-app/js/admin/inout-out-handle.js |  222 +++++++++++++++++++++++-------------------------------
 1 files changed, 95 insertions(+), 127 deletions(-)

diff --git a/igds-app/js/admin/inout-out-handle.js b/igds-app/js/admin/inout-out-handle.js
index 5582017..d46e298 100644
--- a/igds-app/js/admin/inout-out-handle.js
+++ b/igds-app/js/admin/inout-out-handle.js
@@ -30,7 +30,8 @@
 		"fileName2": "",
 		"deHandle": "",
 		"lon": "",
-		"lat": ""
+		"lat": "",
+		"handleUser": ""
 	}
 }
 
@@ -43,10 +44,14 @@
 	url = user.url + "/api-phone/v35/gateway";
 	uploadUrl = user.url + "/api-phone/v35/upload-img";
 	data.tokenAuth = user.tokenAuth;
+	data1.tokenAuth = user.tokenAuth;
+	data1.data.handleUser = user.cname;
 	//鑾峰彇浠庝笂涓�涓〉闈紶閫掔殑鏁版嵁
 	var self = plus.webview.currentWebview();
 	depotData = self.data;
 	data.data.id = depotData.serialNumber;
+	data1.data.id = depotData.serialNumber;
+	console.log(JSON.stringify(depotData))
 	// data.data.intelCard = depotData.intelCard;
 	$("#plateNum").html(depotData.plateNum);
 	$("#depotName").html(depotData.depotName);
@@ -65,31 +70,26 @@
 			contentType: "application/json;charset=utf-8",
 			data: JSON.stringify(data),
 			success: function(result) {
-				if (result.data.code == '0000') {
+				if (result.code == '0000') {
 					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
 					if (result.data.progress == 'HANDLE') {
 						//鍒ゆ柇鍗曞瓙鏄惁宸茬粡寮�濮嬭繘琛屽�间粨
-						if (result.data.handelStart == null) {
-							//鍙戦�佽姹傦紝寮�濮嬪�间粨
-							mui.ajax(url, {
-								type: "POST",
-								dataType: "json",
-								crossDomain: true,
-								contentType: "application/json;charset=utf-8",
-								data: JSON.stringify(data1),
-								success: function(result) {
-									mui.toast("寮�濮嬭绮紝璇蜂笂浼犲浘鐗囷紒");
-									//閲嶆柊璇锋眰鑾峰彇鍗曞瓙璇︽儏骞舵覆鏌�
-									getDetail();
-								},
-								error: function() {
-									mui.alert('寮�濮嬭绮彁浜ゅけ璐ワ紝璇烽噸鏂版搷浣滐紒', '鎻愮ず', ["纭畾"], function() {},
-										"div");
-								}
-							})
-						} else {
-							mui.toast("宸插紑濮嬭绮紒");
-						}
+
+						//鍙戦�佽姹傦紝寮�濮嬪�间粨
+						mui.ajax(url, {
+							type: "POST",
+							dataType: "json",
+							crossDomain: true,
+							contentType: "application/json;charset=utf-8",
+							data: JSON.stringify(data1),
+							success: function(result) {
+								mui.toast("寮�濮嬭绮紝璇蜂笂浼犲浘鐗囷紒");
+							},
+							error: function() {
+								mui.alert('寮�濮嬭绮彁浜ゅけ璐ワ紝璇烽噸鏂版搷浣滐紒', '鎻愮ず', ["纭畾"], function() {},
+									"div");
+							}
+						})
 					} else {
 						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
 						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
@@ -103,6 +103,7 @@
 			}
 		})
 	} else { //缁撴潫鍊间粨
+		data1.data.type = tag;
 		mui.ajax(url, {
 			type: "POST",
 			dataType: "json",
@@ -110,43 +111,41 @@
 			contentType: "application/json;charset=utf-8",
 			data: JSON.stringify(data),
 			success: function(result) {
-				if (result.data.code == '0000') {
+				if (result.code == '0000') {
 					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
 					if (result.data.progress == 'HANDLE') {
-						//鍒ゆ柇鍗曞瓙鏄惁宸茬粡寮�濮嬭繘琛屽�间粨
-						if (result.data.handelStart) {
-							deHandle = $("#number")[0].value;
-							if (fileName1 == null || fileName2 == null) {
-								mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
-							} else {
-								if (deHandle) {
-									data1.data.type = tag;
-									data1.data.fileName1 = fileName1;
-									data1.data.fileName2 = fileName2;
-									data1.data.deHandle = deHandle;
-									mui.ajax(url, {
-										type: "POST",
-										dataType: "json",
-										crossDomain: true,
-										contentType: "application/json;charset=utf-8",
-										data: JSON.stringify(data1),
-										success: function(result) {
-											mui.toast("鍊间粨瀹屾垚锛�");
-											//杩斿洖涓婁竴椤�
-											mui.back();
-										},
-										error: function(result) {
-											mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
-												"div");
-										}
-									})
-								} else {
-									mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
-								}
-							}
+						deHandle = $("#number")[0].value;
+						if (fileName1 == null || fileName2 == null) {
+							mui.toast("璇峰厛涓婁紶鍥剧墖锛�");
 						} else {
-							mui.toast("璇峰厛鐐瑰嚮寮�濮嬭绮紝骞朵笂浼犲浘鐗囷紒");
+							if (deHandle) {
+								data1.data.type = tag;
+								data1.data.fileName1 = fileName1;
+								data1.data.fileName2 = fileName2;
+								data1.data.deHandle = deHandle;
+								mui.ajax(url, {
+									type: "POST",
+									dataType: "json",
+									crossDomain: true,
+									contentType: "application/json;charset=utf-8",
+									data: JSON.stringify(data1),
+									success: function(result) {
+										// mui.toast("鍊间粨瀹屾垚锛�");
+										mui.toast(result.msg)
+										//杩斿洖涓婁竴椤�
+										mui.back();
+										
+									},
+									error: function(result) {
+										mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {},
+											"div");
+									}
+								})
+							} else {
+								mui.toast("璇峰厛濉啓鍊间粨鎵i噸");
+							}
 						}
+
 					} else {
 						//濡傛灉涓嶅湪鍊间粨鐘舵�侊紝缁欏嚭鎻愮ず淇℃伅锛屼笉杩涜鎻愪氦
 						mui.alert("璇ュ崟瀛愪笉鍦ㄥ�间粨鐘舵�侊紝涓嶈兘杩涜鍊间粨锛�", '鎻愮ず', ["纭畾"], function() {}, "div");
@@ -165,78 +164,47 @@
 }
 //鎷嶇収涓婁紶
 function choosePic(typeNum) {
-	//鑾峰彇瀹氫綅淇℃伅
+	// //鑾峰彇瀹氫綅淇℃伅
 	// if (latitude == null || longitude == null) {
 	// 	return;
 	// }
-	//涓婁紶鍥剧墖鍓嶏紝璇锋眰鏌ョ湅鍗曞瓙鏄兘宸茬粡寮�濮嬪嵏绮�
-	// mui.ajax(url, {
-	// 	type: "POST",
-	// 	dataType: "json",
-	// 	crossDomain: true,
-	// 	contentType: "application/json;charset=utf-8",
-	// 	data: JSON.stringify(data),
-	// 	success: function(result) {
-	// 		if (result.code == '0000') {
-	// 			if (result.data.handleStart != null) {
-	// 				var btnArray = [{
-	// 					title: "鎷嶇収涓婁紶"
-	// 				}, {
-	// 					title: "浠庣浉鍐岄�夋嫨"
-	// 				}];
-	// 				plus.nativeUI.actionSheet({
-	// 						title: "璇烽�夋嫨",
-	// 						cancel: "鍙栨秷",
-	// 						buttons: btnArray
-	// 					},
-	// 					function(e) {
-	// 						var index = e.index;
-	// 						switch (index) {
-	// 							case 1:
-	// 								cameraImg(typeNum);
-	// 								break;
-	// 							case 2:
-	// 								galleryImg(typeNum);
-	// 								break;
-	// 						}
-	// 					});
-	// 			} else {
-	// 				mui.toast("璇峰厛鐐瑰嚮寮�濮嬭绮紒");
-	// 			}
-	// 		} else {
-	// 			mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
-	// 		}
-	// 	},
-	// 	error: function() {
-	// 		mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
-	// 	}
-	// })
-
-
-	var btnArray = [{
-		title: "鎷嶇収涓婁紶"
-	}, {
-		title: "浠庣浉鍐岄�夋嫨"
-	}];
-	plus.nativeUI.actionSheet({
-			title: "璇烽�夋嫨",
-			cancel: "鍙栨秷",
-			buttons: btnArray
-		},
-		function(e) {
-			var index = e.index;
-			switch (index) {
-				case 1:
-					cameraImg(typeNum);
-					break;
-				case 2:
-					galleryImg(typeNum);
-					break;
+	// 涓婁紶鍥剧墖鍓嶏紝璇锋眰鏌ョ湅鍗曞瓙鏄兘宸茬粡寮�濮嬪嵏绮�
+	mui.ajax(url, {
+		type: "POST",
+		dataType: "json",
+		crossDomain: true,
+		contentType: "application/json;charset=utf-8",
+		data: JSON.stringify(data),
+		success: function(result) {
+			if (result.code == '0000') {
+				var picker = new mui.PopPicker();
+				picker.setData([{
+					value: "cameraImg",
+					text: "鎷嶇収涓婁紶"
+				}, {
+					value: "galleryImg",
+					text: "浠庣浉鍐岄�夋嫨"
+				}])
+				picker.show(function(SelectedItem) {
+					console.log(JSON.stringify(SelectedItem));
+					if (SelectedItem[0].value == 'cameraImg') {
+						cameraImg(typeNum);
+					} else {
+						galleryImg(typeNum);
+					}
+				})
+			} else {
+				mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
 			}
-		});
+		},
+		error: function() {
+			mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+		}
+	})
+
 };
 
-//浣跨敤鐩告満鎷嶇収
+//鐩告満鎷嶇収
 function cameraImg(typeNum) {
 	var cmr = plus.camera.getCamera();
 	cmr.captureImage(function(p) {
@@ -245,10 +213,10 @@
 			var path = entry.toLocalURL(); //鑾峰緱鍥剧墖璺緞
 			uploadImg(path, typeNum);
 		}, function(e) {
-			mui.toast("璇诲彇鎷嶇収鍥剧墖閿欒锛岃閲嶈瘯锛�" + e.msg);
+			mui.toast("璇诲彇鎷嶇収鍥剧墖閿欒锛岃閲嶈瘯锛�");
 		});
 	}, function(e) {
-		mui.toast("鎷嶇収澶辫触锛岃閲嶈瘯锛�" + e.msg);
+		mui.toast("鎷嶇収澶辫触锛岃閲嶈瘯锛�");
 	});
 }
 
@@ -257,7 +225,7 @@
 	plus.gallery.pick(function(path) {
 		uploadImg(path, typeNum);
 	}, function(e) {
-		mui.toast("娌℃湁閫夋嫨鍥剧墖" + e.msg);
+		mui.toast("娌℃湁閫夋嫨鍥剧墖");
 	});
 }
 
@@ -275,13 +243,13 @@
 				var obj = JSON.parse(t.responseText);
 				mui.toast("涓婁紶鎴愬姛锛�");
 				if (typeNum == "1") {
-					html += '<img src="'+path+'">'
+					html += '<img src="' + path + '">'
 					$("#boxImg1").html(html);
 					base64Img1 = path;
 					fileName1 = obj.data.fileName;
 				}
 				if (typeNum == "2") {
-					html += '<img src="'+path+'">'
+					html += '<img src="' + path + '">'
 					$("#boxImg2").html(html);
 					base64Img2 = path;
 					fileName2 = obj.data.fileName;

--
Gitblit v1.9.3