Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/views/wms/outorder/index.vue

@@ -130,7 +130,8 @@
 				<el-table-column type="selection" width="55" align="center" :index="indexMethod" />
 				<el-table-column label="序号" type="index"> </el-table-column>
 				<el-table-column label="物料描述" align="center" prop="materialDesc" />
-				<el-table-column label="物料编号" align="center" prop="materialCode" />
+				<el-table-column label="物料编号" align="center" prop="materialCode"   v-if="false" />
+        <el-table-column label="物料编号" align="center" prop="materialCodeKEN" />
 				<el-table-column label="单位" align="center" prop="unit" />
 				<el-table-column label="计划数量" align="center" prop="planNumber" />
 				<el-table-column label="出库数量" align="center" prop="outNumber" />