前端下一项

components/MyNumberInput.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="uni-input Numberinput" :class="{'inputdis':Isedit}" @click="maskShow" :id="'input_'+myevent">
-			<text class="myfous" v-if="IsShow"></text><text>{{myvalue}}</text>
+			<text>{{myvalue}}</text><text class="myfous" v-if="IsShow"></text>
 			
 		</view>
 
@@ -118,7 +118,7 @@
 	.Numberinput {
 		display: flex;
 		align-items: center;
-		flex-direction: row-reverse;
+		/* flex-direction: row-reverse; */
 	}
 
 	.myfous {

pages/erpbusiness/add_quality_testing.vue

@@ -300,53 +300,73 @@
 				<view class="c-row ">
 					<view class="title">水分（%）</view>
 					<view class="con-list">
-						<!-- <MyNumberInput :myvalue="gridList.waterContent" :Isedit="Isedit" :IsShow="MykeywordShow"
-												:myevent="'waterContent'"
-												@setValue="mykeywordset"  v-if="InputEvent=='waterContent'" 
-												@Cancelword="Cancelword" 
-												@goNext="goNext('bulkDensity')"></MyNumberInput>
+						<MyNumberInput :myvalue="gridList.waterContent" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'waterContent'"
+							@setValue="mykeywordset"  v-if="InputEvent=='waterContent'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('waterContent')"></MyNumberInput>
 							<input v-else v-model='gridList.waterContent' @click="SetInputKey('waterContent')" placeholder="初检水分" @input="waterContentChange"
-									name="input" type="digit"></input> -->
-						<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
-							name="input" type="digit"></input>
+									name="input" type="digit"></input>
+						<!-- <input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
+							name="input" type="digit"></input> -->
 					</view>
 				</view>
 				<view class="c-row ">
 					<view v-show='gridList.goodsName!="大豆"' class="title">容重（克/升）</view>
 					<view v-show='gridList.goodsName=="大豆"' class="title">蛋白</view>
 					<view class="con-list">
-						<!-- <MyNumberInput :myvalue="gridList.bulkDensity" :Isedit="Isedit" :IsShow="MykeywordShow"
-												:myevent="'bulkDensity'"
-												@setValue="mykeywordset"  v-if="InputEvent=='bulkDensity'" 
-												@Cancelword="Cancelword" 
-												@goNext="goNext('waterContent')"></MyNumberInput>
-						<input v-model='gridList.bulkDensity' placeholder="请输入容重" @click="SetInputKey('bulkDensity')" name="input" type="digit" @input="obtainPrice"></input> -->
-					<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit" @input="obtainPrice"></input>
+						<MyNumberInput :myvalue="gridList.bulkDensity" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'bulkDensity'"
+							@setValue="mykeywordset"  v-if="InputEvent=='bulkDensity'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('bulkDensity')"></MyNumberInput>
+						<input v-else v-model='gridList.bulkDensity' placeholder="请输入容重" @click="SetInputKey('bulkDensity')" name="input" type="digit" @input="obtainPrice"></input>
+				<!-- 	<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit" @input="obtainPrice"></input> -->
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">不完善粒（%）</view>
 					<view class="con-list">
-						<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比" name="input"
+						<MyNumberInput :myvalue="gridList.imperfectGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'imperfectGrain'"
+							@setValue="mykeywordset"  v-if="InputEvent=='imperfectGrain'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('imperfectGrain')"></MyNumberInput>
+						<input v-else v-model='gridList.imperfectGrain' @click="SetInputKey('imperfectGrain')" placeholder="请输入不完整粒占比" name="input"
 							type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">杂质（%）</view>
 					<view class="con-list">
-						<input v-model='gridList.impurity' placeholder="请输入杂质占比" name="input" type="digit"></input>
+						<MyNumberInput :myvalue="gridList.impurity" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'impurity'"
+							@setValue="mykeywordset"  v-if="InputEvent=='impurity'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('impurity')"></MyNumberInput>
+						<input v-else v-model='gridList.impurity' placeholder="请输入杂质占比" @click="SetInputKey('impurity')" name="input" type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">霉变粒（%）</view>
 					<view class="con-list">
-						<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比" name="input" type="digit"></input>
+						<MyNumberInput :myvalue="gridList.mildewGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'mildewGrain'"
+							@setValue="mykeywordset"  v-if="InputEvent=='mildewGrain'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('mildewGrain')"></MyNumberInput>
+						<input v-else v-model='gridList.mildewGrain' @click="SetInputKey('mildewGrain')" placeholder="请输入霉变粒占比" name="input" type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row">
 					<view class="title">热损伤（%）</view>
 					<view class="con-list">
-						<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比" name="input" type="digit"></input>
+						<MyNumberInput :myvalue="gridList.jiaorenli" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'jiaorenli'"
+							@setValue="mykeywordset"  v-if="InputEvent=='jiaorenli'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('jiaorenli')"></MyNumberInput>
+						<input v-else v-model='gridList.jiaorenli' @click="SetInputKey('jiaorenli')" placeholder="请输入热损伤占比" name="input" type="digit"></input>
 					</view>
 				</view>
 				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
@@ -446,7 +466,7 @@
 </template>
 
 <script>
-	const Equ_List=['ktv','ktv2'];
+	const Equ_List=['waterContent','bulkDensity','imperfectGrain','impurity','mildewGrain','jiaorenli'];
 	import dragButton from "@/components/drag-button/drag-button.vue";
 	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
 	import MyNumberInput from "@/components/MyNumberInput.vue";
@@ -896,45 +916,48 @@
 		},
 		methods: {
 			Cancelword(){
-							this.bottomHeight = '10rpx';
-							this.MykeywordShow =false;
-							this.InputEvent = '';
-						},
-						goNext(val){
-							var inputList = Equ_List;
-							if(this.menuIndex==1){
-								inputList = Sign_List;
-							}
-							var index = inputList.indexOf(val);
-							this.setScrollTops(val);
-							if(index<inputList.length-1){
-								this.InputEvent = inputList[index+1];
-							}else{
-								this.bottomHeight = '10rpx';
-								this.MykeywordShow = false;
-							}
-						},
-						mykeywordset(datatxt){
-							var arr = JSON.parse(datatxt);
-							this.gridList[arr.even] = arr.value;
-							if(arr.even=='waterContent'){
-								this.waterContentChange()
-							}
-						},
-						SetInputKey(even){
-							uni.hideKeyboard();
-							this.InputEvent = even;
-							this.setScrollTops(even);
-							if(!this.MykeywordShow){
-								this.bottomHeight = '320rpx';
-								this.MykeywordShow = true;
-							}
-						},
-						setScrollTops(even){
-							var inputList = Equ_List;
-							var index = inputList.indexOf(even);
-							this.viewTop = (index + 1) * 60 + 100;
-						},
+				this.bottomHeight = '10rpx';
+				this.MykeywordShow =false;
+				this.InputEvent = '';
+			},
+			goNext(val){
+				var inputList = Equ_List;
+				if(this.menuIndex==1){
+					inputList = Sign_List;
+				}
+				var index = inputList.indexOf(val);
+				this.setScrollTops(val);
+				if(index<inputList.length-1){
+					this.InputEvent = inputList[index+1];
+				}else{
+					this.InputEvent=''
+					this.bottomHeight = '10rpx';
+					this.MykeywordShow = false;
+				}
+			},
+			mykeywordset(datatxt){
+				var arr = JSON.parse(datatxt);
+				this.gridList[arr.even] = arr.value;
+				if(arr.even=='waterContent'){
+					this.waterContentChange()
+				}else if(arr.even=='bulkDensity'){
+					this.obtainPrice()
+				}
+			},
+			SetInputKey(even){
+				uni.hideKeyboard();
+				this.InputEvent = even;
+				this.setScrollTops(even);
+				if(!this.MykeywordShow){
+					this.bottomHeight = '320rpx';
+					this.MykeywordShow = true;
+				}
+			},
+			setScrollTops(even){
+				var inputList = Equ_List;
+				var index = inputList.indexOf(even);
+				this.viewTop = (index + 1) * 60 + 100;
+			},
 			pricefocus(e,status){
 				console.log(e)
 				if(status==1){

pages/erpbusiness/edit_quality_testing.vue

@@ -281,9 +281,19 @@
 				<view class="c-row ">
 					<view class="title">水分（%）</view>
 					<view class="con-list">
-						<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分"
+						<MyNumberInput :myvalue="gridList.waterContent" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'waterContent'"
+							@setValue="mykeywordset"  v-if="InputEvent=='waterContent'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('waterContent')"></MyNumberInput>
+						<input v-else :disabled='flag==1' @click="SetInputKey('waterContent')" v-model='gridList.waterContent' placeholder="初检水分"
 							@input="waterContentChange" type="digit" name="input"></input>
-						<input v-if='flag==1||flag==2' type="digit" v-model='gridList.reWaterContent' placeholder="复检水分"
+						<MyNumberInput :myvalue="gridList.reWaterContent" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'reWaterContent'"
+							@setValue="mykeywordset"  v-if="InputEvent=='reWaterContent'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('reWaterContent')"></MyNumberInput>
+						<input @click="SetInputKey('reWaterContent')" v-if="flag==1&&InputEvent!='reWaterContent'||flag==2&&InputEvent!='reWaterContent'" type="digit" v-model='gridList.reWaterContent' placeholder="复检水分"
 							name="input"></input>
 					</view>
 				</view>
@@ -291,45 +301,95 @@
 					<view v-if='gridList.goodsName!="大豆"' class="title">容重（克/升）</view>
 					<view v-else class="title">蛋白</view>
 					<view class="con-list">
-						<input :disabled='flag==1' type="digit" v-model='gridList.bulkDensity' placeholder="请输入容重"
+						<MyNumberInput :myvalue="gridList.bulkDensity" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'bulkDensity'"
+							@setValue="mykeywordset"  v-if="InputEvent=='bulkDensity'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('bulkDensity')"></MyNumberInput>
+						<input v-else  @click="SetInputKey('bulkDensity')" :disabled='flag==1' type="digit" v-model='gridList.bulkDensity' placeholder="请输入容重"
 							name="input"  @input="obtainPrice"></input>
-							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重" 
-								name="input"  @input="obtainPrice"></input>
+						<MyNumberInput :myvalue="gridList.reBulkDensity" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'reBulkDensity'"
+							@setValue="mykeywordset"  v-if="InputEvent=='reBulkDensity'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('reBulkDensity')"></MyNumberInput>
+						<input @click="SetInputKey('reBulkDensity')" v-if="flag==1&&InputEvent!='reBulkDensity'||flag==2&&InputEvent!='reBulkDensity'" type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重" 
+								name="input"></input>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">不完善粒（%）</view>
 					<view class="con-list">
-						<input :disabled='flag==1' type="digit" v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
+						<MyNumberInput :myvalue="gridList.imperfectGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'imperfectGrain'"
+							@setValue="mykeywordset"  v-if="InputEvent=='imperfectGrain'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('imperfectGrain')"></MyNumberInput>
+						<input v-else  @click="SetInputKey('imperfectGrain')" :disabled='flag==1' type="digit" v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
 							name="input"></input>
-							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reImperfectGrain' placeholder="请输入不完整粒占比"
+						<MyNumberInput :myvalue="gridList.reImperfectGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'reImperfectGrain'"
+							@setValue="mykeywordset"  v-if="InputEvent=='reImperfectGrain'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('reImperfectGrain')"></MyNumberInput>
+						<input  @click="SetInputKey('reImperfectGrain')" v-if="flag==1&&InputEvent!='reImperfectGrain'||flag==2&&InputEvent!='reImperfectGrain'" type="digit" v-model='gridList.reImperfectGrain' placeholder="请输入不完整粒占比"
 								name="input"></input>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">杂质（%）</view>
 					<view class="con-list">
-						<input :disabled='flag==1' type="digit" v-model='gridList.impurity' placeholder="请输入杂质占比"
+						<MyNumberInput :myvalue="gridList.impurity" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'impurity'"
+							@setValue="mykeywordset"  v-if="InputEvent=='impurity'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('impurity')"></MyNumberInput>
+						<input v-else  @click="SetInputKey('impurity')" :disabled='flag==1' type="digit" v-model='gridList.impurity' placeholder="请输入杂质占比"
 							name="input"></input>
-						<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reImpurity' placeholder="请输入杂质占比"
+							<MyNumberInput :myvalue="gridList.reImpurity" :Isedit="Isedit" :IsShow="MykeywordShow"
+								:myevent="'reImpurity'"
+								@setValue="mykeywordset"  v-if="InputEvent=='reImpurity'" 
+								@Cancelword="Cancelword" 
+								@goNext="goNext('reImpurity')"></MyNumberInput>
+						<input @click="SetInputKey('reImpurity')" v-if="flag==1&&InputEvent!='reImpurity'||flag==2&&InputEvent!='reImpurity'" type="digit" v-model='gridList.reImpurity' placeholder="请输入杂质占比"
 							name="input"></input>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">霉变粒（%）</view>
 					<view class="con-list">
-						<input :disabled='flag==1' type="digit" v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
+						<MyNumberInput :myvalue="gridList.mildewGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'mildewGrain'"
+							@setValue="mykeywordset"  v-if="InputEvent=='mildewGrain'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('mildewGrain')"></MyNumberInput>
+						<input v-else  @click="SetInputKey('mildewGrain')" :disabled='flag==1' type="digit" v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
 							name="input"></input>
-						<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reMildewGrain' placeholder="请输入霉变粒占比"
+						<MyNumberInput :myvalue="gridList.reMildewGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
+								:myevent="'reMildewGrain'"
+								@setValue="mykeywordset"  v-if="InputEvent=='reMildewGrain'" 
+								@Cancelword="Cancelword" 
+								@goNext="goNext('reMildewGrain')"></MyNumberInput>
+						<input @click="SetInputKey('reMildewGrain')" v-if="flag==1&&InputEvent!='reMildewGrain'||flag==2&&InputEvent!='reMildewGrain'" type="digit" v-model='gridList.reMildewGrain' placeholder="请输入霉变粒占比"
 							name="input"></input>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">热损伤（%）</view>
 					<view class="con-list">
-						<input :disabled='flag==1' type="digit" v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+						<MyNumberInput :myvalue="gridList.jiaorenli" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'jiaorenli'"
+							@setValue="mykeywordset"  v-if="InputEvent=='jiaorenli'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('jiaorenli')"></MyNumberInput>
+						<input v-else  @click="SetInputKey('jiaorenli')" :disabled='flag==1' type="digit" v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
 							name="input"></input>
-						<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reJiaorenli' placeholder="请输入热损伤占比"
+						<MyNumberInput :myvalue="gridList.reJiaorenli" :Isedit="Isedit" :IsShow="MykeywordShow"
+							:myevent="'reJiaorenli'"
+							@setValue="mykeywordset"  v-if="InputEvent=='reJiaorenli'" 
+							@Cancelword="Cancelword" 
+							@goNext="goNext('reJiaorenli')"></MyNumberInput>
+						<input  @click="SetInputKey('reJiaorenli')" v-if="flag==1&&InputEvent!='reJiaorenli'||flag==2&&InputEvent!='reJiaorenli'" type="digit" v-model='gridList.reJiaorenli' placeholder="请输入热损伤占比"
 							name="input"></input>
 						<!-- <input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input> -->
 					</view>
@@ -411,8 +471,12 @@
 </template>
 
 <script>
+
+	const Equ_List=['waterContent','bulkDensity','imperfectGrain','impurity','mildewGrain','jiaorenli'];
+	const Equ_List1=['reWaterContent','reBulkDensity','reImperfectGrain','reImpurity','reMildewGrain','reJiaorenli'];
 	import dragButton from "@/components/drag-button/drag-button.vue";
 	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
+	import MyNumberInput from "@/components/MyNumberInput.vue";
 	import {
 		mapState
 	} from 'vuex';
@@ -422,7 +486,8 @@
 	export default {
 		components: {
 			dragButton,
-			keyboard
+			keyboard,
+			MyNumberInput
 		},
 		data() {
 			return {
@@ -500,6 +565,9 @@
 				managementType: '',
 				warehouseName: '',
 				warehouseList: [],
+				InputEvent:'',
+				bottomHeight:'10rpx',
+				MykeywordShow:false,
 				showTran: true,
 				companyId: 1,
 				current: 4,
@@ -742,6 +810,54 @@
 			}
 		},
 		methods: {
+			Cancelword(){
+				this.bottomHeight = '10rpx';
+				this.MykeywordShow =false;
+				this.InputEvent = '';
+			},
+			goNext(val){
+				if(this.flag==0||this.flag==3||this.flag==4){
+					var inputList = Equ_List;	
+				}else{
+					var inputList = Equ_List1;
+				}
+				var index = inputList.indexOf(val);
+				this.setScrollTops(val);
+				if(index<inputList.length-1){
+					this.InputEvent = inputList[index+1];
+				}else{
+					this.InputEvent=''
+					this.bottomHeight = '10rpx';
+					this.MykeywordShow = false;
+				}
+			},
+			mykeywordset(datatxt){
+				var arr = JSON.parse(datatxt);
+				this.gridList[arr.even] = arr.value;
+				if(arr.even=='waterContent'){
+					this.waterContentChange()
+				}else if(arr.even=='bulkDensity'){
+					this.obtainPrice()
+				}
+			},
+			SetInputKey(even){
+				uni.hideKeyboard();
+				this.InputEvent = even;
+				this.setScrollTops(even);
+				if(!this.MykeywordShow){
+					this.bottomHeight = '320rpx';
+					this.MykeywordShow = true;
+				}
+			},
+			setScrollTops(even){
+				if(this.flag==0||this.flag==3||this.flag==4){
+					var inputList = Equ_List;	
+				}else{
+					var inputList = Equ_List1;
+				}
+				var index = inputList.indexOf(even);
+				this.viewTop = (index + 1) * 60 + 100;
+			},
 			pricefocus(e,status){
 				console.log(e)
 				if(status==1){

pages/erpbusiness/quality_testing.vue

@@ -366,6 +366,10 @@
 								}
 								this.isContent = true
 							}
+						}else{
+							if (this.currentPage == 1) {
+								that.gridList = []
+							}
 						}
 						// console.log(that.gridList)
 					})