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

yuyu

2023-08-24 f6d115719f5d5c4aff09fd4f06a8c7b1a1647559

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -244,34 +244,35 @@
      // 将allDepartmentNames转换为options需要的格式
      this.options = allDepartmentNames.map(name => ({ value: name, label: name }))

    },
    // 查询方法
    async search() {
    // 将搜索条件作为参数传递给getCommisionList方法
    let res
    if(this.radioValue === 0){
      res = await getCommisionList({
        pageNo: this.currentPage,
        pageSize: this.pageSize,
        entrustCoding: this.searchData.code,
        sampleName: this.searchData.name,
        entrusted: this.searchData.department,
      })
    }else{
      res = await getCommisionList({
        pageNo: this.currentPage,
        pageSize: this.pageSize,
        entrustCoding: this.searchData.code,
        sampleName: this.searchData.name,
        entrusted: this.searchData.department,
        inspectionStatus: this.radioValue
      })
    }
      // console.log(res)
      this.commisionTable = res.data.row
      this.total = res.data.total
    },
         },
         // 查询方法
         async search() {
            // 将搜索条件作为参数传递给getCommisionList方法
            let res
            if (this.radioValue === 0) {
               res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  entrustCoding: this.searchData.code,
                  sampleName: this.searchData.name,
                  entrusted: this.searchData.department,
               })
            } else {
               res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  entrustCoding: this.searchData.code,
                  sampleName: this.searchData.name,
                  entrusted: this.searchData.department,
                  inspectionStatus: this.radioValue
               })
            }
            // console.log(res)
            this.commisionTable = res.data.row
            this.total = res.data.total
         },

<<<<<<< HEAD
    // 重置方法
    reset() {
      // 重置搜索条件
@@ -325,10 +326,90 @@
    }
  }
}
=======
         // 重置方法
         reset() {
            // 重置搜索条件
            this.searchData.code = ''
            this.searchData.name = ''
            this.searchData.department = ''
            this.radioValue = 0
            // 重新获取数据
            this.getCommisionList()
         },
         async radioclick() {
            // 处理点击radio的时间
            console.log('radioValue', this.radioValue)
            if (this.radioValue === 0) {
               this.getCommisionList()
            } else {
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
               // console.log(res)
               this.commisionTable = res.data.row
               this.total = res.data.total
            }

         },
         // 每页条数改变时触发 选择一页显示多少行
         async handleSizeChange(val) {
            // console.log(`每页 ${val} 条`)
            this.currentPage = 1
            this.pageSize = val
            if (this.radioValue === 0) {
               this.getCommisionList()
            } else {
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
               this.commisionTable = res.data.row
               this.total = res.data.total
            }
         },
         // 当前页改变时触发 跳转其他页
         async handleCurrentChange(val) {
            // console.log(`当前页: ${val}`)
            this.currentPage = val
            if (this.radioValue === 0) {
               this.getCommisionList()
            } else {
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
               this.commisionTable = res.data.row
               this.total = res.data.total
            }
         },
         goToaddCommision() {
            // this.$router.push('/inspectionManagement/commissionInspection/addCommision')
            // this.showDetail = true
            selectViewUUID({
               day: this.day
            }).then(res => {
               this.viewId = res.data
            })
         }
      }
   }
>>>>>>> d94af68ec3f6317124df81296b08c7c110641fca
</script>

<style scoped>
   .top-bar {
      margin: -25px -15px;
      background: #fff;
      display: flex;
      justify-content: space-between;
      padding: 5px 24px 0px 24px;

<<<<<<< HEAD
.top-bar{
    margin: -25px -15px;
    background: #fff;
@@ -391,5 +472,57 @@
          }
      }
    }
=======
      .sermargin {
         margin-right: 60px;
      }
   }
>>>>>>> d94af68ec3f6317124df81296b08c7c110641fca

</style>
   .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;
         }
      }
   }
	
   .vue_qr_div{
      text-align: center;
   }
</style>