删除类型搜索

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

@@ -187,6 +187,7 @@
 			background: #FFFFFF;
 			border: none;
 			margin-bottom: 0;
+			border-radius: 10px 0px 0px 10px;
 		}
 
 		#conSs .line {
@@ -277,12 +278,12 @@
 			<img class="arrow" src="images/arrow.png" id="arrowSs"></img>
 		</div>
 		<div style="display: flex;margin: 10px;align-items: center;" id="conSs">
-			<div class="typeSelect">
+			<!-- <div class="typeSelect">
 				<select id="mySelect">
 				</select>
 				<img class="arrow" src="images/arrow.png" style="margin-right: 10px;"></img>
 				<div class="line"></div>
-			</div>
+			</div> -->
 			<input type="text" placeholder="请输入物资名称" id="searchInput">
 			</input>
 			<div class="search" id="search">
@@ -303,7 +304,7 @@
 		<script>
 			let pageNum = 1;
 			let pageSize = 5;
-			function getDatalist(typeName, callback, option) {
+			function getDatalist(typeName, callback) {
 				const params = new URLSearchParams(window.location.search);
 				mui.ajax({
 					// url: window.location.origin +'/wzglxtht/system/goods/getGoodsList?kufangId=' + params.get('id'),
@@ -318,7 +319,7 @@
 						companyId: params.get('id'),
 						dutyId: params.get('dutyId'),
 						codeId: 1,
-						assetType: option
+						// assetType: option
 					},
 					success: function (json) {
 						if (pageNum == 1) {
@@ -338,8 +339,7 @@
 											<img src="${json.rows[i].photo ? "http://58.144.199.81:8011/" + json.rows[i].photo : "images/listImg.png"}" style="width: 140px;height:120px;border-radius: 10px;"></img>
 											<div style="margin-left:10px;">
 												<div class="list" style="margin-top:0;"><div class="listTitle">资产类型：</div><div style="color: #333;">${json.rows[i].assettype ? json.rows[i].assettype : "无"}</div></div>
-												<div class="list"><div class="listTitle">规格：</div><div style="color: #333;">${json.rows[i].size ? json.rows[i].size : "无"}</div></div>
-												<div class="list"><div class="listTitle">型号：</div><div style="color: #333;">${json.rows[i].model ? json.rows[i].model : "无"}</div></div>
+												<div class="list"><div class="listTitle">型号规格：</div><div style="color: #333;">${json.rows[i].model ? json.rows[i].model : ""} ${json.rows[i].size ? json.rows[i].size : ""}</div></div>
 												<div class="list"><div class="listTitle">数量：</div><div style="color: #333;">${json.rows[i].quantity ? json.rows[i].quantity : 0}</div></div>
 											</div>
 										</div>
@@ -354,11 +354,11 @@
 					document.getElementById('searchInput').value = "";
 					pageNum = 1
 					setTimeout(function () {
-						var option = $("#mySelect option:selected")[0].label
+						// var option = $("#mySelect option:selected")[0].label
 						getDatalist(null, function () {
 							mui('#pullrefresh').pullRefresh().endPullupToRefresh(false);
 							mui('#pullrefresh').pullRefresh().refresh(true);
-						}, option)
+						})
 						mui('#pullrefresh').pullRefresh().scrollTo(0, 0, 100)
 					}, 1000)
 					const id = this.getAttribute('data-id')
@@ -398,7 +398,7 @@
 				pageNum = 1
 				var searchInput = document.getElementById('searchInput').value;
 				setTimeout(function () {
-					var option = $("#mySelect option:selected")[0].label;
+					// var option = $("#mySelect option:selected")[0].label;
 					getDatalist(searchInput, function (goodsTotal) {
 						mui('#pullrefresh').pullRefresh().endPullupToRefresh(goodsTotal < pageSize);
 						if (!(goodsTotal < pageSize)) {
@@ -406,14 +406,14 @@
 						} else {
 							$(".mui-pull-bottom-pocket.mui-block").css("visibility", "visible");
 						}
-					}, option)
+					})
 					mui('#pullrefresh').pullRefresh().scrollTo(0, 0, 100)
 				}, 1000)
 			};
 			$("#conZchz").on('click', '.list', function (e) {
 				const name = this.getAttribute('data-name');
 				pageNum = 1;
-				document.getElementById('mySelect').value = name;
+				// document.getElementById('mySelect').value = name;
 				document.getElementById('searchInput').value = "";
 				setTimeout(function () {
 					getDatalist(null, function (goodsTotal) {
@@ -424,7 +424,7 @@
 							mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
 							$(".mui-pull-caption.mui-pull-caption-nomore").text("暂无数据");
 						}
-					}, name)
+					})
 					mui('#pullrefresh').pullRefresh().scrollTo(0, 0, 100)
 				}, 1000)
 			})
@@ -436,7 +436,7 @@
 				document.getElementById('searchInput').value = "";
 				pageNum = 1
 				setTimeout(function () {
-					var option = $("#mySelect option:selected")[0].label
+					// var option = $("#mySelect option:selected")[0].label
 					getDatalist(null, function (goodsTotal) {
 						if (goodsTotal) {
 							mui('#pullrefresh').pullRefresh().endPullupToRefresh(false);
@@ -445,14 +445,14 @@
 							mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
 							$(".mui-pull-caption.mui-pull-caption-nomore").text("暂无数据");
 						}
-					}, option)
+					})
 					mui('#pullrefresh').pullRefresh().scrollTo(0, 0, 100)
 				}, 1000)
 			}
 			function pullupRefresh() {
 				var searchInput = document.getElementById('searchInput').value;
 				setTimeout(function () {
-					var option = $("#mySelect option:selected")[0].label;
+					// var option = $("#mySelect option:selected")[0].label;
 					getDatalist(searchInput, function (goodsTotal) {
 						if (goodsTotal) {
 							mui('#pullrefresh').pullRefresh().endPullupToRefresh((++pageNum > (parseInt(goodsTotal / pageSize) + goodsTotal % pageSize)));
@@ -460,7 +460,7 @@
 							mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
 							$(".mui-pull-caption.mui-pull-caption-nomore").text("暂无数据");
 						}
-					}, option)
+					})
 				}, 1000)
 			}
 		</script>
@@ -493,7 +493,7 @@
 								$('#txzh').text(data[i].num);
 							}
 						}
-						$('#mySelect').append(html)
+						// $('#mySelect').append(html)
 					}
 				}
 			})