Merge branch '出入库流水' into 测试

src/views/production/warehouse/flow-record/index.vue

@@ -110,7 +110,7 @@ const searchConfig = computed(() => {
 });
 const config = computed(() => {
   return [
-    {
+  {
       attrs: {
         label: "出入库单号",
         prop: "code",
@@ -119,23 +119,16 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "采购单号",
-        prop: "purchaseCode",
-        width: 160,
-      },
-    },
-    {
-      attrs: {
         label: "归属事业部",
         prop: "departmentName",
-        width: 160,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "仓库类型",
         prop: "warehouseType",
-        width: 140,
+        width: 120,
       },
       render(val) {
         return proxy.dictKeyValue(val, proxy.useUserStore().allDict["warehouse_type"]);
@@ -143,16 +136,9 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "仓库名称",
-        prop: "warehouseName",
-        width: 160,
-      },
-    },
-    {
-      attrs: {
         label: "出入库类型",
         prop: "detailType",
-        width: 140,
+        width: 120,
       },
       render(val, row) {
         if (row.type === 1) {
@@ -171,21 +157,28 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "品品名",
+        label: "品名",
         prop: "bomSpecName",
         "min-width": 240,
       },
     },
     {
       attrs: {
-        label: "数量",
+        label: "出入库数量",
         prop: "quantity",
+        width: 100,
+      },
+    },
+    {
+      attrs: {
+        label: "库存数量",
+        prop: "balanceInventoryQuantity",
         width: 120,
       },
     },
     {
       attrs: {
-        label: "出入库时间",
+        label: "操作时间",
         prop: "createTime",
         width: 160,
         align: "center",
@@ -193,9 +186,9 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "出入库申请人",
+        label: "操作人",
         prop: "applicant",
-        width: 160,
+        width: 150,
         align: "center",
       },
     },