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

licp

2024-07-18 fc294881353b4a540166341194ed5dfe0acd000e

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

@@ -27,8 +27,8 @@
            size="small"
            type="daterange"
            range-separator="至"
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd"
            start-placeholder="开始日期"
            end-placeholder="结束日期" @change="refreshTable()" clearable>
          </el-date-picker>
@@ -501,8 +501,8 @@
      let year = currentDate.getFullYear();
      let month = String(currentDate.getMonth() + 1).padStart(2, '0');
      let day = String(currentDate.getDate()).padStart(2, '0');
      let formattedDate1 = `${year}-${month}-${day} 00:00:00`;
      let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
      let formattedDate1 = `${year}-${month}-${day}`;
      let formattedDate2 = `${year}-${month}-${day}`;
      this.entity.dateTime.push(formattedDate1);
      this.entity.dateTime.push(formattedDate2);
      this.componentData1.entity.dateTime.push(formattedDate1);
@@ -556,7 +556,7 @@
    getYearAndMonthAndDays(date){
      return getYearAndMonthAndDays(date)
    },
    refreshTable(){
    refreshTable(e){
      let entity = {}
      if(this.entity.week1&&this.entity.week2){
        entity.week = JSON.stringify([this.entity.week1,this.entity.week2])
@@ -573,10 +573,10 @@
      if(this.currentTable=='ValueTable0'){
        entity.state = this.entity.state
        this.componentData.entity = {...this.componentData.entity,...entity}
        this.$refs['ValueTable0'].selectList()
        this.$refs['ValueTable0'].selectList(e)
      }else{
        this.componentData1.entity = {...this.componentData1.entity,...entity}
        this.$refs['ValueTable1'].selectList()
        this.$refs['ValueTable1'].selectList(e)
      }
      this.collectWorkingHours()
    },
@@ -645,7 +645,7 @@
            this.formData.nonproductiveTime = ''
            this.formData.auxiliaryProject = ''
            // this.addVisible = false
            this.refreshTable()
            this.refreshTable('page')
            this.collectWorkingHours()
          })
      }else{
@@ -666,7 +666,7 @@
            this.formData.nonproductiveTime = ''
            this.formData.auxiliaryProject = ''
            // this.addVisible = false
            this.refreshTable()
            this.refreshTable('page')
            this.collectWorkingHours()
          })
      }
@@ -717,7 +717,7 @@
    },
    submitBatchCheckDialog () {
      this.batchCheckDialog = false
      this.refreshTable()
      this.refreshTable('page')
      this.collectWorkingHours()
    },
    submitCheck(e){
@@ -756,7 +756,7 @@
          if (res.code == 201) return
          this.$message.success('操作成功')
          this.checkVisible = false
          this.refreshTable()
          this.refreshTable('page')
          this.collectWorkingHours()
        })
      }else{
@@ -781,7 +781,7 @@
          if (res.code == 201) return
          this.$message.success('操作成功')
          this.checkVisible = false
          this.refreshTable()
          this.refreshTable('page')
          this.collectWorkingHours()
        })
      }