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

maven

2 天以前 7f9b99a28cd983fa55b5788519682e4794cf6cb0

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -2,13 +2,37 @@
  <div class="app-container">
    <div class="search_form">
      <el-form :model="filters" :inline="true">
        <el-form-item label="采购合同号：">
        <el-form-item label="供应商名称">
          <el-input
              v-model="filters.supplierName"
              placeholder="请输入名称搜索"
              clearable
              :prefix-icon="Search"
              @change="handleQuery"
          />
        </el-form-item>
        <el-form-item label="采购订单号：">
          <el-input
            v-model="filters.purchaseContractNumber"
            placeholder="请输入"
            clearable
            prefix-icon="Search"
            @change="getTableData"
          />
        </el-form-item>

        <el-form-item label="销售合同号">
          <el-input
              v-model="filters.salesContractNo"
              placeholder="请输入销售合同号"
              clearable
          />
        </el-form-item>
        <el-form-item label="项目名称">
          <el-input
              v-model="filters.projectName"
              placeholder="请输入项目名称"
              clearable
          />
        </el-form-item>
        <el-form-item>
@@ -24,8 +48,8 @@
          <el-button type="primary" @click="handleAdd('add')">
            新增登记
          </el-button>
          <el-button @click="handleOut">导出</el-button>
          <el-button type="danger" plain @click="handleDelete">删除</el-button>
<!--          <el-button @click="handleOut">导出</el-button>-->
<!--          <el-button type="danger" plain @click="handleDelete">删除</el-button>-->
        </div>
      </div>
      <PIMTable
@@ -61,7 +85,7 @@
        </template>
      </PIMTable>
    </div>
    <Modal ref="modalRef"></Modal>
    <Modal ref="modalRef" @refreshList="getTableData"></Modal>
  </div>
</template>

@@ -116,12 +140,12 @@
    {
      label: "供应商名称",
      prop: "supplierName",
      width:200
      width:300
    },
    {
      label: "项目名称",
      prop: "projectName",
      width:150
      width:400
    },
    {
      label: "录入人",
@@ -203,7 +227,13 @@
const handleDelete = () => {
   let ids = [];
   if (selectedRows.value.length > 0) {
      ids = selectedRows.value.map((item) => item.id);
    // 新增判断：如果有选中的数据没有ticketRegistrationId，提示并终止
    const noTicket = selectedRows.value.some(item => !item.ticketRegistrationId);
    if (noTicket) {
      proxy.$modal.msgWarning("采购台账还未进行来票登记,无法进行删除操作");
      return;
    }
      ids = selectedRows.value.map((item) => item.ticketRegistrationId);
   } else {
      proxy.$modal.msgWarning("请选择数据");
      return;
@@ -231,8 +261,9 @@
  }
};

const changePage = ({ page }) => {
const changePage = ({ page, limit }) => {
  pagination.currentPage = page;
  pagination.pageSize = limit;
  onCurrentChange(page);
};
// 主表合计方法