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

zouyu

2023-09-06 b533c9cedb2252dfdc001f3d9358c7f082a3a9ae

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

 src/views/experiment/passRateStatistics/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="content-main">
    <div class="top-bar">
      <el-form ref="form" :inline="true" :rules="rules" :model="searchData" label-position="top">
      <el-form ref="form" :inline="true" :rules="rules" :model="searchData" label-position="left">
        <el-form-item label="检测日期:" class="sermargin" prop="date">
          <el-date-picker v-model="searchData.date" type="daterange" range-separator="至" start-placeholder="开始日期"
            end-placeholder="结束日期">
@@ -27,12 +27,10 @@
            </el-option>
          </el-select>
        </el-form-item>
        <div class="rightBtn" style="position: absolute;top: 90px;right: 20px;">
          <el-form-item>
            <el-button type="primary" @click="clear" plain size="mini">清空</el-button>
            <el-button type="primary" @click="search" size="mini">查询</el-button>
          </el-form-item>
        </div>
      </el-form>
    </div>
    <div class="top-bar-copy"></div>
@@ -422,7 +420,7 @@

  .top-bar-copy {
    width: 100%;
    height: 12vh;
    height: 7vh;
  }

  .chart-content {

 src/views/experiment/planAssignments/plan.vue

@@ -96,8 +96,10 @@
                </el-table-column>
                <el-table-column prop="testState" label="检验状态" width="100px">
                    <template slot-scope="scope">
                        <el-tag type="success" v-if="scope.row.testState==1">已报检</el-tag>
                        <el-tag type="danger" v-else-if="scope.row.testState==0">未报检</el-tag>
                        <el-tag type="success" effect="dark" v-if="scope.row.children!=undefined&&scope.row.testState!=null">已上报</el-tag>
                        <el-tag type="danger" effect="dark" v-else-if="scope.row.children!=undefined&&scope.row.testState==null">未上报</el-tag>
                        <el-tag type="success" v-else-if="scope.row.children==undefined&&scope.row.testState!=null">已检验</el-tag>
                        <el-tag type="danger" v-else-if="scope.row.children==undefined&&scope.row.testState==null">未检验</el-tag>
                    </template>
                </el-table-column>
                <el-table-column prop="startTime" label="检验开始" width="100px">
@@ -268,7 +270,6 @@
                    .children.length
            },
            openUpDia(row) {
                console.log(row);
                // console.log(row);
                this.upDia = true
                this.upData = {

 src/views/experiment/reportAuditing/index.vue

@@ -88,26 +88,22 @@
                @click="handleClick(scope.row)"
                >查看详细
              </el-button>
            <el-button  type="text" size="small" @click="shenHE(scope)">审核</el-button>

            <el-button  type="text" size="small" v-if="scope.row.status === 0" @click="shenHE(scope)">审核</el-button>
            <el-dialog
              title="原始记录审核"
              :visible.sync="checkskipvisible"
              width="30%"

              >
              <el-form :model="form">
                <el-form-item label="请选择审核结果:" :label-width="formLabelWidth">
                </el-form-item>
              </el-form>

              <div slot="footer" class="dialog-footer">
                <el-button @click="checkskipvisible = false">取 消</el-button>
                <el-button style="background-color: rgb(206, 211, 216);" @click="nocheckskip(scope.row)" >不通过</el-button>
                <el-button type="primary" @click="checkskip(scope.row)">通过</el-button>
              </div>
            </el-dialog>

            </template>
          </el-table-column>
        </el-table>