ccjgmwz 3 years ago
parent
commit
4bb1328aa7

+ 5 - 1
common/helper.js

@@ -11,9 +11,13 @@ const isArray = Array.isArray || function (obj) {
 };  
 const getListByUserId = function(){
 	let baseUrlNew = config.def().baseUrlNew
+	var userInfo = uni.getStorageSync("userInfo")
 	uni.request({
 	    url: baseUrlNew + '/roleMenu/query/getListByUserId',
-	    method: 'GET',
+	    data: {
+	    	userId: userInfo.id
+	    },
+		method: 'GET',
 	    success: (res) => {			
 	    	if (res.statusCode === 200) {
 				uni.setStorageSync("jurisdiction", res.data.data)

+ 2 - 2
config/index.js

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

+ 2 - 2
manifest.json

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

+ 8 - 2
pages/erp/exWarehousing/exWarehousing.vue

@@ -96,8 +96,8 @@
 				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
 				<u-picker v-model="show9" mode="selector" range-key="name" :range="multiSelector1" @confirm='usestartChange($event)'>
 				</u-picker> -->
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入箱号"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>
@@ -319,6 +319,12 @@
 			this.handler()
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
 			usestartChange(e){
 				this.usestart=this.multiSelector1[e].name
 			},

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

@@ -94,8 +94,8 @@
 			</view>
 			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1"  class="right-bottom" placeholder="请输入箱号"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>
@@ -297,6 +297,12 @@
 			this.handler()
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
 			outtypeChange(e){
 				this.detailData.outType=this.multiSelector[e].name
 				console.log(e)

+ 0 - 1
pages/user/depotMonitoring.vue

@@ -81,7 +81,6 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			debugger
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {