bug

jiangping

2023-12-06 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5

 web_standard/src/views/ext/salaryStatistic.vue

@@ -12,7 +12,7 @@
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="物料编码" prop="mmodelCode">
      <!-- <el-form-item label="物料编码" prop="mmodelCode">
        <el-input v-model="searchForm.mmodelCode" placeholder="请输入物料编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="工序" prop="procedureId">
@@ -24,7 +24,7 @@
            :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      </el-form-item> -->
      <el-form-item label="报工时间">
        <el-date-picker
          v-model="planDate"
@@ -60,18 +60,21 @@
        <el-table-column prop="userInfo.departName" label="部门" min-width="100px"> </el-table-column>
        <el-table-column prop="jijianSalary" label="计件工资" min-width="100px">
          <template slot-scope="{row}">
            {{ row.jijianSalary / 100 }}
            <!-- {{ accDiv(Math.round(row.jijianSalary), 100) }} -->
            {{ row.jijianSalary }}
          </template>
        </el-table-column>
        <el-table-column prop="jishiSalary" label="计时工资" min-width="100px">
          <template slot-scope="{row}">
            {{ row.jishiSalary / 100 }}
            <!-- {{ accDiv(Math.round(row.jishiSalary), 100) }} -->
            {{ row.jishiSalary }}
          </template>
        </el-table-column>
        <el-table-column prop="num" label="报工单总数" min-width="100px"></el-table-column>
        <el-table-column prop="totalSalary" label="小计工资(元)" min-width="100px">
          <template slot-scope="{row}">
            {{ row.totalSalary / 100 }}
            <!-- {{ accDiv(Math.round(row.totalSalary), 100) }} -->
            {{ row.totalSalary }}
          </template>
        </el-table-column>
       
@@ -131,7 +134,13 @@
      'field.main': 'name',
      sorts: [{ direction: 'DESC', property: 'CREATE_TIME' }]
    })
    
    let tempDate = new Date()
    let year = tempDate.getFullYear()
    let month = tempDate.getMonth() + 1
    let day = tempDate.getDate()
    this.searchForm.startDate = `${year}-${month}-01`
    this.searchForm.endDate = `${year}-${month}-${day}`
    this.planDate = [this.searchForm.startDate, this.searchForm.endDate]
    this.search()
  },
  activated() {
@@ -142,7 +151,7 @@
      .catch(err => {
        console.log(err)
      })
    companyUserExtAllUser({ departmentId: this.$store.state.userInfo.curComDepartment.id })
    companyUserExtAllUser({ companyId: this.$store.state.userInfo.company.id })
      .then(res => {
        this.proUsers = res
      })
@@ -173,7 +182,6 @@
      return '-'
    },
    customIndex(index) {
      console.log();
      return (this.tableData.pagination.pageIndex-1) * this.tableData.pagination.pageSize + index + 1
    }
  }