Merge remote-tracking branch 'origin/master'

吴羡

昨天 a52ac50ffc5f3b369eb689dd734bfb8a4bb988a4

 src/views/CNAS/process/method/methodVerification/component/wordFormDIa.vue

@@ -1,6 +1,6 @@
<template>
  <div>
    <el-dialog v-model="visible" :title="operationType === 'edit' ? '编辑方法验证' : '新增方法验证'"
    <el-dialog v-model="visible" :title="dialogTitle"
               width="90%" :close-on-click-modal="false" @close="closeDia">
      <div class="form-body">
        <table class="verify-table">
@@ -104,7 +104,7 @@
      </div>
      <template #footer>
        <el-button @click="closeDia">取消</el-button>
        <el-button :loading="loading" type="primary" @click="submit">提交</el-button>
        <el-button v-if="operationType !== 'view'" :loading="loading" type="primary" @click="submit">提交</el-button>
      </template>
    </el-dialog>
    <ViewDeviceDialog v-if="deviceVisible" ref="device" @closDeviceDia="deviceVisible = false"
@@ -116,12 +116,12 @@
</template>

<script>
import ViewDeviceDialog from '../../standardMethodsChange/component/ViewDeviceDialog.vue'
import ViewTestRecord from '../../standardMethodsChange/component/ViewTestRecord.vue'
import ViewDeviceDialog from './ViewDeviceDialog.vue'
import ViewTestRecord from './ViewTestRecord.vue'
import ViewWorkPermitDia from './viewWorkPermitDia.vue'
import CalibrationsFileDia from '../../standardMethodsChange/component/calibrationsFileDia.vue'
import CalibrationsFileDia from './calibrationsFileDia.vue'
import {addMethodVerify, getMethodVerifyOne, updateMethodVerify} from '@/api/cnas/process/method/methodVerification'
import {selectUserCondition} from '@/api/cnas/process/method/standardMethodsChange'
import {selectUserCondition} from '@/api/cnas/process/method/methodVerification'

const labels = [
  ['personnel', '人员能力'], ['equipment', '检测设备'], ['reagents', '试剂要求'],
@@ -156,6 +156,12 @@
  name: 'MethodVerificationWordForm',
  components: {ViewDeviceDialog, ViewTestRecord, ViewWorkPermitDia, CalibrationsFileDia},
  props: {operationType: {type: String, default: 'add'}},
  computed: {
    dialogTitle() {
      if (this.operationType === 'view') return '查看方法验证'
      return this.operationType === 'edit' ? '编辑方法验证' : '新增方法验证'
    }
  },
  data() {
    return {
      visible: false, loading: false, decisions,
@@ -171,7 +177,7 @@
      selectUserCondition().then(res => {
        if (res.code === 200) this.userList = res.data || []
      })
      if (this.operationType === 'edit') this.load(row)
      if (this.operationType !== 'add') this.load(row)
    },
    load(row) {
      getMethodVerifyOne({methodVerifyId: row.methodVerifyId}).then(res => {