gjy 3 anos atrás
pai
commit
50fe460ec2

+ 1 - 1
components/master-keyboard/master-keyboard.scss

@@ -4,7 +4,7 @@
 	position: fixed;
 	bottom: 0;
 	left: 0;
-	z-index:11;
+	z-index:10000;
 	padding-top: 10rpx;
 	padding-bottom: 20rpx;
 	.down_wrap{

+ 2 - 1
config/index.js

@@ -1,6 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.119:9100/',
+	// baseUrlNew: 'http://192.168.1.119:9100/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 1 - 0
pages/erp/exWarehousing/exWarehousing.vue

@@ -461,6 +461,7 @@
 					} else if (this.detailData.inOutType == '采购出库') {
 						this.detailData.inOutTypeKey = 6
 					}
+					console.log(this.detailData.inOutType)
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 5,

+ 2 - 2
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="warp">
+	<view @click='hidden' class="warp">
 		<view class="top">
 			<view class="top-left">{{warehouseName}}</view>
 			<view>{{binNumber}}仓位</view>
@@ -97,7 +97,7 @@
 			<view class="row row-bottom">
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard" disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
 				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->

+ 17 - 2
pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="warp">
+	<view @click='hidden' class="warp">
 		<view class="top">
 			<view class="top-left">{{warehouseName}}</view>
 			<view>{{binNumber}}仓位</view>
@@ -106,7 +106,9 @@
 			<view class="row row-bottom" v-if="detailData.outType!='火运' && detailData.outType!='散船'">
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard" disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
+				<!-- <input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input> -->
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
 				<view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
@@ -380,6 +382,19 @@
 			},
 		},
 		methods: {
+			hidden(){
+				this.$refs.keyboard.open(false)
+			},
+			handleShowKeyboard(){
+				if(this.$refs.keyboard.open){
+					this.$refs.keyboard.open(true)//true 键盘显示 false 键盘隐藏
+				}else{
+					this.$refs.keyboard[0].open(true)
+				}
+			},
+			handleClick(e){
+				this.detailData.carNo = e.value //键盘输入值
+			},
 			inOutNo(){
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', 
 				{flag:2,warehouseName:this.warehouseName,