diff --git a/src/components/item/slectItemList.vue b/src/components/item/slectItemList.vue index f1cb8a3..632a6cd 100644 --- a/src/components/item/slectItemList.vue +++ b/src/components/item/slectItemList.vue @@ -118,6 +118,7 @@ function showImage(path) { // 关闭全屏图片弹窗 function closeImagePopup() { + uni.hideLoading() isImagePopupVisible.value = false; } diff --git a/src/pages/sparePartsServiceWorkOrderList/addForm.vue b/src/pages/sparePartsServiceWorkOrderList/addForm.vue index 2bc04ac..0663fcb 100644 --- a/src/pages/sparePartsServiceWorkOrderList/addForm.vue +++ b/src/pages/sparePartsServiceWorkOrderList/addForm.vue @@ -369,24 +369,29 @@ proxy.$modal.showToast('请选择备件'); return; } - uni.showLoading({ - title: "加载中....", - mask: true - }); - form1.value['itemNumber'] = form.value.number - choosesingleColumnItem.value = sparePartsList.value.filter(item => item.number == form.value.number) - form1.value.name = form.value.name - form1.value.locationNumber = choosesingleColumnItem.value[0].locationNumber - form1.value.areaNumber = choosesingleColumnItem.value[0].areaNumber - if (!choosesingleColumnItem.value[0].locationNumber) { - isShow.value = true - } else { - isShow.value = false - itemNumber.value = '' + if (type == 1) { + uni.showLoading({ + title: "加载中....", + mask: true + }); + form1.value['itemNumber'] = form.value.number + choosesingleColumnItem.value = sparePartsList.value.filter(item => item.number == form.value.number) + form1.value.name = form.value.name + form1.value.locationNumber = choosesingleColumnItem.value[0].locationNumber + form1.value.areaNumber = choosesingleColumnItem.value[0].areaNumber + if (!choosesingleColumnItem.value[0].locationNumber) { + isShow.value = true + } else { + isShow.value = false + itemNumber.value = '' + } + await getSparePartsList(null); + isShowSelectItem.value = false; + uni.hideLoading() + }else{ + isShowSelectItem.value = false; + uni.hideLoading() } - await getSparePartsList(null); - isShowSelectItem.value = false; - uni.hideLoading() }