695593266@qq.com 8 месяцев назад
Родитель
Сommit
88d2fe3336

+ 4 - 2
src/views/pick/pickApply/components/selfBuildPick.vue

@@ -74,6 +74,9 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip>
+          </el-table-column>
+
           <el-table-column label="名称" prop="name" show-overflow-tooltip>
             <template slot-scope="{ row, $index }">
               <span
@@ -95,8 +98,6 @@
             show-overflow-tooltip
           >
           </el-table-column>
-          <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip>
-          </el-table-column>
 
           <el-table-column label="数量" prop="demandQuantity">
             <template slot-scope="{ row, $index }">
@@ -221,6 +222,7 @@
         list.forEach((item) => {
           item.code = item.categoryCode;
           item.name = item.categoryName;
+          item.modelType = item.categoryModel;
           item.measuringUnit = item.measuringUnit
             ? item.measuringUnit
             : item.measureUnit;

+ 7 - 0
src/views/pick/pickApply/components/selfDetailed.vue

@@ -133,6 +133,13 @@
             showOverflowTooltip: true,
             slot: 'index'
           },
+          {
+            width: 100,
+            prop: 'batchNo',
+            label: '批次号',
+            slot: 'batchNo',
+            align: 'center'
+          },
 
           {
             prop: 'categoryCode',

+ 1 - 0
src/views/produce/components/picking/index.vue

@@ -676,6 +676,7 @@
         list.forEach((item) => {
           item.code = item.categoryCode;
           item.name = item.categoryName;
+          item.modelType = item.modelType ? item.modelType : item.categoryModel;
           item.measuringUnit = item.measuringUnit
             ? item.measuringUnit
             : item.measureUnit;