diff --git a/apis/apiTest.js b/apis/apiTest.js index a04cace..842ad17 100644 --- a/apis/apiTest.js +++ b/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 = { diff --git a/apis/http.js b/apis/http.js index 82b310e..770ea4d 100644 --- a/apis/http.js +++ b/apis/http.js @@ -49,6 +49,7 @@ class HttpConfig { }, fetchMaterialOutStore: { fetchInfoByCode: '/leaseOutDetails/getMaMachineByCode', // 根据maId获取机具详情 + fetchInfoByQrCode: '/leaseOutDetails/getMaMachineByQrCode ', subOutStore: '/leaseOutDetails/submitOut', // 领料出库提交 }, exitMaterial: { diff --git a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue b/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue index 99afa52..ba0286a 100644 --- a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue +++ b/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) { diff --git a/pages/orderCart/orderCart.vue b/pages/orderCart/orderCart.vue index 9e5c9b0..aec9fb0 100644 --- a/pages/orderCart/orderCart.vue +++ b/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); diff --git a/pages/scanOutStore/scanOutStore.vue b/pages/scanOutStore/scanOutStore.vue index aaf5b0e..e46ee3c 100644 --- a/pages/scanOutStore/scanOutStore.vue +++ b/pages/scanOutStore/scanOutStore.vue @@ -99,10 +99,10 @@ this.num = params.num this.parentId = params.parentId // 根据扫出的编码查询设备 - that.$api.fetchMaterialOutStore.fetchInfoByCode({ - maCode: params.code + that.$api.fetchMaterialOutStore.fetchInfoByQrCode({ + qrCode: params.code }, null).then(res => { - console.log(res); + console.log('fetchInfoByQrCode =================================',res); if (res.data.rows.length == 0) { uni.showToast({ icon: 'none',