Merge branch 'debug'

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

@@ -640,8 +640,6 @@
 				}
 				let noNeedIds = this.noNeedIds;
 				let needIds=this.needTypeId;
-				console.log(needIds);
-				console.log(typeList);
 				for(let i in needIds){
 					if(typeList.map(obj=>obj.id).indexOf(needIds[i])==-1){
 						this.$common.toast('缺少必选业务');

app/pages/declare/add.vue

@@ -159,7 +159,7 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l"><text style="color: red;">*</text>商铺：</view>
+				<view class="l">商铺：</view>
 				<view class="r">
 					<u-input placeholder="商铺" @input="handler()" v-model="form.shop" />
 				</view>
@@ -473,10 +473,6 @@
 					this.$common.toast('请填写检验检疫证');
 					return;
 				}
-				if (!this.form.shop) {
-					this.$common.toast('请填写商铺');
-					return;
-				}
 				if (!this.form.productionCode) {
 					this.$common.toast('请填写生产批号');
 					return;

app/pages/disinfect/addDisinfect.vue

@@ -65,8 +65,7 @@
 			<view class="item">
 				<view class="l"><text style="color: red;">*</text>规格：</view>
 				<view class="r">
-					<u-input type="number" placeholder="输入规格" @input="handler()" v-model="form.unit">
-						<text slot="suffix">米</text>
+					<u-input  placeholder="输入规格" @input="handler()" v-model="form.unit">
 					</u-input>
 				</view>
 			</view>
@@ -353,10 +352,6 @@
 					this.$common.toast('请填写原产地');
 					return false;
 				}
-				if (!this.$common.isNum(this.form.unit)) {
-					this.$common.toast('规格只能填写数字');
-					return false;
-				}
 				if (!this.form.pack) {
 					this.$common.toast('请填写包装');
 					return false;

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

@@ -718,23 +718,6 @@
 							sa.error('载重只能输入数字')
 							return;
 						}
-						let checkList = this.itemTypeList;
-						let chechItem = this.checkItem;
-						for (let j in this.needTypeId) {
-							let id = this.needTypeId[j];
-							for (let i in checkList) {
-								let type = checkList[i];
-								let typeName = type.name;
-								if (id == type.id && !type.itemId && typeName !== '特殊车辆' && typeName !== '干杂货人工装卸') {
-									sa.error('选择[' + this.m.goodsName + ']时，[' + typeName + ']必选')
-									return;
-								}
-								if (!chechItem && this.m.goodsName == '干杂货') {
-									sa.error('请选择特殊车辆或干杂货人工装卸之一')
-									return;
-								}
-							}
-						}
 						let typeList = this.itemTypeList.filter(obj => obj.itemId);
 						let needIds = this.needTypeId;
 						for (let i in needIds) {

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfect.java

@@ -78,7 +78,7 @@ public class TbDisinfect extends Model<TbDisinfect> implements Serializable {
 	/**
 	 * 规格 
 	 */
-	private Double unit;	
+	private String unit;
 
 	/**
 	 * 包装