Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	pages/erpbusiness/index.vue

components/master-keyboard/master-keyboard.scss

@@ -18,6 +18,17 @@
 			height: 48rpx;
 		}
 	}
+	.number_next{
+		width: 100%;
+		height: 80rpx;
+		margin-top: 10rpx;
+		background-color: white;
+		border-radius: 10rpx;
+		text-align: center;
+		line-height: 80rpx;
+		box-sizing: border-box;
+		display: block;
+	}
 	.kerboard_number{
 		width: 100%;
 		display: flex;

components/master-keyboard/master-keyboard.vue

@@ -25,6 +25,10 @@
 					</block>
 				</view>
 			</view>
+			<view class="next-btn">
+				<view class='number_next' @click="nextBtnClick(0)">上一项</view>
+				<view class='number_next' @click="nextBtnClick(1)">下一项</view>
+			</view>
 		</block>
 		<block v-else-if="keyboardtype == 'car'">
 			<view class="keyboard_car">
@@ -92,6 +96,10 @@
 	export default {
 		name: "master-keyboard",
 		props: {
+		fatherMethod: {
+				type: Function,
+				default: null
+			  },
 			keyboardtype: {
 				type: String,
 				default: 'number' // number=数字键盘 digit=带小数点的数字键盘  idcard=身份证号键盘  car=车牌号键盘
@@ -166,6 +174,12 @@
 		},
 		onLoad() {},
 		methods: {
+			nextBtnClick(type){debugger
+				let that = this
+				if (this.fatherMethod) {
+				          this.fatherMethod(type);
+					}
+			},
 			formatCarProvinceFirst(value) {
 				const list = ['使', '领', '警', '学', '港', '澳', ]
 				return list.indexOf(value)
@@ -303,4 +317,12 @@
 
 <style scoped lang="scss">
 	@import './master-keyboard.scss';
+	.next-btn{
+		display: flex;
+		justify-content: space-evenly;
+		.number_next{
+			width: 45%;
+		}
+		
+		}
 </style>

pages/erp/exWarehousing/exWarehousing.vue

@@ -462,7 +462,6 @@
 					}else{
 						this.detailData.tips = '买方' + this.contractNoList[i].buyer
 					}
-					
 				} else if (this.detailData.inOutType == '移库出库') {
 					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
 				}

pages/erpbusiness/edit_quality_testing.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view ref="all-input">
 		<view @click='hidden' class='wrap'>
 			<view class='title_b'>基本信息</view>
 			<view class="c-row ">
@@ -162,8 +162,10 @@
 				<view class="c-row ">
 					<view class="title">热损伤（%）</view>
 					<view class="con-list">
-						<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
-							name="input"></input>
+						<!-- <input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+							name="input"></input> -->
+							<input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input>
+							<master-keyboard :fatherMethod="focusConfig" ref="keyboard1" keyboardtype="digit" :randomNumber="true" :newCar="false" :defaultValue="gridList.jiaorenli" @keyboardClick="handleClick1"></master-keyboard>
 					</view>
 				</view>
 			</view>
@@ -329,6 +331,13 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		methods: {
+			focusConfig(type){
+				console.log('childclick',type)
+				// 0是上一项
+				if(type==0){
+					
+				}else{}
+			},
 			hidden(){
 				this.$refs.keyboard.open(false)
 			},
@@ -341,9 +350,21 @@
 					}
 				}
 			},
+			handleShowKeyboard1(){
+				if(this.flag==0){
+					if(this.$refs.keyboard1.open){
+						this.$refs.keyboard1.open(true)//true 键盘显示 false 键盘隐藏
+					}else{
+						this.$refs.keyboard1[0].open(true)
+					}
+				}
+			},
 			handleClick(e){
 				this.gridList.carNumber = e.value //键盘输入值
 			},
+			handleClick1(e){
+				this.gridList.jiaorenli = e.value //键盘输入值
+			},
 			change(e){
 				if(e){
 					this.gridList.supplementaryRecording=1