diff --git a/src/manifest.json b/src/manifest.json index 4bdfb25..4000fae 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,5 +1,5 @@ { - "name" : "鸿翔", + "name" : "富维汽车镜", "appid" : "__UNI__DA78BC9", "description" : "", "versionName" : "1.0.0", diff --git a/src/pages/index.vue b/src/pages/index.vue index ad4dcf1..c0ba226 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -46,7 +46,7 @@ - 采购入库11 + 采购入库 diff --git a/src/pages/outLocation/addForm.vue b/src/pages/outLocation/addForm.vue index 44fe33c..0bd3d54 100644 --- a/src/pages/outLocation/addForm.vue +++ b/src/pages/outLocation/addForm.vue @@ -84,7 +84,7 @@ - + cur.itemNumber == item.itemNumber&&item.isInAccount == 'FALSE'&&cur.isInAccount == 'TRUE') + if(bol){ + proxy.$modal.showToast('请先删除该备件得帐内库') + return; + } form.value.itemNumbers.splice(index, 1) } function getLocation() { diff --git a/src/pages/sparePartsReturn/addForm.vue b/src/pages/sparePartsReturn/addForm.vue index 2a8e62d..db244e4 100644 --- a/src/pages/sparePartsReturn/addForm.vue +++ b/src/pages/sparePartsReturn/addForm.vue @@ -243,8 +243,9 @@ const singleColumnShow = ref(false) proxy.$modal.showToast('该库位属于帐内库,请选择帐外库') return; } + console.log(itemNumber.value) if (itemNumber.value) { - proxy.$modal.showToast(msg.value) + proxy.$modal.showToast('该库位已绑定过其他备件') return; } if (!form1.value.qty) { @@ -275,8 +276,12 @@ const singleColumnShow = ref(false) function getLocation() { locationApi.getLocation(form1.value.locationNumber).then(res => { if(!res.data){ - proxy.$modal.showToast(res.msg) - msg.value = res.msg + if(res.msg){ + proxy.$modal.showToast(res.msg) + msg.value = res.msg + }else{ + proxy.$modal.showToast('找不到该库位') + } return; } locationItem.value = res.data @@ -335,7 +340,7 @@ const singleColumnShow = ref(false) isShow.value =true } }).catch((err)=>{ - msg.value = res.msg + msg.value = err.msg itemNumber.value = '' form1.value.areaNumber = '' form1.value.itemName = ''