湟水峡-销售台账/采购台账,有可能同一个公司不同单子,但是开票登记的时候会一起,一对多或者多对一
已修改3个文件
419 ■■■■ 文件已修改
src/views/procurementManagement/invoiceEntry/components/Modal.vue 322 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/invoiceEntry/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/invoiceRegistration/index.vue 91 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/invoiceEntry/components/Modal.vue
@@ -10,17 +10,7 @@
      <el-row :gutter="30">
        <el-col :span="12">
          <el-form-item label="采购合同号:" prop="purchaseLedgerNo">
            <el-input v-model="form.purchaseLedgerNo" disabled />
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="销售合同号:" prop="salesContractNo">
            <el-input
              v-model="form.salesContractNo"
              placeholder="自动填充"
              clearable
              disabled
            />
            <el-input v-model="form.purchaseLedgerNo" disabled placeholder="多合同批量处理(具体合同号见产品列表)" />
          </el-form-item>
        </el-col>
        <el-col :span="12">
@@ -56,9 +46,8 @@
          <el-form-item label="发票金额(元):" prop="invoiceAmount">
            <el-input-number :step="0.01" :min="0" style="width: 100%"
              v-model="form.invoiceAmount"
              placeholder="自动填充"
              placeholder="请输入发票金额"
              clearable
              :disabled="true"
            />
          </el-form-item>
        </el-col>
@@ -85,6 +74,18 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="录入日期:" prop="enterDate">
            <el-date-picker
              style="width: 100%"
              v-model="form.enterDate"
              type="date"
              value-format="YYYY-MM-DD"
              format="YYYY-MM-DD"
              clearable
            />
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="上传附件">
            <FileUpload
              :showTip="false"
@@ -100,59 +101,70 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="录入日期:" prop="enterDate">
            <el-date-picker
              style="width: 100%"
              v-model="form.enterDate"
              type="date"
              value-format="YYYY-MM-DD"
              format="YYYY-MM-DD"
              clearable
            />
          </el-form-item>
        </el-col>
      </el-row>
      <el-form-item label="产品信息:"> </el-form-item>
      <PIMTable
        rowKey="id"
        :column="columns"
        :tableData="form.productData"
                :summaryMethod="summarizeChildrenTable"
                :isShowSummary="true"
        height="auto"
      <el-table
        :data="form.productData"
        border
        show-summary
        :summary-method="summarizeChildrenTable"
      >
        <template #ticketsNumRef="{ row }">
          <el-input-number
            v-model="row.ticketsNum"
            placeholder="请输入"
            :min="0"
            :step="0.1"
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="所属合同" prop="purchaseLedgerNo" width="200">
          <template #default="{ row }">
            <el-tag type="primary">{{ row.purchaseLedgerNo }}</el-tag>
          </template>
        </el-table-column>
        <el-table-column label="产品大类" prop="productCategory" />
        <el-table-column label="规格型号" prop="specificationModel" width="150" />
        <el-table-column label="单位" prop="unit" width="70" />
        <el-table-column label="数量" prop="quantity" width="70" />
        <el-table-column label="税率(%)" prop="taxRate" width="80" />
        <el-table-column
          label="含税单价(元)"
          prop="taxInclusiveUnitPrice"
          :formatter="formattedNumber"
        />
        <el-table-column
          label="含税总价(元)"
          prop="taxInclusiveTotalPrice"
          :formatter="formattedNumber"
        />
        <el-table-column
          label="不含税总价(元)"
          prop="taxExclusiveTotalPrice"
          :formatter="formattedNumber"
        />
        <el-table-column label="本次开票数" prop="ticketsNum" width="180">
          <template #default="scope">
            <el-input-number :step="0.1" :min="0" style="width: 100%"
                        :precision="2"
            clearable
            style="width: 100%"
            @change="invoiceNumBlur(row)"
              v-model="scope.row.ticketsNum"
              @change="invoiceNumBlur(scope.row)"
          />
        </template>
        <template #ticketsAmountRef="{ row }">
          <el-input-number
            v-model="row.ticketsAmount"
            placeholder="请输入"
            :min="0"
        </el-table-column>
        <el-table-column
          label="本次开票金额(元)"
          prop="ticketsAmount"
          width="180"
        >
          <template #default="scope">
            <el-input-number :step="0.01" :min="0" style="width: 100%"
                        :precision="2"
            :step="0.1"
            clearable
            style="width: 100%"
            @change="invoiceAmountBlur(row)"
              v-model="scope.row.ticketsAmount"
              @change="invoiceAmountBlur(scope.row)"
          />
        </template>
      </PIMTable>
        </el-table-column>
      </el-table>
    </el-form>
    <template #footer>
            <el-button type="primary" :loading="modalLoading" @click="submitForm">
                {{ modalOptions.confirmText }}
                确认
            </el-button>
      <el-button @click="closeModal">{{ modalOptions.cancelText }}</el-button>
      <el-button @click="closeModal">取消</el-button>
    </template>
  </el-dialog>
</template>
@@ -196,6 +208,8 @@
  productData: [], // 表格
  tempFileIds: [], // 文件
});
const selectedContracts = ref([]); // 存储选中的合同数据
const rules = ref({
  invoiceNumber: [
@@ -305,22 +319,83 @@
        width: 200,
  },
];
const getTableData = async (type, id) => {
const formattedNumber = (row, column, cellValue) => {
    if (cellValue == 0) {
        return parseFloat(cellValue).toFixed(2);
    }
    if (cellValue) {
        return parseFloat(cellValue).toFixed(2);
    } else {
        return cellValue;
    }
};
const getTableData = async (type, selectedRows) => {
  if (type == "add") {
    const { data } = await getPurchaseNoById({ id });
    form.purchaseLedgerNo = data.purchaseContractNumber;
    form.invoiceAmount = data.invoiceAmount;
    form.invoiceNumber = data.invoiceNumber;
    form.entryDate = data.entryDate;
    form.salesContractNoId = data.salesContractNoId;
    // 检查所有选择的合同是否具有相同的供应商名称
    const firstRow = selectedRows[0];
    const isSameSupplier = selectedRows.every(row =>
      row.supplierName === firstRow.supplierName
    );
    const { data: infoData } = await getInfo({ id });
    form.salesContractNo = infoData.salesContractNo;
    form.projectName = infoData.projectName;
    form.supplierName = infoData.supplierName;
    form.productData = infoData.productData;
    if (!isSameSupplier) {
      proxy.$modal.msgError("请选择相同供应商名称的合同");
      return;
    }
    // 允许不同的采购合同号批量处理,无需检查重复
    // 清空表单数据
    Object.keys(form).forEach(key => {
      if (key !== 'productData') {
        form[key] = undefined;
      }
    });
    form.productData = [];
    // 加载所有选中合同的产品数据
    const promises = selectedRows.map(row =>
      getInfo({ id: row.id })
    );
    Promise.all(promises).then(results => {
      // 合并所有合同的产品数据,并为每个产品添加对应的合同信息
      const allProductData = [];
      results.forEach((result, index) => {
        const contract = selectedRows[index];
        const contractId = contract.id;
        if (result.data && result.data.productData) {
          result.data.productData.forEach(item => {
            allProductData.push({
              ...item,
              id: contractId, // 明确设置合同ID
              purchaseLedgerNo: contract.purchaseContractNumber, // 添加采购合同号
              supplierName: contract.supplierName, // 添加供应商名称
              projectName: contract.projectName // 添加项目名称
            });
          });
        }
      });
      // 设置表单数据(使用第一个合同的基本信息,采购合同号留空)
      form.purchaseLedgerNo = ""; // 采购合同号留空,因为会在产品表格中分别显示
      form.invoiceAmount = 0;
      form.invoiceNumber = "";
      form.entryDate = dayjs().format("YYYY-MM-DD");
      form.enterDate = dayjs().format("YYYY-MM-DD");
      form.salesContractNo = results[0].data.salesContractNo;
      form.projectName = results[0].data.projectName;
      form.supplierName = results[0].data.supplierName;
      // 保留录入人信息
      form.issUerId = userStore.id;
      form.issUer = userStore.nickName;
      form.productData = allProductData;
      // 存储选中的合同数据
      selectedContracts.value = selectedRows;
    });
  } else if (type == "edit") {
    const id = Array.isArray(selectedRows) ? selectedRows[0].id : selectedRows;
    const data = await getPurchaseById({ id, type: 2 });
    form.purchaseLedgerNo = data.purchaseContractNumber;
    form.invoiceAmount = data.invoiceAmount;
@@ -395,10 +470,23 @@
  form.invoiceAmount = invoiceAmountTotal.toFixed(2);
};
const open = (type, eid) => {
  openModal();
  getTableData(type, eid);
  id.value = eid;
const open = async (type, selectedRows) => {
  visible.value = true;
  // 如果是批量操作,设置标题
  if (Array.isArray(selectedRows) && selectedRows.length > 1) {
    modalOptions.title = `批量新增 (${selectedRows.length}条)`;
  } else {
    modalOptions.title = type == "add" ? "新增" : "编辑";
  }
  // 如果是单个操作,获取id
  if (!Array.isArray(selectedRows) || selectedRows.length === 1) {
    const idValue = Array.isArray(selectedRows) ? selectedRows[0].id : selectedRows;
    id.value = idValue;
  }
  await getTableData(type, selectedRows);
};
const uploadSuccess = (response) => {
@@ -417,32 +505,96 @@
};
const submitForm = () => {
  formRef.value.validate(async (valid, fields) => {
  proxy.$refs["formRef"].validate((valid) => {
    if (valid) {
      // modalLoading.value = true;
      const { code } = await addOrUpdateRegistration({
        purchaseLedgerId: id.value,
        purchaseContractNumber: form.purchaseLedgerNo,
      // 如果是批量操作,将所有合同的数据放在一个数组里,只调用一次接口
      if (selectedContracts.value.length > 1) {
        // 创建包含所有合同数据的数组
        const batchData = selectedContracts.value.map(contract => {
          // 筛选出属于当前合同的产品数据
          const contractProductData = form.productData.filter(item =>
            item.id === contract.id
          );
          // 为每个采购合同创建独立的对象
          return {
            // 基础表单数据
        invoiceNumber: form.invoiceNumber,
        invoiceAmount: form.invoiceAmount,
        salesContractNo: form.salesContractNo,
        projectName: form.projectName,
        productData: form.productData,
        issueDate: form.entryDate,
            entryDate: form.entryDate,
            enterDate: form.enterDate,
        issUerId: form.issUerId, // 录入人id
        issUer: form.issUer, // 录入人
        salesContractNoId: form.salesContractNoId,
        supplierName: form.supplierName,
        tempFileIds: form.tempFileIds,
        enterDate: form.enterDate,
        type: 4,
            // 合同实际信息
            purchaseLedgerId: contract.id, // 使用id作为字段名,值为purchaseLedgerId
            purchaseContractNumber: contract.purchaseContractNumber, // 使用实际的采购合同号
            salesContractNo: contract.salesContractNo, // 使用实际的销售合同号
            supplierName: contract.supplierName, // 使用实际的供应商名称
            projectName: contract.projectName, // 使用实际的项目名称
            // 产品数据
            productData: proxy.HaveJson(contractProductData),
            // 批量标识
            isBatch: true,
            type: 4
          };
      });
        // 只调用一次接口,传递包含所有合同数据的数组
        modalLoading.value = true;
        addOrUpdateRegistration(batchData).then((res) => {
      modalLoading.value = false;
      if (code == 200) {
          if (res.code === 200) {
            proxy.$modal.msgSuccess("批量登记成功");
        closeAndRefresh();
      }
    } else {
        }).catch(() => {
      modalLoading.value = false;
          proxy.$modal.msgError("批量登记失败");
        });
      } else {
        // 单个合同提交逻辑
        const singleContract = selectedContracts.value[0];
        const singleForm = {
          // 基础表单数据
          invoiceNumber: form.invoiceNumber,
          invoiceAmount: form.invoiceAmount,
          entryDate: form.entryDate,
          enterDate: form.enterDate,
          issUerId: form.issUerId, // 录入人id
          issUer: form.issUer, // 录入人
          tempFileIds: form.tempFileIds,
          // 合同实际信息
          purchaseLedgerId: singleContract.id, // 使用id作为字段名,值为purchaseLedgerId
          purchaseContractNumber: singleContract.purchaseContractNumber, // 使用实际的采购合同号
          salesContractNo: singleContract.salesContractNo, // 使用实际的销售合同号
          supplierName: singleContract.supplierName, // 使用实际的供应商名称
          projectName: singleContract.projectName, // 使用实际的项目名称
          // 产品数据
          productData: proxy.HaveJson(form.productData),
          // 批量标识
          isBatch: false,
          type: 4
        };
        modalLoading.value = true;
        addOrUpdateRegistration(singleForm).then((res) => {
          modalLoading.value = false;
          if (res.code === 200) {
            proxy.$modal.msgSuccess("登记成功");
            closeAndRefresh();
          }
        }).catch(() => {
          modalLoading.value = false;
          proxy.$modal.msgError("登记失败");
        });
      }
    }
  });
};
src/views/procurementManagement/invoiceEntry/index.vue
@@ -199,11 +199,11 @@
};
const handleAdd = (type) => {
  if (selectedRows.value.length !== 1) {
    proxy.$modal.msgWarning("请先选中一条数据");
  if (selectedRows.value.length < 1) {
    proxy.$modal.msgWarning("请至少选中一条数据");
    return;
  }
  modalRef.value.open(type, selectedRows.value[0].id);
  modalRef.value.open(type, selectedRows.value);
};
const handleEdit = (type, id) => {
src/views/salesManagement/invoiceRegistration/index.vue
@@ -208,7 +208,7 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="销售合同号:" prop="salesContractNo">
              <el-input v-model="form.salesContractNo" disabled></el-input>
              <el-input v-model="form.salesContractNo" disabled placeholder="多合同批量处理(具体合同号见产品列表)"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -298,6 +298,11 @@
            type="index"
            width="60"
          />
          <el-table-column label="所属合同" prop="salesContractNo" width="200">
            <template #default="{ row }">
              <el-tag type="primary">{{ row.salesContractNo }}</el-tag>
            </template>
          </el-table-column>
          <el-table-column label="产品大类" prop="productCategory" />
          <el-table-column
            label="规格型号"
@@ -576,6 +581,8 @@
    return;
  }
  
  // 允许不同的销售合同号批量处理,无需检查重复
  form.value = {};
  productData.value = [];
  
@@ -585,26 +592,31 @@
  );
  
  Promise.all(promises).then(results => {
    // 合并所有合同的产品数据,并为每个产品添加对应的合同ID
    // 合并所有合同的产品数据,并为每个产品添加对应的合同信息
    const allProductData = [];
    results.forEach((result, index) => {
      const contractId = selectedRows.value[index].id;
      const contract = selectedRows.value[index];
      const contractId = contract.id;
      if (result.productData) {
        result.productData.forEach(item => {
          allProductData.push({
            ...item,
            salesLedgerId: contractId // 明确设置合同ID
            id: contractId, // 明确设置合同ID
            salesContractNo: contract.salesContractNo, // 添加销售合同号
            customerName: contract.customerName, // 添加客户名称
            customerContractNo: contract.customerContractNo // 添加客户合同号
          });
        });
      }
    });
    
    // 设置表单数据(使用第一个合同的基本信息)
    // 设置表单数据(使用第一个合同的基本信息,销售合同号留空)
    form.value = { ...results[0] };
    form.value.createTime = dayjs().format("YYYY-MM-DD");
    form.value.issueDate = dayjs().format("YYYY-MM-DD");
    form.value.createUer = userStore.nickName;
    form.value.selectedContractIds = selectedRows.value.map(row => row.id); // 存储所有选中的合同ID
    form.value.salesContractNo = ""; // 销售合同号留空,因为会在产品表格中分别显示
    
    productData.value = allProductData;
    
@@ -616,39 +628,72 @@
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    if (valid) {
      form.value.productData = proxy.HaveJson(productData.value);
      form.value.isBatch = selectedRows.value.length > 1; // 设置批量标识
      // 如果是批量操作,需要为每个合同创建单独的开票登记记录
      // 如果是批量操作,将所有合同的数据放在一个数组里,只调用一次接口
      if (selectedRows.value.length > 1) {
        // 批量提交逻辑
        const promises = selectedRows.value.map(contract => {
        // 创建包含所有合同数据的数组
        const batchData = selectedRows.value.map(contract => {
          // 筛选出属于当前合同的产品数据
          const contractProductData = productData.value.filter(item => 
            item.salesLedgerId === contract.id
          );
          
          const batchForm = {
            ...form.value,
            salesLedgerId: contract.id,
            productData: contractProductData,
            selectedContractIds: undefined, // 不传递批量ID
          // 为每个销售合同号创建独立的对象
          return {
            // 基础表单数据
            issueDate: form.value.issueDate,
            createTime: form.value.createTime,
            createUer: form.value.createUer,
            invoiceNo: form.value.invoiceNo,
            // 合同实际信息
            id: contract.id, // 使用id作为字段名,值为salesLedgerId
            salesContractNo: contract.salesContractNo, // 使用实际的销售合同号
            customerName: contract.customerName, // 使用实际的客户名称
            customerId: contract.customerId, // 添加客户ID
            customerContractNo: contract.customerContractNo, // 使用实际的客户合同号
            projectName: contract.projectName, // 使用实际的项目名称
            salesman: contract.salesman, // 使用实际的业务员
            // 产品数据
            productData: proxy.HaveJson(contractProductData),
            // 批量标识
            isBatch: true
          };
          return invoiceRegistrationSave(batchForm);
        });
        
        Promise.all(promises).then(results => {
          proxy.$modal.msgSuccess(`成功提交${results.length}条开票登记记录`);
        // 只调用一次接口,传递包含所有合同数据的数组
        invoiceRegistrationSave(batchData).then(() => {
          proxy.$modal.msgSuccess("批量新增成功");
          closeDia();
          getList();
        }).catch(error => {
          proxy.$modal.msgError("部分提交失败,请检查数据");
          console.error("批量提交错误:", error);
        });
      } else {
        // 单个合同提交逻辑
        invoiceRegistrationSave(form.value).then((res) => {
        const singleContract = selectedRows.value[0];
        const singleForm = {
          // 基础表单数据
          issueDate: form.value.issueDate,
          createTime: form.value.createTime,
          createUer: form.value.createUer,
          invoiceNo: form.value.invoiceNo,
          // 合同实际信息
          id: singleContract.id, // 使用id作为字段名,值为salesLedgerId
          salesContractNo: singleContract.salesContractNo, // 使用实际的销售合同号
          customerName: singleContract.customerName, // 使用实际的客户名称
          customerId: singleContract.customerId, // 添加客户ID
          customerContractNo: singleContract.customerContractNo, // 使用实际的客户合同号
          projectName: singleContract.projectName, // 使用实际的项目名称
          salesman: singleContract.salesman, // 使用实际的业务员
          // 产品数据
          productData: proxy.HaveJson(productData.value),
          // 批量标识
          isBatch: false
        };
        invoiceRegistrationSave(singleForm).then((res) => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
          getList();