Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/views/tirePartsMall/activity/assembly/assemblyDetails.vue

@@ -268,6 +268,10 @@ export default {
     },
     methods: {
         importStagList(row, index, type) {
+            if (Number(row.inventory) <= 0) {
+                this.$message.error("所选商品的库存不能为0")
+                return
+            }
             this.goodsListSave.push(row);
         },
         removeStagList(row, index, type) {