Merge branch 'main' of http://192.168.0.56:3000/hywen/SmartStorage

apis/apiTest.js

@@ -105,6 +105,13 @@ const fetchMaterialOutStore = {
 			header
 		)
 	},
+	async fetchInfoByQrCode(data = {}){
+		return await Http.get(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.fetchMaterialOutStore.fetchInfoByQrCode,
+			data
+		)
+	}
 }
 
 const exitMaterial = {

apis/http.js

@@ -49,6 +49,7 @@ class HttpConfig {
 		},
 		fetchMaterialOutStore: {
 			fetchInfoByCode: '/leaseOutDetails/getMaMachineByCode', // 根据maId获取机具详情
+			fetchInfoByQrCode: '/leaseOutDetails/getMaMachineByQrCode ',
 			subOutStore: '/leaseOutDetails/submitOut', // 领料出库提交
 		},
 		exitMaterial: {

pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue

@@ -107,6 +107,10 @@
 		},
 		methods: {
 			openPopup (list) {
+				// if(list.outNum && list.o){
+					
+				// }
+				
 				this.infoList = list
 				console.log(this.infoList.manageType, this.infoList);
 				if (this.infoList.manageType == 0) {

pages/orderCart/orderCart.vue

@@ -250,7 +250,9 @@ import { basePath } from '../../public';
 			
 			async formSubmit () {
 				await this.getgreementId()
-				
+				if(this.deptFormData.deptName = ''){
+					return;
+				}
 				let that = this
 				that.$refs.deptForm.validate().then(formData => {
 					console.log(formData);

pages/scanOutStore/scanOutStore.vue

@@ -99,10 +99,10 @@
 			this.num = params.num
 			this.parentId = params.parentId
 			// 根据扫出的编码查询设备
-			that.$api.fetchMaterialOutStore.fetchInfoByCode({
+			that.$api.fetchMaterialOutStore.fetchInfoByQrCode({
-				maCode: params.code
+				qrCode: params.code
 			}, null).then(res => {
-				console.log(res);
+				console.log('fetchInfoByQrCode =================================',res);
 				if (res.data.rows.length == 0) {
 					uni.showToast({
 						icon: 'none',