Merge branch 'master' into 测试

src/views/production/warehouse/check/index.vue

@@ -181,6 +181,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "盘点单号",
+        prop: "code",
+        width: 200,
+      },
+    },
+    {
+      attrs: {
         label: "归属事业部",
         prop: "departmentName",
         "min-width": 160,
@@ -229,7 +236,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "品号",
         prop: "bomSpecCode",
-        width: 160,
+        width: 150,
       },
     },
     {
@@ -243,7 +250,7 @@ const configTwo = computed(() => {
       attrs: {
         label: "结存单价",
         prop: "balanceUnitPrice",
-        width: 140,
+        width: 120,
         algin: "right",
       },
     },
@@ -251,55 +258,55 @@ const configTwo = computed(() => {
       attrs: {
         label: "仓库名称",
         prop: "warehouseName",
-        width: 160,
+        width: 140,
       },
     },
     {
       attrs: {
         label: "归属事业部",
         prop: "departmentName",
-        width: 160,
+        width: 140,
       },
     },
     {
       attrs: {
         label: "单位",
         prop: "bomUnit",
-        width: 140,
+        width: 100,
       },
     },
     {
       attrs: {
         label: "盘前数量",
         prop: "surplusStock",
-        width: 140,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "盘后数量",
         prop: "checkQuantity",
-        width: 140,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "盘盈/亏数量",
         slot: "quantity",
-        width: 140,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "盘盈/亏金额",
         slot: "money",
-        width: 140,
+        width: 120,
       },
     },
     {
       attrs: {
         label: "备注",
-        slot: "remark",
+        prop: "remark",
         width: 140,
       },
     },
@@ -407,8 +414,7 @@ const calculationMoney = (row) => {
     num = Number(num) - Number(row.surplusStock);
   }
   if (row.balanceUnitPrice) {
-    money = Number(Math.round(money * Number(row.balanceUnitPrice) * 100) / 100);
-    return money;
+    return Number(Math.round(num * Number(row.balanceUnitPrice) * 100) / 100);
   } else {
     return 0;
   }