Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue

@@ -1,18 +1,18 @@
<template>
  <div class="capacity-scope">
    <div class="search">
      <div>
        <el-form :model="form" ref="form" size="small" :inline="true">
          <el-form-item label="物质名称">
            <el-input v-model="form.name"></el-input>
          </el-form-item>
          <el-form-item>
            <el-button @click="reset">重 置</el-button>
            <el-button type="primary" @click="getTableData">查 询</el-button>
          </el-form-item>
        </el-form>
    <div style="display: flex;justify-content: space-between">
      <div style="display: flex;">
        <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
          <span style="width: 88px;font-size: 14px;font-weight: 700;color: #606266;">物质名称</span>
          <el-input size="small" placeholder="请输入" clearable v-model="form.name"
                    @keyup.enter.native="getTableData"></el-input>
        </div>
        <div style="line-height: 30px;">
          <el-button type="primary" @click="getTableData" size="mini">查询</el-button>
          <el-button @click="reset" size="mini">重置</el-button>
        </div>
      </div>
      <div>
      <div style="line-height: 30px;">
        <el-button icon="el-icon-plus" size="small" type="primary" @click="openDialog">添加验收</el-button>
        <el-button size="small" type="primary" @click="exportExcel">导出</el-button>
      </div>
@@ -113,9 +113,13 @@
  },
  methods: {
    getTableData() {
      this.tableLoading = true
      getPageAcceptance({...this.form, ...this.page}).then(res => {
        this.tableLoading = false
        this.tableData = res.data.records;
        this.page.total = res.data.total;
      }).catch(error => {
        this.tableLoading = false
      })
    },
    openDialog() {