Merge branch 'master' of http://123.206.9.27:3000/zhangqingyu/BaoShengWave_vue

src/view/ware/storechange.vue

@@ -117,6 +117,8 @@
 				</el-table-column>
 				<el-table-column prop="carNo" label="入库车号" width="200" show-overflow-tooltip header-align="center">
 				</el-table-column>
+				<el-table-column prop="inwareDay" label="存储天数" width="100" show-overflow-tooltip header-align="center">
+				</el-table-column>
 			</el-table>
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 			 :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalRows">
@@ -440,6 +442,7 @@
 				}
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
+						console.log(response.data.data.list)
 						this.tableData = response.data.data.list
 						this.totalRows = response.data.data.total
 					} else {