Merge branch 'master' of https://git.7in6.com/dacheng/mes-dacheng-admin-backend-ui

src/view/inventory/ruku.vue

@@ -73,14 +73,14 @@
 			  <el-table-column align="left"  label="款式" prop="款式"  width="120"/>
 			  <el-table-column align="left"  label="物料编码" prop="物料编码"  width="150"/>
 			  <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
-			  <el-table-column align="left"  label="颜色" prop="颜色"  width="120"/>
+			  <el-table-column align="left"  label="颜色" prop="BOM_颜色"  width="120"/>
 			  <!-- <el-table-column align="left"  label="计划用料" prop="计划用料"  width="90"/> -->
 			  <!-- <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="90"/> -->
-			  <el-table-column align="left"  label="定额用料" prop="定额用料"  width="90"/>
+			  <el-table-column align="left"  label="定额用料" prop="实际门幅"  width="90"/>
 			  <el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="90"/>
-			  <el-table-column align="left"  label="入库数量" prop="入仓总量"  width="90"/>
+			  <el-table-column align="left"  label="入库数量" prop="数量"  width="90"/>
+			  <el-table-column align="left"  label="入仓总量" prop="入仓总量"  width="90"/>
 			  <el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
-			  <el-table-column align="left"  label="面料结余" prop="面料结余"  width="90"/>
 			  <el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
 			  <el-table-column align="left"  label="入库人员" prop="操作机台"  width="100"/>
 			  <el-table-column align="left"  label="入库日期" prop="日期"  width="160"/>

src/view/performance/chukubaogong.vue

@@ -73,14 +73,14 @@
 				<el-table-column align="left"  label="款式" prop="款式"  width="120"/>
 				<el-table-column align="left"  label="物料编码" prop="物料编码"  width="150"/>
 				<el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
-				<el-table-column align="left"  label="颜色" prop="颜色"  width="120"/>
+				<el-table-column align="left"  label="颜色" prop="BOM_颜色"  width="120"/>
 				<!-- <el-table-column align="left"  label="计划用料" prop="计划用料"  width="90"/> -->
 				<!-- <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="90"/> -->
-				<el-table-column align="left"  label="定额用料" prop="定额用料"  width="90"/>
+				<el-table-column align="left"  label="定额用料" prop="实际门幅"  width="90"/>
 				<el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="90"/>
-				<el-table-column align="left"  label="出库数量" prop="入仓总量"  width="90"/>
-				<el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
-				<el-table-column align="left"  label="面料结余" prop="面料结余"  width="90"/>
+				<el-table-column align="left"  label="出库数量" prop="数量"  width="90"/>
+				<el-table-column align="left"  label="入仓总量" prop="入仓总量"  width="90"/>
+				<el-table-column align="left"  label="库存数量" prop="库存数量"  width="90"/>
 				<el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
 				<el-table-column align="left"  label="出库人员" prop="操作机台"  width="100"/>
 				<el-table-column align="left"  label="出库日期" prop="日期"  width="160"/>