1222

pages/addNewBatch/index.vue

@@ -330,7 +330,7 @@
 
 		text {
 			flex: 3;
-			width: 80%;
+			// width: 80%;
 		}
 
 		.data-select {

pages/dashboard/index.vue

@@ -129,7 +129,7 @@
 
 <style lang="scss">
 	.page-container {
-		height: 1000rpx;
+		height: calc(100% - 208rpx);
 		overflow: auto;
 	}
 	.logo-container {
@@ -151,7 +151,7 @@
 	}
 
 	.user-info-container {
-		margin: 64rpx 0 20rpx 20rpx;
+		margin: 16rpx 0 20rpx 20rpx;
 
 		.icon {
 			width: 120rpx;

pages/index/index.vue

@@ -203,14 +203,15 @@
 		width: 90%;
 		margin: 0 auto;
 		border-radius: 12rpx;
+		align-items: center;
 
 		input {
-			width: 80%;
+			width: 70%;
 			padding: 16rpx 24rpx;
 		}
 
 		button {
-			width: 20%;
+			width: 30%;
 		}
 	}
 

pages/productionPlan/index.vue

@@ -134,11 +134,20 @@
 			url: '/pages/batchReporting/index'
 		})
 	}
-
+ 
 	function handleSearch() {
 		let reqParam = {
 			keywords: keywords.value
 		}
+		if (!store.tenantId) {
+			reqParam = {
+				tenantId: store.userInfo.tenantId
+			}
+		}else {
+			reqParam = {
+				tenantId: store.tenantId
+			}
+		}
 		init(reqParam)
 	}
 </script>