From ff77023946ed6b0b46fbea8d78bdc23712891aeb Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 21 十月 2025 10:24:39 +0800
Subject: [PATCH] 1.针对报工数量为零的做校验
---
src/views/statistic/personSalaryList.vue | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/views/statistic/personSalaryList.vue b/src/views/statistic/personSalaryList.vue
index d4aa68f..aceb2c6 100644
--- a/src/views/statistic/personSalaryList.vue
+++ b/src/views/statistic/personSalaryList.vue
@@ -40,6 +40,9 @@
style="display: flex; "
>
<div class="elForm">
+ <el-form-item label="閿�鍞崟鍙�" style="display: flex;">
+ <el-input v-model="form.socode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -62,7 +65,7 @@
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
@@ -81,9 +84,9 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
- <el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">
- <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鎶ュ伐浜哄憳" style=" display: flex;">-->
+ <!-- <el-input v-model="form.reportname" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.reportdate"
@@ -156,6 +159,13 @@
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -322,6 +332,13 @@
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -508,7 +525,7 @@
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
- name: 'Zzjg',
+ name: 'PersonSalaryList',
components: {
Pagination, ImportPicker
},
@@ -521,6 +538,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ socode: '',
wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -614,7 +632,7 @@
const { columns, data } = param
const sums = []
- const i = this.form.compute === 'last' ? 9 : 9
+ const i = this.form.compute === 'last' ? 11 : 11
columns.forEach((column, index) => {
if (index === i) {
@@ -633,7 +651,7 @@
}
}, 0)
- sums[index] += ' 鍏�'
+ sums[index] = sums[index].toFixed(2) + ' 鍏�'
} else {
// sums[index] = 'N/A'
sums[index] = ' '
@@ -656,6 +674,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ socode: this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -714,6 +733,7 @@
}
const data = {
+ socode: this.form.socode,
wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
@@ -743,6 +763,7 @@
},
// 閲嶇疆
reset() {
+ this.form.socode = ''
this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
--
Gitblit v1.9.3