From 2df906a447195f9786dd468512ea895d6cc18532 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 15 五月 2025 14:53:54 +0800
Subject: [PATCH] APP3.5开发

---
 igds-app/js/admin/grain-history.js |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/igds-app/js/admin/grain-history.js b/igds-app/js/admin/grain-history.js
index da2958b..b492358 100644
--- a/igds-app/js/admin/grain-history.js
+++ b/igds-app/js/admin/grain-history.js
@@ -33,7 +33,7 @@
 function init() {
 	var user = JSON.parse(localStorage.getItem('user'));
 	var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId'));
-	url = user.url + "/api-phone/v35/gateway";
+	url = user.url + "/api/phone/v35/gateway";
 	data.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
 	data0.tokenAuth = user.tokenAuth;
@@ -50,6 +50,7 @@
 	$("#depot").val(depotName);
 	//鑾峰彇浠撳簱鍒楄〃
 	getDepotList();
+	getHistoryList();
 }
 
 //鏌ヨ鍘嗗彶鏁版嵁
@@ -171,23 +172,29 @@
 	date = new Date(date);
 	dateTime = getDate(date);
 	$("#dateTime").val(dateTime);
+	getHistoryList()
 }
 
 //閫夋嫨鏃ユ湡
 function chooseDate() {
 	var dtpicker = new mui.DtPicker({
 		type: "month", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 
+		value: dateTime
 	})
+	var time = dateTime
 	dtpicker.show(function(e) {
 		dateTime = e.value;
 		$("#dateTime").val(dateTime);
-	})
+		if(time != dateTime){
+			getHistoryList()
+		}
+	})	
 }
 
 //閫夋嫨浠撳簱
 function chooseDepot() {
 	var groupPicker = new mui.PopPicker();
-
+	console.log(JSON.stringify(depotData))
 	groupPicker.setData(depotData);
 
 	groupPicker.show(function(items) {
@@ -195,7 +202,7 @@
 		depotName = items[0].text;
 
 		$("#depot").val(depotName);
-		mui.toast(depotId + "-" + dateTime);
+		// mui.toast(depotId + "-" + dateTime);
 	});
 }
 
@@ -210,6 +217,7 @@
 		success: function(result) {
 			if (result.code == "0000") {
 				depotList = result.data;
+				// console.log(JSON.stringify(depotList))
 				renderDepotData();
 			} else {
 				mui.toast("娌℃湁浠撳簱淇℃伅锛�");
@@ -223,17 +231,18 @@
 
 //娓叉煋浠撳簱閫夋嫨鏁版嵁
 function renderDepotData() {
-	depotData = [];
+	var fenl = {};
 	$.each(depotList, function(index, item) {
-		depotData.push({
-			value: item.depotId,
-			text: item.depotName
-		});
+		fenl = {
+			value: item.id,
+			text: item.name,
+		}
+		depotData.push(fenl);
 	})
 }
 
 mui('.mui-scroll-wrapper').scroll({
-	indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+	indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
 	deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
 	bounce: false, //鏄惁鍚敤鍥炲脊
 	deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
@@ -252,4 +261,4 @@
 			}
 		})
 	}
-});
+});
\ No newline at end of file

--
Gitblit v1.9.3