业务项过滤

app/pages/business-entering/business-edit.vue

@@ -59,21 +59,22 @@
 			<view class="item">
 				<view class="l">载重：</view>
 				<view class="r">
-					<u-input type="number" placeholder="输入载重"  v-model="form.netWeight">
+					<u-input type="number" placeholder="输入载重" v-model="form.netWeight">
 						<text slot="suffix">吨</text>
 					</u-input>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l" >境外车牌：</view>
+				<view class="l">境外车牌：</view>
 				<view class="r">
-					<u-input placeholder="输入车牌号"  v-model="form.cardNo" />
+					<u-input placeholder="输入车牌号" v-model="form.cardNo" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="l">境外车规格：</view>
 				<view class="r">
-					<u-input type="number" placeholder="输入车辆规格" @blur="car.carInput=false" @input="carSizeInput" v-model="form.cardSize">
+					<u-input type="number" placeholder="输入车辆规格" @blur="car.carInput=false" @input="carSizeInput"
+						v-model="form.cardSize">
 						<text slot="suffix">米</text>
 					</u-input>
 				</view>
@@ -83,7 +84,7 @@
 				<view class="l">预计入场：</view>
 				<view class="r">
 					<view class="r">
-						<uni-datetime-picker placeholder="请选择" @change="expectDayChange" :clear-icon="false" 
+						<uni-datetime-picker placeholder="请选择" @change="expectDayChange" :clear-icon="false"
 							:start="exprctStart" type="datetime" v-model="form.expectInDay" @close="closeFn" />
 					</view>
 				</view>
@@ -91,22 +92,22 @@
 			<view class="item">
 				<view class="l">中国车牌号：</view>
 				<view class="r">
-					<u-input placeholder="中国车牌号"  v-model="form.chinaCarNo" />
+					<u-input placeholder="中国车牌号" v-model="form.chinaCarNo" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="l">中国司机：</view>
 				<view class="r">
-					<u-input placeholder="司机姓名"  v-model="form.driverName" />
+					<u-input placeholder="司机姓名" v-model="form.driverName" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="l">联系号码：</view>
 				<view class="r">
-					<u-input placeholder="司机联系号码"  type="number" v-model="form.driverPhone" />
+					<u-input placeholder="司机联系号码" type="number" v-model="form.driverPhone" />
 				</view>
 			</view>
-			
+
 			<view class="item-line">
 				业务项
 			</view>
@@ -115,14 +116,14 @@
 				</view>
 				<view class="r">
 					<view @click="selectItemFn(item)" style="width: 150px;">
-						<u-input placeholder="请选择" v-model="item.itemName" readonly clearable >
+						<u-input placeholder="请选择" v-model="item.itemName" readonly clearable>
 							<u-icon name="close" v-if="item.itemName" slot="suffix" color="#E5E5E5;" size="5"
 								@click="item.itemName=''"></u-icon>
 						</u-input>
 					</view>
 					<view style="width: 20px;margin-left: 10rpx;">
-						<u-input placeholder="数量" :disabled="item.inc==0" border="surround" v-model="item.num" type="number"
-							style="width: 15px;" v-if="item.itemName"></u-input>
+						<u-input placeholder="数量" :disabled="item.inc==0" border="surround" v-model="item.num"
+							type="number" style="width: 15px;" v-if="item.itemName"></u-input>
 					</view>
 					<view style="margin-left:30rpx;color: red;" v-if="item.itemName">
 						{{item.items.filter(obj=>obj.itemName==item.itemName)[0].price*item.num}}元
@@ -159,7 +160,10 @@
 			<view style="padding: 40rpx;">
 				<u-radio-group @change="itemSelectFn" placement="column" v-model="item.itemName">
 					<u-radio v-for="item in item.items" :key="item.id" :label="item.itemName" :name="item.itemName"
-						style="margin-top: 30rpx;">
+						v-if="form.netWeight >= item.minWeight
+					&& form.netWeight < item.maxWeight
+					&&form.cardSize<=item.carLength
+					&&form.cardSize>=item.minLength" style="margin-top: 30rpx;">
 					</u-radio>
 				</u-radio-group>
 			</view>
@@ -281,15 +285,15 @@
 				}).then(resp => {
 					let data = resp.data;
 					this.form = data;
-					let goodsName=data.goodsName;
+					let goodsName = data.goodsName;
 					this.customer.index = this.customer.customerList.map(obj => obj.name).indexOf(data
 						.customerName);
 					this.goods.index = this.goods.goodsList.map(o => o.name).indexOf(goodsName);
-					let goods=this.goods.goodsList[this.goods.index];
+					let goods = this.goods.goodsList[this.goods.index];
 					let items = data.items;
 					let noNeedIds = goods.noNeedIds.split(',');
 					let itemTypeList = this.itemList.filter(obj => noNeedIds.indexOf(obj.id) == -1);
-					this.filterItemList=itemTypeList;
+					this.filterItemList = itemTypeList;
 					for (let i in itemTypeList) {
 						let type = itemTypeList[i];
 						for (let j in items) {
@@ -383,7 +387,7 @@
 					this.hs.list.push(this.modal.form);
 				}
 				this.modal.visible = false;
-				
+
 			},
 			editFn(data) {
 				Object.assign(this.modal, {
@@ -405,7 +409,7 @@
 					this.getItemList();
 				})
 			},
-			getItemList(){
+			getItemList() {
 				this.$api.getItemList().then(resp => {
 					this.itemList = resp.data;
 					this.getBusinessById();
@@ -484,7 +488,7 @@
 					this.$common.toast('司机联系号码不正确')
 					return false;
 				}
-				if (!this.form.netWeight||!this.$common.isNum(this.form.netWeight)) {
+				if (!this.form.netWeight || !this.$common.isNum(this.form.netWeight)) {
 					this.$common.toast('载重必须输入数字')
 					return false;
 				}
@@ -504,7 +508,7 @@
 						}
 					}
 				}
-				let peopleList=this.hs.list;
+				let peopleList = this.hs.list;
 				if (typeList.filter(obj => obj.name.indexOf('人') !== -1 &&
 						obj.name.indexOf('核酸') !== -1).length > 0 &&
 					peopleList.length == 0) {
@@ -528,7 +532,7 @@
 					})
 				}
 				this.form.itemJson = JSON.stringify(list);
-				this.form.peopleJson=JSON.stringify(peopleList);
+				this.form.peopleJson = JSON.stringify(peopleList);
 				this.form.items = null;
 				if (this.customerId == '1') {
 					this.form.customerId = this.customer.customerList[this.customer.index].id;

app/pages/business-entering/business-entering.vue

@@ -159,7 +159,10 @@
 			<view style="padding: 40rpx;">
 				<u-radio-group @change="itemSelectFn" placement="column" v-model="item.itemName">
 					<u-radio v-for="item in item.items" :key="item.id" :label="item.itemName" :name="item.itemName"
-						v-if="item.carLength>=form.cardSize&&item.maxWeight>=form.netWeight" style="margin-top: 30rpx;">
+						v-if="form.netWeight >= item.minWeight 
+						&& form.netWeight < item.maxWeight
+						&&form.cardSize<=item.carLength
+						&&form.cardSize>=item.minLength" style="margin-top: 30rpx;">
 					</u-radio>
 				</u-radio-group>
 			</view>

sp-admin/sa-view/tb-business/tb-business-add.html

@@ -74,7 +74,8 @@
 												</el-option>
 											</el-select>
 										</div>
-										<sa-item type="num" name="载重(吨)" placeholder="请输入车辆载重" v-model="m.netWeight" br>
+										<sa-item type="num" name="载重(吨)"  placeholder="请输入车辆载重"
+											v-model="m.netWeight" br>
 										</sa-item>
 										<sa-item type="text" name="境外车牌号" placeholder="请输入境外车牌号" v-model="m.cardNo" br>
 										</sa-item>
@@ -86,7 +87,7 @@
 												:fetch-suggestions="queryCaSizerAsync">
 											</el-autocomplete>
 										</div>
-									
+
 										<sa-item type="text" name="中国车牌" placeholder="请输入中国车牌" v-model="m.chinaCarNo"
 											br></sa-item>
 										<sa-item type="text" name="中国司机" placeholder="请输入中国车司机" v-model="m.driverName"
@@ -110,8 +111,9 @@
 											<label slot="label"><label v-if="needTypeId.indexOf(type.id)!==-1"
 													style="color: red;">*</label>{{type.name}}</label>
 											<el-select v-model="type.itemId" style="width: 120px;" placeholder="请选择">
-												<el-option v-for="item in type.items" :key="item.id" v-if="item.carLength>=m.cardSize&&item.maxWeight>=m.netWeight"
-													:label="item.itemName" :value="item.id">
+												<el-option v-for="item in type.items" :key="item.id" :label="item.itemName" :value="item.id"
+												v-if="m.netWeight >= item.minWeight && m.netWeight < item.maxWeight
+												&&m.cardSize<=item.carLength&&m.cardSize>=item.minLength">
 												</el-option>
 											</el-select>
 											<el-input-number style="margin-left: 60px;" class="item-num"
@@ -150,7 +152,8 @@
 				<el-card class="box-card">
 					<div slot="header">
 						<span>列表</span>
-						<el-button style="float: right;" icon="el-icon-plus" type="primary" @click="showAddModal" v-if="modal.list.length<modal.num">添加
+						<el-button style="float: right;" icon="el-icon-plus" type="primary" @click="showAddModal"
+							v-if="modal.list.length<modal.num">添加
 						</el-button>
 					</div>
 					<el-table :data="modal.list">
@@ -263,7 +266,6 @@
 					}
 				},
 				methods: {
-					
 					goodsChange(value) {
 						let goods = this.goodsList.filter(obj => obj.name === value).pop();
 						let noNeedIds = goods.noNeedIds.split(',');
@@ -452,8 +454,9 @@
 								num: type.num
 							})
 						}
-						if (typeList.filter(obj => obj.name.indexOf('人')!==-1&&obj.name.indexOf('核酸')!==-1).length > 0 
-						&& this.modal.list
+						if (typeList.filter(obj => obj.name.indexOf('人') !== -1 && obj.name.indexOf('核酸') !== -1)
+							.length > 0 &&
+							this.modal.list
 							.length == 0) {
 							sa.error('请添加核酸检测人员');
 							return false;

sp-admin/sa-view/tb-business/tb-business-edit.html

@@ -111,7 +111,8 @@
 													style="color: red;">*</label>{{type.name}}</label>
 											<el-select v-model="type.itemId" style="width: 120px;" placeholder="请选择">
 												<el-option v-for="item in type.items"
-													v-if="item.carLength>=m.cardSize&&item.maxWeight>=m.netWeight"
+													v-if="m.netWeight >= item.minWeight && m.netWeight < item.maxWeight
+													&&m.cardSize<=item.carLength&&m.cardSize>=item.minLength"
 													:key="item.id" :label="item.itemName" :value="item.id">
 												</el-option>
 											</el-select>

sp-server/app.pid

@@ -1 +1 @@
-16032
+6124

sp-server/src/main/java/com/pj/project/tb_item/TbItem.java

@@ -60,6 +60,8 @@ public class TbItem extends Model<TbItem> implements Serializable {
     private String unit;
     private double carLength;
     private double maxWeight;
+    private double minLength;
+    private double minWeight;
     private int status;
 
     @TableField(exist = false)