2

frontend/pages/supplier/select.vue

@@ -35,12 +35,21 @@
 			},
 			createSupplier() { uni.navigateTo({ url: '/pages/supplier/form' }) },
 			select(s) {
-				const opener = getCurrentPages()[getCurrentPages().length-2]
-				if (opener && opener.$vm) {
-					opener.$vm.order.supplierId = s.id
-					opener.$vm.supplierName = s.name
+				try {
+					const pages = getCurrentPages()
+					const opener = pages && pages.length >= 2 ? pages[pages.length - 2] : null
+					const vm = opener && opener.$vm ? opener.$vm : null
+					const canPick = !!(vm && vm.order)
+					if (canPick) {
+						vm.order.supplierId = s.id
+						if (Object.prototype.hasOwnProperty.call(vm, 'supplierName')) vm.supplierName = s.name
+						uni.navigateBack()
+					} else {
+						uni.navigateTo({ url: `/pages/supplier/form?id=${s.id}` })
+					}
+				} catch (_) {
+					uni.navigateTo({ url: `/pages/supplier/form?id=${s.id}` })
 				}
-				uni.navigateBack()
 			}
 		}
 	}