diff --git a/src/api/request2.js b/src/api/request2.js
index 3a63aff..1de769d 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -243,7 +243,7 @@ export function foamMaterialInputSubmit(params) {
  */
 export function foamCheckSubmit(params) {
 	return request({
-		url: baseApi + "/system/captcha/captchaImage",
+		url: baseApi + "/MachineClass/Insert",
 		method: "post",
 		data: params,
 	});
diff --git a/src/mycomponents/form/customerFrom.vue b/src/mycomponents/form/customerFrom.vue
index 677faba..189e984 100644
--- a/src/mycomponents/form/customerFrom.vue
+++ b/src/mycomponents/form/customerFrom.vue
@@ -371,23 +371,24 @@
 					}
 
 					this.formData.forEach(res => {
-						if (res.SelectName.includes("班")) {
-							var value = this.dataClassList.filter(item => item.name == res.SelectName)
-							if (value.length > 0) {
-								res.SelectValue = value[0].value
-							} else {
-								res.SelectValue = ""
-							}
-						} else {
-							var value = this.dataList.filter(item => item.name == res.SelectName)
-							if (value.length > 0) {
-								res.SelectValue = value[0].value
+						if(res.SelectName){
+							if (res.SelectName.includes("班")) {
+								var value = this.dataClassList.filter(item => item.name == res.SelectName)
+								if (value.length > 0) {
+									res.SelectValue = value[0].value
+								} else {
+									res.SelectValue = ""
+								}
 							} else {
-								res.SelectValue = res.SelectName
+								var value = this.dataList.filter(item => item.name == res.SelectName)
+								if (value.length > 0) {
+									res.SelectValue = value[0].value
+								} else {
+									res.SelectValue = res.SelectName
+								}
 							}
 						}
 					})
-
 					callBack(this.formData)
 				} catch (error) {
 					this.showHint("", error.message)
diff --git a/src/pages/foam/check.vue b/src/pages/foam/check.vue
index 9b7fafa..b094d91 100644
--- a/src/pages/foam/check.vue
+++ b/src/pages/foam/check.vue
@@ -2,28 +2,54 @@
 	<view class="page-wraper">
 		<view class="page-header flex"
 			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
-			<view class="flex u-col-center space-between">
-				<view class="">
+			<!-- <view class="flex u-col-center space-between"> -->
+				<!-- <view class="">
 					<view class="" style="margin: 5rpx; font-weight: bold;">
 						设备编号 : {{deviceCode}}
 					</view>
 					<view class="" style="margin: 5rpx; font-weight: bold;" v-if="deviceName!=''">
 						设备名称 : {{deviceName}}
-					</view>
+					</view> -->
 
 					<!-- <text v-if="deviceName!=''">({{deviceName}})</text> -->
-				</view>
-				<view class="">
+				<!-- </view> -->
+				<!-- <view class="">
 					<button type="primary" size="mini" @click="openScanPopup">扫描</button>
-				</view>
+				</view> -->
 
-			</view>
-			<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
+			<!-- </view> -->
+			<!-- <view class="" style="margin: 5rpx;" v-if="deviceName!=''">
 				点检日期 : {{dateTime}}
 			</view>
 			<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
 				点检人 : {{worker}}
+			</view> -->
+			<view class="">
+				<view class="uni-flex uni-row space-between u-col-center"  >
+					<view class="" style="margin: 5rpx; font-weight: bold;">
+						设备编号: 
+					</view>
+					<uni-easyinput
+					 class="" 
+					 trim="all" 
+					 ref="inputDevice"
+					 v-model="deviceCode"
+					 @clear="deviceClear"
+					 :focus="true"
+						@confirm="onConfirmDevice"></uni-easyinput>
+				</view>
+				<view class="" style="margin: 5rpx; font-weight: bold;" v-if="deviceName!=''">
+					设备名称 : {{deviceName}}
+				</view>
+				<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
+					点检日期 : {{dateTime}}
+				</view>
+				<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
+					点检人 : {{worker}}
+				</view>
 			</view>
+			
+			
 			<view class="" style="width: 100%;background-color: gray;height: 2rpx; margin-top: 10rpx;" />
 
 		</view>
@@ -38,7 +64,7 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<button class="btn_single_reset" hover-class="btn_single_after" @click="reset">重置</button>
+					<button class="btn_single_reset" hover-class="btn_single_after" @click="clearData">清空</button>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
@@ -76,6 +102,7 @@
 			return {
 				dateTime: "",
 				deviceCode: "",
+				deviceCheckCode:"",
 				deviceName: "",
 				worker: this.$store.state.user.name,
 				dataList: [],
@@ -202,9 +229,12 @@
 		computed: {},
 		onLoad() {
 
+		},
+		mounted() {
+			this.$refs.inputDevice.focused = true
 		},
 		onReady() {
-			this.openScanPopup();
+			// this.openScanPopup();
 		},
 		methods: {
 			getScanResult(result) {
@@ -216,7 +246,6 @@
 					uni.hideLoading()
 					this.deviceCode = result;
 					console.log(result)
-					this.reset();
 					this.closeScanPopup();
 					var groupSelect = {
 						Type: "4",
@@ -227,19 +256,10 @@
 					// this.dataList = this.formData
 					this.dataList = res.Result;
 					this.dataList.push(groupSelect)
-					this.dataList.forEach(res=>{
-						res.SelectName=""
-						res.SelectValue=""
-						if(res.putMachine){
-							res.putMachine.forEach(item=>{
-								item.SelectName=""
-								item.SelectValue=""
-							})
-						}
-						
-					})
+					
 					this.deviceName=this.dataList[0].Name;
 					this.dateTime = getCurrDateTime()
+					this.worker = this.$store.state.user.name
 				}).catch(error => {
 					uni.hideLoading()
 					this.showMessage(error)
@@ -256,6 +276,7 @@
 			},
 			submit() {
 				if (this.deviceCode == "") {
+					this.deviceCheckCode=""
 					this.$refs.comMessage.showMessage("提示", "请先扫描设备编号")
 					return
 				}
@@ -269,34 +290,35 @@
 						}
 					})
 					var commitData={
-						LoginUserID:this.$store.state.user.id,
-						UserName:this.$store.state.user.name,
+						id:this.$store.state.user.id,
 						createTime:getCurrDateTime(),
 						groupName:groupName,
 						groupValue:groupValue,
 						dataList:data
 					}
-					var param = commitData
 					
-					console.log("提交", JSON.stringify(param))
-					// foamCheckSubmit(param).then(res=>{
-					// 	uni.hideLoading()
-					// 	this.showMessage("提交成功")
-					// 	this.clearData()
-					// }).catch(error=>{
-					// 	uni.hideLoading()
-					// 	this.showMessage(error)
-					// })
-
+					console.log("提交", JSON.stringify(commitData))
+					foamCheckSubmit(commitData).then(res=>{
+						uni.hideLoading()
+						this.showMessage("提交成功")
+						this.clearData()
+					}).catch(error=>{
+						uni.hideLoading()
+						this.showMessage(error)
+					})
 				})
 			},
 			clearData() {
 				this.deviceCode = ""
+				this.deviceName="";
+				this.dateTime ="";
 				this.dateTime = "",
-					this.deviceCode = "",
-					this.deviceName = "",
-					this.reset();
-			},
+				this.deviceCode = "",
+				this.deviceName = "",
+				this.worker=""
+				this.dataList=[]
+					// this.reset();
+		},
 			reset() {
 				this.$refs.customerFrom.reset()
 			},
@@ -307,9 +329,44 @@
 			closeScanPopup() {
 				this.$refs.scanPopup.closeScanPopup();
 			},
+			deviceClear(){
+				this.deviceCode="";
+				this.deviceCheckCode=""
+			},
 			showMessage(hint){
 				this.$refs.comMessage.showMessage("提示", hint)
 			},
+			onConfirmDevice(data){
+				if(data==undefined||data==""){
+					this.showMessage("请扫描设备编号")
+					return;
+				}
+			
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
+				getDeviceInfo(data).then(res => {
+					uni.hideLoading()
+					this.deviceCode = data;
+					this.deviceCheckCode = data;
+					console.log(data)
+					this.closeScanPopup();
+					var groupSelect = {
+						Type: "4",
+						Content: "选择班组",
+						SelectName: "",
+						SelectValue: "",
+					}
+					this.dataList = res.Result;
+					this.dataList.push(groupSelect)
+					this.deviceName=this.dataList[0].Name;
+					this.dateTime = getCurrDateTime()
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
 
 		}
 	}
diff --git a/src/pages/foam/input.vue b/src/pages/foam/input.vue
index e49c433..431baec 100644
--- a/src/pages/foam/input.vue
+++ b/src/pages/foam/input.vue
@@ -22,42 +22,50 @@
 						<!-- <view class="" style="font-size: 35rpx;">
 							计划单号 
 						</view> -->
-							<uni-section title="计划单号" subTitle="选择计划单号"  subTitleFontSize="26rpx" titleFontSize="35rpx" type="line" >
-									</uni-section>
-						
+						<uni-section title="计划单号" subTitle="选择计划单号" subTitleFontSize="26rpx" titleFontSize="35rpx"
+							type="line">
+						</uni-section>
+
 						<view class="uni-flex space-between">
 							<view class="" style="width: 80%;  ">
-								<input class="input" disabled v-model="planNumber"  />
+								<uni-easyinput disabled style="margin-left: 10rpx; margin-right: 10rpx;" trim="all" v-model="planNumber"></uni-easyinput>
 							</view>
 							<view class="uni-flex" style="width: 20%; align-items: center;">
 								<button type="primary" size="mini" @click="showPlanSelect">单号</button>
 							</view>
 						</view>
-						
+
 					</view>
-					
+
 					<view class="uni-flex uni-column " style="margin: 10rpx;">
-						<uni-section title="原料名称" subTitle="输入或者选择原料名称"  subTitleFontSize="26rpx" titleFontSize="35rpx" type="line">
-								</uni-section>
-						<view class="uni-flex space-between">
+						<uni-section title="原料名称" subTitle="输入或者选择原料名称" subTitleFontSize="26rpx" titleFontSize="35rpx"
+							type="line">
+						</uni-section>
+						<view class="uni-flex space-between  uni-row u-col-center" >
 							<view class="" style="width: 80%;">
 								<!-- <input id='inputSelect' class="input" v-model="materialName" @focus="render._inputFocus" /> -->
-								<input id='inputSelect' class="input" v-model="materialName" @focus="render._inputFocus" />
+								<!-- <input id='inputSelect' class="input" v-model="materialName" @focus="render._inputFocus" /> -->
+								<uni-easyinput class="" style="margin-left: 10rpx; margin-right: 10rpx;" trim="all" v-model="materialName"></uni-easyinput>
 							</view>
-							<view class="uni-flex" style="width: 20%; align-items: center;">
+							<view class="uni-flex u-col-center" style="width: 20%; margin-left: 10rpx; ">
 								<button type="primary" size="mini" @click="showMaterialSelect">原料</button>
 							</view>
 						</view>
 					</view>
-					<view class="uni-flex uni-column "   style="margin: 10rpx;">
-						<uni-section title="原料投入量"  subTitle="输入原料投入量"  subTitleFontSize="26rpx" titleFontSize="35rpx" type="line">
-								</uni-section>
+					<view class="uni-flex uni-column " style="margin: 10rpx;">
+						<uni-section title="原料投入量" subTitle="输入原料投入量" subTitleFontSize="26rpx" titleFontSize="35rpx"
+							type="line">
+						</uni-section>
 						<view class="uni-flex space-between">
 							<view class="" style="width: 50%;">
-								<input class="input" v-model="materialQty" type="digit"  />
+								<uni-easyinput class="uni-mt-5" trim="all" type="digit" ref="inputQty"
+									v-model="materialQty"></uni-easyinput>
+								<!-- <input class="input" v-model="materialQty" type="digit"  /> -->
 							</view>
 						</view>
 					</view>
+					
+					
 
 				</view>
 			</scroll-view>
@@ -84,14 +92,14 @@
 
 
 </template>
-<script module="render" lang="renderjs">  
-    export default {  
-        methods: {  
-            _inputFocus (event) {  
-                document.querySelector('#inputSelect input').select()  
-            }  
-        }  
-    }  
+<script module="render" lang="renderjs">
+	export default {
+		methods: {
+			_inputFocus(event) {
+				document.querySelector('#inputSelect input').select()
+			}
+		}
+	}
 </script>
 <script>
 	import {
@@ -102,7 +110,7 @@
 	import {
 		getPlaneNumberList,
 		getMaterialLists,
-		foamCheckSubmit
+		foamInputSubmit
 	} from '@/api/request2.js';
 	import showModal from '../../mycomponents/common/showModal.vue'
 	import winScanNormal from "@/mycomponents/scan/winScanNormal.vue"
@@ -118,25 +126,24 @@
 			return {
 				dateTime: "",
 				planNumber: "",
-				materialName:"",
-				materialCode:"",
-				materialQty:"",
+				materialName: "",
+				materialCode: "",
+				materialQty: "",
 				planName: "",
 				dataList: [],
 				userForm: {
 					names: [],
 					values: [],
 					origin: []
-				}
+				},
+				materialList:[]
 
 
 			}
 		},
 		computed: {},
-		onLoad() {
-		},
-		onUnload() {
-		},
+		onLoad() {},
+		onUnload() {},
 		onReady() {
 
 		},
@@ -150,7 +157,7 @@
 				console.log(event.detail);
 			},
 			submit() {
-				if (this.planNumber == "") {
+				if (this.planNumber == "123") {
 					this.showMessage("请选择计划单号")
 					return
 				}
@@ -158,20 +165,24 @@
 					this.showMessage("请输入原料名称")
 					return
 				}
-				if (this.materialQty == ""||this.materialQty==0) {
+				if (this.materialQty == "" || this.materialQty == 0) {
 					this.showMessage("请输入原料数量")
 					return
 				}
 				uni.showLoading({
-					title:"加载中",
-					mask:true
+					title: "加载中",
+					mask: true
 				})
-				var param ={
-					planNumber:this.planNumber,
-					materialName:this.materialName,
-					materialQty:this.materialQty
+				var param = {
+					planNumber: this.planNumber,
+					materialName: this.materialName,
+					materialQty: this.materialQty,
+					UserName:this.$store.state.user.id,
+					createTime:getCurrDateTime(),
 				}
-				// foamMaterialInputSubmit(param).then(res=>{
+				console.log("提交", JSON.stringify(param))
+				
+				// foamInputSubmit(param).then(res=>{
 				// 	uni.hideLoading()
 				// 	this.showMessage("提交成功")
 				// 	this.resetData()
@@ -180,20 +191,20 @@
 				// 	this.showMessage(error)
 				// })
 			},
-			showMessage(hint){
+			showMessage(hint) {
 				this.$refs.comMessage.showMessage("提示", hint)
 			},
 			resetData() {
-				this.planNumber ="";
-				this.materialName=""
-				this.materialQty=0
+				this.planNumber = "";
+				this.materialName = ""
+				this.materialQty = 0
 			},
 			showPlanSelect() {
 				uni.showLoading({
-					title:"加载中",
-					mask:true
+					title: "加载中",
+					mask: true
 				})
-				getPlaneNumberList().then(res=>{
+				getPlaneNumberList().then(res => {
 					uni.hideLoading()
 					this.$refs.selectPopup.open({
 						mode: 'radio', //radio checkbox 单选、多选
@@ -211,7 +222,7 @@
 							value: 'code'
 						}
 					})
-				}).catch(error=>{
+				}).catch(error => {
 					uni.hideLoading()
 					this.showMessage(error)
 				})
@@ -232,15 +243,15 @@
 				// 	}
 				// })
 			},
-			
-			
+
+
 			select(mode, data) {
 				this.planNumber = data.code
 				this.planName = data.name
 				console.log(mode)
 				console.log(data)
 			},
-			
+
 			showMaterialSelect() {
 				// getMaterialLists().then(res=>{
 				// 	uni.hideLoading()
@@ -261,15 +272,15 @@
 				// 			value: 'code'
 				// 		}
 				// 	})
-					
+
 				// }).catch(error=>{
 				// 	uni.hideLoading()
 				// 	this.showMessage(error)
 				// })
-				
+
 				this.$refs.selectPopupMaterial.open({
 					mode: 'radio', //radio checkbox 单选、多选
-					dataList: getMaterialList(), //如果dataList传入了数组则直接使用传入的数组渲染，无需再配置proxyConfig
+					dataList: this.materialList, //如果dataList传入了数组则直接使用传入的数组渲染，无需再配置proxyConfig
 					// selected: this.userForm.values, //已选中的数据
 					// proxyConfig: { //组件内部代理请求数据配置
 					// 	reqFun: this.reqGetList, //请求方法
@@ -284,9 +295,10 @@
 					}
 				})
 			},
-			
-			selectMaterial(mode, data){
+
+			selectMaterial(mode, data) {
 				this.materialName = data.name
+				this.$refs.inputQty.focused = true
 				console.log("selectPopupMaterial")
 			},
 			reqGetList(data) {
diff --git a/src/pages/plastics/check.vue b/src/pages/plastics/check.vue
index 15c142a..0312601 100644
--- a/src/pages/plastics/check.vue
+++ b/src/pages/plastics/check.vue
@@ -1,28 +1,68 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header flex"
-			style="font-size: 35rpx; padding-left: 20rpx; padding-top: 20rpx; flex-direction: column;">
-			<view class="flex u-col-center space-between">
-				<view class="">
-					设备编号 : {{deviceCode}}
-					<text v-if="deviceName!=''">({{deviceName}})</text>
+			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
+			<!-- <view class="flex u-col-center space-between"> -->
+				<!-- <view class="">
+					<view class="" style="margin: 5rpx; font-weight: bold;">
+						设备编号 : {{deviceCode}}
+					</view>
+					<view class="" style="margin: 5rpx; font-weight: bold;" v-if="deviceName!=''">
+						设备名称 : {{deviceName}}
+					</view> -->
 
-				</view>
-				<view class="">
+					<!-- <text v-if="deviceName!=''">({{deviceName}})</text> -->
+				<!-- </view> -->
+				<!-- <view class="">
 					<button type="primary" size="mini" @click="openScanPopup">扫描</button>
+				</view> -->
+
+			<!-- </view> -->
+			<!-- <view class="" style="margin: 5rpx;" v-if="deviceName!=''">
+				点检日期 : {{dateTime}}
+			</view>
+			<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
+				点检人 : {{worker}}
+			</view> -->
+			<view class="">
+				<view class="uni-flex uni-row space-between u-col-center"  >
+					<view class="" style="margin: 5rpx; font-weight: bold;">
+						设备编号: 
+					</view>
+					<uni-easyinput
+					 class="uni-mt-5" 
+					 trim="all" 
+					 ref="inputDevice"
+					 v-model="deviceCode"
+					 @clear="deviceClear"
+					 :focus="true"
+						@confirm="onConfirmDevice"></uni-easyinput>
+				</view>
+				<view class="" style="margin: 5rpx; font-weight: bold;" v-if="deviceName!=''">
+					设备名称 : {{deviceName}}
+				</view>
+				<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
+					点检日期 : {{dateTime}}
+				</view>
+				<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
+					点检人 : {{worker}}
 				</view>
 			</view>
-			<view class="" style="width: 100%;background-color: gray;height: 2rpx;" />
+			
+			
+			
+			
+			<view class="" style="width: 100%;background-color: gray;height: 2rpx; margin-top: 10rpx;" />
 
 		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view>
-					<customerFrom ref="customerFrom" :formData="formData"> </customerFrom>
+				<view style="padding-bottom: 80rpx;">
+					<customerFrom ref="customerFrom" :formData="dataList"> </customerFrom>
 				</view>
 			</scroll-view>
 		</view>
-		<view class="page-footer">
+		<view class="page-footer" v-if="dataList.length>0">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
@@ -34,35 +74,112 @@
 			</view>
 		</view>
 		<winScanNormal ref="scanPopup" title="设备编号" @getResult='getScanResult'></winScanNormal>
+		<showModal ref="comMessage"></showModal>
 	</view>
 
 
 </template>
 
 <script>
+	import showModal from '../../mycomponents/common/showModal.vue'
 	import customerFrom from "@/mycomponents/form/customerFrom.vue"
 	import winScanNormal from "@/mycomponents/scan/winScanNormal.vue"
-
+	import {
+		getCurrDateTime,
+		deepCopyData
+	} from "@/common/basic.js"
+	import {
+		getPlaneNumberList,
+		getMaterialLists,
+		foamCheckSubmit,
+		getDeviceInfo
+	} from '@/api/request2.js';
 	export default {
 		components: {
 			customerFrom,
-			winScanNormal
+			winScanNormal,
+			showModal
 		},
 		data() {
 			return {
+				dateTime: "",
 				deviceCode: "",
+				deviceCheckCode:"",
 				deviceName: "",
+				worker: this.$store.state.user.name,
+				dataList: [],
 				formData: [{
-						type: "inputAndSelect",
+						type: "stateSelect",
 						position: "PB",
 						content: "检查各个管路及接头",
 						methond: "目视野无液体渗出",
 						placeholder: "请输入点检状态",
+						name: "",
+						value: "",
+					},
+					{
+						type: "inputAndSelect",
+						check: true,
+						position: "开孔机",
+						content: "检查油温",
+						methond: "目视80°C~100°C",
+						lower: 80,
+						upper: 100,
+						placeholder: "请输入点检状态",
 						name: '',
 						value: "",
 					},
 					{
 						type: "inputAndSelect",
+						position: "开孔机",
+						content: "待机状态下真空度",
+						methond: "目视<=6Bar",
+						lower: 0,
+						upper: 6,
+						placeholder: "请输入待机状态下真空度",
+						name: '',
+						value: "",
+					},
+					{
+						type: "inputAndSelect",
+						position: "开孔机",
+						content: "工作时真空度",
+						methond: "达到-0.07~0.08Mpa",
+						lower: -0.07,
+						upper: 0.08,
+						placeholder: "请输入工作时真空度",
+						name: '',
+						value: "",
+					},
+					{
+						type: "inputAndSelect",
+						position: "开孔机",
+						content: "检查开孔机压缩空气压力",
+						methond: "主表6±0.5bar,副表4±0.5bar",
+						placeholder: "请输入检查开孔机压缩空气压力",
+						name: '',
+						value: "",
+						main: {
+							name: "",
+							value: "",
+							placeholder: "请输入主表压力",
+							hint: "主表压力范围5.5~6.5bar",
+							lower: "5.5",
+							upper: "6.5"
+						},
+						minor: {
+							name: "",
+							value: "",
+							placeholder: "请输入副表压力",
+							hint: "副表压力范围3.5~4.5bar",
+							lower: "3.5",
+							upper: "4.5"
+						}
+
+
+					},
+					{
+						type: "stateSelect",
 						position: "PB",
 						content: "电机检查",
 						methond: "倾听无异响",
@@ -71,7 +188,7 @@
 						value: "",
 					},
 					{
-						type: "inputAndSelect",
+						type: "stateSelect",
 						position: "PB",
 						content: "检查气源气压",
 						methond: "倾听无异响",
@@ -80,7 +197,27 @@
 						value: "",
 					},
 					{
-						type: "select",
+						type: "inputRange",
+						position: "PB",
+						content: "检查气袋气压",
+						methond: "压力表示数范围2.5bar-4.5bar",
+						inputLow: {
+							name: "",
+							value: "",
+							placeholder: "请输入最低压力",
+							lower: "2.5",
+							upper: "4.5"
+						},
+						inputHigh: {
+							name: "",
+							value: "",
+							placeholder: "请输入最高压力",
+							lower: "2.5",
+							upper: "4.5"
+						}
+					},
+					{
+						type: "groupSelect",
 						content: "选择班组",
 						placeholder: "请选择班组",
 						name: '',
@@ -92,24 +229,107 @@
 			}
 		},
 		computed: {},
-		onLoad() {},
-		onReady() {
+		onLoad() {
 
+		},
+		mounted() {
+			this.$refs.inputDevice.focused = true
+		},
+		onReady() {
+			// this.openScanPopup();
 		},
 		methods: {
 			getScanResult(result) {
-				this.deviceCode = result;
-				this.deviceName = "自配料系统"
-				console.log(result)
-				this.reset();
-				this.closeScanPopup();
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
+				getDeviceInfo(result).then(res => {
+					uni.hideLoading()
+					this.deviceCode = result;
+					console.log(result)
+					this.reset();
+					this.closeScanPopup();
+					var groupSelect = {
+						Type: "4",
+						Content: "选择班组",
+						SelectName: "",
+						SelectValue: "",
+					}
+					// this.dataList = this.formData
+					this.dataList = res.Result;
+					this.dataList.push(groupSelect)
+					this.dataList.forEach(res=>{
+						res.SelectName=""
+						res.SelectValue=""
+						if(res.putMachine){
+							res.putMachine.forEach(item=>{
+								item.SelectName=""
+								item.SelectValue=""
+							})
+						}
+						
+					})
+					this.deviceName=this.dataList[0].Name;
+					this.dateTime = getCurrDateTime()
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+				// this.deviceCode = result;
+				// this.deviceName = "自配料系统"
+				// console.log(result)
+				// this.reset();
+				// this.closeScanPopup();
+				// this.dataList = this.formData;
+				// this.dateTime = getCurrDateTime()
+
+
 			},
 			submit() {
-				this.$refs.customerFrom.submit(callBack => {
-					console.log("提交", JSON.stringify(callBack))
+				if (this.deviceCode == "") {
+					this.deviceCheckCode=""
+					this.$refs.comMessage.showMessage("提示", "请先扫描设备编号")
+					return
+				}
+				this.$refs.customerFrom.submit(data => {
+					var groupName="";
+					var groupValue=""
+					data.forEach(res=>{
+						if(res.Type=="4"){
+							groupName=res.SelectName;
+							groupValue=res.SelectValue;
+						}
+					})
+					var commitData={
+						LoginUserID:this.$store.state.user.id,
+						UserName:this.$store.state.user.name,
+						createTime:getCurrDateTime(),
+						groupName:groupName,
+						groupValue:groupValue,
+						dataList:data
+					}
+					var param = commitData
 					
+					console.log("提交", JSON.stringify(param))
+					// foamCheckSubmit(param).then(res=>{
+					// 	uni.hideLoading()
+					// 	this.showMessage("提交成功")
+					// 	this.clearData()
+					// }).catch(error=>{
+					// 	uni.hideLoading()
+					// 	this.showMessage(error)
+					// })
+
 				})
 			},
+			clearData() {
+				this.deviceCode = ""
+				this.dateTime = "",
+					this.deviceCode = "",
+					this.deviceName = "",
+					this.reset();
+			},
 			reset() {
 				this.$refs.customerFrom.reset()
 			},
@@ -120,6 +340,57 @@
 			closeScanPopup() {
 				this.$refs.scanPopup.closeScanPopup();
 			},
+			deviceClear(){
+				this.deviceCode="";
+				this.deviceCheckCode=""
+			},
+			showMessage(hint){
+				this.$refs.comMessage.showMessage("提示", hint)
+			},
+			onConfirmDevice(data){
+				if(data==undefined||data==""){
+					this.showMessage("请扫描设备编号")
+					return;
+				}
+			
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
+				getDeviceInfo(data).then(res => {
+					uni.hideLoading()
+					this.deviceCode = data;
+					this.deviceCheckCode = data;
+					console.log(data)
+					this.reset();
+					this.closeScanPopup();
+					var groupSelect = {
+						Type: "4",
+						Content: "选择班组",
+						SelectName: "",
+						SelectValue: "",
+					}
+					// this.dataList = this.formData
+					this.dataList = res.Result;
+					this.dataList.push(groupSelect)
+					this.dataList.forEach(res=>{
+						res.SelectName=""
+						res.SelectValue=""
+						if(res.putMachine){
+							res.putMachine.forEach(item=>{
+								item.SelectName=""
+								item.SelectValue=""
+							})
+						}
+						
+					})
+					this.deviceName=this.dataList[0].Name;
+					this.dateTime = getCurrDateTime()
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
 
 		}
 	}
diff --git a/src/pages/plastics/input.vue b/src/pages/plastics/input.vue
index f4efff5..b2c82b8 100644
--- a/src/pages/plastics/input.vue
+++ b/src/pages/plastics/input.vue
@@ -38,7 +38,7 @@
 						<view class="uni-flex">
 							<uni-easyinput 
 							@clear="bucketClear"
-							ref="inputBucketCode" class="uni-mt-5" trim="all" v-model="bucketCode" 
+							ref="inputBucketCode" class="" trim="all" v-model="bucketCode" 
 								@confirm="onConfirmBucketCode"  ></uni-easyinput>
 						</view>
 
@@ -52,7 +52,7 @@
 							<uni-easyinput 
 							ref="inputItemCode"
 							@clear="itemClear"
-							class="uni-mt-5" trim="all" v-model="itemCode"
+							class="" trim="all" v-model="itemCode"
 								@confirm="onConfirmItemCode" ></uni-easyinput>
 						</view>
 					</view>
@@ -62,7 +62,7 @@
 						</uni-section>
 						<view class="uni-flex space-between">
 							<uni-easyinput 
-							class="uni-mt-5"
+							class=""
 							 trim="all"
 							 ref="inputBatchCode"
 							  v-model="batchCode"
@@ -75,7 +75,7 @@
 						</uni-section>
 						<view class="uni-flex space-between">
 							<uni-easyinput 
-							class="uni-mt-5" 
+							class="" 
 							trim="all"
 							 ref="inputReferenceCode"
 							 v-model="referenceCode"
@@ -88,7 +88,7 @@
 						</uni-section>
 						<view class="uni-flex space-between">
 							<uni-easyinput 
-							class="uni-mt-5"
+							class=""
 							 ref="inputSupplierCode"
 							 trim="all"
 							  v-model="supplierCode"
@@ -101,7 +101,7 @@
 						</uni-section>
 						<view class="uni-flex space-between">
 							<uni-easyinput
-							 class="uni-mt-5" 
+							 class="" 
 							 trim="all" 
 							 ref="inputWeight"
 							 v-model="weight"