合并装备代码

spring

2025-03-21 7ec7fea9b03f6fb66b25769e3ec578528ccf2365

 src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue

@@ -9,8 +9,8 @@
              @keyup.enter.native="getYearPlanList"></el-input>
          </el-form-item>
          <el-form-item>
            <el-button icon="el-icon-refresh" size="mini" @click="clearYear">重 置</el-button>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="getYearPlanList">查 询</el-button>
            <el-button type="primary" size="mini" @click="getYearPlanList">查询</el-button>
            <el-button size="mini" @click="clearYear">重置</el-button>
          </el-form-item>
        </el-form>
        <div>
@@ -36,8 +36,8 @@
            <el-input v-model="yearDetailForm.superviseProject" placeholder="请输入" size="small"></el-input>
          </el-form-item>
          <el-form-item>
            <el-button icon="el-icon-refresh" size="mini" @click="clearDetail">重 置</el-button>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="getYearDetailPlanList">查 询</el-button>
            <el-button type="primary" size="mini" @click="getYearDetailPlanList">查询</el-button>
            <el-button size="mini" @click="clearDetail">重置</el-button>
          </el-form-item>
        </el-form>
        <div>
@@ -136,7 +136,7 @@
import { mapGetters } from "vuex";

export default {
  name: 'a7-quality-control-plan',
  name: 'QualityControlPlan',
  // import 引入的组件需要注入到对象中才能使用
  components: { limsTable, RectifyDialogNew, ProcessingSheet, RecordsDialog, DetailFormDialog },
  data() {
@@ -200,7 +200,6 @@
          minWidth: '160'
        }, {
          dataType: 'action',
          minWidth: '170',
          label: '操作',
          fixed: 'right',
          operation: [
@@ -284,7 +283,6 @@
          minWidth: '150px'
        }, {
          dataType: 'action',
          width: '260',
          label: '操作',
          fixed: 'right',
          operation: [
@@ -473,7 +471,7 @@
      this.getUserList()
    },
    getUserList() {
      selectUserCondition({ type: 0 }).then((res) => {
      selectUserCondition({ type: 2 }).then((res) => {
        this.userList = res.data;
      })
    },