spring
2025-03-20 4ff4e1d736dff5434fcd28508df83af99b54a0d4
能力范围、实验室能力档案功能变更
已修改4个文件
49 ■■■■ 文件已修改
src/views/CNAS/process/method/standardMethod/index.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/structural/capabilityAndLaboratory/capability/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/process/method/standardMethod/index.vue
@@ -53,10 +53,12 @@
        <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
      </div>
      <div class="btn">
        <!-- <el-button size="small" @click="$refs.ValueTable.openUpload()" v-if="inPower">
          <i class="el-icon-upload2" style="color: #3a7bfa"></i>
          <span style="color: #3a7bfa">导入</span></el-button> -->
        <el-button size="small" type="primary" @click="openAdd" v-if="addPower">新增</el-button>
        <el-upload ref='upload' style="display: inline;margin-right: 8px" :action="uploadAction"
          :before-upload="beforeUpload" :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp"
          :show-file-list="false" accept='.xls,.xlsx'>
          <el-button size="small" type="primary">导入</el-button>
        </el-upload>
        <el-button size="small" type="primary" @click="openAdd">新增</el-button>
      </div>
    </div>
    <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
@@ -130,6 +132,7 @@
  },
  data() {
    return {
      uploadAction: process.env.VUE_APP_BASE_API + '/standardMethod/importStandardDetails',
      addPower: true,
      title: "新增",
      inPower: true,
@@ -371,6 +374,29 @@
        })
        .catch(() => { });
    },
    // 上传文件
    beforeUpload(file, fileList) {
      if (file.size > 1024 * 1024 * 10) {
        this.$message.error('上传文件不超过10M');
        this.$refs.upload.clearFiles()
        return false;
      } else {
        return true;
      }
    },
    onError(err, file, fileList) {
      this.$message.error('上传失败')
      this.$refs.upload.clearFiles()
    },
    handleSuccessUp(response, file, fileList) {
      this.$refs.upload.clearFiles()
      if (response.code !== 200) {
        this.$message.error(response.msg)
        return
      }
      this.$message.success('上传成功')
      this.refreshTable()
    },
  },
};
</script>
src/views/login.vue
@@ -38,7 +38,7 @@
            <router-link class="link-type" :to="'/register'">立即注册</router-link>
          </div>
        </el-form-item>
        <el-button v-if="false" type="primary" plain @click="goLogin">集团集成登录</el-button>
        <!-- <el-button v-if="false" type="primary" plain @click="goLogin">集团集成登录</el-button> -->
      </el-form>
    </div>
    <!--  底部  -->
src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -155,13 +155,13 @@
        { label: '试验室', prop: 'sonLaboratory' },
        { label: '要求描述', prop: 'askTell' },
        { label: '要求值', prop: 'ask' },
        { label: '试验条件', prop: 'radiusList' },
        { label: '计量单位', prop: 'unit' },
        { label: '工时(H)', prop: 'manHour' },
        { label: '预计时间(H)', prop: 'manDay' },
        { label: '工时分组', prop: 'manHourGroup' },
        { label: '创建时间', prop: 'createTime' },
        { label: '修改时间', prop: 'updateTime' },
        { label: '条件', prop: 'radiusList' },
        {
          dataType: 'action',
          fixed: 'right',
@@ -514,6 +514,11 @@
      }
    },
    refresh() {
      this.itemParameterForm = {
        inspectionItem: null,
        inspectionItemSubclass: null,
        sample: null
      }
      this.resetForm('itemParameterForm')
      this.page.current = 1
      this.refreshTable()
src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue
@@ -64,9 +64,9 @@
        specimenName: [
          { required: true, message: '请输入检验对象', trigger: 'blur' }
        ],
        // code: [
        //   { required: true, message: '请输入对象代号', trigger: 'blur' }
        // ],
        objectType: [
          { required: true, message: '请输入对象类型', trigger: 'change' }
        ],
      },
      operationType: ''
    }