Merge branch 'dev' into 'master'

Dev

See merge request !83

src/views/order/pod/index.vue

@@ -1604,6 +1604,11 @@ const saveCompleteShipment = async () => {
   } catch (e) {
   } catch (e) {
     return
     return
   }
   }
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
   const productIdList = selection.value.map(
   const productIdList = selection.value.map(
     (item: CardOrderData | PodProductList) => item.id,
     (item: CardOrderData | PodProductList) => item.id,
   )
   )
@@ -1617,6 +1622,8 @@ const saveCompleteShipment = async () => {
     loadDiffList()
     loadDiffList()
   } catch (e) {
   } catch (e) {
     console.error(e)
     console.error(e)
+  }finally {
+    loading.close()
   }
   }
 }
 }