Merge branch '销售出货表' into 测试

src/views/group/finance/sales-shipment/index.vue

@@ -38,27 +38,27 @@
       <el-table-column label="万里牛单号" prop="wlnCode" width="140" />
       <el-table-column label="SKU单号" prop="skuSpecCode" width="140" />
       <el-table-column label="SKU品号" prop="skuSpecName" width="180" />
-      <el-table-column label="SKU数量" prop="quantitySKU" width="90" />
+      <el-table-column label="SKU数量" prop="quantitySKU" align="center" width="90" />
       <el-table-column label="BOM品号" prop="bomSpecCode" width="140" />
       <el-table-column label="BOM品名" prop="bomSpecName" width="300" />
       <el-table-column label="定制加工类型" prop="customProcessingType" width="140" />
       <el-table-column label="存货会计分类" prop="classifyName" width="120" />
       <el-table-column label="单位" prop="unit" width="80" />
-      <el-table-column label="BOM数量" prop="quantityBOM" width="90" />
-      <el-table-column label="单价" prop="unitPriceBOM" width="80" />
-      <el-table-column label="激光LOGO" prop="laserLogoSummary" width="100" />
-      <el-table-column label="激光体位线" prop="laserMitochondrialSummary" width="100" />
-      <el-table-column label="代发费" prop="lssueFeeSummary" width="90" />
-      <el-table-column label="快递包材费" prop="deliveryMaterialsFeeSummary" width="100" />
-      <el-table-column label="包装人工费" prop="packingLaborSummary" width="100" />
-      <el-table-column label="管理费" prop="managementFeeSummary" width="90" />
-      <el-table-column label="SKU单价" prop="unitPriceSKU" width="90" />
+      <el-table-column label="BOM数量" prop="quantityBOM" align="center" width="90" />
+      <el-table-column label="单价" prop="unitPriceBOM" align="center" width="80" />
+      <el-table-column label="激光LOGO" prop="laserLogoSummary" align="center" width="100" />
+      <el-table-column label="激光体位线" prop="laserMitochondrialSummary" align="center" width="100" />
+      <el-table-column label="代发费" prop="lssueFeeSummary" align="center" width="90" />
+      <el-table-column label="快递包材费" prop="deliveryMaterialsFeeSummary" align="center" width="100" />
+      <el-table-column label="包装人工费" prop="packingLaborSummary" align="center" width="100" />
+      <el-table-column label="管理费" prop="managementFeeSummary" align="center" width="90" />
+      <el-table-column label="SKU单价" prop="unitPriceSKU" align="center" width="90" />
       <el-table-column label="小计" align="center" width="120">
         <template #default="{ row }">
           {{ moneyFormat(row.subtotal) }}
         </template>
       </el-table-column>
-      <el-table-column label="外箱包装费" prop="outerBoxPackingFee" width="100" />
+      <el-table-column label="外箱包装费" prop="outerBoxPackingFee" align="center" width="100" />
       <el-table-column label="合计" align="center" width="120">
         <template #default="{ row }">
           {{ moneyFormat(row.total) }}
@@ -189,13 +189,24 @@ const mergeRow = (list) => {
       list[k][field + "Span"] = 1;
       list[k][field + "Dis"] = false;
       for (i = k + 1; i <= list.length - 1; i++) {
-        if (list[k][field] === list[i][field] && list[k].orderId === list[i].orderId) {
-          list[k][field + "Span"]++;
-          list[k][field + "Dis"] = false;
-          list[i][field + "Span"] = 1;
-          list[i][field + "Dis"] = true;
+        if (["statementOfAccountTime", "departmentName", "shopName", "mesCode", "sellCode", "wlnCode", "outerBoxPackingFee", "total"].includes(field)) {
+          if (list[k][field] === list[i][field] && list[k].orderId === list[i].orderId) {
+            list[k][field + "Span"]++;
+            list[k][field + "Dis"] = false;
+            list[i][field + "Span"] = 1;
+            list[i][field + "Dis"] = true;
+          } else {
+            break;
+          }
         } else {
-          break;
+          if (list[k][field] === list[i][field] && list[k].orderId === list[i].orderId && list[k].skuSpecCode === list[i].skuSpecCode) {
+            list[k][field + "Span"]++;
+            list[k][field + "Dis"] = false;
+            list[i][field + "Span"] = 1;
+            list[i][field + "Dis"] = true;
+          } else {
+            break;
+          }
         }
       }
       k = i;