From 1bd6821c8ccc6861c74505bab0e8c52fe38f69f7 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 15 六月 2023 19:36:57 +0800
Subject: [PATCH] 出入库调整

---
 igds-app/js/admin/inout-in-handle.js |  162 ++++++++++++++++++++++-------------------------------
 1 files changed, 68 insertions(+), 94 deletions(-)

diff --git a/igds-app/js/admin/inout-in-handle.js b/igds-app/js/admin/inout-in-handle.js
index 2ddc4cc..4d9aaca 100644
--- a/igds-app/js/admin/inout-in-handle.js
+++ b/igds-app/js/admin/inout-in-handle.js
@@ -30,7 +30,8 @@
 		"fileName2": "",
 		"deHandle": "",
 		"lon": "",
-		"lat": ""
+		"lat": "",
+		"handleUser": ""
 	}
 }
 
@@ -44,10 +45,13 @@
 	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);
@@ -70,27 +74,22 @@
 					//鍒ゆ柇璇ュ�间粨鏄惁澶勪簬鍦ㄥ�间粨鐘舵��
 					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");
@@ -104,6 +103,7 @@
 			}
 		})
 	} else { //缁撴潫鍊间粨
+		data1.data.type = tag;
 		mui.ajax(url, {
 			type: "POST",
 			dataType: "json",
@@ -114,40 +114,37 @@
 				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");
@@ -166,25 +163,6 @@
 }
 //鎷嶇収涓婁紶
 function choosePic(typeNum) {
-	var picker = new mui.PopPicker();
-	picker.setData([{
-		value: "cameraImg",
-		text: "鎷嶇収涓婁紶"
-	}, {
-		value: "galleryImg",
-		text: "浠庣浉鍐岄�夋嫨"
-	}])
-	picker.show(function(SelectedItem) {
-		console.log(JSON.stringify(SelectedItem[0].value));
-		console.log()
-		if (SelectedItem[0].value == 'cameraImg') {
-			console.log("鎷嶇収")
-			cameraImg(typeNum);
-		} else {
-			console.log("鐩稿唽")
-			galleryImg(typeNum);
-		}
-	})
 	// //鑾峰彇瀹氫綅淇℃伅
 	// if (latitude == null || longitude == null) {
 	// 	return;
@@ -198,26 +176,22 @@
 		data: JSON.stringify(data),
 		success: function(result) {
 			if (result.code == '0000') {
-				if (result.data.handleStart != null) {
-					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.toast("璇峰厛鐐瑰嚮寮�濮嬭绮紒");
-				}
+				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");
 			}
@@ -226,7 +200,7 @@
 			mui.alert('绯荤粺绻佸繖,璇烽噸璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
 		}
 	})
-	
+
 };
 
 //鐩告満鎷嶇収

--
Gitblit v1.9.3