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

Fixiaobai

2023-09-09 34a7e21b3508ac0f5f011d958210fdb7176d726b

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

 src/views/CNAS/reviewAnnualPlan/index.vue

@@ -281,7 +281,7 @@
        <el-table
          ref="auditTable"
          border
          :max-height="800"
          :max-height="660"
          :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{
            border: '0px',
@@ -602,6 +602,7 @@
}

.library-table {
  height: 80vh;
  background-color: #fff;
  flex: 1;
  margin: 0px -15px;

 src/views/experiment/checkTheReport/index.vue

@@ -43,7 +43,7 @@
                </div>
            </el-dialog>
            <div class="table-box">
                <el-table ref="reportTable" :max-height="800" :cell-style="{ textAlign: 'left' }" :header-cell-style="{
                <el-table ref="reportTable" height="200" :max-height="800" :cell-style="{ textAlign: 'left' }" :header-cell-style="{
            border: '0px',
            background: '#f5f7fa',
            color: '#606266',
@@ -313,13 +313,16 @@
        }

        .table-box {
            height: 60vh;
            padding: 0px 20px;
            margin-top: 0px;
            flex: 1;
            background: #fff;
            display: flex;
            flex-direction: column;

            .el-table{
                overflow: scroll;
            }
            >div:nth-child(2) {
                display: flex;
                justify-content: end;

 src/views/experiment/inspectionApplication/index.vue

@@ -53,7 +53,12 @@
                                    <div v-if="scope.row.type === 1"><el-tag type="warning">成品检验</el-tag></div>
                                </template>
                            </el-table-column>
                            <el-table-column prop="formTime" label="来料日期" min-width="90px" />
                            <el-table-column prop="formTime" label="来料日期" min-width="90px">
                                <template slot-scope="scope">
                                    <p v-if="scope.row.type!=1">{{scope.row.formTime}}</p>
                                    <p v-else>/</p>
                                </template>
                            </el-table-column>
                            <el-table-column prop="supplier" label="供应商名称" min-width="150px" show-overflow-tooltip />
                            <el-table-column prop="mcode" label="原材料编码" min-width="170px" />
                            <el-table-column prop="name" label="原材料名称" min-width="90px" />
@@ -769,7 +774,7 @@
                //成品
                if (this.type === 1) {
                    obj = {
                        supplier:"supplier",
                        supplier:"/",
                        formTime: "2023-09-09",
                        endTime: this.finishedTable.checkdate[1],
                        mcode: this.finishedTable.code,

 src/views/experiment/nonConformingFeedback/index.vue

@@ -34,7 +34,7 @@
    </div>
    <div class="library-table">
      <div class="table-box">
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'left' }"
        <el-table ref="tableData" :max-height="700" :cell-style="{ textAlign: 'left' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
          :data="tableData" style="width: 100%">
          <el-table-column type="selection" label="" min-width="5%" />
@@ -155,6 +155,7 @@
    }
  }
  .library-table {
    height:80vh;
    background-color: #fff;
    flex: 1;
    margin: 0px -15px;

 src/views/experiment/reportAuditing/index.vue

@@ -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',
@@ -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>
@@ -236,6 +236,7 @@
  }
}
.library-table {
  height:80vh;
  background-color: #fff;
  flex: 1;
  margin: 0px -15px;

 src/views/laboratory/measure/index.vue

@@ -42,7 +42,7 @@
          </div>
        </div>
        <div class="table-box">
          <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'left' }"
          <el-table v-if="this.radioValue == 0" :max-height="600" :cell-style="{ textAlign: 'left' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
            :data="measureLedgerTable" style="width: 100%">
            <el-table-column type="index" min-width="10%" />

 src/views/laboratory/personnel/index.vue

@@ -62,7 +62,7 @@
        </div>
        <div class="content-main">
            <div class="personner-table">
                <el-table ref="personnerlTable" height="calc(100vh - 240px)" border :cell-style="{ textAlign: 'left' }"
                <el-table ref="personnerlTable" height="calc(100vh - 250px)" border :cell-style="{ textAlign: 'left' }"
                    :header-cell-style="{
            border: '0px',
            background: '#f5f7fa',