Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

buhuazhen

4 天以前 2c783310e724c54f3936856410b701a3be79eab4

 src/views/procurementManagement/purchaseReturnOrder/New.vue

@@ -26,6 +26,7 @@
              v-model="formState.no"
              :placeholder="formState.isDefaultNo ? '使用系统编号' : '请输入退料单号'"
              :disabled="formState.isDefaultNo"
              style="width: 240px"
          >
            <template #append>
              <el-checkbox v-model="formState.isDefaultNo" size="large" @change="handleChangeIsDefaultNo" />
@@ -69,6 +70,7 @@
              v-model="formState.supplierId"
              placeholder="请选择供应商"
              style="width: 240px"
                     filterable
              @focus="fetchSupplierOptions"
              @change="handleChangeSupplierId"
          >
@@ -77,25 +79,6 @@
              :key="item.id"
              :label="item.supplierName"
              :value="item.id"
            />
          </el-select>
        </el-form-item>

        <el-form-item
            label="项目"
            prop="projectId"
        >
          <el-select
              v-model="formState.projectId"
              placeholder="请选择项目"
              style="width: 240px"
              @focus="fetchProjectOptions"
          >
            <el-option
                v-for="item in projectOptions"
                :key="item.id"
                :label="item.name"
                :value="item.id"
            />
          </el-select>
        </el-form-item>
@@ -159,6 +142,7 @@
              :reserve-keyword="false"
              style="width: 240px"
              @focus="fetchUserOptions"
              @change="formState.preparedUserName = userOptions.find(item => item.userId === formState.preparedUserId)?.nickName || ''"
          >
            <el-option
                v-for="item in userOptions"
@@ -189,6 +173,7 @@
              style="width: 240px"
              :reserve-keyword="false"
              @focus="fetchUserOptions"
              @change="formState.returnUserName = userOptions.find(item => item.userId === formState.returnUserId)?.nickName || ''"
          >
            <el-option
                v-for="item in userOptions"
@@ -233,7 +218,7 @@
            label="备注："
            prop="remark"
        >
          <el-input v-model="formState.remark" type="textarea" placeholder="请输入备注"/>
          <el-input style="width: 240px" v-model="formState.remark" :rows="1" type="textarea" placeholder="请输入备注"/>
        </el-form-item>

        <div style="margin: 20px 0;">
@@ -242,10 +227,11 @@
              <span class="title-text">产品列表</span>
            </div>
            <el-button type="primary" size="small" style="margin-bottom: 20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">添加产品</el-button>
            <el-table :data="formState.purchaseReturnOrderProductsDtos"
            <div class="product-table-scroll">
            <el-table class="product-table-inner"
                      :data="formState.purchaseReturnOrderProductsDtos"
                      border
                      max-height="400"
                      :scroll-y="true"
                      show-summary
                      :summary-method="summarizeChildrenTable">
              <el-table-column align="center"
@@ -255,6 +241,12 @@
                               label="序号"
                               type="index"
                               width="60" />
              <el-table-column label="入库单号"
                               prop="inboundBatches"
                               width="150" />
              <el-table-column label="批次号"
                               prop="batchNo"
                               width="150" />
              <el-table-column label="产品大类"
                               prop="productCategory" />
              <el-table-column label="规格型号"
@@ -263,8 +255,17 @@
                               prop="unit"
                               width="70" />
              <el-table-column label="数量"
                               prop="quantity"
                               width="70" />
                               prop="stockInNum"
                               width="100" />
                               <el-table-column label="可退货数量"
                               prop="unQuantity"
                               width="130" />
              <el-table-column label="已退货数量"
                               width="130">
                <template #default="scope">
                  {{ calcAlreadyReturned(scope.row) }}
                </template>
              </el-table-column>
              <el-table-column label="退货数量"
                               prop="returnQuantity"
                               width="180">
@@ -272,34 +273,35 @@
                  <el-input-number v-model="scope.row.returnQuantity"
                            controls-position="right"
                            :step="1"
                            :min="1"
                            :max="scope.row.quantity"
                            :min="0"
                            :max="getReturnQtyMax(scope.row)"
                            :disabled="getReturnQtyMax(scope.row) <= 0"
                            @change="syncReturnTotal(scope.row)"
                            required
                            placeholder="请输入退货数量" />
                </template>
              </el-table-column>
              <el-table-column label="库存预警数量"
              <!-- <el-table-column label="库存预警数量"
                               prop="warnNum"
                               width="120"
                               show-overflow-tooltip />
              <el-table-column label="税率(%)"
                               prop="taxRate"
                               width="80" />
                               width="80" /> -->
              <el-table-column label="含税单价(元)"
                               prop="taxInclusiveUnitPrice"
                               :formatter="formattedNumber"
                               width="150" />
              <el-table-column label="含税总价(元)"
                               width="120" />
              <el-table-column label="退货总价(元)"
                               prop="taxInclusiveTotalPrice"
                               :formatter="formattedNumber"
                               width="150" />
              <el-table-column label="不含税总价(元)"
                               prop="taxExclusiveTotalPrice"
                               :formatter="formattedNumber"
                               width="150" />
                               width="120">
                <template #default="scope">
                  {{ formatAmount(getReturnTotal(scope.row)) || '--' }}
                </template>
              </el-table-column>
              <el-table-column label="是否质检"
                               prop="isChecked"
                               width="150">
                               width="100">
                <template #default="scope">
                  <el-tag :type="scope.row.isChecked ? 'success' : 'info'">
                    {{ scope.row.isChecked ? '是' : '否' }}
@@ -322,6 +324,7 @@
                </template>
              </el-table-column>
            </el-table>
            </div>
          </div>

        <div class="section-title">
@@ -346,26 +349,54 @@
            label="整单折扣率："
            prop="totalDiscountAmount"
        >
          <el-input-number v-model="formState.totalDiscountRate"
          <el-input v-model="formState.totalDiscountRate"
                           controls-position="right"
                           :step="0.01"
                           :precision="2"
                           style="width: 100%;"
                           placeholder="请输入整单折扣率"/>
                           @change="totalDiscount"
                           placeholder="请输入整单折扣率">
            <template #append>
                %
            </template>
          </el-input>
        </el-form-item>

        <el-form-item
            label="成交金额："
            prop="totalAmount"
            :rules="[
              {
                required: true,
                message: '请输入成交金额',
                trigger: 'change',
              }
            ]"
        >
          <el-input-number v-model="formState.totalAmount"
                           controls-position="right"
                           :step="0.01"
                           :precision="2"
                           style="width: 100%;"
                           @change="handleChangeTotalAmount"
                           placeholder="请输入成交金额"/>
        </el-form-item>
        <el-form-item label="收款方式" prop="incomeType" :rules="[
              {
                required: true,
                message: '请选择收款方式',
                trigger: 'change',
              }
            ]">
        <el-select
          style="width: 240px;"
          v-model="formState.incomeType"
          placeholder="请选择"
          clearable
          
        >
          <el-option :label="item.label" :value="item.value" v-for="(item,index) in payment_methods" :key="index" />
        </el-select>
      </el-form-item>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
@@ -386,7 +417,7 @@
</template>

<script setup>
import {ref, computed, getCurrentInstance} from "vue";
import {ref, computed, getCurrentInstance, watch, defineAsyncComponent} from "vue";
import {createPurchaseReturnOrder} from "@/api/procurementManagement/purchase_return_order.js";
import {getOptions, purchaseList} from "@/api/procurementManagement/procurementLedger.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
@@ -398,6 +429,24 @@
  }
});
let { proxy } = getCurrentInstance()
const payment_methods  = [
    {
        "label": "现金",
        "value": "0",
    },
    {
        "label": "支票",
        "value": "1",
    },
    {
        "label": "银行转账",
        "value": "2",
    },
    {
        "label": "其他",
        "value": "3",
    },
]
const emit = defineEmits(['update:visible', 'completed']);

// 响应式数据（替代选项式的 data）
@@ -405,6 +454,7 @@
  no: '',
  isDefaultNo: true,
  returnType: 0,
  incomeType: undefined,
  remark: '',
  supplierId: undefined,
  projectId: undefined,
@@ -420,8 +470,6 @@
});
// 供应商选项
const supplierOptions = ref([])
// 项目选项
const projectOptions = ref([])
// 项目阶段选项
const projectStageOptions = ref([
  {
@@ -465,6 +513,72 @@
  return parseFloat(cellValue).toFixed(2);
};

const formatAmount = (value) => {
  if (value === null || value === undefined || value === '') {
    return '--'
  }
  const num = Number(value)
  if (Number.isNaN(num)) {
    return '--'
  }
  return num.toFixed(2)
}

const toNumber = (val) => {
  const num = Number(val)
  return Number.isNaN(num) ? 0 : num
}

/** 已退货数量 = 入库行总数量 − 当前可退货数量（剩余） */
const calcAlreadyReturned = (row) => {
  const total = Number(row?.stockInNum ?? row?.totalQuantity ?? row?.quantity ?? 0)
  const un = Number(row?.unQuantity ?? 0)
  if (!Number.isFinite(total) || !Number.isFinite(un)) return 0
  return Math.max(total - un, 0)
}

const getReturnTotal = (row) => {
  const qty = toNumber(row?.returnQuantity)
  const unitPrice = toNumber(row?.taxInclusiveUnitPrice)
  const total = qty * unitPrice
  return Number(total.toFixed(2))
}

const syncReturnTotal = (row) => {
  if (!row) {
    return
  }
  row.taxInclusiveTotalPrice = getReturnTotal(row)
}

const getBaseAmount = () => {
  const rows = formState.value.purchaseReturnOrderProductsDtos || []
  return rows.reduce((sum, item) => {
    return sum + toNumber(item.taxInclusiveTotalPrice)
  }, 0)
}

// 同步折扣额
const totalDiscount = () => {
  const discountRate = toNumber(formState.value.totalDiscountRate)
  if (discountRate < 0 || discountRate > 100) {
    proxy.$modal.msgError("请输入0-100之间的折扣率")
    return
  }
  const baseAmount = getBaseAmount()
  // 折扣额 = 产品退货总价合计 * 折扣率
  formState.value.totalDiscountAmount = Number((baseAmount * (discountRate / 100)).toFixed(2))
  syncTotalAmount()
}

const getReturnQtyMax = (row) => {
  const max = Number(row?.unQuantity)
  if (Number.isNaN(max) || max < 0) {
    return 0
  }
  return max
}

const closeModal = () => {
  isShow.value = false;
};
@@ -473,25 +587,58 @@
  return proxy.summarizeTable(
      param,
      [
        "quantity",
        "stockInNum",
        "unQuantity",
        "returnQuantity",
        "taxInclusiveUnitPrice",
        "taxInclusiveTotalPrice",
        "taxExclusiveTotalPrice",
      ],
      {
        quantity: { noDecimal: true }, // 不保留小数
        stockInNum: { noDecimal: true }, // 不保留小数
        returnQuantity: { noDecimal: true }, // 不保留小数
        unQuantity: { noDecimal: true }, // 不保留小数
      }
  );
};

const handleChangeTotalDiscountAmount= () => {
  formState.value.totalAmount = formState.value.totalDiscountAmount * -1
  const discountAmount = toNumber(formState.value.totalDiscountAmount)
  if (discountAmount < 0) {
    proxy.$modal.msgError("整单折扣额不能小于0")
    formState.value.totalDiscountAmount = 0
  }

  const baseAmount = getBaseAmount()
  const normalizedAmount = toNumber(formState.value.totalDiscountAmount)
  if (baseAmount <= 0) {
    formState.value.totalDiscountRate = 0
    syncTotalAmount()
    return
  }

  if (normalizedAmount > baseAmount) {
    proxy.$modal.msgError("整单折扣额不能大于产品退货总价合计")
    formState.value.totalDiscountAmount = Number(baseAmount.toFixed(2))
  }

  const discountRate = (toNumber(formState.value.totalDiscountAmount) / baseAmount) * 100
  formState.value.totalDiscountRate = Number(discountRate.toFixed(2))
  syncTotalAmount()
}

const handleChangeTotalAmount= () => {
  formState.value.totalDiscountAmount = formState.value.totalAmount * -1
const resetFeeInfo = () => {
  formState.value.totalDiscountAmount = 0
  formState.value.totalDiscountRate = undefined
  formState.value.totalAmount = 0
  formState.value.incomeType = undefined
}

const syncTotalAmount = () => {
  const baseAmount = getBaseAmount()
  const discount = toNumber(formState.value.totalDiscountAmount)
  // 成交金额 = 产品退货总价合计 - 折扣额
  formState.value.totalAmount = Number((baseAmount - discount).toFixed(2))
}

// 获取供应商选项
@@ -504,13 +651,6 @@
  });
}

// 获取项目选项
const fetchProjectOptions = () => {
  if (projectOptions.value.length > 0) {
    return
  }
  // todo 项目选项
}

// 获取用户选项
const fetchUserOptions = () => {
@@ -525,6 +665,7 @@
// 处理改变供应商数据
const handleChangeSupplierId = () => {
  formState.value.purchaseLedgerId = undefined
  formState.value.supplierName = supplierOptions.value.find(item => item.id === formState.value.supplierId)?.supplierName || ''
  fetchPurchaseLedgerOptions()
}

@@ -532,15 +673,17 @@
const fetchPurchaseLedgerOptions = () => {
  purchaseLedgerOptions.value = []
  if (formState.value.supplierId) {
    purchaseList({supplierId: formState.value.supplierId}).then((res) => {
    purchaseList({supplierId: formState.value.supplierId,approvalStatus:3}).then((res) => {
      purchaseLedgerOptions.value = res.rows;
    });
  }
}

// 处理改变采购台账数据
// 处理改变采购台账数据（不请求接口回显产品，产品仅在「添加产品」弹窗勾选后写入）
const handleChangePurchaseLedgerId = () => {
  resetFeeInfo()
  formState.value.purchaseReturnOrderProductsDtos = []
  syncTotalAmount()
}

// 处理改变是否默认编号
@@ -556,28 +699,63 @@
  const newProducts = selectedRows.filter(item => !existingIds.has(item.id)).map(item => ({
    ...item,
    returnQuantity: undefined,
    salesLedgerProductId: item.id,
    taxInclusiveTotalPrice: 0,
    // salesLedgerProductId: item.salesLedgerProductId,
  }));
  formState.value.purchaseReturnOrderProductsDtos.push(...newProducts);
  syncTotalAmount()
}

// 删除单项产品
const delProduct = (index) => {
  formState.value.purchaseReturnOrderProductsDtos.splice(index, 1)
  syncTotalAmount()
}

// 提交表单
const handleSubmit = () => {
  // 验证退货数量
  const hasEmptyReturnQuantity = formState.value.purchaseReturnOrderProductsDtos.some(item => !item.returnQuantity || item.returnQuantity <= 0);
  if (hasEmptyReturnQuantity) {
    proxy.$modal.msgError("请为所有产品填写退货数量");
    return;
  const productList = formState.value.purchaseReturnOrderProductsDtos || []

  productList.forEach(syncReturnTotal)

  if (productList.length === 0) {
    proxy.$modal.msgError("请先选择产品")
    return
  }

  // 逐行校验退货数量：任意一行未填/非法/超限都不允许提交
  const invalidRowIndex = productList.findIndex((item) => {
    const qty = Number(item.returnQuantity)
    const maxQty = Number(item.unQuantity)

    if (item.returnQuantity === null || item.returnQuantity === undefined || item.returnQuantity === "") {
      return true
    }
    if (Number.isNaN(qty) || qty <= 0) {
      return true
    }
    if (!Number.isNaN(maxQty) && maxQty > 0 && qty > maxQty) {
      return true
    }
    return false
  })

  if (invalidRowIndex !== -1) {
    proxy.$modal.msgError(`第${invalidRowIndex + 1}行退货数量未填写或不合法`)
    return
  }

  proxy.$refs["formRef"].validate(valid => {
    if (valid) {
      createPurchaseReturnOrder(formState.value).then(res => {
      console.log(productList)
      const submitPayload = {
        ...formState.value,
        purchaseReturnOrderProductsDtos: productList.map((row) => ({
          ...row,
          stockInRecordId: row.id,
        })),
      }
      createPurchaseReturnOrder(submitPayload).then(res => {
        // 关闭模态框
        isShow.value = false;
        // 告知父组件已完成
@@ -587,6 +765,15 @@
    }
  })
};

watch(
  () => formState.value.purchaseReturnOrderProductsDtos,
  (rows) => {
    (rows || []).forEach(syncReturnTotal)
    syncTotalAmount()
  },
  { deep: true }
)

defineExpose({
  closeModal,
@@ -615,4 +802,13 @@
  border-radius: 50%;
  margin-right: 8px;
}

.product-table-scroll {
  width: 100%;
  overflow-x: auto;
}

.product-table-inner {
  min-width: 1280px;
}
</style>