Merge remote-tracking branch 'origin/dev' into dev

src/views/mail/order/add.vue

@@ -424,7 +424,7 @@
                   @timeCheck="timescInventory"
                   @btnCheck="btnscInventory"
                   @selectCheck="searchStockList"
-                  @selection="selectionChange"
+                  @selection="selectionInventoryChange"
           >
 <!--            ref="multipleTable"-->
 
@@ -1088,16 +1088,16 @@
             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: [