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

Fixiaobai

2023-08-28 77a041c5e9a31ad96fce404f06fe0c03f4031b1d

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -339,23 +339,18 @@
      display: flex;
      justify-content: space-between;
      padding: 5px 24px 0px 24px;
    }

.top-bar{
    margin: -25px -15px;
    background: #fff;
    display: flex;
    justify-content: space-between;
    padding: 5px 24px 0px 24px;
    .sermargin{
      margin-right: 60px;
    }

    .rightForm{
      display: flex;
      justify-content: space-between;
      /* background-color: #bfa; */
      height: 40px;
      line-height: 40px;

      >div{
        padding: 0px 10px;
        padding-bottom: 10px;
@@ -364,6 +359,7 @@
        /* height: 40px;
        line-height: 40px; */
      }

      .rightBtn{
        background-color: rgb(1, 102, 226);
      }
@@ -377,14 +373,17 @@
      margin-top: 40px;
      display: flex;
      flex-direction: column;

      .table-header{
        padding: 20px;
        display: flex;
        justify-content: space-between;

        .el-form-item{
          margin-bottom: 30px !important;
        }
      }

      .table-box{
          padding: 0px 20px;
          margin-top: 0px;
@@ -393,9 +392,11 @@
          /* padding: 20px 20px 10px 20px; */
          display: flex;
          flex-direction: column;

          .el-table {
            flex: 1;
          }

          >div:nth-child(2){
            display: flex;
            justify-content: end;