Merge branch 'bug' into develop

src/views/supply/engin/engin_list.vue

@@ -306,12 +306,18 @@
             </el-table-column>
             <el-table-column
               align="right"
-              label="已发货数"
+              label="出库数量"
               prop="hasDeliverQty"
               min-width="100"
               show-overflow-tooltip
             />
-
+            <el-table-column
+              align="right"
+              label="发货数量"
+              prop="hasSendQty"
+              min-width="100"
+              show-overflow-tooltip
+            />
             <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.price | numToFixed }}