添加发货状态列并优化发货逻辑

yyb

9 天以前 0c130536545f66d2acb8ec65df388fb8e84abbd9

 src/views/salesManagement/salesLedger/index.vue

@@ -68,6 +68,7 @@
          <template #default="props">
            <el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
              <el-table-column align="center" label="序号" type="index"/>
         <el-table-column label="楼层编号" prop="floorCode" min-width="100" show-overflow-tooltip />
              <el-table-column label="产品大类" prop="productCategory" />
              <el-table-column label="规格型号" prop="specificationModel" />
              <el-table-column label="厚度" prop="thickness" min-width="90">
@@ -75,6 +76,34 @@
                  {{ scope.row.thickness ?? "" }}
                </template>
              </el-table-column>
                     <el-table-column label="宽(mm)" prop="width" min-width="80">
                        <template #default="scope">
                           {{ scope.row.width ?? "" }}
                        </template>
                     </el-table-column>
                     <el-table-column label="高(mm)" prop="height" min-width="80">
                        <template #default="scope">
                           {{ scope.row.height ?? "" }}
                        </template>
                     </el-table-column>
                     <el-table-column label="周长(cm)" prop="perimeter" min-width="90">
                        <template #default="scope">
                           {{ scope.row.perimeter ?? "" }}
                        </template>
                     </el-table-column>
                     <el-table-column label="总面积(cm²)" prop="actualTotalArea" min-width="100">
                        <template #default="scope">
                           {{ scope.row.actualTotalArea ?? "" }}
                        </template>
                     </el-table-column>
                     <el-table-column label="加工要求" prop="processRequirement" min-width="120"
                        show-overflow-tooltip />
                     <el-table-column label="备注" prop="remark" min-width="120" show-overflow-tooltip />
                     <el-table-column label="重箱" prop="heavyBox" min-width="80">
                        <template #default="scope">
                           {{ scope.row.heavyBox ?? "" }}
                        </template>
                     </el-table-column>
                     <el-table-column label="产品状态"
                                              width="100px"
                                              align="center">
@@ -87,13 +116,13 @@
                           <el-tag v-else type="danger">不足</el-tag>
                </template>
              </el-table-column>
                     <el-table-column label="发货状态" width="140" align="center">
                     <!-- <el-table-column label="发货状态" width="140" align="center">
                        <template #default="scope">
                           <el-tag :type="getShippingStatusType(scope.row)" size="small">
                              {{ getShippingStatusText(scope.row) }}
                           </el-tag>
                        </template>
                     </el-table-column>
                     </el-table-column> -->
                     <el-table-column label="快递公司" prop="expressCompany" show-overflow-tooltip />
                     <el-table-column label="快递单号" prop="expressNumber" show-overflow-tooltip />
              <el-table-column label="发货车牌" minWidth="100px" align="center">
@@ -143,6 +172,12 @@
        <el-table-column label="付款方式" prop="paymentMethod" show-overflow-tooltip />
        <el-table-column label="合同金额(元)" prop="contractAmount" width="220" show-overflow-tooltip
          :formatter="formattedNumber" />
        <el-table-column label="发货状态" width="140" align="center">
         <template #default="scope">
            <el-tag v-if="Number(scope.row.deliveryStatus) === 1" type="success">已发货</el-tag>
            <el-tag v-else type="info">未发货</el-tag>
         </template>
        </el-table-column>
        <el-table-column label="录入人" prop="entryPersonName" width="100" show-overflow-tooltip />
        <el-table-column label="录入日期" prop="entryDate" width="120" show-overflow-tooltip />
        <el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip />
@@ -258,6 +293,21 @@
               <el-table-column label="厚度" prop="thickness" min-width="90">
                  <template #default="scope">
                     {{ scope.row.thickness ?? "" }}
                  </template>
               </el-table-column>
               <el-table-column label="宽(mm)" prop="width" min-width="80">
                  <template #default="scope">
                     {{ scope.row.width ?? "" }}
                  </template>
               </el-table-column>
               <el-table-column label="高(mm)" prop="height" min-width="80">
                  <template #default="scope">
                     {{ scope.row.height ?? "" }}
                  </template>
               </el-table-column>
               <el-table-column label="面积(m²)" prop="actualTotalArea" min-width="100">
                  <template #default="scope">
                     {{ scope.row.actualTotalArea ?? "" }}
                  </template>
               </el-table-column>
               <el-table-column label="数量" prop="quantity" />
@@ -677,11 +727,12 @@
                                 <el-input-number
                                    v-model="item.quantity"
                                    :min="0"
                                    :step="0.1"
                                    :precision="2"
                                    :step="1"
                                    :precision="0"
                                    style="width: 100%;"
                                    placeholder="请输入数量"
                                    :disabled="operationType === 'view'"
                                    @change="calculateFromUnitPrice(true)"
                                 />
                              </div>
                              <el-button
@@ -1049,7 +1100,7 @@
    type: "货车", // 货车, 快递
  },
  deliveryRules: {
    type: [
    type: [	
      { required: true, message: "请选择发货类型", trigger: "change" }
    ]
  },
@@ -1075,6 +1126,7 @@
      otherAmountSelectOptions.value = records.map((item) => ({
         id: item.id,
         processName: item.processName ?? "",
         unitPrice: item.unitPrice ?? 0,
      }));
   } finally {
      otherAmountSelectOptionsLoading.value = false;
@@ -1146,6 +1198,7 @@
      return {
         id: s.id,
         processName: opt?.processName ?? s.processName ?? "",
         unitPrice: opt?.unitPrice ?? s.unitPrice ?? 0,
         quantity: Number(s.quantity ?? 0) || 0,
      };
   });
@@ -1201,8 +1254,10 @@
   productForm.value.salesProductProcessList.push({
      id: opt.id,
      processName: opt.processName,
      unitPrice: opt.unitPrice ?? 0,
      quantity: 0,
   });
   calculateFromUnitPrice(true);

   // 选择完成后关闭弹窗，下一次可再次点击“新增”继续添加
   otherAmountAddDialogVisible.value = false;
@@ -1217,6 +1272,7 @@
   if (operationType.value === "view") return;
   if (!Array.isArray(productForm.value?.salesProductProcessList)) return;
   productForm.value.salesProductProcessList.splice(index, 1);
   calculateFromUnitPrice(true);
};

// 发货审批人节点（仿协同审批 infoFormDia.vue）
@@ -1843,15 +1899,16 @@
         recalcAreaTotals();
         // 其他金额只提交 {id, processName, quantity}（后端字段：salesProductProcessList）
         productForm.value.salesProductProcessList = (Array.isArray(productForm.value.salesProductProcessList)
            ? productForm.value.salesProductProcessList
            : []
         )
            .map((it) => ({
               id: it?.id,
               processName: it?.processName ?? "",
               quantity: Number(it?.quantity ?? 0) || 0,
            }))
            .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
         ? productForm.value.salesProductProcessList
         : []
      )
         .map((it) => ({
            id: it?.id,
            processName: it?.processName ?? "",
            unitPrice: Number(it?.unitPrice ?? 0) || 0,
            quantity: Number(it?.quantity ?? 0) || 0,
         }))
         .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");

         if (operationType.value === "edit") {
            submitProductEdit();
@@ -2155,12 +2212,15 @@
      return;
   }
   const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
   // 含税总价计算 = 单价 * 结算面积 * 数量
   productForm.value.taxInclusiveTotalPrice =
      proxy.calculateTaxIncludeTotalPrice(
         productForm.value.taxInclusiveUnitPrice * settlePieceArea,
         productForm.value.quantity
      );
   // 含税总价计算 = 单价 * 结算面积 * 数量 + 其他金额总和
   const basePrice = proxy.calculateTaxIncludeTotalPrice(
      productForm.value.taxInclusiveUnitPrice * settlePieceArea,
      productForm.value.quantity
   );
   const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
      return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
   }, 0);
   productForm.value.taxInclusiveTotalPrice = (parseFloat(basePrice) + otherAmountTotal).toFixed(2);
   if (productForm.value.taxRate) {
      // 不含税总价计算
      productForm.value.taxExclusiveTotalPrice =
@@ -2242,8 +2302,12 @@
   
   isCalculating.value = true;
   
   // 计算含税单价 = 含税总价 / 数量
   productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
   // 计算含税单价 = (含税总价 - 其他金额总和) / 数量
   const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
      return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
   }, 0);
   const basePrice = totalPrice - otherAmountTotal;
   productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
   
   // 如果有税率，计算不含税总价
   if (productForm.value.taxRate) {
@@ -2280,8 +2344,12 @@
   const inclusiveTotalPrice = exclusiveTotalPrice / (1 - taxRateDecimal);
   productForm.value.taxInclusiveTotalPrice = inclusiveTotalPrice.toFixed(2);
   
   // 计算含税单价 = 含税总价 / 数量
   productForm.value.taxInclusiveUnitPrice = (inclusiveTotalPrice / quantity).toFixed(2);
   // 计算含税单价 = (含税总价 - 其他金额总和) / 数量
   const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
      return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
   }, 0);
   const basePrice = inclusiveTotalPrice - otherAmountTotal;
   productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
   
   isCalculating.value = false;
};
@@ -2304,8 +2372,12 @@

   isCalculating.value = true;

   // 计算含税总价 = 单价 * 结算面积 * 数量
   productForm.value.taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);
   // 计算含税总价 = 单价 * 结算面积 * 数量 + 其他金额总和
   const basePrice = unitPrice * settlePieceArea * quantity;
   const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
      return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
   }, 0);
   productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);

   // 如果有税率，计算不含税总价
   if (productForm.value.taxRate) {
@@ -2337,8 +2409,12 @@

   isCalculating.value = true;

   // 计算含税总价 = 单价 * 结算面积 * 数量
   productForm.value.taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);
   // 计算含税总价 = 单价 * 结算面积 * 数量 + 其他金额总和
   const basePrice = unitPrice * settlePieceArea * quantity;
   const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
      return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
   }, 0);
   productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);

   // 如果有税率，计算不含税总价
   if (productForm.value.taxRate) {
@@ -2446,11 +2522,23 @@
 * @param row 行数据
 */
const canShip = (row) => {

   // 产品状态必须是充足（approveStatus === 1）
   if (row.approveStatus !== 1) {
      return false;
   }
   // if (row.approveStatus !== 1) {
   //    return false;
   // }
   
   // 如果后端返回了台账级发货状态（deliveryStatus）
   // 1=已发货，则禁止再次发货
   const deliveryStatus = row.deliveryStatus;
   if (
      deliveryStatus !== null &&
      deliveryStatus !== undefined &&
      String(deliveryStatus).trim() !== ""
   ) {
      if (Number(deliveryStatus) === 1) return false;
   }

   // 获取发货状态
   const shippingStatus = row.shippingStatus;
   
@@ -2468,6 +2556,34 @@
   if (selectedRows.value.length === 0) {
      proxy.$modal.msgWarning("请选择数据");
      return;
   }

   // 已发货台账：弹窗提醒，不能再次发货
   const shippedLedgers = selectedRows.value.filter((r) => Number(r.deliveryStatus) === 1);
   if (shippedLedgers.length === selectedRows.value.length) {
      try {
         await ElMessageBox.alert("所选销售台账均已发货，不能再次发货。", "提示", {
            type: "warning",
            confirmButtonText: "知道了",
         });
      } catch {
         /* 关闭弹窗 */
      }
      return;
   }
   if (shippedLedgers.length > 0) {
      try {
         await ElMessageBox.alert(
            "选中的销售台账中包含已发货记录，已发货的不能再次发货，系统将仅为未发货台账处理。",
            "提示",
            {
               type: "warning",
               confirmButtonText: "知道了",
            }
         );
      } catch {
         return;
      }
   }

   const customerNames = selectedRows.value.map((r) => String(r.customerName || "").trim());
@@ -2497,6 +2613,8 @@
   try {
      const targets = [];
      for (const ledger of selectedRows.value) {
         // 台账已发货：不允许再次发货
         if (Number(ledger.deliveryStatus) === 1) continue;
         let products = [];
         try {
            const res = await productList({ salesLedgerId: ledger.id, type: 1 });
@@ -2504,7 +2622,6 @@
         } catch {
            products = [];
         }

         for (const product of products) {
            if (!canShip(product)) continue;
            targets.push({
@@ -2547,6 +2664,15 @@

// 打开发货弹框
const openDeliveryForm = (row) => {
   // 如果该行已经发货（deliveryStatus=1），禁止再次发货
   if (Number(row.deliveryStatus) === 1) {
      ElMessageBox.alert("该记录已发货，不能再次发货。", "提示", {
         type: "warning",
         confirmButtonText: "知道了",
      });
      return;
   }

   // 检查是否可以发货
   if (!canShip(row)) {
      proxy.$modal.msgWarning("只有在产品状态是充足，发货状态是待发货或审核拒绝的时候才可以发货");