Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_app

components/dialog-lot/dialog-lot.vue

@@ -9,7 +9,7 @@
 		</uni-section>
 		<view style="overflow: auto;">
 			<view :class="{'list-container':true, 'selected':isSelected(item)}" @click="handleSelection(item,index)"
-				v-for="(item, index) in form" :key="item.id" style="height: 180px;">
+				v-for="(item, index) in form" :key="item.id">
 				<view class="list-title"><text class="label">批次号：{{item.lotCode}}</text></view>
 				<view class="list-container-item uni-row"
 					style="border-top: 1px solid #e1e1e1;border-radius: 8rpx 8rpx 0 0;">
@@ -216,7 +216,7 @@
 			display: flex;
 			align-items: flex-start;
 			margin: 10rpx auto;
-			padding: 2%;
+			padding: 8px 2% 16px 2%;
 			border-radius: 8rpx;
 
 			.list-container-item {

pages/fastProductionPlaan/index.vue

@@ -1,350 +0,0 @@
-<template>
-	<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">
-					<view style="flex: 2;">
-						<button :class="[checkAll ? 'active' : 'select' ]" @click="handleAll"
-							style="margin-left: 0rpx; ">全选</button>
-
-					</view>
-					<button @click="handleSearch" style="margin-right: 20rpx ;">搜索</button>
-
-					<uni-data-select v-model=" workshopId" :localdata="workshopList" @change="handleChangeWorkshop"
-						:clear="false" class="label right"
-						style="width: 50rpx; outline: 2rpx solid #999999;border-radius: 10rpx;flex: 1;"></uni-data-select>
-				</view>
-			</view>
-		</view>
-		<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)">
-
-				<view class="title-container uni-row">
-					<view class="title uni-row"><text class="label">{{item.lotCode}}</text></view>
-					<view><button class="start-batch-btn uni-row" type=primary @click='handleAdd'>换箱</button></view>
-				</view>
-				<view class="item-info uni-row">
-					<text class="label">产品描述</text>
-					<text class="label right">{{item['productDescription']}}</text>
-				</view>
-				<view class="item-info uni-row">
-					<text class="label">关联箱号</text>
-					<text class="label right">{{item['carrierName']}}</text>
-				</view>
-				<view class="item-info uni-row">
-					<text class="label">下序</text>
-					<text class="label right">{{item['process']}}</text>
-				</view>
-				<view class="item-info uni-row">
-					<text class="label">下序工段</text>
-					<text class="label right">{{item['dept']}}</text>
-				</view>
-			</view>
-
-		</view>
-
-
-		<view v-if="form.length==0" style="color: #999;margin: 50% auto;">
-			<text>扫码开始快速报工</text>
-		</view>
-		<view v-if="form.length==0" class='bottom-btn-container'>
-			<button class="start-batch-btn uni-row" type=primary @click='handleAdd'>扫码开始报工</button>
-		</view>
-		<view v-if="form.length>0" class='btn uni-row'>
-			<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>
-
-<script setup>
-	import {
-		getPlanDetailsList
-	} from '@/api/business/planDetails.js'
-	import {
-		ref
-	} from 'vue'
-	import path from '@/api/base/path.js'
-
-	const lotReporting = ref(null);
-	const searchRef = ref(null);
-	const workshopId = ref();
-
-	const form = ref([]); //表单数据true
-	const checkAll = ref(false); //是否全选
-	const listData = ref([]);
-	const selection = ref([]); //选中数据
-	const workshopList = ref([]); //车间数据
-
-	//初始化
-	function init() {
-		// uni.showLoading({
-		// 	title: '加载中'
-		// });
-
-		workshopList.value = [{
-				value: '1762872520725155842',
-				text: '一号车间'
-			},
-			{
-				value: '1762874510792380417',
-				text: '二三车间'
-			}
-		];
-
-		workshopId.value = '1762872520725155842';
-
-		form.value = [{
-				lotCode: 'DC1885224440',
-				productDescription: '万博_0395614149_15*110.1',
-				carrierName: 'X12522、X55222、X15522、J5211',
-				process: '热处理',
-				dept: '热处理',
-			},
-			{
-				lotCode: 'DC1885224423',
-				productDescription: '万博_0395614149_15*110.1',
-				carrierName: 'X12522、X55222、X15522、J5211',
-				process: '热处理',
-				dept: '热处理',
-			},
-			{
-				lotCode: 'DC1885224423',
-				productDescription: '万博_0395614149_15*110.1',
-				carrierName: 'X12522、X55222、X15522、J5211',
-				process: '热处理',
-				dept: '热处理',
-			},
-			{
-				lotCode: 'DC1885224423',
-				productDescription: '万博_0395614149_15*110.1',
-				carrierName: 'X12522、X55222、X15522、J5211',
-				process: '热处理',
-				dept: '热处理',
-			},
-			{
-				lotCode: 'DC1885224423',
-				productDescription: '万博_0395614149_15*110.1',
-				carrierName: 'X12522、X55222、X15522、J5211',
-				process: '热处理',
-				dept: '热处理',
-			},
-			{
-				lotCode: 'DC1885224423',
-				productDescription: '万博_0395614149_15*110.1',
-				carrierName: 'X12522、X55222、X15522、J5211',
-				process: '热处理',
-				dept: '热处理',
-			}
-		];
-	}
-
-	function handleAdd() {
-		let data = [{
-				productionPlanNo: '456123',
-				lotCode: 'D597412820',
-				productDescription: '8669sdfrfw',
-				carrierName: 'X12522、X55222、X15522',
-				nextProcess: {
-					processAlias: '热处理'
-				}
-			},
-			{
-				productionPlanNo: '456123',
-				lotCode: 'D597412820',
-				productDescription: '8669sdfrfw',
-				carrierName: 'X12522、X55222、X15522',
-				nextProcess: {
-					processAlias: '热处理'
-				}
-			},
-			{
-				productionPlanNo: '456123',
-				lotCode: 'D597412820',
-				productDescription: '8669sdfrfw',
-				carrierName: 'X12522、X55222、X15522',
-				nextProcess: {
-					processAlias: '热处理'
-				}
-			}
-		]
-		lotReporting.value.open(data);
-	}
-
-	// 搜索按钮操作
-	function handleSearch() {
-		searchRef.value.open();
-	}
-
-	// 全选按钮操作
-	function handleAll() {
-		//清空选中数据
-		selection.value.length = 0;
-		if (checkAll.value) {
-			//变更选中状态
-			checkAll.value = false;
-		} else {
-			checkAll.value = true;
-			form.value.findIndex(item => handleSelection(item))
-		}
-	}
-
-	function handleChangeWorkshop() {}
-
-
-	function isSelected(item) {
-		return selection.value.includes(item);
-	}
-
-	//
-	function handleSelection(item) {
-		const buttonIndex = selection.value.findIndex(selectedItem => selectedItem === item);
-		if (buttonIndex > -1) {
-			selection.value.splice(buttonIndex, 1); // 取消选中
-		} else {
-			selection.value.push(item); // 选中
-		}
-		if (selection.value.length == form.value.length) {
-			checkAll.value = true;
-		} else {
-			checkAll.value = false;
-		}
-	}
-
-	init();
-</script>
-
-<style lang="scss">
-	.active {
-		flex: 1;
-		height: 40rpx;
-		font-size: 20rpx;
-		background-color: #5e6eff;
-		border: 1px solid #5e6eff;
-		color: #000000;
-	}
-
-	.select {
-		flex: 1;
-		height: 40rpx;
-		font-size: 20rpx;
-		background-color: #5e6eff;
-		border: 1px solid #5e6eff;
-		color: #ffffff;
-
-	}
-
-
-	.btn {
-		position: fixed;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		height: 100rpx;
-		padding: 16rpx 24rpx;
-		align-items: center;
-		background-color: #FFFFFF;
-		justify-content: space-between;
-
-		.bottom-btn {
-			flex: 1;
-			font-size: 28rpx;
-			color: #FFFFFF;
-
-			&.left-btn {
-				// background-color: #a4adb3;
-			}
-
-			&.right-btn {
-				background-color: #1684fc;
-				margin-left: 24rpx;
-
-			}
-		}
-	}
-
-
-	.search {
-		width: 20%;
-		text-align: center;
-		color: #808080;
-		margin-top: -20rpx;
-	}
-
-
-	.list-item {
-		background-color: #fff;
-		position: relative;
-		padding: 16rpx;
-		padding-bottom: 24rpx;
-		border-radius: 24rpx;
-		margin-bottom: 24rpx;
-
-		.title-container {
-			justify-content: space-between;
-			margin-top: 8rpx;
-			margin-bottom: 16rpx;
-
-			.title {
-				height: 48rpx;
-				align-items: center;
-
-				.label {
-					font-size: 32rpx;
-					font-weight: bold;
-
-					&.code {
-						margin-left: 8rpx;
-					}
-				}
-			}
-
-			.tag {
-				border: 1px solid #1ce5b0;
-				background-color: #f6fffd;
-				padding: 8rpx;
-				border-radius: 8rpx;
-
-				.label {
-					color: #1ce5b0;
-					font-size: 24rpx;
-				}
-
-				&.not-start {
-					border: 1px solid #bbbbbb;
-					background-color: #f5f5f5;
-
-					.label {
-						color: #bbbbbb;
-					}
-				}
-			}
-		}
-
-
-		.item-info {
-			margin-bottom: 8rpx;
-
-			.label {
-				font-size: 28rpx;
-				width: 150rpx;
-				color: #808080;
-
-				&.right {
-					flex: 1;
-					color: #000000;
-				}
-			}
-		}
-	}
-
-	.selected {
-		border: 1rpx solid #c0c4fc;
-		background-color: #c0c4fc;
-		/* 选中之后样式 */
-	}
-</style>