chenrui
13 小时以前 0805c8f58834e70b2a654cfa9f54fdaeaa0ddda1
bug修改
已修改6个文件
69 ■■■■ 文件已修改
src/views/procurementManagement/invoiceEntry/index.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/paymentLedger/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceLedger/index.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/receiptPaymentLedger/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/invoiceEntry/index.vue
@@ -119,13 +119,13 @@
          <el-table-column label="不含税总价(元)" width="150" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
          <el-table-column label="本次来票数" prop="ticketsNum" width="170">
            <template #default="scope">
              <el-input-number v-model="scope.row.ticketsNum" placeholder="请选择" min="0" :step="0.1" clearable style="width: 100%"
              <el-input-number v-model="scope.row.ticketsNum" placeholder="请选择" :min="0" :step="0.1" clearable style="width: 100%"
                @change="invoiceNumBlur(scope.row)" />
            </template>
          </el-table-column>
          <el-table-column label="本次来票金额(元)" prop="ticketsAmount" min="0" :step="0.1" :formatter="formattedNumber" @change="invoiceAmountBlur"  width="170">
          <el-table-column label="本次来票金额(元)" prop="ticketsAmount" :min="0" :step="0.1" :formatter="formattedNumber" @change="invoiceAmountBlur"  width="170">
            <template #default="scope">
              <el-input-number v-model="scope.row.ticketsAmount" placeholder="请选择" min="0" :step="0.1" clearable style="width: 100%"
              <el-input-number v-model="scope.row.ticketsAmount" placeholder="请选择" :min="0" :step="0.1" clearable style="width: 100%"
                               @change="invoiceAmountBlur(scope.row)" />
            </template>
          </el-table-column>
@@ -412,6 +412,7 @@
  row.futureTickets = row.tempFutureTickets - row.ticketsNum
  // 计算未来票金额
  row.futureTicketsAmount = row.tempFutureTicketsAmount - row.ticketsAmount
  calculateinvoiceAmount()
}
// 本次来票金额失焦操作
const invoiceAmountBlur = (row) => {
@@ -429,6 +430,7 @@
  row.futureTickets = row.tempFutureTickets - row.ticketsNum
  // 计算未来票金额
  row.futureTicketsAmount = row.tempFutureTicketsAmount - row.ticketsAmount
  calculateinvoiceAmount()
}
// 获取当前日期函数
@@ -441,6 +443,20 @@
  if (strDate < 10) strDate = `0${strDate}` // 如果日是个位数,在前面补0
  return `${year}-${month}-${strDate}`
}
function calculateinvoiceAmount() {
  console.log('productData',productData.value)
  var invoiceAmountTotal = 0
  productData.value.forEach(item => {
    if(item.ticketsAmount){
      invoiceAmountTotal += item.ticketsAmount
    }
  })
  form.value.invoiceAmount = invoiceAmountTotal.toFixed(2)
}
getList()
</script>
src/views/procurementManagement/paymentLedger/index.vue
@@ -150,7 +150,7 @@
    prop: "happenTime",
  },
  {
    label: "发票金额",
    label: "发票金额(元)",
    prop: "invoiceAmount",
    formatData: (params) => {
      return parseFloat(params).toFixed(2);
@@ -237,10 +237,10 @@
const handlePagination = ({ page, limit }) => {
  sonPage.current = page;
  sonPage.size = limit;
  const start = (page - 1) * limit;
  const end = start + limit;
  originalTableDataSon.value = tableDataSon.value.slice(start, end);
}
src/views/procurementManagement/procurementLedger/index.vue
@@ -562,8 +562,10 @@
  const index = modelOptions.value.findIndex(item => item.id === value);
  if (index !== -1) {
    productForm.value.specificationModel = modelOptions.value[index].model;
    productForm.value.unit = modelOptions.value[index].unit;
  } else {
    productForm.value.specificationModel = null;
    productForm.value.unit = null
  }
}
const findNodeById = (nodes, productId) => {
src/views/salesManagement/invoiceLedger/index.vue
@@ -90,7 +90,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="开票人:" prop="invoicePerson">
              <el-input v-model="form.invoicePerson" placeholder="请输入" clearable/>
              <el-input v-model="form.invoicePerson" placeholder="请输入" clearable disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -103,6 +103,7 @@
                  type="date"
                  placeholder="请选择"
                  clearable
                  disabled
              />
            </el-form-item>
          </el-col>
@@ -194,6 +195,7 @@
  commitFile,
  registrationProductPage
} from "../../../api/salesManagement/invoiceLedger.js";
import useUserStore from "@/store/modules/user.js";
const { proxy } = getCurrentInstance()
const tableData = ref([])
const productData = ref([])
@@ -235,6 +237,7 @@
})
const { searchForm, form, rules } = toRefs(data)
const currentId = ref('')
const userStore = useUserStore()
const upload = reactive({
  // 上传的地址
  url: import.meta.env.VITE_APP_BASE_API + "/invoiceLedger/uploadFile",
@@ -282,9 +285,17 @@
  productData.value = []
  fileList.value = []
  currentId.value = row.id;
  invoiceLedgerProductInfo({id: row.id}).then(res => {
    form.value = {...res.data}
    fileList.value = res.data.fileList;
    if(!form.value.invoicePerson){
      form.value.invoicePerson = userStore.nickName
      form.value.entryDate = getCurrentDate();
    }
    if(!form.value.invoiceDate){
      form.value.invoiceDate = getCurrentDate();
    }
  })
  dialogFormVisible.value = true
}
@@ -395,6 +406,15 @@
}
// 获取当前日期并格式化为 YYYY-MM-DD
function getCurrentDate() {
  const today = new Date();
  const year = today.getFullYear();
  const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始
  const day = String(today.getDate()).padStart(2, '0');
  return `${year}-${month}-${day}`;
}
getList()
</script>
src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -24,9 +24,9 @@
                  height="calc(100vh - 18.5em)">
          <el-table-column align="center" label="序号" type="index" width="60" />
          <el-table-column label="客户名称" prop="customerName" show-overflow-tooltip/>
          <el-table-column label="开票金额" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="回款金额" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="未回款金额" prop="unReceiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="开票金额(元)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="回款金额(元)" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="未回款金额(元)" prop="unReceiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
        </el-table>
        <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
                    :limit="page.size" @pagination="paginationChange" />
@@ -39,9 +39,9 @@
                  height="calc(100vh - 18.5em)">
          <el-table-column align="center" label="序号" type="index" width="60" />
          <el-table-column label="发生日期" prop="receiptPaymentDate" show-overflow-tooltip/>
          <el-table-column label="回款金额" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="待收金额" prop="noReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="应收金额" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="回款金额(元)" prop="receiptPaymentAmount" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="待收金额(元)" prop="noReceiptAmount" show-overflow-tooltip :formatter="formattedNumber"/>
          <el-table-column label="应收金额(元)" prop="invoiceTotal" show-overflow-tooltip :formatter="formattedNumber"/>
        </el-table>
        <pagination v-show="recordTotal > 0" :total="recordTotal" layout="total, sizes, prev, pager, next, jumper" :page="recordPage.current"
                    :limit="recordPage.size" @pagination="recordPaginationChange" />
src/views/salesManagement/salesLedger/index.vue
@@ -56,7 +56,7 @@
        <el-table-column label="合同金额(元)" prop="contractAmount" width="180" show-overflow-tooltip :formatter="formattedNumber"/>
        <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/>
        <el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip/>
        <el-table-column fixed="right" label="操作" min-width="60" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">编辑</el-button>
@@ -439,11 +439,14 @@
  })
}
const getProductModel =(value) => {
  console.log('value', value)
  const index = modelOptions.value.findIndex(item => item.id === value);
  if (index !== -1) {
    productForm.value.specificationModel = modelOptions.value[index].model;
    productForm.value.unit = modelOptions.value[index].unit;
  } else {
    productForm.value.specificationModel = null;
    productForm.value.unit = null;
  }
}
const findNodeById = (nodes, productId) => {