wangxin před 1 rokem
rodič
revize
a74714f0cd

+ 86 - 0
components/dialog-Search/dialog-Search.vue

@@ -0,0 +1,86 @@
+<template>
+	<dialog-base ref="baseDialog" title="搜索">
+		<view class="list-container">
+			<input class="input-control" v-model="keywork" placeholder='批次号或产品描述' />
+			<view class="login-btn uni-row" @click=""><text class="label">确认</text></view>
+		</view>
+	</dialog-base>
+</template>
+
+<script setup>
+	import {
+		ref,
+		getCurrentInstance
+	} from 'vue'
+	import {
+		defineProps
+	} from 'vue'
+
+
+	const baseDialog = ref(null)
+	const keywork = ref("");
+
+
+	function open() {
+		resetPage();
+		baseDialog.value.open();
+		init();
+	}
+
+	function resetPage() {
+
+	}
+
+	defineExpose({
+		open
+	})
+
+	function close() {
+		baseDialog.value.close()
+
+	}
+
+	function init() {
+
+	}
+</script>
+
+<style lang="scss">
+	.dialog-body {
+
+		.msg {
+			height: 300rpx;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.btn-container {
+			margin-top: 32rpx;
+
+			.btn {
+				flex: 1;
+				margin: 0 10rpx;
+			}
+		}
+
+		.input-control {
+			border: 1px solid #666666;
+			padding: 16rpx 24rpx;
+			font-size: 32rpx;
+			margin-top: 40rpx;
+		}
+
+		.login-btn {
+			// background-color: #999999;
+			background-color: #1684fc;
+			margin-top: 32rpx;
+			justify-content: center;
+			padding: 16rpx 0;
+
+			.label {
+				font-size: 40rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>

+ 17 - 60
pages/fastProductionPlaan/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="uni-column" style="padding: 24rpx">
+	<view class="uni-column" style="padding: 24rpx ;background-color: #f5f5f5;">
 		<view v-if="form.length>0" style="margin-bottom: 20rpx;">
 			<view>
 				<view class="item-info uni-row">
@@ -16,7 +16,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="form.length>0" style="height: calc(100% - 200rpx); overflow: auto;">
+		<view v-if="form.length>0" calss="item-info uni-row" style="overflow: auto; padding-bottom:  100rpx">
 			<view v-for="(item, index) in form" :key="index" :class="{'list-item':true,'selected':isSelected(item)}"
 				@click="handleSelection(item)">
 
@@ -41,6 +41,7 @@
 					<text class="label right">{{item['dept']}}</text>
 				</view>
 			</view>
+
 		</view>
 
 
@@ -54,7 +55,9 @@
 			<button class='bottom-btn left-btn' type="warn" @click="handleEnd">结束报工</button>
 			<button class='bottom-btn right-btn' type="primary" @click="handleContinue">继续扫码</button>
 		</view>
+
 		<dialog-lotReporting ref="lotReporting"></dialog-lotReporting>
+		<dialog-Search ref="searchRef"></dialog-Search>
 	</view>
 </template>
 
@@ -67,7 +70,8 @@
 	} from 'vue'
 	import path from '@/api/base/path.js'
 
-	const lotReporting = ref(null)
+	const lotReporting = ref(null);
+	const searchRef = ref(null);
 	const workshopId = ref();
 
 	const form = ref([]); //表单数据true
@@ -171,6 +175,11 @@
 		lotReporting.value.open(data);
 	}
 
+	// 搜索按钮操作
+	function handleSearch() {
+		searchRef.value.open();
+	}
+
 	// 全选按钮操作
 	function handleAll() {
 		//清空选中数据
@@ -210,22 +219,6 @@
 </script>
 
 <style lang="scss">
-	$nav-height: 60rpx;
-
-	.bottom-btn-container {
-		position: fixed;
-		top: 80%;
-		right: 20rpx;
-		left: 20rpx;
-
-		.start-batch-btn {
-			margin-bottom: 24rpx;
-			border-radius: 8rpx;
-			background-color: #00e2a6;
-			width: 80%;
-		}
-	}
-
 	.active {
 		flex: 1;
 		height: 40rpx;
@@ -274,50 +267,14 @@
 		}
 	}
 
-	.box-bg {
-		width: 100%;
-		background-color: #F5F5F5;
-		padding: 5rpx 0;
-		justify-content: space-around;
-		align-items: center;
-
-		.input-view {
-			width: 100%;
-			flex: 4;
-			background-color: #f8f8f8;
-			height: $nav-height;
-			border: 1rpx solid #999;
-			border-radius: 15rpx;
-			padding: 0 15rpx;
-			flex-wrap: nowrap;
-			margin: 0 10rpx 20rpx;
-			line-height: $nav-height;
-
-			.input-uni-icon {
-				line-height: $nav-height;
-			}
-
-			.nav-bar-input {
-				width: 80%;
-				height: $nav-height;
-				line-height: $nav-height;
-				padding: 0 5rpx;
-				background-color: #f8f8f8;
-			}
-		}
 
-		.search {
-			width: 20%;
-			text-align: center;
-			color: #808080;
-			margin-top: -20rpx;
-		}
+	.search {
+		width: 20%;
+		text-align: center;
+		color: #808080;
+		margin-top: -20rpx;
 	}
 
-	.uni-column {
-		background-color: rgba(245, 245, 245, 1);
-		height: calc(100% - 40rpx);
-	}
 
 	.list-item {
 		background-color: #fff;