From 9510b0945f7a59d4b6d6279022d783f748254599 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 7 Nov 2024 14:28:12 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=91=98=E5=B7=A5=E5=B7=A5?=
 =?UTF-8?q?=E8=B5=84=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8A=A0=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prod/planExecuteUser/index.vue  |  6 ++--
 .../mes/record/recordStaffSalary/index.vue    | 30 +++++++++++++++++--
 .../mes/record/teamEmployeesWages/index.vue   |  9 +++---
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/views/mes/prod/planExecuteUser/index.vue b/src/views/mes/prod/planExecuteUser/index.vue
index a4f4cf0..ad5a871 100644
--- a/src/views/mes/prod/planExecuteUser/index.vue
+++ b/src/views/mes/prod/planExecuteUser/index.vue
@@ -94,10 +94,10 @@
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="订单编号" align="center" prop="orderCode" width="130" v-if="columns[1].visible"/>
       <el-table-column label="工单编号" align="center" prop="planCode" width="230" v-if="columns[2].visible"/>
-      <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[3].visible"/>
+      <el-table-column label="工序编号" align="center" prop="processCode" width="80" v-if="columns[3].visible"/>
       <el-table-column label="工位名称" align="center" prop="stationName" width="100" v-if="columns[4].visible"/>
       <el-table-column label="员工名称" align="center" prop="staffName" v-if="columns[5].visible"/>
-      <el-table-column label="生产米数" align="center" prop="completeAmount" v-if="columns[6].visible"/>
+      <el-table-column label="生产米数" align="center" prop="completeAmount" width="80" v-if="columns[6].visible"/>
       <el-table-column label="工单明细开始时间" align="center" prop="planBeginDate" width="180" v-if="columns[7].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planBeginDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -108,7 +108,7 @@
           <span>{{ parseTime(scope.row.planEndDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="生产次数（锅数）" align="center" prop="batchNumber" v-if="columns[14].visible"/>
+      <el-table-column label="生产次数（锅数）" align="center" prop="batchNumber" width="130" v-if="columns[14].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
diff --git a/src/views/mes/record/recordStaffSalary/index.vue b/src/views/mes/record/recordStaffSalary/index.vue
index 525285a..bb7d18f 100644
--- a/src/views/mes/record/recordStaffSalary/index.vue
+++ b/src/views/mes/record/recordStaffSalary/index.vue
@@ -38,6 +38,16 @@
           end-placeholder="结束时间"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="上传ERP标识" prop="isErp">
+        <el-select v-model="queryParams.isErp" placeholder="请选择打卡类型" clearable>
+          <el-option
+            v-for="dict in dict.type.is_erp"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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>
@@ -114,7 +124,15 @@
       <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"/>
       <el-table-column label="任务编号" align="center" prop="taskCode" v-if="columns[12].visible" width="120"/>
-      <el-table-column label="工资系数" align="center" prop="salaryCoefficient" v-if="columns[13].visible"/>
+      <el-table-column label="上传ERP标识" align="center" prop="isErp" width="100" v-if="columns[18].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_erp" :value="scope.row.isErp"/>
+        </template>
+      </el-table-column>
+      <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="beginDate" width="100" v-if="columns[14].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
@@ -240,6 +258,7 @@ import { parseTime } from '@/utils/ruoyi'
 
 export default {
   name: 'RecordStaffSalary',
+  dicts: ['is_erp'],
   data() {
     return {
       // 遮罩层
@@ -279,7 +298,8 @@ export default {
         taskCode: null,
         salaryCoefficient: null,
         beginDate: null,
-        endDate: null
+        endDate: null,
+        isErp: null,
       },
       // 表单参数
       form: {},
@@ -307,7 +327,11 @@ export default {
         { key: 14, label: `开始日期`, visible: true },
         { key: 15, label: `结束日期`, visible: true },
         { key: 16, label: `员工名称`, visible: true },
-        { key: 17, label: `班组名称`, visible: true }
+        { key: 17, label: `班组名称`, visible: true },
+        { key: 18, label: `上传ERP标识`, visible: true },
+        { key: 19, label: `生产米数`, visible: false },
+        { key: 21, label: `订单编号`, visible: false },
+        { key: 22, label: `工单编号`, visible: false },
       ],
       // 班组选项
       teamMembersList: []
diff --git a/src/views/mes/record/teamEmployeesWages/index.vue b/src/views/mes/record/teamEmployeesWages/index.vue
index 6a53738..553f76e 100644
--- a/src/views/mes/record/teamEmployeesWages/index.vue
+++ b/src/views/mes/record/teamEmployeesWages/index.vue
@@ -237,7 +237,7 @@ export default {
         ]
       },
       columns: [
-        { key: 0, label: `序号`, visible: true },
+        { key: 0, label: `序号`, visible: false },
         { key: 1, label: `身份证`, visible: true },
         { key: 2, label: `班组编号`, visible: true },
         { key: 3, label: `事件日期`, visible: true },
@@ -276,10 +276,9 @@ export default {
       this.loading = true
       this.queryParams.params = {}
       if (null != this.daterangeOrderDate && '' != this.daterangeOrderDate) {
-        this.queryParams.params['beginOrderDate'] = this.daterangeOrderDate[0]
-        this.queryParams.params['endOrderDate'] = this.daterangeOrderDate[1]
+        this.queryParams.params['beginOffWorkTime'] = this.daterangeOrderDate[0]
+        this.queryParams.params['endOffWorkTime'] = this.daterangeOrderDate[1]
       }
-
       selectTeamEmployeesWages(this.queryParams).then(response => {
         this.recordStaffSalaryList = response.data
         // this.total = response.total
@@ -341,7 +340,7 @@ export default {
       this.$modal.confirm('是否将已勾选的员工工资上传至ERP系统？').then(function() {
         return uploadERPStaffSalary(dataList)
       }).then(() => {
-        this.recordStaffSalaryList = [];
+        this.getList()
         this.$modal.msgSuccess('上传ERP成功')
       }).catch(() => {
       })