MS-FUUVYHVOEAYJ\Administrator 11 місяців тому
батько
коміт
1e163bcd59

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

@@ -31,7 +31,8 @@
 		line-height: 15px;
 		text-align: right;
 	}
-	.mui-col-xs-4>div{
+
+	.mui-col-xs-4>div {
 		white-space: nowrap;
 	}
 
@@ -48,6 +49,10 @@
 		line-height: 30px;
 	}
 
+	.mui-table-view-cell {
+		padding: 11px 0;
+	}
+
 	.mui-table-view-cell:after {
 		content: none;
 	}
@@ -61,8 +66,8 @@
 </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>
+	<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>
 	</header>
 	<div class="mui-content">
@@ -287,7 +292,7 @@
 				$('#makeTime').text(result.grsj)
 				$('#remark').text(result.bz)
 				$('#goodStadus').text(result.zt)
-				if (result.tp!="null") {
+				if (result.tp != "null") {
 					var imgList = result.tp.split(",");
 					// var imgList = ['upload/2024-05-28/20240528023654.jpg']
 					let html = '';
@@ -299,36 +304,6 @@
 					$('#imgList').append("无")
 				}
 			}
-
-			// 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>

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

@@ -71,8 +71,9 @@
 </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>
+	<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>
 		<h1 id="title" class="mui-title">库房</h1>
 	</header>
 	<div class="mui-content">
@@ -106,7 +107,7 @@
 					assetName: typeName ? typeName : "",
 					departmentId: params.get('departmentId'),
 					companyId: params.get('id'),
-					dutyId:params.get('dutyId'),
+					dutyId: params.get('dutyId'),
 					codeId: 1
 				},
 				success: function (json) {
@@ -116,17 +117,17 @@
 						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-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">
 											<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 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>`
@@ -153,24 +154,24 @@
 				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
+				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));