1.双奇点-bug修改

gaoluyang

12 小时以前 12b411cd617a1f8d4ef7d03b2d0677f23515ce2f

 src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue

@@ -23,7 +23,7 @@
      </el-col>
      <el-col :span="12">
        <el-form-item label="发票号：">
          <el-input disabled v-model="form.invoiceNumber" />
               <el-input v-model="form.invoiceNumber" />
        </el-form-item>
      </el-col>
      <el-col :span="12">
@@ -53,7 +53,10 @@
defineOptions({
  name: "来票台账表单",
});
const temFutureTickets = ref(0)
const temFutureTickets = ref(0) // 初始未来票数
const initialTicketsNum = ref(0) // 初始来票数
const initialTicketsAmount = ref(0) // 初始来票金额
const quantity = ref(0) // 总数量
const { form, resetForm } = useFormData({
  id: undefined,
  purchaseContractNumber: undefined, // 采购合同号
@@ -63,6 +66,7 @@
  ticketsNum: undefined, // 来票数
  ticketsAmount: undefined, // 来票金额
   taxInclusiveUnitPrice: undefined, // 含税单价
   ticketRegistrationId: undefined, // 含税单价
});

const load = async (id) => {
@@ -74,10 +78,15 @@
    form.createdAt = data.createdAt;
    form.invoiceNumber = data.invoiceNumber;
    form.ticketsNum = data.ticketsNum;
    form.ticketsAmount = data.ticketsAmount.toFixed(2);
      form.ticketsAmount = data.ticketsAmount ? Number(data.ticketsAmount).toFixed(2) : 0;
    form.taxInclusiveUnitPrice = data.taxInclusiveUnitPrice;
    form.futureTickets = data.futureTickets;
    temFutureTickets.value = data.futureTickets;
      initialTicketsNum.value = data.ticketsNum || 0;
      initialTicketsAmount.value = data.ticketsAmount || 0;
      form.ticketRegistrationId = data.ticketRegistrationId;
      // 获取总数量，如果数据中有 quantity 字段则使用，否则使用来票数+未来票数
      quantity.value = data.quantity || (Number(data.ticketsNum || 0) + Number(data.futureTickets || 0));
  }
};

@@ -87,15 +96,44 @@
      proxy.$modal.msgWarning("含税单价不能为零或未定义");
      return;
   }
   if (Number(form.ticketsNum) > Number(temFutureTickets.value)) {
      proxy.$modal.msgWarning("开票数不得大于未开票数");
      form.ticketsNum = temFutureTickets.value
	
   const newTicketsNum = Number(form.ticketsNum) || 0;
   const currentTicketsNum = Number(initialTicketsNum.value) || 0;
	
   // 计算新增的来票数
   const addedTicketsNum = newTicketsNum - currentTicketsNum;
	
   // 计算新的未来票数 = 初始未来票数 - 新增的来票数
   const newFutureTickets = Number(temFutureTickets.value) - addedTicketsNum;
	
   // 验证：新的来票数 + 新的未来票数 ≤ quantity
   if (newTicketsNum + newFutureTickets > Number(quantity.value)) {
      proxy.$modal.msgWarning(`来票数+未来票数不能大于总数量(${quantity.value})`);
      // 限制来票数，使其满足：来票数 + 未来票数 ≤ quantity
      // 最大来票数 = quantity - 初始未来票数 + 初始来票数
      const maxTicketsNum = Number(quantity.value) - Number(temFutureTickets.value) + Number(initialTicketsNum.value);
      form.ticketsNum = Math.max(0, Math.min(maxTicketsNum, newTicketsNum));
      // 重新计算
      const recalculatedAddedTicketsNum = Number(form.ticketsNum) - Number(initialTicketsNum.value);
      const recalculatedFutureTickets = Number(temFutureTickets.value) - recalculatedAddedTicketsNum;
      form.futureTickets = Number(recalculatedFutureTickets.toFixed(2));
      const ticketsAmount = Number(form.ticketsNum) * Number(form.taxInclusiveUnitPrice);
      form.ticketsAmount = Number(ticketsAmount.toFixed(2));
      return;
   }
	
   // 检查新增的来票数是否大于初始未来票数
   if (addedTicketsNum > Number(temFutureTickets.value)) {
      proxy.$modal.msgWarning("新增开票数不得大于未开票数");
      form.ticketsNum = Number(initialTicketsNum.value) + Number(temFutureTickets.value);
   }
   
   // 确保所有数值都转换为数字类型进行计算
   const ticketsAmount = Number(form.ticketsNum) * Number(form.taxInclusiveUnitPrice);
   const futureTickets = Number(temFutureTickets.value) - Number(form.ticketsNum);
   form.futureTickets = Number(futureTickets.toFixed(2));
   const finalTicketsNum = Number(form.ticketsNum) || 0;
   const finalAddedTicketsNum = finalTicketsNum - Number(initialTicketsNum.value);
   const finalFutureTickets = Number(temFutureTickets.value) - finalAddedTicketsNum;
   const ticketsAmount = finalTicketsNum * Number(form.taxInclusiveUnitPrice);
   form.futureTickets = Number(finalFutureTickets.toFixed(2));
   form.ticketsAmount = Number(ticketsAmount.toFixed(2));
};
const inputTicketsAmount = (val) => {
@@ -105,17 +143,47 @@
      return;
   }
   
   if (Number(val) > Number(form.futureTickets*form.taxInclusiveUnitPrice)) {
      proxy.$modal.msgWarning("本次来票金额不得大于总金额");
      form.ticketsAmount = (form.futureTickets*form.taxInclusiveUnitPrice).toFixed(2)
      const ticketsNum = Number(form.ticketsAmount) / Number(form.taxInclusiveUnitPrice);
      form.ticketsNum = Number(ticketsNum.toFixed(2))
   const newTicketsAmount = Number(val) || 0;
	
   // 计算新的来票数
   const newTicketsNum = newTicketsAmount / Number(form.taxInclusiveUnitPrice);
   const currentTicketsNum = Number(initialTicketsNum.value) || 0;
	
   // 计算新增的来票数
   const addedTicketsNum = newTicketsNum - currentTicketsNum;
	
   // 计算新的未来票数 = 初始未来票数 - 新增的来票数
   const newFutureTickets = Number(temFutureTickets.value) - addedTicketsNum;
	
   // 验证：新的来票数 + 新的未来票数 ≤ quantity
   if (newTicketsNum + newFutureTickets > Number(quantity.value)) {
      proxy.$modal.msgWarning(`来票数+未来票数不能大于总数量(${quantity.value})`);
      // 限制来票数，使其满足：来票数 + 未来票数 ≤ quantity
      const maxTicketsNum = Number(quantity.value) - Number(temFutureTickets.value) + Number(initialTicketsNum.value);
      form.ticketsNum = Math.max(0, Math.min(maxTicketsNum, newTicketsNum));
      form.ticketsAmount = Number((form.ticketsNum * Number(form.taxInclusiveUnitPrice)).toFixed(2));
      const recalculatedAddedTicketsNum = Number(form.ticketsNum) - Number(initialTicketsNum.value);
      const recalculatedFutureTickets = Number(temFutureTickets.value) - recalculatedAddedTicketsNum;
      form.futureTickets = Number(recalculatedFutureTickets.toFixed(2));
      return;
   }
	
   // 检查新增的来票金额是否大于初始未来票数对应的金额
   const maxAddedAmount = Number(temFutureTickets.value * form.taxInclusiveUnitPrice);
   if (addedTicketsNum > 0 && addedTicketsNum * Number(form.taxInclusiveUnitPrice) > maxAddedAmount) {
      proxy.$modal.msgWarning("新增来票金额不得大于未开票金额");
      form.ticketsAmount = Number((initialTicketsAmount.value + maxAddedAmount).toFixed(2));
      form.ticketsNum = Number((currentTicketsNum + Number(temFutureTickets.value)).toFixed(2));
      form.futureTickets = 0;
      return;
   }
   
   // 确保所有数值都转换为数字类型进行计算
   const ticketsNum = Number(val) / Number(form.taxInclusiveUnitPrice);
   form.ticketsNum = Number(ticketsNum.toFixed(2));
   const finalTicketsNum = Number(newTicketsNum.toFixed(2));
   const finalAddedTicketsNum = finalTicketsNum - Number(initialTicketsNum.value);
   const finalFutureTickets = Number(temFutureTickets.value) - finalAddedTicketsNum;
   form.ticketsNum = finalTicketsNum;
   form.futureTickets = Number(finalFutureTickets.toFixed(2));
};

defineExpose({