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

yuyu

2023-08-30 22a0512510da46df94afd7f7733cdf6c6bc38518

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -65,20 +65,20 @@
                     <el-table-column type="index" label="序号" min-width="10%" />
                     <el-table-column prop="entrust_coding" label="委托编号" min-width="10%" />
                     <el-table-column prop="entrusted" label="委托单位" min-width="12%" />
                     <el-table-column prop="samples_number" label="样品编号" min-width="8%" />
                     <el-table-column prop="samples_number" label="样品数量" min-width="8%" />
                     <el-table-column prop="sample_name" label="样品名称" min-width="8%" />
                     <el-table-column prop="specifications_models" label="规格型号" min-width="12%" />
                     <el-table-column prop="dateSurvey" label="送达时间" min-width="8%" />
                     <el-table-column prop="inspectionTime" label="送样时间" min-width="8%" />
                     <el-table-column prop="completionDeadline" label="完成期限" min-width="8%" />
                     <el-table-column prop="contacts" label="委托编制人" min-width="8%" />
                     <el-table-column prop="inspectionTime" label="检验日期" min-width="8%" />
                     <el-table-column prop="insTime" label="检验日期" min-width="8%" />
                     <el-table-column prop="inspection_status" label="状态" min-width="8%">
                        <template slot-scope="scope">
                           <div v-if="scope.row.inspection_status === 1">
                              <span style="color: green;">已检测</span>
                           <div v-if="scope.row.inspection_status === 0">
                              <span style="color: green;">已报检</span>
                           </div>
                           <div v-else>
                              <span style="color: red;">待检测</span>
                              <span style="color: red;">未报检</span>
                           </div>
                        </template>
                     </el-table-column>
@@ -133,7 +133,8 @@
   import {
      getCommisionList,
      getViewUUID,
      selectViewUUID
      selectViewUUID,
      delLink
   } from '@/api/inspection/commisioninspection'
   export default {
      data() {
@@ -191,7 +192,6 @@
      },
      updated() {
         if (this.$router.currentRoute.name === 'AddCommision') {
            // console.log(this.$router.currentRoute.name)
            this.showDetail = true
         }
      },
@@ -203,7 +203,6 @@
            })
            this.commisionTable = res.data.row
            this.total = res.data.total
            // console.log(res)
            // 获取所有的委托单位名称
            const allDepartmentNames = [...new Set(this.commisionTable.map(item => item.entrusted))]
            // 将allDepartmentNames转换为options需要的格式
@@ -235,7 +234,6 @@
                  inspectionStatus: this.radioValue
               })
            }
            // console.log(res)
            this.commisionTable = res.data.row
            this.total = res.data.total
         },
@@ -252,7 +250,6 @@
         },
         async radioclick() {
            // 处理点击radio的时间
            console.log('radioValue', this.radioValue)
            if (this.radioValue === 0) {
               this.getCommisionList()
            } else {
@@ -261,7 +258,6 @@
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
               // console.log(res)
               this.commisionTable = res.data.row
               this.total = res.data.total
            }
@@ -269,7 +265,6 @@
         },
         // 每页条数改变时触发 选择一页显示多少行
         async handleSizeChange(val) {
            // console.log(`每页 ${val} 条`)
            this.currentPage = 1
            this.pageSize = val
            if (this.radioValue === 0) {
@@ -286,7 +281,6 @@
         },
         // 当前页改变时触发 跳转其他页
         async handleCurrentChange(val) {
            // console.log(`当前页: ${val}`)
            this.currentPage = val
            if (this.radioValue === 0) {
               this.getCommisionList()
@@ -327,82 +321,91 @@
            if (document.execCommand('copy')) {
               this.$message.success('已复制到剪贴板')
            }
         },
         handleClick(row){
            delLink({
               id: row.id
            }).then(res=>{
               this.$message.success('删除成功')
               this.getCommisionList()
            })
         }
      }
   }
</script>

<style scoped>
<style scoped lang="scss">
   .top-bar {
      margin: -25px -15px;
      background: #fff;
      display: flex;
      justify-content: space-between;
      padding: 5px 24px 0px 24px;
    }
      padding: 24px 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;
        border:1px solid rgb(8, 156, 230);
        margin-right: 10px;
        /* height: 40px;
      .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;
            border: 1px solid rgb(8, 156, 230);
            margin-right: 10px;
            /* height: 40px;
        line-height: 40px; */
      }
      .rightBtn{
        background-color: rgb(1, 102, 226);
      }
    }
  }
         }

.library-table{
      background-color: #fff;
      flex: 1;
      margin: 0px -15px;
      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;
          flex: 1;
          background: #fff;
          /* padding: 20px 20px 10px 20px; */
          display: flex;
          flex-direction: column;
          .el-table {
            flex: 1;
          }
          >div:nth-child(2){
            display: flex;
            justify-content: end;
            margin: 10px 0;
          }
      }
    }
         .rightBtn {
            background-color: rgb(1, 102, 226);
         }
      }
   }

   .library-table {
      background-color: #fff;
      flex: 1;
      margin: 0px -15px;
      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;
         flex: 1;
         background: #fff;
         /* padding: 20px 20px 10px 20px; */
         display: flex;
         flex-direction: column;

         .el-table {
            flex: 1;
         }

         >div:nth-child(2) {
            display: flex;
            justify-content: end;
            margin: 10px 0;
         }
      }
   }

   .rightBtn {
      background-color: rgb(1, 102, 226);