1.托盘库存品

src/views/basicdata/warehouse/tray/basicdataTrayedt.vue

@@ -272,6 +272,16 @@ export default {
             search: true,
             width: '100px',
           },
+          {
+            label: '操作时间',
+            prop: 'operateTime',
+            width: '100px',
+          },
+          {
+            label: '操作人',
+            prop: 'operateUserName',
+            width: '100px',
+          },
         ],
       },
 
@@ -399,6 +409,16 @@ export default {
             prop: 'layerNum',
             width: '100px',
           },
+          {
+            label: '操作时间',
+            prop: 'operateTime',
+            width: '100px',
+          },
+          {
+            label: '操作人',
+            prop: 'operateUserName',
+            width: '100px',
+          },
         ],
       },
       // 库存品表单配置
@@ -471,6 +491,16 @@ export default {
             prop: 'layerNum',
             width: '100px',
           },
+          {
+            label: '操作时间',
+            prop: 'operateTime',
+            width: '100px',
+          },
+          {
+            label: '操作人',
+            prop: 'operateUserName',
+            width: '100px',
+          },
         ],
       },
       // 订单表单配置
@@ -776,6 +806,16 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          label: '操作时间',
+          prop: 'operateTime',
+          width: '100px',
+        },
+        {
+          label: '操作人',
+          prop: 'operateUserName',
+          width: '100px',
+        },
       ],
       inventoryoptioncolumn: [
         {
@@ -845,8 +885,8 @@ export default {
           head: false,
         },
         {
-          prop: 'shoppingMall',
-          label: '所属商场',
+          prop: 'marketName',
+          label: '商场名称',
           type: 1,
           values: '',
           width: '150',
@@ -888,6 +928,27 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'num',
+          label: '数量',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          label: '操作时间',
+          prop: 'operateTime',
+          width: '150px',
+        },
+        {
+          label: '操作人',
+          prop: 'operateUserName',
+          width: '150px',
+        },
       ],
       optioncolumn: [
         {
@@ -989,6 +1050,16 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          label: '操作时间',
+          prop: 'operateTime',
+          width: '100px',
+        },
+        {
+          label: '操作人',
+          prop: 'operateUserName',
+          width: '100px',
+        },
       ],
     };
   },

src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue

@@ -485,8 +485,8 @@ export default {
             width: '100px',
           },
           {
-            label: '所属商场',
-            prop: 'shoppingMall',
+            label: '商场名称',
+            prop: 'marketName',
             search: true,
             width: '100px',
           },
@@ -887,8 +887,8 @@ export default {
           head: false,
         },
         {
-          prop: 'shoppingMall',
-          label: '所属商场',
+          prop: 'marketName',
+          label: '商场名称',
           type: 1,
           values: '',
           width: '150',