From e5f6fbec6701fab567d11bcb9f1698cb4a761ed0 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 19 Dec 2024 15:59:47 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20add=E5=91=98=E5=B7=A5=E5=B7=A5?=
 =?UTF-8?q?=E8=B5=84=E6=B1=87=E6=80=BB=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/record/recordStaffSalary.js       |   9 +
 src/views/ems/report/energyPreview/index.vue  |  18 +-
 src/views/mes/prod/prodOrderDetail/index.vue  |  48 +--
 src/views/mes/prod/prodOrderInfo/index.vue    |  24 +-
 .../mes/record/recordStaffSalary/index.vue    |   4 +-
 .../mes/record/salarySummaryReport/index.vue  | 307 ++++++++++++++++++
 .../mes/record/teamEmployeesWages/index.vue   |   1 +
 7 files changed, 364 insertions(+), 47 deletions(-)
 create mode 100644 src/views/mes/record/salarySummaryReport/index.vue

diff --git a/src/api/mes/record/recordStaffSalary.js b/src/api/mes/record/recordStaffSalary.js
index eae0a24..021e9b5 100644
--- a/src/api/mes/record/recordStaffSalary.js
+++ b/src/api/mes/record/recordStaffSalary.js
@@ -60,3 +60,12 @@ export function uploadERPStaffSalary(data) {
     data: data
   })
 }
+
+// 查询员工工资汇总报表
+export function listSalarySummaryReport(query) {
+  return request({
+    url: '/mes/boardPort/salarySummaryReport',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/ems/report/energyPreview/index.vue b/src/views/ems/report/energyPreview/index.vue
index d3cb576..c828872 100644
--- a/src/views/ems/report/energyPreview/index.vue
+++ b/src/views/ems/report/energyPreview/index.vue
@@ -15,9 +15,9 @@
               <el-select v-model="queryParams.energyType" style="width: 100px" placeholder="请选择能源类型">
                 <el-option
                   v-for="item in energyTypeList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.energyTypeId"
+                  :label="item.energyName"
+                  :value="item.energyTypeId"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -177,6 +177,7 @@ import {
 } from '@/utils/dateReportUtils.js'
 import { handleExport } from '@/utils/export.js'
 import {handleTree, parseTime} from '@/utils/ruoyi'
+import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
 
 let data = {}
 let optionData = {}
@@ -213,7 +214,7 @@ export default {
       form: {},
       // 查询参数
       queryParams: {
-        energyType: '2',
+        energyType: 2,
         dateType: '10',
         startTime: '',
         endTime: ''
@@ -230,11 +231,7 @@ export default {
         { label: '年', value: '4' }
       ],
       // 能源类型选项
-      energyTypeList: [
-        { value: '2', label: '电' },
-        { value: '3', label: '水' },
-        { value: '4', label: '蒸汽' }
-      ],
+      energyTypeList: [],
       option: {
         grid: {
           containLabel: true,
@@ -360,6 +357,9 @@ export default {
     }
   },
   created() {
+    getBaseEnergyTypeList({}).then(response => {
+      this.energyTypeList = response.data
+    })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.queryParams.startTime = nowDate + ' 00:00:00'
     this.queryParams.endTime = nowDate + ' 23:59:59'
diff --git a/src/views/mes/prod/prodOrderDetail/index.vue b/src/views/mes/prod/prodOrderDetail/index.vue
index 920aa37..f5ff422 100644
--- a/src/views/mes/prod/prodOrderDetail/index.vue
+++ b/src/views/mes/prod/prodOrderDetail/index.vue
@@ -70,30 +70,30 @@
       <!--        >新增-->
       <!--        </el-button>-->
       <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['mes/prod:prodOrderDetail:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['mes/prod:prodOrderDetail:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['mes/prod:prodOrderDetail:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['mes/prod:prodOrderDetail:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
diff --git a/src/views/mes/prod/prodOrderInfo/index.vue b/src/views/mes/prod/prodOrderInfo/index.vue
index ce4cab8..d0aa79c 100644
--- a/src/views/mes/prod/prodOrderInfo/index.vue
+++ b/src/views/mes/prod/prodOrderInfo/index.vue
@@ -112,18 +112,18 @@
         >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['mes/prod:prodOrderInfo:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['mes/prod:prodOrderInfo:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
diff --git a/src/views/mes/record/recordStaffSalary/index.vue b/src/views/mes/record/recordStaffSalary/index.vue
index bb7d18f..935f15f 100644
--- a/src/views/mes/record/recordStaffSalary/index.vue
+++ b/src/views/mes/record/recordStaffSalary/index.vue
@@ -119,7 +119,7 @@
       <el-table-column label="薪资类别" align="center" prop="salaryCategory" v-if="columns[4].visible"/>
       <el-table-column label="收入大类" align="center" prop="revenueClass" v-if="columns[5].visible" width="120"/>
       <el-table-column label="收入金额" align="center" prop="revenueAmount" v-if="columns[6].visible"/>
-      <el-table-column label="收入理由" align="center" prop="revenueReason" v-if="columns[7].visible"/>
+      <el-table-column label="收入理由" align="center" prop="revenueReason" width="200" v-if="columns[7].visible"/>
       <el-table-column label="扣罚大类" align="center" prop="fineClass" v-if="columns[8].visible"/>
       <el-table-column label="扣罚金额" align="center" prop="fineAmount" v-if="columns[9].visible"/>
       <el-table-column label="扣罚理由" align="center" prop="fineReason" v-if="columns[10].visible"/>
@@ -132,7 +132,7 @@
       <el-table-column label="订单编号" align="center" prop="orderCode" v-if="columns[20].visible"/>
       <el-table-column label="工单编号" align="center" prop="planCode" v-if="columns[21].visible"/>
       <el-table-column label="生产米数" align="center" prop="prodNumber" v-if="columns[19].visible"/>
-      <el-table-column label="工资系数" align="center" prop="prodNumber" v-if="columns[13].visible"/>
+      <el-table-column label="工资系数" align="center" prop="salaryCoefficient" v-if="columns[13].visible"/>
       <el-table-column label="开始日期" align="center" prop="beginDate" width="100" v-if="columns[14].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
diff --git a/src/views/mes/record/salarySummaryReport/index.vue b/src/views/mes/record/salarySummaryReport/index.vue
new file mode 100644
index 0000000..fdc2c38
--- /dev/null
+++ b/src/views/mes/record/salarySummaryReport/index.vue
@@ -0,0 +1,307 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="员工名称" prop="staffName">
+        <el-input
+          v-model="queryParams.staffName"
+          placeholder="请输入员工名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="班组名称" prop="groupId">
+        <el-select v-model="queryParams.groupId" placeholder="请选择班组名称" clearable>
+          <el-option
+            v-for="item in teamMembersList"
+            :key="item.teamCode"
+            :label="item.teamName"
+            :value="item.teamCode"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="事件日期">
+        <el-date-picker
+          v-model="daterangeEventDate"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['mes/record:recordStaffSalary:add']"-->
+      <!--        >新增-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['mes/record:recordStaffSalary:edit']"-->
+      <!--        >修改-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['mes/record:recordStaffSalary:remove']"-->
+      <!--        >删除-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['mes/record:recordStaffSalary:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordStaffSalaryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="员工编号" align="center" prop="staffId" v-if="columns[1].visible"/>
+      <el-table-column label="员工名称" align="center" prop="staffName" v-if="columns[2].visible"/>
+      <el-table-column label="身份证" align="center" prop="idCard" v-if="columns[3].visible" width="200"/>
+      <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[5].visible" width="230"/>
+      <el-table-column label="收入金额" align="center" prop="revenueAmount" v-if="columns[4].visible"/>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import {
+  listSalarySummaryReport
+} from '@/api/mes/record/recordStaffSalary'
+import { getTeamMembers } from '@/api/mes/base/baseTeamMembers'
+import { parseTime } from '@/utils/ruoyi'
+
+export default {
+  name: 'SalarySummaryReport',
+  dicts: ['is_erp'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 员工工资记录表格数据
+      recordStaffSalaryList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 结束日期时间范围
+      daterangeEventDate: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        idCard: null,
+        groupId: null,
+        eventDate: null,
+        salaryCategory: null,
+        revenueClass: null,
+        revenueAmount: null,
+        revenueReason: null,
+        fineClass: null,
+        fineAmount: null,
+        fineReason: null,
+        taskCode: null,
+        salaryCoefficient: null,
+        beginDate: null,
+        endDate: null,
+        isErp: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `员工编号`, visible: true },
+        { key: 2, label: `员工名称`, visible: true },
+        { key: 3, label: `身份证`, visible: true },
+        { key: 4, label: `收入金额`, visible: true },
+        { key: 5, label: `班组名称`, visible: true },
+      ],
+      // 班组选项
+      teamMembersList: []
+    }
+  },
+  created() {
+    const currentDate = new Date()
+    const firstDay = parseTime(new Date(currentDate.getFullYear(), currentDate.getMonth(), 1), '{y}-{m}-{d}')
+    const lastDay = parseTime(new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0), '{y}-{m}-{d}')
+    this.daterangeEventDate[0] = firstDay
+    this.daterangeEventDate[1] = lastDay
+    getTeamMembers().then(response => {
+      this.teamMembersList = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询员工工资记录列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeEventDate && '' != this.daterangeEventDate) {
+        this.queryParams.beginEventDate = this.daterangeEventDate[0]
+        this.queryParams.endEventDate = this.daterangeEventDate[1]
+      }
+      listSalarySummaryReport(this.queryParams).then(response => {
+        this.recordStaffSalaryList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        idCard: null,
+        groupId: null,
+        eventDate: null,
+        salaryCategory: null,
+        revenueClass: null,
+        revenueAmount: null,
+        revenueReason: null,
+        fineClass: null,
+        fineAmount: null,
+        fineReason: null,
+        createTime: null,
+        taskCode: null,
+        salaryCoefficient: null,
+        beginDate: null,
+        endDate: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeEventDate = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加员工工资记录'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getRecordStaffSalary(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改员工工资记录'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateRecordStaffSalary(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addRecordStaffSalary(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除员工工资记录编号为"' + objIds + '"的数据项？').then(function() {
+        return delRecordStaffSalary(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('mes/boardPort/salarySummaryReport/export', {
+        ...this.queryParams
+      }, `员工工资汇总报表_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/src/views/mes/record/teamEmployeesWages/index.vue b/src/views/mes/record/teamEmployeesWages/index.vue
index 553f76e..bad070c 100644
--- a/src/views/mes/record/teamEmployeesWages/index.vue
+++ b/src/views/mes/record/teamEmployeesWages/index.vue
@@ -186,6 +186,7 @@ import {
 } from '@/api/mes/record/recordStaffSalary'
 import { getTeamMembers } from '@/api/mes/base/baseTeamMembers'
 import { parseTime } from '@/utils/ruoyi'
+import { delRecordStaffCommute } from '@/api/mes/record/recordStaffCommute'
 
 export default {
   name: 'TeamEmployeesWages',