4.8线上问题修改

apis/http.js

@@ -3,12 +3,12 @@ class HttpConfig {
 	baseUrl = "/api"
 	// #endif
 	// #ifdef APP-PLUS
-	// baseUrl = "http://112.29.103.165:21624"
+	baseUrl = "http://112.29.103.165:21624"
 	// baseUrl = "http://192.168.0.14:21624"
-	baseUrl = "http://112.29.103.165:21626"
+	// baseUrl = "http://112.29.103.165:21626"
 	// baseUrl = "http://172.20.10.3:8080"
 	// baseUrl = "http://10.40.92.13:8080"
-	// baseUrl = "http://10.40.92.94:8080"
+	// baseUrl = "http://10.40.92.75:8080"
 	// baseUrl = "http://10.40.92.8:8080"
 	// baseUrl = "https://z.csgmall.com.cn/gl"	
 	// #endif

pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue

@@ -189,7 +189,7 @@
 				}) */
 				const userId = uni.getStorageSync('userInfo').userid
 				uni.navigateTo({
-					url: `/pages/QRIn/QRIn?typeId=${that.infoList.typeId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
+					url: `/pages/QRIn/QRIn?typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
 				})
 			},
 			codeOut() {
@@ -202,6 +202,7 @@
 					taskId,
 					id,
 					typeId,
+					modelId,
 					manageType,
 					typeName,
 					typeCode,
@@ -211,6 +212,7 @@
 					taskId,
 					id,
 					typeId,
+					modelId,
 					manageType,
 					userId,
 					typeName,

pages/codeReceive/codeReceive.vue

@@ -202,9 +202,7 @@
 									icon: 'none',
 									title: res.data.msg,
 									success: () => {
-										uni.navigateBack({
-											delta: 2
-										})
+										uni.navigateBack()
 									}
 								})
 								// that.searchCode()
@@ -228,7 +226,7 @@
 		onLoad(params) {
 			console.log("init",params);
 			this.transCode = params.maCode
-			this.typeId = params.typeId
+			this.typeId = params.modelId
 			this.num = params.num
 			this.parentId = params.id
 			this.manageType = params.manageType

pages/login/login.vue

@@ -164,6 +164,8 @@ import { authPath, publicPath, systemPath } from '../../public'
 						if (res.data.code == 200) {
 							uni.setStorageSync('userInfo', res.data.data)
 							uni.setStorageSync('token', res.data.data.token)
+							uni.setStorageSync('roles', res.data.data.login_user.roles)
+							uni.setStorageSync('deptId', res.data.data.login_user.sysUser.dept.deptId)
 							uni.showToast({
 								icon: 'none',
 								title: '登录成功！',

pages/numReceive/numReceive.vue

@@ -85,6 +85,7 @@
 						title: '请确保退料总量不为0！'
 					})
 				} else {
+					console.log(this.handleSubmitData());
 					that.$api.backMaterialReceive.backMaterialSetNumBack({
 						taskId: this.upperInfo.taskId,
 						arr: this.handleSubmitData()