瀏覽代碼

修改移动端页面

MS-FUUVYHVOEAYJ\Administrator 11 月之前
父節點
當前提交
4eb93eea39

+ 324 - 171
RuoYi-Vue-v3.8.7/ruoyi-admin/src/main/resources/static/page/goods/detail.html

@@ -1,177 +1,330 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8">
-		<title>物品信息</title>
-		<meta name="viewport" content="width=device-width, initial-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="css/mui.min.css">
-	</head>
-	<body>
-		<header id="header" class="mui-bar mui-bar-nav">
-			<a id="go-back" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="display: none;"></a>
-			<h1 id="title" class="mui-title">物品信息</h1>
-		</header>
-		<div class="mui-content">
-			<div class="mui-card">
-				<ul id="kfList" class="mui-table-view mui-table-view-striped mui-table-view-condensed">
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>所属库房:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="kfName"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>库房管理员:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="kfAdmin"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>物品名称:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="goodsName"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>型号/规格:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="goodsType"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>单位:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="goodsUnit"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>装备数量:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="goodsNum"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>入库年限:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="upTime"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>存储年限(年):</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="saveYear"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>报废数量:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="scrapNum"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>剩余数量:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="leaveNum"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>盘库时间:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="makeTime"></div>
-					        </div>
-					    </div>
-					</li>
-					<li class="mui-table-view-cell">
-					    <div class="mui-table">
-					        <div class="mui-table-cell mui-col-xs-5">
-					            <div>备注:</div>
-					        </div>
-					        <div class="mui-table-cell mui-col-xs-7">
-					            <div id="remark"></div>
-					        </div>
-					    </div>
-					</li>
-				</ul>
+
+<head>
+	<meta charset="utf-8">
+	<title>物品信息</title>
+	<meta name="viewport" content="width=device-width, initial-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="css/mui.min.css">
+	<link rel="stylesheet" href="js/layui-v2.9.3/layui/css/layui.css">
+	<!-- 引入Layui的JS文件 -->
+	<script src="js/layui-v2.9.3/layui/layui.js"></script>
+</head>
+<style>
+	.mui-card {
+		background-color: transparent;
+		box-shadow: none;
+	}
+
+	.toptitle {
+		background-image: url(images/bg.png);
+		background-size: 100% 100%;
+		height: 100px;
+		padding-top: 15px;
+		font-size: 16px;
+	}
+
+	.mui-col-xs-4 {
+		color: #999;
+		line-height: 15px;
+		text-align: right;
+	}
+
+	.toptitle .mui-col-xs-4 {
+		color: #FFFFFF;
+		line-height: 30px;
+		opacity: 0.6;
+		text-align: right;
+	}
+
+	.toptitle .mui-col-xs-8 {
+		font-weight: bold;
+		color: #FFFFFF;
+		line-height: 30px;
+	}
+
+	.mui-table-view-cell:after {
+		content: none;
+	}
+
+	.mui-col-xs-8 img {
+		width: 110px;
+		height: 60px;
+		margin-right: 10px;
+		margin-bottom: 10px;
+	}
+</style>
+
+<body>
+	<header id="header" class="mui-bar mui-bar-nav">
+		<a id="go-back" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="display: none;"></a>
+		<h1 id="title" class="mui-title">物品信息</h1>
+	</header>
+	<div class="mui-content">
+		<div class="mui-card">
+			<div class="toptitle">
+				<div class="mui-table">
+					<div class="mui-table-cell mui-col-xs-4">
+						<div>所属库房:</div>
+					</div>
+					<div class="mui-table-cell mui-col-xs-8">
+						<div id="kfName"></div>
+					</div>
+				</div>
+				<div class="mui-table">
+					<div class="mui-table-cell mui-col-xs-4">
+						<div>库房管理员:</div>
+					</div>
+					<div class="mui-table-cell mui-col-xs-8">
+						<div id="kfAdmin"></div>
+					</div>
+				</div>
 			</div>
+			<ul id="kfList" class="mui-table-view mui-table-view-striped mui-table-view-condensed"
+				style="margin-top: -10px;">
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>资产编号:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="goodsNode"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>资产名称:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="goodsName"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>资产类型:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="goodType"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>资产状态:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="goodStadus"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>型号/规格:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="goodsType"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>单位:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="goodsUnit"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>装备数量:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="goodsNum"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>入库时间:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="upTime"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>存储年限(年):</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="saveYear"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>报废数量:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="scrapNum"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>剩余数量:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="leaveNum"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>盘库时间:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="makeTime"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>备注:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="remark"></div>
+						</div>
+					</div>
+				</li>
+				<li class="mui-table-view-cell">
+					<div class="mui-table" style="display: flex;">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>图片:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							<div id="imgList"></div>
+						</div>
+					</div>
+				</li>
+			</ul>
 		</div>
-		<script src="js/jquery.min.js"></script>
-		<script src="js/mui.min.js"></script>
-		<script>
-			mui.init({
-				statusBarBackground: '#f7f7f7'
-			});
-			mui.ready(() => {
-				const params = new URLSearchParams(window.location.search);
-				if (params.get('type') == 1) {
-					$('#go-back').css({'display': 'block'})
+	</div>
+	<script src="js/jquery.min.js"></script>
+	<script src="js/mui.min.js"></script>
+	<script>
+		layui.use('layer', function () {
+			var layer = layui.layer;
+			var node = document.getElementById('imgList');
+			var images = node.querySelectorAll('img');
+			console.log(images)
+			for (var i = 0; i < images.length; i++) {
+				// 获取图片元素
+				var img = document.getElementById(images[i].id);
+				// 绑定点击事件
+				img.onclick = function () {
+					// 调用图片查看器
+					layer.photos({
+						photos: {
+							"title": "",
+							"id": 1,
+							"start": 0, // 开始图片的位置
+							"data": [ // 图片数组
+								{
+									"src": this.src // 点击的图片的路径
+								}
+							]
+						},
+						closeBtn: false, // 显示关闭按钮
+						anim: 5 // 图片切换动画
+					});
+				};
+			}
+
+		});
+		mui.init({
+			statusBarBackground: '#f7f7f7'
+		});
+		mui.ready(() => {
+			const params = new URLSearchParams(window.location.search);
+			if (params.get('type') == 1) {
+				$('#go-back').css({ 'display': 'block' })
+			}
+			var result = JSON.parse(sessionStorage.getItem("detailData"));
+			console.log(result)
+			if (result) {
+				$('#goodsNode').text(result.zcbm)
+				$('#kfName').text(result.kfm)
+				$('#kfAdmin').text(result.kfgly)
+				$('#goodsName').text(result.name)
+				$('#goodType').text(result.zclx)
+				$('#goodsType').text(result.xhgg?result.xhgg:"无")
+				$('#goodsUnit').text(result.dw)
+				$('#goodsNum').text(result.zbsl + " " + result.dws)
+				$('#upTime').text(result.rknx)
+				$('#saveYear').text(result.ccnx)
+				$('#scrapNum').text(result.bfsl)
+				$('#leaveNum').text(result.sysl)
+				$('#makeTime').text(result.grsj)
+				$('#remark').text(result.bz)
+				$('#goodStadus').text(result.zt)				
+				// var imgList=result.tp.split(",");
+				var imgList = ['upload/2024-05-28/20240528023654.jpg']
+				let html = '';
+				for (let i = 0; i < imgList.length; i++) {
+					html += '<img src="http://58.144.199.81:8011/' + imgList[i] + '" id="zoom-img"' + (i + 1) + '></img>'
 				}
-				mui.ajax({
-					url: window.location.origin +'/wzglxtht/system/goods/getKuFangGoodsById?id=' + params.get('id'),
-					type: 'get',
-					success: function(json) {
-						if (json.data) {
-							$('#kfName').text(json.data.kufang.kfName)
-							$('#kfAdmin').text(json.data.adminName)
-							$('#goodsName').text(json.data.goods.goodsName)
-							$('#goodsType').text(json.data.goods.goodsType)
-							$('#goodsUnit').text(json.data.goods.goodsUnit)
-							$('#goodsNum').text(json.data.goods.goodsNum)
-							$('#upTime').text(json.data.goods.upTime)
-							$('#saveYear').text(json.data.goods.saveYear)
-							$('#scrapNum').text(json.data.goods.scrapNum)
-							$('#leaveNum').text(json.data.goods.leaveNum)
-							$('#makeTime').text(json.data.goods.makeTime)
-							$('#remark').text(json.data.goods.remark)
-						}
-					}
-				})
-				
-			})
-		</script>
-	</body>
+				$('#imgList').append(html)
+			}
+
+			// mui.ajax({
+			// 	// url: window.location.origin +'/wzglxtht/system/goods/getKuFangGoodsById?id=' + params.get('id'),
+			// 	url: 'http://8.137.99.54/wzglxtht/system/goods/getKuFangGoodsById?id=' + params.get('id'),
+			// 	type: 'get',
+			// 	success: function (json) {
+			// 		if (json.data) {
+			// 			console.log(json.data)
+			// 			$('#kfName').text(json.data.kufang.kfName)
+			// 			$('#kfAdmin').text(json.data.adminName)
+			// 			$('#goodsName').text(json.data.goods.goodsName)
+			// 			$('#goodsType').text(json.data.goods.goodsType)
+			// 			$('#goodsUnit').text(json.data.goods.goodsUnit)
+			// 			$('#goodsNum').text(json.data.goods.goodsNum)
+			// 			$('#upTime').text(json.data.goods.upTime)
+			// 			$('#saveYear').text(json.data.goods.saveYear)
+			// 			$('#scrapNum').text(json.data.goods.scrapNum)
+			// 			$('#leaveNum').text(json.data.goods.leaveNum)
+			// 			$('#makeTime').text(json.data.goods.makeTime)
+			// 			$('#remark').text(json.data.goods.remark)
+			// 			// let html='<div id="imgList">';
+			// 			// for (let i = 0; i <json.data.images.length; i++) {
+			// 			// 		html += '<img src='+json.data.images[i]+' id="zoom-img"'+(i+1s)+'></img>'
+			// 			// 	}
+			// 			// 	html+="</div>"
+			// 			// $('#imagesList').append(html)
+			// 		}
+			// 	}
+			// })
+
+		})
+	</script>
+</body>
+
 </html>

+ 192 - 58
RuoYi-Vue-v3.8.7/ruoyi-admin/src/main/resources/static/page/goods/goods.html

@@ -1,71 +1,205 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8">
-		<title>物资列表</title>
-		<meta name="viewport" content="width=device-width, initial-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="css/mui.min.css">
-	</head>
-	<body>
-		<header id="header" class="mui-bar mui-bar-nav">
-			<a id="go-back" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="display: none;"></a>
-			<h1 id="title" class="mui-title">库房</h1>
-		</header>
-		<div class="mui-content">
-			<div class="mui-card">
-				<ul id="kfList" class="mui-table-view mui-table-view-striped mui-table-view-condensed">
-					
-				</ul>
+
+<head>
+	<meta charset="utf-8">
+	<title>物资列表</title>
+	<meta name="viewport" content="width=device-width, initial-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="css/mui.min.css">
+</head>
+<style>
+	.search {
+		display: flex;
+		width: 80px;
+		height: 40px;
+		background: #1484FE;
+		border-radius: 0px 10px 10px 0px;
+		color: #fff;
+		align-items: center;
+		justify-content: space-evenly;
+	}
+
+	.search::placeholder {
+		color: #999;
+	}
+
+	#kfList li {
+		background: #FFFFFF;
+		border-radius: 10px;
+		margin-bottom: 10px;
+	}
+
+	.mui-card {
+		box-shadow: none;
+		background-color: transparent;
+	}
+
+	.mui-table-view {
+		background-color: transparent;
+	}
+
+	.mui-table-view-cell:after {
+		content: none;
+	}
+
+	.mui-table-view-cell {
+		padding: 0 5px;
+	}
+
+	.mui-ellipsis {
+		color: #1484FE;
+		font-size: 18px;
+		display: flex;
+		border-bottom: 1px solid #DCDCDC;
+		padding: 10px;
+	}
+
+	.mui-table .list {
+		font-size: 16px;
+		color: #999999;
+		display: flex;
+		margin-top: 10px;
+	}
+
+	.listTitle {
+		width: 80px;
+		min-width: 80px;
+		text-align: right;
+	}
+</style>
+
+<body>
+	<header id="header" class="mui-bar mui-bar-nav">
+		<a id="go-back" class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" style="display: none;"></a>
+		<h1 id="title" class="mui-title">库房</h1>
+	</header>
+	<div class="mui-content">
+		<div style="display: flex;margin: 10px;">
+			<input type="text" placeholder="请输入关键字" id="searchInput"
+				style="width: calc(100% - 80px);height: 40px;background: #FFFFFF;border-radius: 10px 0px 0px 10px;border: none;margin-bottom: 0;">
+			</input>
+			<div class="search" id="search">
+				<img src="images/search.png"></img><span>搜索</span>
 			</div>
 		</div>
-		<script src="js/jquery.min.js"></script>
-		<script src="js/mui.min.js"></script>
-		<script>
-			mui.init({
-				statusBarBackground: '#f7f7f7'
-			});
-			mui.ready(() => {
-				const params = new URLSearchParams(window.location.search);
-				if (params.get('type') == 1) {
-					$('#title').text('库房--' + params.get('name'))
-					$('#go-back').css({'display': 'block'})
-				}
-				$('#kfList').empty();
-				mui.ajax({
-					url: window.location.origin +'/wzglxtht/system/goods/getGoodsList?kufangId=' + params.get('id'),
-					type: 'get',
-					success: function(json) {
-						if (json.data && json.data.length) {
-							let html = ''
-							for (let i = 0; i < json.data.length; i++) {
-								html += `<li class="mui-table-view-cell" data-id="${json.data[i].id}">
+		<div class="mui-card">
+			<ul id="kfList" class="mui-table-view mui-table-view-striped mui-table-view-condensed">
+
+			</ul>
+		</div>
+	</div>
+	<script src="js/jquery.min.js"></script>
+	<script src="js/mui.min.js"></script>
+	<script>
+		function getDatalist(typeName) {
+			const params = new URLSearchParams(window.location.search);
+			$('#kfList').empty();
+			mui.ajax({
+				// url: window.location.origin +'/wzglxtht/system/goods/getGoodsList?kufangId=' + params.get('id'),
+				// url: 'http://8.137.99.54/wzglxtht/system/goods/getGoodsList?kufangId=' + params.get('id'),
+				url: "http://192.168.0.26:9081/system/dept/assetList",
+				type: 'get',
+				data: {
+					pageNum: 1,
+					pageSize: 20,
+					assetName: typeName ? typeName : "",
+					departmentId: params.get('departmentId'),
+					companyId: params.get('id'),
+					dutyId:params.get('dutyId'),
+					codeId: 1
+				},
+				success: function (json) {
+					console.log(json)
+					if (json.rows && json.rows.length) {
+						let html = ''
+						for (let i = 0; i < json.rows.length; i++) {
+							html += `<li class="mui-table-view-cell" data-assetno="${json.rows[i].assetno}" data-name="${json.rows[i].name}" data-zclx="${json.rows[i].assettype}" data-kfm="${json.rows[i].savedepartment}" data-kfgly="${json.rows[i].duty}"
+								data-xhgg="${json.rows[i].model}" data-dw="${json.rows[i].savecompany}" data-zbsl="${json.rows[i].quantity}" data-rknx="${json.rows[i].buyed.split('T00')[0]}" data-ccnx="${json.rows[i].predictyear}"
+								data-bfsl="${json.rows[i].scrapNum?json.rows[i].scrapNum:0}" data-sysl="${json.rows[i].quantity?json.rows[i].quantity:''}" data-grsj="${json.rows[i].created.split('T00')[0]}" data-bz="" data-tp="${json.rows[i].photo}"
+								data-dws="${json.rows[i].assetunit}" data-zt="${json.rows[i].assetstate}">
 									<div class="mui-table">
 										<div class="mui-table-cell mui-col-xs-10">
-											<h4 class="mui-ellipsis">${json.data[i].goodsName}</h4>
-											<h5>入库年限:${json.data[i].upTime}</h5>
-											<h5>盘库时间:${json.data[i].makeTime}</h5>
-											<h5>装备数量:${json.data[i].goodsNum}</h5>
-											<h5>报废数量:${json.data[i].scrapNum}</h5>
-											<h5>剩余数量:${json.data[i].leaveNum}</h5>
+											<div class="mui-ellipsis">${json.rows[i].name}</div>
+											<div style="padding:10px;">
+											<div class="list" style="margin-top:0;"><div class="listTitle">入库时间:</div><div style="color: #333;">${json.rows[i].buyed.split('T00')[0]?json.rows[i].buyed.split('T00')[0]:""}</div></div>
+											<div class="list"><div class="listTitle">购入时间:</div><div style="color: #333;">${json.rows[i].buyed.split('T00')[0]?json.rows[i].buyed.split('T00')[0]:""}</div></div>
+											<div class="list"><div class="listTitle">装备数量:</div><div style="color: #333;">${json.rows[i].quantity?json.rows[i].quantity+" "+json.rows[i].assetunit:""}</div></div>
+											<div class="list"><div class="listTitle">报废数量:</div><div style="color: #333;">${json.rows[i].scrapNum?json.rows[i].scrapNum:0}</div></div>
+											<div class="list"><div class="listTitle">剩余数量:</div><div style="color: #333;">${json.rows[i].quantity?json.rows[i].quantity:""}</div></div>
 										</div>
 									</div>
 								</li>`
-							}
-							$('#kfList').append(html)
 						}
+						$('#kfList').append(html)
 					}
-				})
-				mui("#kfList").on('tap','.mui-table-view-cell',function() {
-					const id = this.getAttribute('data-id')
-					const name = this.getAttribute('data-name')
-					mui.openWindow({
-						id: 'detail',
-						url: 'detail.html?type=1&id=' + id
-					});
-				})
+				}
+			})
+			mui("#kfList").on('tap', '.mui-table-view-cell', function () {
+				const dws = this.getAttribute('data-dws')
+				const kfm = this.getAttribute('data-kfm')
+				const kfgly = this.getAttribute('data-kfgly')
+				const zcbm = this.getAttribute('data-assetno')
+				const name = this.getAttribute('data-name')
+				const xhgg = this.getAttribute('data-xhgg')
+				const zclx = this.getAttribute('data-zclx')
+				const dw = this.getAttribute('data-dw')
+				const zbsl = this.getAttribute('data-zbsl')
+				const rknx = this.getAttribute('data-rknx')
+				const ccnx = this.getAttribute('data-ccnx')
+				const bfsl = this.getAttribute('data-bfsl')
+				const sysl = this.getAttribute('data-sysl')
+				const grsj = this.getAttribute('data-grsj')
+				const bz = this.getAttribute('data-bz')
+				const tp = this.getAttribute('data-tp')
+				const zt = this.getAttribute('data-zt')
+				var jsonData={
+					zt:zt,
+					dws:dws,
+					kfm:kfm,
+					kfgly:kfgly,
+					zcbm:zcbm,
+					name:name,
+					zclx:zclx,
+					xhgg:xhgg,
+					dw:dw,
+					zbsl:zbsl,
+					rknx:rknx,
+					ccnx:ccnx,
+					bfsl:bfsl,
+					sysl:sysl,
+					grsj:grsj,
+					bz:bz,
+					tp:tp
+				}
+				console.log(jsonData)
+				sessionStorage.setItem("detailData", JSON.stringify(jsonData));
+				mui.openWindow({
+					id: 'detail',
+					url: 'detail.html?type=1'
+				});
 			})
-		</script>
-	</body>
+		}
+		mui.init({
+			statusBarBackground: '#f7f7f7'
+		});
+		mui.ready(() => {
+			const params = new URLSearchParams(window.location.search);
+			if (params.get('type') == 1) {
+				$('#title').text('库房--' + params.get('name'))
+				$('#go-back').css({ 'display': 'block' })
+			}
+			getDatalist();
+		})
+
+		var node = document.getElementById("search");
+		// 绑定点击事件
+		node.onclick = function () {
+			var searchInput = document.getElementById('searchInput').value;
+			getDatalist(searchInput);
+		};
+	</script>
+</body>
+
 </html>

+ 2 - 1
RuoYi-Vue-v3.8.7/ruoyi-admin/src/main/resources/static/page/goods/index.html

@@ -96,7 +96,8 @@
 			layui.use(function() {
 				const $ = layui.jquery
 				$.ajax({
-					url: window.location.origin + '/wzglxtht/system/goods/getKuFangGoodsById?id=' + layui.url().search.id,
+					// url: window.location.origin + '/wzglxtht/system/goods/getKuFangGoodsById?id=' + layui.url().search.id,
+					url: 'http://8.137.99.54/wzglxtht/system/goods/getKuFangGoodsById?id=' + layui.url().search.id,
 					type: 'get',
 					success: function(json) {
 						if (json.data) {

+ 140 - 48
RuoYi-Vue-v3.8.7/ruoyi-admin/src/main/resources/static/page/goods/total.html

@@ -1,61 +1,153 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="utf-8">
-		<title>库房列表</title>
-		<meta name="viewport" content="initial-scale=1, maximum-scale=3, minimum-scale=1, user-scalable=no">
-		<link rel="stylesheet" href="css/mui.min.css">
-	</head>
-	<body>
-		<header id="header" class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">库房列表</h1>
-		</header>
-		<div class="mui-content">
-			<div class="mui-card">
-				<ul id="kfList" class="mui-table-view mui-table-view-striped mui-table-view-condensed">
-					
-				</ul>
+
+<head>
+	<meta charset="utf-8">
+	<title>库房列表</title>
+	<meta name="viewport" content="initial-scale=1, maximum-scale=3, minimum-scale=1, user-scalable=no">
+	<link rel="stylesheet" href="css/mui.min.css">
+</head>
+<style>
+	.search {
+		display: flex;
+		width: 80px;
+		height: 40px;
+		background: #1484FE;
+		border-radius: 0px 10px 10px 0px;
+		color: #fff;
+		align-items: center;
+		justify-content: space-evenly;
+	}
+
+	.search::placeholder {
+		color: #999;
+	}
+
+	#kfList li {
+		background: #FFFFFF;
+		border-radius: 10px;
+		margin-bottom: 10px;
+	}
+
+	.mui-card {
+		box-shadow: none;
+		background-color: transparent;
+	}
+
+	.mui-table-view {
+		background-color: transparent;
+	}
+
+	.mui-table-view-cell:after {
+		content: none;
+	}
+
+	.mui-table-view-cell {
+		padding: 0 5px;
+	}
+
+	.mui-ellipsis {
+		color: #1484FE;
+		font-size: 18px;
+		display: flex;
+		border-bottom: 1px solid #DCDCDC;
+		padding: 10px;
+	}
+
+	.mui-table .list {
+		font-size: 16px;
+		color: #999999;
+		display: flex;
+	}
+
+	.listTitle {
+		width: 100px;
+		min-width: 100px;
+		text-align: right;
+	}
+</style>
+
+<body>
+	<header id="header" class="mui-bar mui-bar-nav">
+		<h1 class="mui-title">库房列表</h1>
+	</header>
+	<div class="mui-content">
+		<div style="display: flex;margin: 10px;">
+			<input type="text" placeholder="请输入关键字" id="searchInput"
+				style="width: calc(100% - 80px);height: 40px;background: #FFFFFF;border-radius: 10px 0px 0px 10px;border: none;margin-bottom: 0;">
+			</input>
+			<div class="search" id="search">
+				<img src="images/search.png"></img><span>搜索</span>
 			</div>
 		</div>
-		<script src="js/jquery.min.js"></script>
-		<script src="js/mui.min.js"></script>
-		<script>
-			mui.init({
-				statusBarBackground: '#f7f7f7'
-			});
-			mui.ready(() => {
-				const params = new URLSearchParams(window.location.search);
-				$('#kfList').empty();
-				mui.ajax({
-					url: window.location.origin +'/wzglxtht/system/goods/getOpenKuFangList?userId=' + params.get('id'),
-					type: 'get',
-					success: function(json) {
-						if (json.data && json.data.length) {
-							let html = ''
-							for (let i = 0; i < json.data.length; i++) {
-								html += `<li class="mui-table-view-cell" data-id="${json.data[i].id}" data-name="${json.data[i].kfName}">
+		<div class="mui-card">
+			<ul id="kfList" class="mui-table-view mui-table-view-striped mui-table-view-condensed">
+
+			</ul>
+		</div>
+	</div>
+	<script src="js/jquery.min.js"></script>
+	<script src="js/mui.min.js"></script>
+	<script>
+		function getDatalist(departmentName) {
+			$('#kfList').empty();
+			mui.ajax({
+				// url: window.location.origin +'/wzglxtht/system/goods/getOpenKuFangList?userId=' + params.get('id'),
+				// url: 'http://8.137.99.54/wzglxtht/system/goods/getOpenKuFangList?userId=' + params.get('id'),
+				url: 'http://192.168.0.26:9081/system/dept/getDepartments',
+				type: 'get',
+				data: {
+					departmentName: departmentName ? departmentName : "",
+				},
+				success: function (json) {
+					if (json.data && json.data.length) {
+						console.log(json)
+						let html = ''
+						for (let i = 0; i < json.data.length; i++) {
+							console.log(json.data[i])
+							html += `<li class="mui-table-view-cell" data-id="${json.data[i].DepartMentDto.companyId}" data-departmentId="${json.data[i].DepartMentDto.departmentId}" data-name="${json.data[i].DepartMentDto.name}"
+							data-kgyIds="${json.data[i].kgyIds}">
 									<div class="mui-table">
 										<div class="mui-table-cell mui-col-xs-10">
-											<h4 class="mui-ellipsis">${json.data[i].kfName}</h4>
-											<h5>库房管理员:${json.data[i].userName}</h5>
-											<h5>库房位置:${json.data[i].kfAddress}</h5>
+											<div class="mui-ellipsis"><img src="images/logo.png"></img>${json.data[i].DepartMentDto.name?json.data[i].DepartMentDto.name:""}</div>
+											<div style="padding:10px;">
+											<div class="list"><div class="listTitle">库房管理员:</div><div style="color: #333;">${json.data[i].kgyNames.join()}</div></div>
+											<div class="list" style="margin-top:10px;"><div class="listTitle">库房位置:</div><div style="color: #333;">${json.data[i].DepartMentDto.location?json.data[i].DepartMentDto.location:""}</div>
+											</div>
 										</div>
 									</div>
 								</li>`
-							}
-							$('#kfList').append(html)
 						}
+						$('#kfList').append(html)
 					}
-				})
-				mui("#kfList").on('tap','.mui-table-view-cell',function() {
-					const id = this.getAttribute('data-id')
-					const name = this.getAttribute('data-name')
-					mui.openWindow({
-						id: 'goods',
-						url: 'goods.html?type=1&id=' + id + '&name=' + name
-					});
-				})
+				}
+			})
+			mui("#kfList").on('tap', '.mui-table-view-cell', function () {
+				const dutyId=this.getAttribute('data-kgyIds')
+				console.log(dutyId)
+				const id = this.getAttribute('data-id')
+				const name = this.getAttribute('data-name')
+				const departmentId = this.getAttribute('data-departmentId')
+				mui.openWindow({
+					id: 'goods',
+					url: 'goods.html?type=1&id=' + id + '&name=' + name + '&departmentId=' +departmentId+'&dutyId='+dutyId
+				});
 			})
-		</script>
-	</body>
+		}
+		mui.init({
+			statusBarBackground: '#f7f7f7'
+		});
+		mui.ready(() => {
+			// const params = new URLSearchParams(window.location.search);
+			getDatalist();
+		})
+		var node = document.getElementById("search");
+		// 绑定点击事件
+		node.onclick = function () {
+			var searchInput = document.getElementById('searchInput').value;
+			getDatalist(searchInput);
+		};
+	</script>
+</body>
+
 </html>