Merge branch 'dev' into pre-production

src/views/distribution/reservation/reservationAddFrom.vue

@@ -1052,16 +1052,16 @@ export default {
           sortable: true,
         },
 
-        // {
+        {
-        //   prop: '',
+          prop: '',
-        //   label: '操作',
+          label: '操作',
-        //   type: 6,
+          type: 6,
-        //   values: '',
+          values: '',
-        //   width: '200',
+          width: '200',
-        //   checkarr: [],
+          checkarr: [],
-        //   fixed: 'right',
+          fixed: 'right',
-        //   hide: true,
+          hide: true,
-        // },
+        },
         // 更多列的配置...
       ],
       stockArtcolumnList: [

src/views/distribution/reservation/reservationDetails.vue

@@ -704,6 +704,17 @@
           }
         ],
         stockListColumnList:[
+          {
+            prop: 'incomingBatch',
+            label: '入库批次号',
+            type: 2,
+            values: '',
+            width: '160',
+            checkarr: [],
+            fixed: true,
+            sortable: true,
+            head: false
+          },
           {
             prop: 'orderCode',
             label: '订单自编号',