From cac13d369f5e1869460ed27a888856dc9dcdd602 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 30 十月 2024 08:54:33 +0800
Subject: [PATCH] 1.寄存领料单 2.巡检优化 3.新合并寄存领料

---
 pages/CangKuManage/XJ_check.html       |    3 
 pages/CangKuManage/XJ_check_HBGD.html  |    3 
 pages/CangKuManage/GS_HBJCLLD_NEW.html |  164 +++++++++++++
 js/CangKuManage_js/GS_JCLLD.js         |   12 
 js/CangKuManage_js/GS_HBJCLLD_NEW.js   |  533 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 711 insertions(+), 4 deletions(-)

diff --git a/js/CangKuManage_js/GS_HBJCLLD_NEW.js b/js/CangKuManage_js/GS_HBJCLLD_NEW.js
new file mode 100644
index 0000000..b324f1f
--- /dev/null
+++ b/js/CangKuManage_js/GS_HBJCLLD_NEW.js
@@ -0,0 +1,533 @@
+/**
+ * 
+ */
+
+// 鍏ㄥ眬鍙橀噺
+var billNo = '';
+var i = 0; //璁$畻鎵弿鏉$爜鏁伴噺
+var WLBM = "";//鐗╂枡缂栫爜
+var matterTable = null;
+var PopPicker = new mui.PopPicker();
+
+
+
+//鍒濆鍖栵紝榛樿鐒︾偣
+mui.plusReady(function(){	
+	app.init();
+	mui("#txtGD")[0].focus();
+	console.log("杩炴帴娴嬭瘯锛�");
+	//initBluetooth();
+	//SetBillNo();
+	$('#info').height($(window).height()- $("#row001").height() - $("#div001").height()- $("#div002").height() - 70);
+});		
+// $(function(){
+ //	billNo= GetMaxBillNO("1201",GetSysDateTime());//璋冩嫧鍗曞彿锛屽彧瑕佷笉绂诲紑鐣岄潰锛屽崟鍙蜂笉鍙�
+// 	 $('#info').height($(window).height()- $("#row001").height() - $("#div001").height()- $("#div002").height() - 70);
+// })
+
+// $(function() {	
+// SetBillNo();
+// });
+
+function SetBillNo() {
+	$("#txtBillNo").click(function() {		
+		GetBillList();		
+		PopPicker.show(function(items) {
+			var billNo = items[0].text;
+			$("#txtBillNo").val(billNo);
+		});
+	});
+}
+
+//鏁板瓧鎷栧姩涔嬪悗璋冩暣鏁板瓧灏忓浘鏍囦綅缃�
+function onStopDrag(e) {
+	var d = e.data;
+	if(d.left < 0) {
+		d.left = 0
+	}
+	if(d.top < 0) {
+		d.top = 0
+	}
+	if(d.top + $(d.target).outerHeight() > $(d.parent).height()) {
+		$("#dgWOMDAG-sum")[0].innerHTML = "0";
+		$("#dgWOMDAG-sum").css("top", d.startTop + "px");
+		$("#dgWOMDAG-sum").css("left", d.startLeft + "px");
+		$("#dgWOMDAG-sum").css("position", "initial");
+		i = 0;
+	}
+}
+
+//鏇存柊琛ㄦ牸鏁版嵁
+// 灏嗘暟鎹斁鍒拌〃鏍间腑
+function populateTable(data) {
+	
+	console.log('1');
+  let tbody = document.querySelector("#myTable tbody");
+
+  // 娓呯┖琛ㄦ牸鍐呭
+  tbody.innerHTML = "";
+
+  // 寰幆閬嶅巻鏁版嵁锛岀敓鎴愯〃鏍艰
+  for (let i = 0; i < data["鐗╂枡鍚嶇О"].length; i++) {
+    let tr = document.createElement("tr");
+
+    // 鍒涘缓琛ㄦ牸鍗曞厓鏍硷紝骞跺皢鏁版嵁濉叆
+    let td1 = document.createElement("td");
+    td1.textContent = data["鐗╂枡鍚嶇О"][i];
+    tr.appendChild(td1);
+
+    let td2 = document.createElement("td");
+    td2.textContent = data["鐗╂枡浠g爜"][i];
+    tr.appendChild(td2);
+
+    let td3 = document.createElement("td");
+    td3.textContent = data["寰呭彂鏁伴噺"][i];
+	if (data["寰呭彂鏁伴噺"][i] === "0.0000") {
+	    tr.style.color = "green";
+	  }else{ tr.style.color = "red";}
+    tr.appendChild(td3);
+	
+	let td4 = document.createElement("td");
+	td4.textContent = data["宸插彂鏁伴噺"][i];
+	tr.appendChild(td4);
+
+    // let td5 = document.createElement("td");
+    // td5.textContent = data["鎺ㄨ崘浠撲綅"][i];
+    // tr.appendChild(td5);
+
+
+    // let td6 = document.createElement("td");
+    // td6.textContent = data["鍥惧彿"][i];
+    // tr.appendChild(td6);
+
+
+
+    tbody.appendChild(tr);
+  }
+};
+//鎵弿鎸囦护宸ュ崟澶勭悊鏂规硶
+
+function GetBarInfoDGD(){
+	 console.log(2);
+		if(event.keyCode == 13) {
+		 		//濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶
+				if($("#DGD").val() == "") {
+					$("#DGD").focus();
+					playerAudio("NG");
+					mui.toast("璇峰厛杈撳叆宸ュ崟!");			
+					return;
+				}	
+		$.ajax({
+		  url: app.API_URL_HEADER + "/XKYDHD/GetGSDGD",
+		 data: {
+			 DGD: $("#DGD").val()
+				},
+		 DataType: "json",
+		 type: "post",
+		 async: false,
+		  success: function(data){
+		
+		    if (data.status === 0) {
+							  console.log(data);
+						   /// console.log(JSON.stringify(response));
+		      var selectElement = document.getElementById('txtGD');
+		      selectElement.innerHTML = "";
+		      matterTable = data.data.matterTable;
+		
+							
+		      for (var i = 0; i < matterTable.length; i++) {
+		        var option = document.createElement("option");
+		        option.value = matterTable[i]["DAA001"];
+		        option.text = matterTable[i]["DAA001"];
+		        selectElement.appendChild(option);
+		      }
+				selectElement.value = matterTable[0]["DAA001"];	
+						GETGDINFO_SX();
+		    } else {
+				playerAudio("NG");
+				mui.toast("澶辫触!"+data.message);					
+		      alert("鑾峰彇鏁版嵁寮傚父锛�" + data.message);
+		    }
+		 
+		  },
+		  error: function(xhr, type, errorThrown) {
+						
+		    mui.toast("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+		    alert("鑾峰彇鏁版嵁寮傚父锛�");
+		  }
+		});		
+		 		//鐢ㄦ埛ID
+		       // var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
+		   		//var user_id =$("#txtBillNo").val(); //currentSession.user_id;
+		   		//var  mun=$("#txtSL").val();
+				//GETGDINFO_SX();
+		//		var user_id = "admin";
+		 		
+		 	}
+};
+
+function GetBarInfoDGDSS(){
+	 console.log(2);
+		if(event.keyCode == 13) {
+		 		//濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶
+				if($("#DGD").val() == "") {
+					$("#DGD").focus();
+					playerAudio("NG");
+					mui.toast("璇峰厛杈撳叆宸ュ崟!");			
+					return;
+				}	
+		$.ajax({
+		  url: app.API_URL_HEADER + "/XKYDHD/GetGSDGDSS",
+		 data: {
+			 DGD: $("#DGD").val(),
+			 ITEM: $("#DAB020").val()
+				},
+		 DataType: "json",
+		 type: "post",
+		 async: false,
+		  success: function(data){
+		
+		    if (data.status === 0) {
+							  console.log(data);
+						   /// console.log(JSON.stringify(response));
+		      var selectElement = document.getElementById('txtGD');
+		      selectElement.innerHTML = "";
+		      matterTable = data.data.matterTable;
+		
+		if(matterTable.length>0){		
+		      for (var i = 0; i < matterTable.length; i++) {
+		        var option = document.createElement("option");
+		        option.value = matterTable[i]["DAA001"];
+		        option.text = matterTable[i]["DAA001"];
+		        selectElement.appendChild(option);
+		      }
+				selectElement.value = matterTable[0]["DAA001"];	
+						GETGDINFO_SX();
+			}
+		    } else {
+				playerAudio("NG");
+				mui.toast("澶辫触!"+data.message);					
+		      alert("鑾峰彇鏁版嵁寮傚父锛�" + data.message);
+		    }
+		 
+		  },
+		  error: function(xhr, type, errorThrown) {
+						
+		    mui.toast("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+		    alert("鑾峰彇鏁版嵁寮傚父锛�");
+		  }
+		});		
+		 		//鐢ㄦ埛ID
+		       // var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
+		   		//var user_id =$("#txtBillNo").val(); //currentSession.user_id;
+		   		//var  mun=$("#txtSL").val();
+				//GETGDINFO_SX();
+		//		var user_id = "admin";
+		 		
+		 	} 
+};
+
+//鎵弿鎸囦护宸ュ崟澶勭悊鏂规硶
+function GetBarInfoGD(){
+	GETGDINFO_SX();
+
+};
+
+function GETGDINFO_SX()
+{
+	//console.log(234);
+	$.ajax({
+		url: app.API_URL_HEADER + "/XKYDHD/GetBarInfoHBGD",
+			
+		data: {
+			DAA001: $("#DGD").val(),
+		},
+		DataType: "json",
+		type: "post",
+		async: false,
+		//timeout: 15000,
+		success: function(data) {
+			//console.log(JSON.stringify(data));
+			if(data.status != 0) {
+				playerAudio("NG");
+				mui.alert(data.message,"","",function(){ 
+					mui("#DAB001")[0].focus();
+					$("#DAB001").val("");
+					$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+				});			
+				return;
+			} else {
+				populateTable(data.data);
+				
+				$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+			
+				$("#DEPOT").val(data.data.DEPOT);
+				$("#DEPOTSE").val(data.data.DEPOTSE);
+				$("#txtSL").val(data.data.txtSL);//濉叆鏉$爜鏁伴噺
+				mui("#DAB001")[0].focus();
+			
+			}
+		},
+		error: function(xhr, type, errorThrown) {
+			alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+		}
+	});
+}
+
+ //鎵弿鏉$爜澶勭悊鏂规硶
+ function GetBarInfoLL() {
+ 	if(event.keyCode == 13) {
+ 		//濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶
+		if($("#DAB001").val() == "") {
+			$("#DAB001").focus();
+			playerAudio("NG");
+			mui.toast("璇峰厛鎵弿鐗╂枡鏉$爜!");			
+			return;
+		}	
+		
+ 		//鐢ㄦ埛ID
+        var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
+   		var user_id =currentSession.user_id; //currentSession.user_id;
+//		var user_id = "admin";
+ 		$.ajax({
+ 			url: app.API_URL_HEADER + "/XKYDHD/GetBarInfoLLHBJC",
+ 				
+ 			data: {
+ 				DAB001: $("#DAB001").val(),
+				DAA001: $("#DGD").val(),
+				DEPOT: $("#DEPOT").val(),
+				DEPOTSE: $("#DEPOTSE").val(),
+ 				logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯
+ 				
+ 			},
+ 			DataType: "json",
+ 			type: "post",
+ 			async: false,
+ 			//timeout: 15000,
+ 			success: function(data) {
+ 				//console.log(JSON.stringify(data));
+ 				if(data.status != 0) {
+					playerAudio("NG");
+ 					mui.alert(data.message,"","",function(){ 
+ 						mui("#DAB001")[0].focus();
+						$("#DAB001").val("");
+						$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ 					});			
+ 					return;
+ 				} else {
+ 					matterTable = data.data.matterTable;
+					$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+					$("#FLSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+
+					$("#txtSL").val(data.data.txtSL);//濉叆鏉$爜鏁伴噺
+					$("#DFSL").val(data.data.FLSL);//濉叆鍙戞枡鏁伴噺
+					$("#JCSL").val(data.data.JCNUM);//濉叆鍙戞枡鏁伴噺
+					$("#DAB020").val(data.data.DAB020);//濉叆鐗╂枡缂栫爜
+					$("#model").val(data.data.MSG);//濉叆鐗╂枡缂栫爜
+					//mui("#FLSL")[0].focus();
+
+ 				}
+ 			},
+ 			error: function(xhr, type, errorThrown) {
+ 				alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+ 			}
+ 		});
+ 	}
+ };
+ 
+ 
+// 鎵弿鏉$爜澶勭悊鏂规硶
+ $('#doSure').click(function is_CreateSCLLD() {
+
+// console.log(223);
+ // console.log(FLSLValue);
+    // 姣旇緝鏁板�煎ぇ灏�
+	
+	CreateSCLLD();
+	//GetBarInfoDGDSS();
+	GETGDINFO_SX();
+//     if (txtSLValue <= FLSLValue) {
+//       // txtSL鐨勫�煎皬浜嶧LSL鐨勫��
+// //	  console.log("鐢熸垚棰嗘枡鍗�");
+// 	  CreateSCLLD();
+// 	  GETGDINFO_SX();
+//     } else if (txtSLValue > FLSLValue) {
+//       // txtSL鐨勫�煎ぇ浜嶧LSL鐨勫��
+//       //console.log("纭鏄惁鎷嗗垎棰嗘枡");
+//       mui.confirm('鏄惁鎷嗗垎璇ユ潯鐮侊紵', '璇风‘璁�', ['纭', '鍙栨秷'], function(e) {
+//         if (e.index === 0) {
+// 			PrintSplit();
+// 		  GETGDINFO_SX();
+//           console.log("鍒锋柊鎴愬姛锛�");
+//         } else {
+//           // 鐢ㄦ埛鐐瑰嚮浜嗗彇娑堟寜閽�
+// 		  mui("#FLSL")[0].focus();
+//         }
+//       });
+   // }
+
+});
+ 
+ 
+ function CreateSCLLD() {
+	 //鐢ㄦ埛ID
+	         var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
+	    	 var user_id =currentSession.user_id; //currentSession.user_id;
+	 //		var user_id = "admin";
+	 //console.log(1);
+	  		$.ajax({
+	  			url: app.API_URL_HEADER + "/XKYDHD/CreateSCLLDHBJC",
+	  				
+	  			data: {
+	  				DAB001: $("#DAB001").val(),
+					DAB020: $("#DAB020").val(),
+	 				DAA001: $("#txtGD").val(),
+					FLSL:$("#txtSL").val(),
+					DEPOT:$("#DEPOT").val(),
+					DEPOTSE:$("#DEPOTSE").val(),
+	  				logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯
+	  				
+	  			},
+	  			DataType: "json",
+	  			type: "post",
+	  			async: false,
+	  			//timeout: 15000,
+	  			success: function(data) {
+	  				console.log(JSON.stringify(data));
+	  				if(data.status != 0) {
+	 					playerAudio("NG");
+	  					mui.alert(data.message,"","",function(){ 
+	  						mui("#DAB001")[0].focus();
+	 						$("#DAB001").val("");
+	 						$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+	  					});			
+	  					return;
+	  				} else {
+	 					$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+	 					$("#FLSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+						$("#DFSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+						$("#JCSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+	 $("#DAB001").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+	 					// $("#txtSL").val(data.data.txtSL);//濉叆鏉$爜鏁伴噺
+	 					// $("#FLSL").val(data.data.FLSL);//濉叆鏉$爜鏁伴噺
+	 					mui("#FLSL")[0].focus();
+
+						playerAudio("OK");
+						mui.toast("棰嗘枡鎴愬姛");		
+
+	  				}
+	  			},
+	  			error: function(xhr, type, errorThrown) {
+					console.log(2);
+	  				alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+	  			}
+	  		});
+ };
+ 
+ function PrintSplit() {
+ 	 //鐢ㄦ埛ID
+ 	         var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION);
+ 	    	 var user_id =currentSession.user_id; //currentSession.user_id;
+ 	 //		var user_id = "admin";
+ 	  		$.ajax({
+ 	  			url: app.API_URL_HEADER + "/WARBABChag/PrintSplit",
+ 	  				
+ 	  			data: {
+ 	  				DAB001: $("#DAB001").val(),
+ 					DAB020: $("#DAB020").val(),
+ 	 				DAA001: $("#txtGD").val(),
+ 					FLSL:$("#FLSL").val(),
+ 	  				logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯
+ 	  				
+ 	  			},
+ 	  			DataType: "json",
+ 	  			type: "post",
+ 	  			async: false,
+ 	  			//timeout: 15000,
+ 	  			success: function(data) {
+ 	  				//console.log(JSON.stringify(data));
+ 	  				if(data.status != 0) {
+ 	 					playerAudio("NG");
+ 	  					mui.alert(data.message,"","",function(){ 
+ 	  						mui("#DAB001")[0].focus();
+ 	 						$("#DAB001").val("");
+ 	 						$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ 	  					});			
+ 	  					return;
+ 	  				} else {
+ 	 					$("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ 	 					$("#FLSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮
+ 	 
+ 	 					$("#txtSL").val(data.data.txtSL);//濉叆鏉$爜鏁伴噺
+ 	 					$("#FLSL").val(data.data.FLSL);//濉叆鏉$爜鏁伴噺
+ 	 					mui("#FLSL")[0].focus();
+ 						
+						//console.log(data.data.BARID);
+						console.log("寮�濮嬫墦鍗帮紒锛�");
+
+						var str = data.data.BARID.toString();
+						console.log(str); // 灏咮ARID杞崲涓哄瓧绗︿覆骞舵墦鍗拌緭鍑�
+
+						printByIds(str);
+						console.log("鎵撳嵃鎴愬姛锛侊紒");
+ 						playerAudio("OK");
+ 						mui.toast("棰嗘枡鎴愬姛");		
+						//initBluetooth();
+ 
+ 	  				}
+ 	  			},
+ 	  			error: function(xhr, type, errorThrown) {
+ 	  				alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown));
+ 	  			}
+ 	  		});
+ };
+ 
+ 
+ 
+ function BarcodePutInStorageHint(){
+	 $.ajax({
+	 	url: app.API_URL_HEADER + app.API_METHOD_ESP,
+	 	data: {
+	 		spname: "BarcodePutInStorageHint",
+	 		returnvalue: 1,
+	 		_sp_DAB001: $("#DAB001").val()
+	 	},
+	 	type: "post",
+	 	success: function(data) {
+	 		console.log(JSON.stringify(data));
+	 		if(data.status == 0) {
+				$("#hint")[0].innerHTML=
+				"涓暟/鎵弿鏁�/閫佽揣鏁帮細"+
+				data.data[0]["A1"]+"/"+
+				data.data[0]["B1"]+"/"+
+				data.data[0]["B"];
+				
+				;
+	 		} else {
+				$("#hint")[0].innerHTML="";
+	 		}
+	 	},
+	 	error: function(xhr, type, errorThrown) {
+	 	}
+	 });
+ }
+ 
+
+
+/* 褰撻〉闈㈢殑鏂囨湰澶卞幓鐒︾偣鏃讹紝璁╁叾鍐嶆鑾峰彇鐒︾偣 */
+
+
+/**
+ *  @param {鍑哄彂DOM鎺т欢锛歵his} e
+ */
+//function SetInputFoucs(codeID) {
+//	var itemTag = document.activeElement.tagName; //鑾峰彇鍏冪礌鐨勬爣绛惧悕
+//	var name = document.activeElement.name; //鑾峰彇鍏冪礌鐨勫悕绉�	
+//	//濡傛灉鎺т欢涓嶆槸鏂囨湰
+//	//濡傛灉鎺т欢鏄枃鏈�,Name闈炵┖鏃讹紙濡俢heckbox)
+//	//鏉$爜鑾峰彇鐒︾偣
+//	if ((itemTag != 'INPUT') ||
+//		(itemTag == 'INPUT' && name != '')) {
+//		$(codeID).focus();
+//	}
+//}
\ No newline at end of file
diff --git a/js/CangKuManage_js/GS_JCLLD.js b/js/CangKuManage_js/GS_JCLLD.js
index 411b5be..8402404 100644
--- a/js/CangKuManage_js/GS_JCLLD.js
+++ b/js/CangKuManage_js/GS_JCLLD.js
@@ -373,12 +373,20 @@
 		mui.alert("璇疯緭鍏ユ纭殑鏁板瓧锛�")
 		return;
 	}
+	var txtSL = parseFloat($("#txtSL").val());  
+	var SFSL = parseFloat($("#SFSL").val());  
+	console.log("txtSL:", txtSL);  
+	console.log("SFSL:", SFSL); 
 	// 姣旇緝鏁板�煎ぇ灏�
-	if ($("#txtSL").val() < $("#SFSL").val()) {
+	if (txtSL < SFSL) {
+		console.log($("#txtSL").val());
+		console.log( $("#SFSL").val());
+		console.log("1");
 		mui.alert("瀹炲彂鏁颁笉鑳藉ぇ浜庢潯鐮佹暟");
 		return;
 	};
-	if ($("#txtSL").val() > $("#SFSL").val()) {
+	if (txtSL > SFSL) {
+		// console.log("2");
 		PrintSplit();
 	};
 
diff --git a/pages/CangKuManage/GS_HBJCLLD_NEW.html b/pages/CangKuManage/GS_HBJCLLD_NEW.html
new file mode 100644
index 0000000..f06379b
--- /dev/null
+++ b/pages/CangKuManage/GS_HBJCLLD_NEW.html
@@ -0,0 +1,164 @@
+
+<!doctype html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>瀵勫瓨寮忛鏂�</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<!-- <link rel="stylesheet" href="../../lib/base_js/css/common.css" /> -->
+		<script type="text/javascript" src="../../lib/jquery/js/jquery.min.js"></script>
+		<script type="text/javascript" src="../../lib/easyui/js/jquery.easyui.min.js" ></script>
+		<script src="../../lib/mui/js/mui.min.js"></script>
+		<link href="../../lib/mui/css/mui.min.css" rel="stylesheet" />
+		<link href="../../lib/mui/css/mui.picker.min.css" rel="stylesheet" />
+		<link href="../../lib/mui/css/mui.poppicker.css" rel="stylesheet" />
+		<script src="../../lib/mui/js/mui.picker.min.js"></script>
+		<script src="../../lib/mui/js/mui.poppicker.js"></script>
+		<!--<script type="text/SetInputFoucsjavascript" src="../../lib/base_js/js/common.js" ></script>-->
+		<script type="text/javascript" src="../../lib/base_js/js/app.js"></script>
+		
+		<script type="text/javascript" src="../../lib/base_js/js/common.js" ></script>
+		
+		<link rel="stylesheet" href="../../lib/base_js/css/common.css" />
+		<style>
+			#info {
+				/*鏌ヨ淇℃伅灞炴��*/
+				background-color: #FFE48D;
+			}
+		</style>
+
+	</head>
+
+	<body>
+		
+		<div class="mui-input-group mui-content">
+			<!-- <div class="mui-input-row  ">
+				<div style=" float: left; ">
+					<label class="row-title">浜哄憳</label>
+					<input class="row-content-split" type="text" name="txtBillNo" id="txtBillNo" placeholder="璇烽�夋嫨鎶ュ伐浜哄憳"readonly="readonly">
+				</div>			
+			</div> -->
+			<div class="mui-input-row" id="row001">
+				<label>鍚堝苟宸ュ崟</label>
+				<input id="DGD" type="text" value="" class="mui-input-clear text-color"  placeholder="璇锋壂鎻忓伐鍗�" onkeypress="GetBarInfoGD()"  />
+			</div>	
+		<!-- 	<div class="mui-input-row" id="row001">
+				<label>鎸囦护宸ュ崟</label>
+				<select id="txtGD" style="margin:auto; color:#000;font-size: 18px" onchange="GetBarInfoGD()" >
+					<option value="">璇风偣鍑婚�夋嫨</option>
+				</select>
+			</div>	 -->	
+				<div class="mui-input-row" id="row001">
+					<label>瀵勫瓨浠撳簱</label>
+					<input id="DEPOT" type="text" readonly="readonly" value="" class="mui-input-clear text-color"  />
+				</div>
+				<div class="mui-input-row" id="row001">
+					<label>瀵勫瓨搴撲綅</label>
+					<input id="DEPOTSE" type="text" readonly="readonly" value="" class="mui-input-clear text-color"  />
+				</div>
+			<div class="mui-input-row" id="row001">
+				<label>鐗╂枡鏉$爜</label>
+				<input id="DAB001" type="text" value="" class="mui-input-clear text-color" placeholder="璇锋壂鎻忔潯鐮�" onkeypress="GetBarInfoLL()" />
+			</div>
+			<div class="mui-input-row" id="row001">
+				<label>鐗╂枡缂栫爜</label>
+				<input id="DAB020" type="text" value="" class="mui-input-clear text-color"  readonly="readonly" />
+			</div>
+			<div class="mui-input-row" id="row001">
+				<label>鏉$爜鏁伴噺</label>
+				<input id="txtSL" type="text" value="" class="mui-input-clear text-color"  readonly="readonly" />
+			</div>
+			<div class="mui-input-row" id="row001">
+				<label>寰呭彂鏁伴噺</label>
+				<input id="DFSL" type="text" value="" class="mui-input-clear text-color"  readonly="readonly" />
+			</div>
+			<div class="mui-input-row" id="row001">
+				<label>瀵勫瓨浠撴暟閲�</label>
+				<input id="JCSL" type="text" value="" class="mui-input-clear text-color"  readonly="readonly" />
+			</div>
+	<div class="mui-collapse-content" style="height:80px">
+		<!-- <p id="model" style="font-size: 1.0625rem;color: #000000;"></p> -->
+		<textarea id='model' type="text" class='input-text' style="height:200px"></textarea>
+	</div>
+			<!-- <div class="mui-input-row" id="row001">
+				<label>鍙戞枡鏁伴噺</label>
+				<input id="FLSL" type="text" value="" class="mui-input-clear text-color" placeholder="璇疯緭鍏ュ彂鏂欐暟閲�" onkeypress="is_CreateSCLLD()"/>
+			</div> -->
+			</div>
+			<div class="mui-input-row" style="margin-top: 5px;">
+						<button type="button" class="mui-btn mui-btn-green mui-icon mui-icon-checkmarkempty"
+							style="font-size:1.3rem;width: 100%;" id="doSure">纭</button>
+			</div>
+			<div id="txtInfo"><!--<div class="mui-input-row" style="height: 350px; margin-top: 10px;">-->
+				<div class="link-area" id="div001">
+					<h4 style="color: #008000; text-align: center;">
+						寰呭嚭搴撳崟鎹槑缁�
+						<!-- <span id="dgWOMDAG-sum" class="mui-badge mui-badge-success easyui-draggable"
+							style="font-size: 15px;" data-options="onStopDrag:onStopDrag">0</span> -->
+					</h4>
+				</div>
+			</div>
+			<div class="data-table-container" style="height: 100%; width: 100%;">
+			  <table class="data-table" id="myTable" style="height: 100%; width: 100%;">
+			    <!-- 琛ㄦ牸浠g爜 -->
+				<table class="data-table" id="myTable" style="height:100% width: 100%;;">
+				  <thead>
+				    <tr>
+				      <th>鐗╂枡鍚嶇О</th>
+					  <th>鐗╂枡浠g爜</th>
+					  <th>寰呭彂鏁伴噺</th>
+					  <th>宸插彂鏁伴噺</th>
+					  <!-- <th>鎺ㄨ崘浠撲綅</th> -->
+
+				    </tr>
+				  </thead>
+				  <tbody>
+				    <!-- 琛ㄦ牸鍐呭灏嗛�氳繃 JS 鍔ㄦ�佺敓鎴� -->
+				  </tbody>
+				</table>
+			  </table>
+			</div>
+		</div>
+		<script type="text/javascript" src="../../js/CangKuManage_js/GS_HBJCLLD.js" ></script>
+		<script type="text/javascript" src="../../js/CangKuManage_js/print_template.js" ></script>
+		<script type="text/javascript" src="../../js/api.js" ></script>
+
+	</body> 
+
+</html>
+
+<style>
+		  /* 娣诲姞琛ㄦ牸鏍峰紡 */
+		  .data-table {
+		    width: 100%;
+		    border-collapse: collapse;
+			overflow-x: auto; /* 姘村钩婊氬姩鏉� */
+		  }
+
+		  .data-table th,
+		  .data-table td {
+		    border: 1px solid #ccc;
+		    padding: 3px;
+		    text-align: left;
+		    word-wrap: break-word;
+		    white-space: pre-wrap;
+		    text-overflow: ellipsis; /* 鏂囨湰鎴柇鍜岀渷鐣ュ彿 */
+		    overflow: hidden;
+			font-size: 10px;
+		  }
+		  
+		  /* 濯掍綋鏌ヨ */
+		  @media (max-width: 768px) {
+		    .data-table {
+		      /* 璋冩暣琛ㄦ牸鏍峰紡浠ラ�傚簲灏忓睆骞� */
+		    }
+		  }
+		  
+		   option {
+		       font-size: 25px; /* 璋冩暣涓嬫媺閫夐」鐨勫瓧浣撳ぇ灏� */
+		       padding: 20px; /* 璋冩暣涓嬫媺閫夐」鐨勫唴杈硅窛 */
+		     }
+		</style>
\ No newline at end of file
diff --git a/pages/CangKuManage/XJ_check.html b/pages/CangKuManage/XJ_check.html
index c5eab3c..36759bf 100644
--- a/pages/CangKuManage/XJ_check.html
+++ b/pages/CangKuManage/XJ_check.html
@@ -220,7 +220,8 @@
 							<div class="font-seal" style="color: #4CD964;border: 1px solid #4CD964"><%=(item.妫�楠岀粨鏋�)%></div>
 							{{else if item.妫�楠岀粨鏋�=='涓嶅悎鏍�'}}
 							<div class="font-seal"><%=(item.妫�楠岀粨鏋�)%></div>
-							{{else}}
+							{{else if item.妫�楠岀粨鏋�=='闈炴楠岄」鐩�'}}
+							<div class="font-seal" style="color: #A67D3D;border: 1px solid #A67D3D"><%=(item.妫�楠岀粨鏋�)%></div>
 							{{/if}}
 						<span class="mui-media-object mui-pull-left" style="border-radius: 50%;    height: 20px;    width: 20px;    display: inline-block;    background: #<%=(c)%>;      vertical-align: top;">  
 						     <span style="display: block;    color: #FFFFFF;    height: 20px;    line-height: 20px;    text-align: center"><%=(++i)%></span>  
diff --git a/pages/CangKuManage/XJ_check_HBGD.html b/pages/CangKuManage/XJ_check_HBGD.html
index 47d503c..7f4cdbc 100644
--- a/pages/CangKuManage/XJ_check_HBGD.html
+++ b/pages/CangKuManage/XJ_check_HBGD.html
@@ -191,7 +191,8 @@
 							<div class="font-seal" style="color: #4CD964;border: 1px solid #4CD964"><%=(item.妫�楠岀粨鏋�)%></div>
 							{{else if item.妫�楠岀粨鏋�=='涓嶅悎鏍�'}}
 							<div class="font-seal"><%=(item.妫�楠岀粨鏋�)%></div>
-							{{else}}
+							{{else if item.妫�楠岀粨鏋�=='闈炴楠岄」鐩�'}}
+							<div class="font-seal" style="color: #A67D3D;border: 1px solid #A67D3D"><%=(item.妫�楠岀粨鏋�)%></div>
 							{{/if}}
 						<span class="mui-media-object mui-pull-left" style="border-radius: 50%;    height: 20px;    width: 20px;    display: inline-block;    background: #<%=(c)%>;      vertical-align: top;">  
 						     <span style="display: block;    color: #FFFFFF;    height: 20px;    line-height: 20px;    text-align: center"><%=(++i)%></span>  

--
Gitblit v1.9.3