Merge branch 'master' of ssh://123.56.95.229:29418/高精

2020-04-25 10:45:52 +08:00
parent a7c9870526 a9fa3746db
commit f8810e49bb
14 changed files with 110 additions and 57 deletions
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -88,7 +88,7 @@
                </el-table-column>
                <el-table-column label="库存" align="center" width="50">
                  <template slot-scope="scope">
-                    {{ scope.row.货位存量1 }}
+                    {{ scope.row.货位存量1 ? scope.row.货位存量1 : 0 }}
                  </template>
                </el-table-column>
                <el-table-column label="已领" align="center" width="50">
@@ -735,7 +735,8 @@ export default {
    background: #D8DDE6 !important;
  }
  .el-table .weilingwan-row {
-    background: #E9F0F9 !important;
+    background: #4395D0 !important;
+    color: white;
  }
 </style>