Merge remote-tracking branch 'origin/master'

src/views/modules/finishedProductWarehouse/otherOut.vue

@@ -279,7 +279,6 @@ export default {
         let status = JSON.parse(JSON.stringify(this.dataList)).filter(item => item.statusDb !== 'I' &&  item.statusDb !== 'S')
         let flag = true
         if (status.length > 0) {
-          this.$message.warning("数据中包含不在库的卷!")
           await this.$confirm('数据中包含不在库的卷, 是否继续?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -301,7 +300,7 @@ export default {
               this.dataList = []
               this.$message.success('出库成功')
             } else {
-              this.$message.warning('出库失败')
+              this.$message.warning('出库失败'+data.msg)
             }
 
           })