优化

pages/pda/sample/components/sampleBom.vue

@@ -48,20 +48,13 @@
 							@blur='item.sampleNum > item.formedNum ?  item.sampleNum = item.formedNum : item.sampleNum'></input>
 						<view class="unit">{{item.unit}}</view>
 						<view class="penalize" @click="penalize">处置
-							{{Number(item.sampleNum || 0) - Number(item.recoveryNum || 0)  }}</view>
+						
+						</view>
 
 					</view>
 				</view>
 
-				<view class="item">
-					<view class="lable rx-cc">回收数量</view>
-					<view class="content content_num  rx-sc">
-						<input class="uni-input" v-model="item.recoveryNum" type='digit'
-							@blur='item.recoveryNum > item.sampleNum ?  item.recoveryNum = item.sampleNum : item.recoveryNum'></input>
-						<view class="unit">{{item.unit}}</view>
-
-					</view>
-				</view>
+		
 
 
 
@@ -72,7 +65,8 @@
 
 			<view class="content_table2" v-if="item.sampleList.length > 0">
 				<view class="head row rx-sc">
-					<view class="item ww30">数量</view>
+					<view class="item ww15">类型</view>
+					<view class="item ww20">数量</view>
 					<view class="item ww55">处置</view>
 					<view class="item ww15">操作</view>
 				</view>
@@ -81,13 +75,19 @@
 
 					<view class="tr row rx-sc" v-for="(item, index) in item.sampleList" :key='index'>
 
-						<view class="item ww30 content_num">
+
+						<view class="item ww15 content_num">
+							{{ item.selectType == 1 ? '回用' : item.selectType == 2 ? '入库' : ''  }}
+						</view>
+
+						<view class="item ww20 content_num">
 							<input class="uni-input" v-model="item.num"></input>
 						</view>
 
 						<view class="item ww55  content_num">
-							<zxz-uni-data-select :localdata="warehouseList" v-model="item.warehouseId" dataValue='id'
-								dataKey="name" filterable format='{name}' ></zxz-uni-data-select>
+							<zxz-uni-data-select :localdata="warehouseList" v-if='item.selectType != 1'
+								v-model="item.warehouseId" dataValue='id' dataKey="name" filterable
+								format='{name}'></zxz-uni-data-select>
 						</view>
 						<view class="item ww15">
 							<view class="left rx-ss" @click="getDelete(index)">
@@ -111,6 +111,19 @@
 
 		</view>
 
+		<u-popup :show="show" mode='center' v-if='show' :closeOnClickOverlay='false'>
+			<view class="popup_box">
+				<uni-data-select v-model="selectType" :localdata="rangeList"></uni-data-select>
+
+				<view class="operate_box rx-sc">
+					<u-button size="small" class="u-reset-button" @click="cancel">取消</u-button>
+					<u-button size="small" class="u-reset-button" type="success" @click="save">确定</u-button>
+				</view>
+			</view>
+
+
+		</u-popup>
+
 
 	</view>
 </template>
@@ -133,7 +146,19 @@
 		},
 		data() {
 			return {
-				warehouseList: []
+				warehouseList: [],
+
+				show: false,
+				selectType: null,
+				rangeList: [{
+						value: 1,
+						text: "回用"
+					},
+					{
+						value: 2,
+						text: "入库"
+					}
+				]
 			}
 		},
 		created() {
@@ -145,24 +170,48 @@
 					this.warehouseList = res
 				})
 			},
+			cancel() {
+				this.selectType = null
+				this.show = false
+
+			},
+
 			penalize() {
-				if (Number(this.item.sampleNum || 0) - Number(this.item.recoveryNum || 0) <= 0) {
 
+				if (Number(this.item.sampleNum <= 0) ) {
 					uni.showToast({
 						icon: 'none',
-						title: '处置数量不能小于等于0'
+						title: '取样数量要大于0'
 					})
 					return false
 				}
-				this.item.sampleList.push({
-					num: null,
-					warehouseId: null
-				})
+
+				this.show = true
+
+
+			},
+
+			save() {
+				this.show = false
+				if (this.selectType) {
+					this.item.sampleList.push({
+						selectType: this.selectType,
+						num: null,
+						warehouseId: null
+					})
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: '请先选项处置方法'
+					})
+				}
+
 			},
 
 			getDelete(idx) {
 				this.item.sampleList.splice(idx, 1)
 			},
+
 		}
 	}
 </script>
@@ -327,6 +376,14 @@
 					width: 30%;
 				}
 
+				.ww20 {
+					width: 20%;
+				}
+
+				.ww35 {
+					width: 35%;
+				}
+
 				.ww55 {
 					width: 55%;
 				}
@@ -359,7 +416,7 @@
 
 				.item {
 					font-size: 24rpx;
-					min-height: 64rpx;
+					min-height: 78rpx;
 					display: flex;
 					align-items: center;
 					border-right: 2rpx solid #E3E5E5;
@@ -383,14 +440,34 @@
 		display: flex;
 		align-items: center;
 		padding: 0 4rpx;
+		box-sizing: border-box;
 
 		/deep/ .uni-input-input {
 			border: 2rpx solid #F0F8F2;
-			width: 260rpx;
+			min-width: 100rpx;
 			background: #F0F8F2;
 			color: $theme-color;
+			box-sizing: border-box;
 		}
 
 
 	}
+
+	.popup_box {
+		width: 78vw;
+		padding: 32rpx;
+
+
+	}
+
+
+
+	.operate_box {
+		margin-top: 32rpx;
+		padding: 10rpx 100rpx;
+
+		/deep/ .u-button {
+			width: 160rpx;
+		}
+	}
 </style>