Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

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

@@ -63,7 +63,7 @@
      </el-radio-group>
      <div style="display: flex;align-items: center;">
        <p style="font-size: 14px;margin-right: 30px;">
          总工时汇总：<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{ (totalInfo['产量工时汇总']+totalInfo['辅助工时汇总'])? (totalInfo['产量工时汇总']+totalInfo['辅助工时汇总']):0 }}</span>&nbsp;&nbsp;&nbsp;&nbsp;产量工时汇总：<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['产量工时汇总']?totalInfo['产量工时汇总']:0}}</span>&nbsp;&nbsp;&nbsp;&nbsp;辅助工时汇总：<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['辅助工时汇总']?totalInfo['辅助工时汇总']:0}}</span>
          总工时汇总：<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{ (totalInfo['产量工时汇总']+totalInfo['辅助工时汇总'])? Number((totalInfo['产量工时汇总']+totalInfo['辅助工时汇总'])).tofixed(4):0 }}</span>&nbsp;&nbsp;&nbsp;&nbsp;产量工时汇总：<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['产量工时汇总']?Number(totalInfo['产量工时汇总']).tofixed(4):0}}</span>&nbsp;&nbsp;&nbsp;&nbsp;辅助工时汇总：<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['辅助工时汇总']?Number(totalInfo['辅助工时汇总']).tofixed(4):0}}</span>
        </p>
        <el-button size="small" type="primary" @click="openAdd" v-show="currentTable == 'ValueTable0'&&add">录入数据</el-button>
        <el-button size="small" type="primary"
@@ -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=='批准'">
@@ -332,7 +332,8 @@
          }
        },
        requiredAdd: [],
        requiredUp: []
        requiredUp: [],
        needSort: ['createTime', 'name']
         },
      entityCopy: {},
         upIndex: 0,
@@ -362,13 +363,13 @@
      entityCopy1: {},
      upIndex1:100,
      weekList:[
        {label: '周一', value: '1',type:'primary'},
        {label: '周二', value: '2',type:'primary'},
        {label: '周三', value: '3',type:'primary'},
        {label: '周四', value: '4',type:'primary'},
        {label: '周五', value: '5',type:'primary'},
        {label: '周六', value: '6',type:'primary'},
        {label: '周日', value: '7',type:'primary'}
        {label: '周一', value: '周一',type:'primary'},
        {label: '周二', value: '周二',type:'primary'},
        {label: '周三', value: '周三',type:'primary'},
        {label: '周四', value: '周四',type:'primary'},
        {label: '周五', value: '周五',type:'primary'},
        {label: '周六', value: '周六',type:'primary'},
        {label: '周日', value: '周日',type:'primary'}
      ],
      currentTable:'ValueTable0',
      addVisible:false,
@@ -399,7 +400,8 @@
        reviewerNonproductiveTime:'',
        auxiliaryProject:'',
        reviewerRemark:'',
        nameUser: ''
        nameUser: '',
        name: ''
      },
      checkVisible:false,
      checkLoadN:false,
@@ -507,6 +509,7 @@
      this.entity.dateTime.push(formattedDate2);
      this.componentData1.entity.dateTime.push(formattedDate1);
      this.componentData1.entity.dateTime.push(formattedDate2);
      this.componentData1.entity.dateTime = JSON.stringify(this.componentData1.entity.dateTime)
      this.refreshTable()
    },
    getPower(){
@@ -573,7 +576,9 @@
      if(this.currentTable=='ValueTable0'){
        entity.state = this.entity.state
        this.componentData.entity = {...this.componentData.entity,...entity}
        this.$refs['ValueTable0'].selectList(e)
        this.$nextTick(() => {
          this.$refs['ValueTable0'].selectList(e)
        })
      }else{
        this.componentData1.entity = {...this.componentData1.entity,...entity}
        this.$refs['ValueTable1'].selectList(e)
@@ -675,11 +680,13 @@
      this.title = '审核'
      this.formData0 = row;
      this.checkVisible = true
      this.formData0.reviewerNumber = this.formData0.amount
    },
    handleRatify(row){
      this.title = '批准'
      this.formData0 = row;
      this.checkVisible = true
      this.formData0.reviewerNumber = this.formData0.amount
    },
    handleChangeTask (row) {
      this.ValueTable0Selected = JSON.parse(JSON.stringify(row))
@@ -920,7 +927,4 @@
      height: calc(100% - 60px - 80px - 10px - 40px - 25px);
      padding: 20px;
   }
>>>.el-dialog__wrapper {
  z-index: 9999 !important; /* 根据需要调整层级 */
}
</style>