Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-07-19 856c232988d2a89b84e6c63e85a0590e8dd737b5

Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

 src/components/do/b3-work-time-management/work-time-management.vue

@@ -161,7 +161,7 @@
              </el-select>
            </el-form-item>
            <el-form-item label="姓名:">
              <el-input v-model="formData0.nameUser" size="small" disabled></el-input>
              <el-input v-model="formData0.name" size="small" disabled></el-input>
            </el-form-item>
            <el-form-item label="班次:">
              <el-select v-model="formData0.shift" placeholder="请选择" size="small" :disabled="title=='批准'">
@@ -399,7 +399,8 @@
        reviewerNonproductiveTime:'',
        auxiliaryProject:'',
        reviewerRemark:'',
        nameUser: ''
        nameUser: '',
        name: ''
      },
      checkVisible:false,
      checkLoadN:false,
@@ -574,7 +575,9 @@
      if(this.currentTable=='ValueTable0'){
        entity.state = this.entity.state
        this.componentData.entity = {...this.componentData.entity,...entity}
        this.$nextTick(() => {
        this.$refs['ValueTable0'].selectList(e)
        })
      }else{
        this.componentData1.entity = {...this.componentData1.entity,...entity}
        this.$refs['ValueTable1'].selectList(e)
@@ -920,8 +923,5 @@
        width: calc(100% - 40px);
        height: calc(100% - 60px - 80px - 10px - 40px - 25px);
        padding: 20px;
    }
>>>.el-dialog__wrapper {
  z-index: 9999 !important; /* 根据需要调整层级 */
}
</style>

 src/components/tool/value-table.vue

@@ -52,6 +52,9 @@
  .red{
    color: red !important;
  }
  >>>.el-loading-parent--relative {
    z-index: 1 !important;
  }
</style>
<style>
  /* .value-table .highlight-warning-row-border td {
@@ -104,6 +107,7 @@
    display: inline-block;
    margin-left: 200px;
  }

</style>

<template>
@@ -1134,7 +1138,7 @@
                return
              }
              this.$message.success('删除成功')
              this.selectList()
              this.selectList('page')
            }).catch(e => {
              this.$message.error('删除失败')
            })
@@ -1149,8 +1153,20 @@
          const list = JSON.parse(JSON.stringify(this.multipleSelection))
          const url = e === 0 ? this.$api.auxiliaryWorkingHoursDay.check : this.$api.auxiliaryWorkingHoursDay.approve
          const state = e === 0 ? '已审核' : '已批准'
          let auxiliaryWorkingHoursDays = []
          list.forEach(item => {
            this.$axios.post(url, {id: item.id, state: state
            delete item.orderBy
            item.state = state
            if (e === 0) {
              auxiliaryWorkingHoursDays.push(item)
            } else {
              auxiliaryWorkingHoursDays.push({
                id: item.id,
                state: item.state
              })
            }
          })
          this.$axios.post(url, {auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays
              },{
                headers: {
                  'Content-Type': 'application/json'
@@ -1162,7 +1178,6 @@
              }
              this.$parent.submitBatchCheckDialog()
              this.$message.success('操作成功')
            })
          })
        } else {
          this.$message.error('请选择至少一条数据')

 src/components/view/a5-laboratory-management.vue

@@ -302,7 +302,7 @@
        this.fileVisible = true;
        this.fileComponentData.entity.labId = row.id;
        this.$nextTick(function () {
          this.$refs['ValueTable0'].selectList()
          this.$refs['ValueTable0'].selectList('page')
        })
      },
      confirmConnect(){
@@ -327,7 +327,7 @@
                    if (res.code === 201) {
                        return
                    }
          this.$refs['ValueTable0'].selectList()
          this.$refs['ValueTable0'].selectList('page')
          this.upFileVisible = false;
        })
      },

 src/components/view/a5-laboratory-qualifications.vue

@@ -351,9 +351,9 @@
          this.refreshTable();
        }
            },
            refreshTable() {
            refreshTable(e) {
                if (this.radio === '0') {
                    this.$refs['itemParameterTable'].selectList()
                    this.$refs['itemParameterTable'].selectList(e)
                } else {
          if(this.currentPage>1){
            this.isLoding = true
@@ -504,7 +504,7 @@
                        this.loading = false
                        if (res.code == 201) return
                        this.$message.success('已提交')
                        this.refreshTable()
                        this.refreshTable('page')
            this.qualificationsConnectVisible = false
                    })
      },

 src/components/view/role-manage.vue

@@ -177,8 +177,8 @@
      this.getPower()
    },
    methods: {
      refreshTable() {
        this.$refs['ValueTable'].selectList()
      refreshTable(e) {
        this.$refs['ValueTable'].selectList(e)
      },
      refresh() {
        this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -265,7 +265,7 @@
          }
          this.addLoad = false
          this.addDia = false
          this.refreshTable()
          this.refreshTable('page')
        }).catch(e => {
          this.addLoad = false
        })