loulijun2021
2022-11-16 72d29a847bda8db54c0823ce35f8ad9383e8b35d
1.班组、人员工资报表求和统计
已修改4个文件
92 ■■■■ 文件已修改
src/assets/images/UP.png 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/bzgz.vue 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bbgl/rygz.vue 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/scgl/gd.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/images/UP.png

src/views/bbgl/bzgz.vue
@@ -42,7 +42,7 @@
            <el-form-item v-show="isExpandForm" label="操作人员" style=" display: flex;">
              <el-input v-model="form.username" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="操作时间" style="display: flex;align-items: center">
            <el-form-item v-show="isExpandForm" label="报工时间" style="display: flex;align-items: center">
              <el-date-picker
                v-model="form.operdate"
                type="daterange"
@@ -92,6 +92,8 @@
          :data="tableData"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          border
          :summary-method="getSummaries"
          show-summary
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          highlight-current-row
@@ -195,8 +197,13 @@
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="操作人员"
            label="报工人员"
            width="110"
            sortable="custom"
          />          <el-table-column
            prop="report_date"
            label="报工时间"
            width="160"
            sortable="custom"
          />
@@ -366,6 +373,37 @@
        }
      })
    },
    getSummaries(param) {
      const { columns, data } = param
      const sums = []
      columns.forEach((column, index) => {
        if (index === 10) {
          sums[index] = '总价'
          return
        }
        const values = data.map(item => Number(item[column.property]))
        if (column.property === 'usermoney') {
          sums[index] = values.reduce((prev, curr) => {
            const value = Number(curr)
            if (!isNaN(value)) {
              return prev + curr
            } else {
              return prev
            }
          }, 0)
          sums[index] += ' 元'
        } else {
          // sums[index] = 'N/A'
          sums[index] = ' '
        }
      })
      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
      })
      return sums
    },
    async getGroupSalaryReportSearch() {
      let tempDate = this.form.operdate
      if (tempDate.length > 0) {
@@ -386,7 +424,6 @@
        rows: this.form.rows
      }
      console.log(data, 1)
      const res = await GroupSalaryReportSearch(data)
      this.tableData = res.data
      this.total = res.count
src/views/bbgl/rygz.vue
@@ -90,6 +90,8 @@
          :data="tableData"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          border
          :summary-method="getSummaries"
          show-summary
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          highlight-current-row
@@ -164,13 +166,13 @@
            sortable="custom"
          />
          <el-table-column
            prop="good_qty"
            prop="report_qty"
            label="报工数量"
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.good_qty">{{ row.good_qty }}</div>
              <div v-if="row.report_qty">{{ row.report_qty }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
@@ -187,7 +189,7 @@
          </el-table-column>
          <el-table-column
            prop="usermoney"
            label="班组记件工资"
            label="个人记件工资"
            width="130"
            sortable="custom"
          >
@@ -197,7 +199,7 @@
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            prop="username"
            label="报工人员"
            width="110"
            sortable="custom"
@@ -352,6 +354,39 @@
        }
      })
    },
    getSummaries(param) {
      const { columns, data } = param
      const sums = []
      columns.forEach((column, index) => {
        if (index === 10) {
          sums[index] = '总价'
          return
        }
        const values = data.map(item => Number(item[column.property]))
        if (column.property === 'usermoney') {
          sums[index] = values.reduce((prev, curr) => {
            const value = Number(curr)
            if (!isNaN(value)) {
              return prev + curr
            } else {
              return prev
            }
          }, 0)
          sums[index] += ' 元'
        } else {
          // sums[index] = 'N/A'
          sums[index] = ' '
        }
      })
      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
      })
      return sums
    },
    async getPeopleSalaryReportSearch() {
      let tempDate = this.form.reportdate
      if (tempDate.length > 0) {
src/views/scgl/gd.vue
@@ -1217,10 +1217,10 @@
          <div id="qrCodeSource" ref="qrCodeSource" style="width: 130px;height: 130px;overflow: hidden"/>
        </div>
        <div v-if="formApprove.m_po" style="margin-top: 10px;">
        <div v-if="formApprove.m_po" style="margin-top: 5px;">
<!--          <svg-icon icon-class="UP" style="color:#000;margin-left: 130px;font-size: 50px;background-color: #FFFFFF"></svg-icon>-->
          <img src="../../assets/images/UP.png" alt="" style="margin-left: 92px;">
            <div style="font-size: 18px;font-weight: bolder;margin-left: 4px;">根据单号扫码入库,扫描此二维码</div>
          <img src="../../assets/images/UP.png" alt="" style="margin-left: 107px;">
            <div style="font-size: 18px;font-weight: bolder;">根据单号扫码入库,用PDA扫描此二维码</div>
        </div>