Merge branch 'master' of http://192.168.0.22:9001/r/lims-before

Fixiaobai

2023-09-09 34a7e21b3508ac0f5f011d958210fdb7176d726b

 src/views/experiment/reportAuditing/index.vue

@@ -22,9 +22,9 @@
          <el-radio-group v-model="checkStatus" @change="handleRadioChange">
            <el-radio-button>全部</el-radio-button>
            <el-radio-button label="0">待通过</el-radio-button>
            <el-radio-button label="2">通过</el-radio-button>
            <el-radio-button label="1">通过</el-radio-button>
          </el-radio-group>
          <el-checkbox v-model="checked" style="margin-left: 20px"
          <el-checkbox @change="changeMy" v-model="checked" style="margin-left: 20px"
            >仅看我的</el-checkbox
          >
        </div>
@@ -32,7 +32,7 @@
      <div class="table-box">
        <el-table
          ref="reportTable"
          :max-height="800"
          :max-height="600"
          :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{
            border: '0px',
@@ -63,7 +63,7 @@
              </span>
            </template></el-table-column
          >
          <el-table-columne
          <el-table-column
            prop="materialName"
            label="样品名称"
            min-width="10%"
@@ -107,18 +107,18 @@
            </template>
          </el-table-column>
        </el-table>
        <!-- 分页器 -->
        <div>
          <el-pagination
            :current-page="page"
            :page-sizes="[10, 20, 30, 40]"
            :page-size="pageSize"
            layout="total, sizes, prev, pager, next, jumper"
            :total="total"
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
          />
        </div>
      </div>
      <!-- 分页器 -->
      <div style="text-align: right;">
        <el-pagination
          :current-page="page"
          :page-sizes="[10, 20, 30, 40]"
          :page-size="pageSize"
          layout="total, sizes, prev, pager, next, jumper"
          :total="total"
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
        />
      </div>
    </div>
  </div>
@@ -134,11 +134,11 @@
      reportTable: [],
      page: 1,
      total: 0,
      pageSize: 8,
      pageSize: 10,
      checkskipvisible: false,
      form:{},
      formLabelWidth: '120px',
      checked:{},
      checked: false,
      usertt:[],
      Auditconclusion:{},
      tableRow: {},
@@ -151,6 +151,9 @@
    shenHE(s){
      this.tableRow=s
      this.checkskipvisible=true
    },
    changeMy(){
      this.getData()
    },
    // 状态按钮
    handleRadioChange() {
@@ -182,11 +185,6 @@
      this.reportTable[this.tableRow.$index].status=1
      this.transmitData(this.tableRow.row.id,1)
      this.checkskipvisible= false
      this.$message({
          message: '通过成功',
          type: 'success'
        });
         this.getData();
    },
    //不通过
     nocheckskip(row) {
@@ -194,16 +192,12 @@
      this.reportTable[this.tableRow.$index].status=0
      this.transmitData(this.tableRow.row.id,2)
      this.checkskipvisible= false
      this.$message({
          message: '待通过',
          type: 'warning'
        });
        this.getData();
    },
    //审核
    async transmitData(id, result) {
      let param={"id":id,"result":result}
     let data = await checkApi(param)
     await this.getData();
    },
    // 查询列表
    async getData() {
@@ -212,8 +206,10 @@
        pageSize: this.pageSize,
        name: this.input ? this.input : undefined,
        status: this.checkStatus ? this.checkStatus : undefined,
        checked: this.checked
      };
      const { data } = await selectAllReportCheck(params);
      console.log(data);
      this.reportTable = data.row;
      this.total = data.total;
    },
@@ -240,6 +236,7 @@
  }
}
.library-table {
  height:80vh;
  background-color: #fff;
  flex: 1;
  margin: 0px -15px;