소스 검색

修改样式

MS-FUUVYHVOEAYJ\Administrator 11 달 전
부모
커밋
836060674e

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

@@ -49,6 +49,11 @@
 		line-height: 30px;
 	}
 
+	/* .mui-table {
+		display: flex;
+		align-items: center;
+	} */
+
 	.mui-table-view-cell {
 		padding: 11px 0;
 	}
@@ -67,8 +72,8 @@
 
 <body>
 	<header id="header" class="mui-bar mui-bar-nav" style="display: flex;align-items: center;">
-		<a id="go-back" class="mui-icon mui-icon-back" href="javascript:history.back()" style="display: none;"></a>
-		<h1 id="title" class="mui-title">物品信息</h1>
+		<a id="go-back" class="mui-icon mui-icon-back" onclick="goBack()" style="display: none;"></a>
+		<h1 id="title" class="mui-title"></h1>
 	</header>
 	<div class="mui-content">
 		<div class="mui-card">
@@ -155,6 +160,16 @@
 				<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="goodsAdtress"></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">
@@ -175,40 +190,40 @@
 				<li class="mui-table-view-cell">
 					<div class="mui-table">
 						<div class="mui-table-cell mui-col-xs-4">
-							<div>存储年限(年):</div>
+							<div>购入时间:</div>
 						</div>
 						<div class="mui-table-cell mui-col-xs-8">
-							<div id="saveYear"></div>
+							<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>
 						</div>
 						<div class="mui-table-cell mui-col-xs-8">
-							<div id="scrapNum"></div>
+							<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>
 						</div>
 						<div class="mui-table-cell mui-col-xs-8">
-							<div id="leaveNum"></div>
+							<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>
 						</div>
 						<div class="mui-table-cell mui-col-xs-8">
-							<div id="makeTime"></div>
+							<div id="leaveNum"></div>
 						</div>
 					</div>
 				</li>
@@ -223,7 +238,7 @@
 					</div>
 				</li>
 				<li class="mui-table-view-cell">
-					<div class="mui-table" style="display: flex;">
+					<div class="mui-table" style="display: flex;" id="imgageDiv">
 						<div class="mui-table-cell mui-col-xs-4">
 							<div>图片:</div>
 						</div>
@@ -231,6 +246,14 @@
 							<div id="imgList"></div>
 						</div>
 					</div>
+					<div class="mui-table" style="" id="noDiv">
+						<div class="mui-table-cell mui-col-xs-4">
+							<div>图片:</div>
+						</div>
+						<div class="mui-table-cell mui-col-xs-8">
+							无
+						</div>
+					</div>
 				</li>
 			</ul>
 		</div>
@@ -238,6 +261,13 @@
 	<script src="js/jquery.min.js"></script>
 	<script src="js/mui.min.js"></script>
 	<script>
+		function goBack() {
+			if (document.referrer) {
+				window.history.go(-1);
+			} else {
+				window.location.href = 'total.html';
+			}
+		}
 		layui.use('layer', function () {
 			var layer = layui.layer;
 			var node = document.getElementById('imgList');
@@ -276,7 +306,7 @@
 				$('#go-back').css({ 'display': 'block' })
 			}
 			mui.ajax({
-				url: window.location.origin+'/system/dept/getAsset',
+				url:  window.location.origin+'/system/dept/getAsset',
 				type: 'get',
 				data: {
 					id: params.get('id'),
@@ -288,18 +318,22 @@
 						$('#kfName').text(result.savedepartment)
 						$('#kfAdmin').text(result.duty)
 						$('#goodsName').text(result.name)
+						$('#title').text(result.name)
 						$('#goodType').text(result.assettype)
 						$('#goodsType').text(result.model ? result.model : "无")
 						$('#goodsUnit').text(result.savecompany)
-						$('#goodsNum').text(result.quantity + " " + result.assetunit)
-						$('#upTime').text(result.buyed.split('T00')[0])
+						$('#goodsNum').text(result.quantity)
+						$('#upTime').text(result.created.split('T00')[0])
 						$('#saveYear').text(result.predictyear)
-						$('#scrapNum').text(result.scrapNum?result.scrapNum:0)
-						$('#leaveNum').text(result.quantity?result.quantity:"")
-						$('#makeTime').text(result.created.split('T00')[0])
+						$('#scrapNum').text(result.scrapNum ? result.scrapNum : 0)
+						$('#leaveNum').text(result.quantity ? result.quantity : "")
+						$('#makeTime').text(result.buyed.split('T00')[0])
 						$('#remark').text("")
 						$('#goodStadus').text(result.assetstate)
+						$('#goodsAdtress').text(result.location)
 						if (result.photo) {
+							$('#imgageDiv').css({ 'display': 'flex' })
+							$('#noDiv').css({ 'display': 'none' })
 							var imgList = result.photo.split(",");
 							// var imgList = ['upload/2024-05-28/20240528023654.jpg']
 							let html = '';
@@ -308,7 +342,8 @@
 							}
 							$('#imgList').append(html)
 						} else {
-							$('#imgList').append("无")
+							$('#imgageDiv').css({ 'display': 'none' })
+							$('#noDiv').css({ 'display': 'table' })
 						}
 					}
 				}

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

@@ -72,7 +72,7 @@
 
 <body>
 	<header id="header" class="mui-bar mui-bar-nav" style="display: flex;">
-		<a id="go-back" class="mui-icon mui-icon-back" href="javascript:history.back()" style="display: none;">
+		<a id="go-back" class="mui-icon mui-icon-back" href="total.html" style="display: none;">
 		</a>
 		<h1 id="title" class="mui-title">库房</h1>
 	</header>
@@ -99,7 +99,7 @@
 			$('#kfList').empty();
 			mui.ajax({
 				// url: window.location.origin +'/wzglxtht/system/goods/getGoodsList?kufangId=' + params.get('id'),
-				url: window.location.origin+"/system/dept/assetList",
+				url:  window.location.origin+"/system/dept/assetList",
 				type: 'get',
 				data: {
 					pageNum: 1,
@@ -120,9 +120,9 @@
 										<div class="mui-table-cell mui-col-xs-10">
 											<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" style="margin-top:0;"><div class="listTitle">入库时间:</div><div style="color: #333;">${json.rows[i].created.split('T00')[0] ? json.rows[i].created.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].quantity ? json.rows[i].quantity: ""}</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>
@@ -159,6 +159,10 @@
 			var searchInput = document.getElementById('searchInput').value;
 			getDatalist(searchInput);
 		};
+		function goindex(){
+			console.log(11)
+			window.location.href="total.html"
+		}
 	</script>
 </body>
 

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

@@ -93,7 +93,7 @@
 			$('#kfList').empty();
 			mui.ajax({
 				// url: window.location.origin +'/wzglxtht/system/goods/getOpenKuFangList?userId=' + params.get('id'),
-				url: window.location.origin+'/system/dept/getDepartments',
+				url:  window.location.origin+'/system/dept/getDepartments',
 				type: 'get',
 				data: {
 					departmentName: departmentName ? departmentName : "",