Merge remote-tracking branch 'origin/master'

gaoluyang

8 小时以前 d0716996bcc06c5b4dbeb4a11c909dd1a77f4368

 src/views/CNAS/resourceDemand/device/component/usingExternalInstruments.vue

@@ -4,7 +4,7 @@
      <div style="display: flex;justify-content: space-between;margin-top: 10px;">
        <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>
            <span style="width: 88px;font-size: 14px;font-weight: 700;color: var(--lims-text-2);">单位名称</span>
            <el-input size="small" placeholder="请输入" clearable v-model="searchForm.unitName"
                      @keyup.enter="getYearTableDetailData"></el-input>
          </div>
@@ -36,15 +36,15 @@
          <!-- 操作按钮 -->
          <el-table-column align="center" fixed="right" label="操作" min-width="150">
            <template #default="scope">
              <el-button :disabled="scope.row.ratifyStatus === 1" size="small" link type="primary"
              <el-button :disabled="scope.row.isFinish === 1" size="small" link type="primary"
                @click="handleForm(scope.row.externalApplyId)">操作</el-button>
              <el-button size="small" link type="primary" @click="handleDownOne(scope.row.externalApplyId)">导出</el-button>
              <el-button size="small" link type="danger"
              <el-button :disabled="scope.row.isFinish === 1" size="small" link type="danger"
                @click="deleteFun(scope.row.externalApplyId)">删除</el-button>
            </template>
          </el-table-column>
        </el-table>
        <el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
        <el-pagination :current-page="pagination1.current" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
          :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper" background
          @size-change="handleSizeChange1" @current-change="handleCurrentChange1">
        </el-pagination>
@@ -61,6 +61,7 @@
  exportDeviceExternalApply,
  delDeviceExternalApply,
} from '@/api/cnas/resourceDemand/device.js'
import { saveBlobOrShowError } from '@/utils/saveBlob'
export default {
  name: "using-external-instruments",
  // import 引入的组件需要注入到对象中才能使用
@@ -135,8 +136,9 @@
      this.outLoading = true
      exportDeviceExternalApply({ externalApplyId: id }).then(res => {
        this.outLoading = false
        const blob = new Blob([res], { type: 'application/octet-stream' });
        this.$download.saveAs(blob, '利用外部仪器设备申请表.doc')
        saveBlobOrShowError(res, '利用外部仪器设备申请表.doc', 'application/msword')
      }).catch(() => {
        this.outLoading = false
      })
    },
    // 删除