宝东 1.部署修改 2.发货台账修改

gaoluyang

2026-04-24 c865f718a5866afa4c7d2ea0b10583a98b6fbcc4

 src/views/salesManagement/salesLedger/index.vue

@@ -51,12 +51,10 @@
                                              width="100px"
                                              align="center">
                <template #default="scope">

                           <el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
                           <el-tag v-if="scope.row.approveStatus === 1"
                                       type="success">充足</el-tag>
                           <el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
                                       type="success">已出库</el-tag>
                           <el-tag v-else type="danger">不足</el-tag>
                           <el-tag v-else
                                       type="danger">不足</el-tag>
                </template>
              </el-table-column>
                     <el-table-column label="发货状态" width="140" align="center">
@@ -66,34 +64,15 @@
                           </el-tag>
                        </template>
                     </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">
                <template #default="scope">
                  <div>
                    <el-tag type="success" v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}</el-tag>
                    <el-tag v-else type="info">-</el-tag>
                  </div>
                </template>
              </el-table-column>
                     <el-table-column label="发货日期"
                                              minWidth="100px"
                                              align="center">
                <template #default="scope">
                  <div>
                    <div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
                              <el-tag v-else
                                          type="info">-</el-tag>
                  </div>
                </template>
              </el-table-column>
              <el-table-column label="已发货数量" prop="shippingNum" align="center" />
              <el-table-column label="已退货数量" prop="returnNum" align="center" />
              <el-table-column label="数量" prop="quantity" />
              <el-table-column label="税率(%)" prop="taxRate" />
              <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" :formatter="sensitiveAmountFormatter" />
              <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" :formatter="sensitiveAmountFormatter" />
              <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="sensitiveAmountFormatter" />
            <!--操作-->
              <el-table-column Width="60px" label="操作" align="center">
              <el-table-column width="150" label="操作" align="center" fixed="right">
                <template #default="scope">
                  <el-button 
                    link 
@@ -101,6 +80,14 @@
                    :disabled="!canShip(scope.row)"
                    @click="openDeliveryForm(scope.row)">
                    发货
                  </el-button>
                  <el-button
                    link
                    type="danger"
                    size="small"
                    :disabled="!canRevokeShipping(scope.row)"
                    @click="handleRevokeShipping(scope.row)">
                    撤销发货
                  </el-button>
                </template>
              </el-table-column>
@@ -578,22 +565,16 @@
         @close="closeDeliveryDia"
      >
         <el-form :model="deliveryForm" label-width="120px" label-position="top" :rules="deliveryRules" ref="deliveryFormRef">
            <el-row :gutter="30">
            <el-row>
               <el-col :span="24">
                  <el-form-item label="发货类型：" prop="type">
                     <el-select
                        v-model="deliveryForm.type"
                        placeholder="请选择发货类型"
                        style="width: 100%"
                     >
                        <el-option label="货车" value="货车" />
                        <el-option label="快递" value="快递" />
                     </el-select>
                  </el-form-item>
                  <el-alert
                     title="确认后将直接发货！"
                     type="warning"
                     :closable="false"
                     show-icon
                  />
               </el-col>
            </el-row>


         </el-form>
         <template #footer>
            <div class="dialog-footer">
@@ -626,7 +607,7 @@
   delLedger,
   addOrUpdateSalesLedgerProduct,
   delProduct,
   delLedgerFile, getProductInventory,
   delLedgerFile, getProductInventory, cancelDelivery,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
@@ -756,14 +737,8 @@
const deliveryFormVisible = ref(false);
const currentDeliveryRow = ref(null);
const deliveryFormData = reactive({
  deliveryForm: {
    type: "货车", // 货车, 快递
  },
  deliveryRules: {
    type: [
      { required: true, message: "请选择发货类型", trigger: "change" }
    ]
  },
  deliveryForm: {},
  deliveryRules: {},
});
const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);

@@ -2018,11 +1993,6 @@
 * @param row 行数据
 */
const getShippingStatusText = (row) => {
   // 如果已发货（有发货日期或车牌号），显示"已发货"
   if (row.shippingDate || row.shippingCarNumber) {
      return '已发货';
   }
	
   // 获取发货状态字段
   const status = row.shippingStatus;
   
@@ -2033,15 +2003,24 @@
   
   // 状态是字符串
   const statusStr = String(status).trim();
	
   const statusTextMap = {
      '待发货': '待发货',
      '待审核': '待审核',
      '审核中': '审核中',
      '发货中': '发货中',
      '审核拒绝': '审核拒绝',
      '审核通过': '审核通过',
      '已发货': '已发货'
      '已发货': '已发货',
      '已撤销': '已撤销'
   };
   return statusTextMap[statusStr] || '待发货';
	
   // 如果状态在映射表中，直接返回对应文本
   if (statusTextMap[statusStr]) {
      return statusTextMap[statusStr];
   }
	
   return '待发货';
};

/**
@@ -2049,11 +2028,6 @@
 * @param row 行数据
 */
const getShippingStatusType = (row) => {
   // 如果已发货（有发货日期或车牌号），显示绿色
   if (row.shippingDate || row.shippingCarNumber) {
      return 'success';
   }
	
   // 获取发货状态字段
   const status = row.shippingStatus;
   
@@ -2064,20 +2038,29 @@
   
   // 状态是字符串
   const statusStr = String(status).trim();
	
   const typeTextMap = {
      '待发货': 'info',
      '待审核': 'info',
      '审核中': 'warning',
      '审核拒绝': 'danger',
      '已撤销': 'warning',
      '审核通过': 'success',
      '已发货': 'success'
      '已发货': 'success',
      '发货中': 'warning'
   };
   return typeTextMap[statusStr] || 'info';
	
   // 如果状态在映射表中，直接返回对应类型
   if (typeTextMap[statusStr]) {
      return typeTextMap[statusStr];
   }
	
   return 'info';
};

/**
 * 判断是否可以发货
 * 只有在产品状态是充足，发货状态是待发货和审核拒绝的时候才可以发货
 * 只有在产品状态是充足，发货状态是待发货、审核拒绝和已撤销的时候才可以发货
 * @param row 行数据
 */
const canShip = (row) => {
@@ -2089,14 +2072,56 @@
   // 获取发货状态
   const shippingStatus = row.shippingStatus;
   
   // 如果状态为空或未定义，默认为"待发货"
   if (shippingStatus === null || shippingStatus === undefined || shippingStatus === '') {
      return true;
   }
	
   // 状态是字符串
   const statusStr = String(shippingStatus).trim();
	
   // 如果状态是"已撤销"，允许发货
   if (statusStr === '已撤销') {
      return true;
   }
	
   // 如果已发货（有发货日期或车牌号），不能再次发货
   if (row.shippingDate || row.shippingCarNumber) {
      return false;
   }
   
   // 发货状态必须是"待发货"或"审核拒绝"
   const statusStr = shippingStatus ? String(shippingStatus).trim() : '';
   // 发货状态必须是"待发货"、"审核拒绝"或"已撤销"
   return statusStr === '待发货' || statusStr === '审核拒绝';
};

/**
 * 判断是否可以撤销发货
 * 只有当发货数量等于退货数量且都不为0时才可以撤销
 * @param row 行数据
 */
const canRevokeShipping = (row) => {
   const shippingNum = row.shippingNum || 0;
   const returnNum = row.returnNum || 0;
   return shippingNum > 0 && returnNum > 0 && shippingNum === returnNum;
};

/**
 * 撤销发货
 * @param row 行数据
 */
const handleRevokeShipping = (row) => {
   ElMessageBox.confirm("此操作将撤销该发货记录，是否确认？", "撤销发货", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
   })
      .then(() => {
         cancelDelivery({ id: row.id }).then(() => {
            proxy.$modal.msgSuccess("撤销成功");
            getList();
         });
      })
      .catch(() => {});
};

/**
@@ -2133,13 +2158,12 @@
const submitDelivery = () => {
  proxy.$refs["deliveryFormRef"].validate((valid) => {
    if (valid) {
      // 保存当前展开的行ID，以便发货后重新加载子表格数据
      const currentExpandedKeys = [...expandedRowKeys.value];
      const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
      addShippingInfo({
        salesLedgerId: salesLedgerId,
        salesLedgerProductId: currentDeliveryRow.value.id,
        type: deliveryForm.value.type,
        shippingTotal: currentDeliveryRow.value.quantity,
      })
        .then(() => {
          proxy.$modal.msgSuccess("发货成功");