haoxuan
2024-04-24 78ba89a381c2ca6a745ffa0c3b6c903ed3130d5f
更新考勤统计的入参修改
3个文件已修改
38 ■■■■■ 已修改文件
src/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/employeeSalary/attendanceStatistics/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/employeeSalary/salaryPlan/index.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/employeeSalary/attendanceStatistics/components/AttendanceStatisticsDetails.vue
@@ -163,6 +163,8 @@
    formInfo() {
      if (this.islook) {
        this.form = {};
        this.isEditOne=false
        this.isEditTwo=false
        this.$nextTick(()=>{
          this.$refs["form"].resetFields();
          if (this.editRow.workerId) {
@@ -194,6 +196,7 @@
    cancelMethod() {
      this.$refs["form"].resetFields();
      this.islook = false;
      this.$emit('shutdown')
    },
    submitForm(formName,name) {
      this.$refs[formName].validate((valid) => {
@@ -204,7 +207,14 @@
            date:form.month+'-'+day,
            overTimeDuration:Number(form.weekdayOverTime),
            status:form.status,
            workerId:form.workerId
            workerId:form.workerId,
            classes:form.classes,
            classesEndTime:form.classesEndTime,
            classesStartTime:form.classesStartTime,
            endWorkTime:form.endWorkTime,
            startWorkTime:form.startWorkTime,
            workTypeId:form.workTypeId,
            workerName:form.workerName,
          }
            updateAttendance(params).then((res) => {
              if (res.code == 200) {
@@ -213,7 +223,6 @@
                  type: "success",
                });
                this[name]=false
                this.$emit('shutdown')
                this.cancelMethod();
              }
            });
src/views/employeeSalary/attendanceStatistics/index.vue
@@ -157,10 +157,10 @@
                { label: "月份", prop: "month", min: 90 ,fixed:'left'},
              ];
              let tableColumn3=[
                { label: "工作日加班时长(小时)", prop: "weekdayOverTime", min: 140,fixed:'right'},
                { label: "休息日加班时长(小时)", prop: "restDayOverTime", min: 140,fixed:'right' },
                { label: "应出勤天数", prop: "requiredAttendanceDays", min: 110 ,fixed:'right'},
                { label: "实际出勤天数", prop: "actualAttendanceDays", min: 110,fixed:'right'},
                { label: "工作日加班时长(小时)", prop: "weekdayOverTime", min: 140,},
                { label: "休息日加班时长(小时)", prop: "restDayOverTime", min: 140, },
                { label: "应出勤天数", prop: "requiredAttendanceDays", min: 110 ,},
                { label: "实际出勤天数", prop: "actualAttendanceDays", min: 110,},
              ]
              let tableColumn2=[]
              let headerList=res.data.list.length>0?res.data.list[0]:[]
src/views/employeeSalary/salaryPlan/index.vue
@@ -12,7 +12,6 @@
        <TableCommonView
          :table-list="tableList"
          @selTableCol="selTableCol"
          @handleShow="handleShow"
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
@@ -52,13 +51,13 @@
      showCol: ["方案名称", "工种", "薪资类型", "计费周期", "计费公式定义", "添加时间", "添加人"],
      tableColumn: [
        // { label: "车间", prop: "workshopNumber",iconRight:"el-icon-setting"},
        { label: "方案名称", prop: "workshopNumber",},
        { label: "工种", prop: "groupNumber", },
        { label: "薪资类型", prop: "startCarNumber" },
        { label: "计费周期", prop: "endCarNumber" },
        { label: "方案名称", prop: "workshopNumber",min:110},
        { label: "工种", prop: "groupNumber",min:100 },
        { label: "薪资类型", prop: "startCarNumber",min:110 },
        { label: "计费周期", prop: "endCarNumber",min:110 },
        { label: "计费公式定义", prop: "carFlag", },
        { label: "添加时间", prop: "notes", },
        { label: "添加人", prop: "notes", },
        { label: "添加时间", prop: "notes",min:130 },
        { label: "添加人", prop: "notes",min:110 },
      ],
      editConfig:{
        visible:false,
@@ -118,10 +117,6 @@
    onFilterSearch(searchText) {
      this.getDataParams.keyWord = searchText,
        this.getData()
    },
    // 组别
    handleShow() {
    },
    // 表格行点击
    tableRowClick(row) {