wangxin 1 жил өмнө
parent
commit
c99d932999

+ 18 - 15
pages/fastProductionPlan/index.vue

@@ -2,26 +2,28 @@
 	<view class="uni-column" style="padding: 24rpx">
 	<view class="uni-column" style="padding: 24rpx">
 		<view v-if="listData.length>0" style="margin-bottom: 20rpx;">
 		<view v-if="listData.length>0" style="margin-bottom: 20rpx;">
 			<view>
 			<view>
-				<view class="item-info uni-row">
-					<view style="flex: 3;">
+				<view class="item-info uni-row" style="height: 80rpx;">
+					<view style="flex: 2;">
 						<button :class="[ checkAll ? 'active' : 'select' ]" @click="handleAll"
 						<button :class="[ checkAll ? 'active' : 'select' ]" @click="handleAll"
-							style="margin-left: 0px;">全选</button>
+							style="margin-left: 0px;display: flex; align-items: center; justify-content: center;">全选</button>
 					</view>
 					</view>
 
 
+					<button @click="handleSearch" style="margin-right: 20rpx ;">搜索</button>
 					<uni-data-select v-model="workshopId" :localdata="workshopList" @change="handleChangeWorkshop"
 					<uni-data-select v-model="workshopId" :localdata="workshopList" @change="handleChangeWorkshop"
 						:clear="false" class="label right"
 						:clear="false" class="label right"
-						style="width: 50rpx; outline: 2rpx solid #999999;border-radius: 10rpx;flex: 1;"></uni-data-select>
+						style=" margin-right: 20rpx; outline: 2rpx solid #999999;border-radius: 10rpx;flex: 1;"></uni-data-select>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view v-if="listData.length>0" style="height: calc(100% - 200rpx); overflow: auto;">
+		<view v-if="listData.length>0" style="overflow: auto; padding-bottom:  100rpx">
 			<view v-for="(item, index) in listData" :key="index" :class="{'list-item':true,'selected':isSelected(item)}"
 			<view v-for="(item, index) in listData" :key="index" :class="{'list-item':true,'selected':isSelected(item)}"
 				@click="handleSelection(item)">
 				@click="handleSelection(item)">
 
 
 				<view class="title-container uni-row">
 				<view class="title-container uni-row">
 					<view class="title uni-row"><text class="label">{{item.lotCode}}</text></view>
 					<view class="title uni-row"><text class="label">{{item.lotCode}}</text></view>
-					<view><button class="start-batch-btn uni-row" type=primary
-							@click.stop='handleChangeCarrier(item)'>换箱</button>
+					<view><button class="start-batch-btn uni-row"
+							style="height: 70rpx; display: flex; align-items: center; justify-content: center;"
+							type=primary @click.stop='handleChangeCarrier(item)'>换箱</button>
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="item-info uni-row">
 				<view class="item-info uni-row">
@@ -66,6 +68,7 @@
 			<button class='bottom-btn right-btn' type="primary" @click="handleContinue">继续扫码</button>
 			<button class='bottom-btn right-btn' type="primary" @click="handleContinue">继续扫码</button>
 		</view>
 		</view>
 		<dialog-lotReporting ref="lotReporting" :getList="init" @scan="handleAdd"></dialog-lotReporting>
 		<dialog-lotReporting ref="lotReporting" :getList="init" @scan="handleAdd"></dialog-lotReporting>
+		<dialog-Search ref="searchRef"></dialog-Search>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -99,6 +102,7 @@
 
 
 	const lotReporting = ref(null)
 	const lotReporting = ref(null)
 	const workshopId = ref(null);
 	const workshopId = ref(null);
+	const searchRef = ref(null);
 
 
 	const form = ref([]); //表单数据true
 	const form = ref([]); //表单数据true
 	const checkAll = ref(false); //是否全选
 	const checkAll = ref(false); //是否全选
@@ -111,7 +115,7 @@
 	})
 	})
 	//初始化
 	//初始化
 	function init() {
 	function init() {
-		// console.log(store.curDeptDetails)
+		console.log(store.curDeptDetails)
 		uni.showLoading({
 		uni.showLoading({
 			title: '加载中'
 			title: '加载中'
 		});
 		});
@@ -146,6 +150,11 @@
 
 
 	}
 	}
 
 
+	// 搜索按钮操作
+	function handleSearch() {
+		searchRef.value.open();
+	}
+
 	function handleAdd() {
 	function handleAdd() {
 		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
 		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
 		if (mpaasScanModule) {
 		if (mpaasScanModule) {
@@ -322,7 +331,6 @@
 	.active {
 	.active {
 		flex: 1;
 		flex: 1;
 		height: 40rpx;
 		height: 40rpx;
-		font-size: 20rpx;
 		background-color: #5e6eff;
 		background-color: #5e6eff;
 		border: 1px solid #5e6eff;
 		border: 1px solid #5e6eff;
 		color: #000000;
 		color: #000000;
@@ -331,7 +339,7 @@
 	.select {
 	.select {
 		flex: 1;
 		flex: 1;
 		height: 40rpx;
 		height: 40rpx;
-		font-size: 20rpx;
+		// font-size: 20rpx;
 		background-color: #5e6eff;
 		background-color: #5e6eff;
 		border: 1px solid #5e6eff;
 		border: 1px solid #5e6eff;
 		color: #ffffff;
 		color: #ffffff;
@@ -407,11 +415,6 @@
 		}
 		}
 	}
 	}
 
 
-	.uni-column {
-		background-color: rgba(245, 245, 245, 1);
-		height: calc(100% - 40rpx);
-	}
-
 	.list-item {
 	.list-item {
 		background-color: #fff;
 		background-color: #fff;
 		position: relative;
 		position: relative;