src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -20,7 +20,6 @@
      <div>
        <el-button size="small" @click="exportFun">导 出</el-button>
        <el-button size="small" type="primary" @click="importVisible = true">导 入</el-button>
        <el-button size="small" type="primary" @click="openFormDia('add')">新 增</el-button>
      </div>
    </div>
    <div class="table">
@@ -28,8 +27,7 @@
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
    <form-dia v-if="formDia" ref="formDia" @closeYearDia="closeYearDia"></form-dia>
    <borrow-dia v-if="borrowDia" ref="borrowDia" @closeYearDia="closeBorrowDia"></borrow-dia>
    <return-dia v-if="returnDia" ref="returnDia" @closeYearDia="closeReturnDia"></return-dia>
    <borrow-dia v-if="borrowDia" ref="borrowDia" @closeBorrowDia="closeBorrowDia"></borrow-dia>
    <el-dialog title="标准物质导入" v-model="importVisible" width="500px" @closed="resetImport">
      <div style="margin-bottom: 12px;">
        请使用标准物质导入模板填写数据,单个文件不超过10MB。
@@ -61,14 +59,12 @@
} from '@/api/cnas/resourceDemand/standardMaterial/standardMaterial'
import FormDia from '../standardMaterial/component/formDia.vue';
import BorrowDia from '../standardMaterial/component/borrowDia.vue';
import ReturnDia from '../standardMaterial/component/returnDia.vue';
export default {
  name: 'StandardMaterial',
  components: {
    limsTable,
    FormDia,
    BorrowDia,
    ReturnDia
    BorrowDia
  },
  data() {
    return {
@@ -93,6 +89,11 @@
          minWidth: '100'
        },
        {
          label: '供应商',
          prop: 'supplier',
          minWidth: '120'
        },
        {
          label: '出厂编号',
          prop: 'factoryNum',
          minWidth: '100'
@@ -111,6 +112,11 @@
          label: '数量',
          prop: 'quantity',
          minWidth: '100'
        },
        {
          label: '单位',
          prop: 'unit',
          minWidth: '80'
        },
        {
          label: '购置日期',
@@ -156,18 +162,11 @@
              },
            },
            {
              name: '借用',
              name: '领用',
              type: 'text',
              clickFun: (row) => {
                this.borrow(row);
              },
            },
            {
              name: '归还',
              type: 'text',
              clickFun: (row) => {
                this.return(row);
              }
            },
            {
              name: '删除',
@@ -190,7 +189,6 @@
      total: 0,
      formDia: false,
      borrowDia: false,
      returnDia: false,
      importVisible: false,
      importing: false,
      importFiles: [],
@@ -316,17 +314,6 @@
    },
    closeBorrowDia() {
      this.borrowDia = false
      this.searchList()
    },
    // 归还
    return(row) {
      this.returnDia = true
      this.$nextTick(() => {
        this.$refs.returnDia.openDia(row)
      })
    },
    closeReturnDia() {
      this.returnDia = false
      this.searchList()
    },
    // 重置查询条件