前端

components/master-keyboard/master-keyboard.vue

@@ -121,7 +121,7 @@
 			return {
 				numberArr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
 				carProvinceArr: ['京', '津', '渝', '沪', '冀', '晋', '辽', '吉', '黑', '苏', '浙', '皖', '闽', '赣', '鲁', '豫',
-					'鳄', '湘', '粤', '琼', '川', '贵', '云', '陕', '甘', '青', '蒙', '桂', '宁', '新', '藏', '使',
+					'鄂', '湘', '粤', '琼', '川', '贵', '云', '陕', '甘', '青', '蒙', '桂', '宁', '新', '藏', '使',
 					'领', '警', '学', '港', '澳'
 				],
 				carLatterArr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',

config/index.js

@@ -1,10 +1,9 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.1.122:8090/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.67",
-    "versionCode" : 1167,
+    "versionName" : "1.1.68",
+    "versionCode" : 1168,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/erp/exWarehousing/exWarehousing.vue

@@ -111,7 +111,7 @@
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true"  class="right-bottom" placeholder="请输入车牌号1" v-if="!showCar"></input>
+				<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&&carjudge"></input>
 				<view v-else v-show="showCar" @click="carno = true">
 					<view v-if="detailData.tranCarNo">
@@ -433,9 +433,11 @@
 			        if(!this.carjudge){
 			            this.detailData.selfLoading = "0"
 			            this.carChange1="手动填写"
+						this.detailData.carNo = ""
 			        }else{
 			            this.detailData.selfLoading = "1"
 			            this.carChange1="识别下拉"
+						this.detailData.carNo = ""
 			        }
 			      },
 			print() {

pages/erp/index.vue

@@ -140,6 +140,7 @@
 								],
 				gridList: [
 					{
+
 						num: 0,
 						name: '入库',
 						// icon: 'cuIcon-apps',
@@ -211,6 +212,7 @@
 						// 	url: `/pages/erpbusiness/quality_testing?managementType=1`,
 						// 	show: true
 						// }
+
 					// {
 					// 	num: 4,
 					// 	name: '开通业务',