Merge remote-tracking branch 'origin/master'

zss

2024-07-17 226ba0f4e64ba0eacb780909a3bc120a36b3b720

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

@@ -170,6 +170,9 @@
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="复核说明:">
              <el-input v-model="formData0.reviewerRemark" type="textarea" :rows="3" size="small" :disabled="title=='批准'"></el-input>
            </el-form-item>
          </el-form>
            </el-col>
        <el-col :span="12">
@@ -178,6 +181,9 @@
              <el-input v-model="formData0.number" size="small" :disabled="title=='批准'"></el-input>
            </el-form-item>
            <el-form-item label="数量:" required>
              <el-input v-model="formData0.amount" size="small" :disabled="title=='批准'"></el-input>
            </el-form-item>
            <el-form-item label="复核数量:" required>
              <el-input v-model="formData0.reviewerNumber" size="small" :disabled="title=='批准'"></el-input>
            </el-form-item>
            <el-form-item label="核准工时:">
@@ -192,12 +198,6 @@
          </el-form>
            </el-col>
         </el-row>
      <el-form :model="formData0" label-width="90px">
        <el-form-item label="复核说明:">
          <el-input v-model="formData0.reviewerRemark" type="textarea"
  :rows="3" size="small" :disabled="title=='批准'"></el-input>
        </el-form-item>
      </el-form>
         <span slot="footer" class="dialog-footer">
            <el-row>
               <el-button @click="submitCheck(0)" :loading="checkLoadN">{{title=='审核'?'不通过':'不批准'}}</el-button>
@@ -341,7 +341,7 @@
               entity: {
                  week: null,
                  weekDay: null,
                  dateTime: null,
                  dateTime: [],
            name:null,
                  orderBy: {
                     field: 'id',
@@ -400,6 +400,7 @@
        reviewerNonproductiveTime:'',
        auxiliaryProject:'',
        reviewerRemark:'',
        nameUser: ''
      },
      checkVisible:false,
      checkLoadN:false,
@@ -505,6 +506,8 @@
      let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
      this.entity.dateTime.push(formattedDate1);
      this.entity.dateTime.push(formattedDate2);
      this.componentData1.entity.dateTime.push(formattedDate1);
      this.componentData1.entity.dateTime.push(formattedDate2);
      this.refreshTable()
    },
    getPower(){