From fe2da43a5c79c2e7c41b2525d959346e2a4f0588 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期五, 05 六月 2026 10:17:16 +0800
Subject: [PATCH] 1.个人工资报表更新
---
src/views/statistic/personSalaryList.vue | 528 +++++++++++++++++++---------------------------------------
1 files changed, 172 insertions(+), 356 deletions(-)
diff --git a/src/views/statistic/personSalaryList.vue b/src/views/statistic/personSalaryList.vue
index df68edc..43c98c9 100644
--- a/src/views/statistic/personSalaryList.vue
+++ b/src/views/statistic/personSalaryList.vue
@@ -139,357 +139,172 @@
</div>
</div>
- <el-tabs type="border-card" style="margin-top: 10px" @tab-click="tabClick">
- <el-tab-pane label="鏈亾宸ュ簭">
- <div class="elTableDiv" style="margin: 0 auto 10px;">
- <el-table
- ref="tableDataRef"
- class="tableFixed"
- :data="tableData"
- :height="isExpandForm?(tableHeight-120):(tableHeight-40)+'px'"
- border
- :summary-method="getSummaries"
- show-summary
- :row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="sortChange"
- >
- <el-table-column
- prop="rowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- 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
- prop="partcode"
- label="浜у搧缂栫爜"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wkshp_name"
- label="杞﹂棿鍚嶇О"
- width="130"
- show-tooltip-when-overflow
- sortable="custom"
- />
-
- <el-table-column
- prop="step_code"
- label="宸ュ簭缂栫爜"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="stepname"
- label="宸ュ簭鍚嶇О"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="plan_quantity"
- label="浠诲姟鏁伴噺"
- sortable="custom"
- show-overflow-tooltip
- min-width="110"
- />
- <el-table-column
- prop="task_qty"
- label="鎬诲彲鎶ユ暟閲�"
- sortable="custom"
- show-overflow-tooltip
- min-width="120"
- />
- <!-- <el-table-column-->
- <!-- prop="group_name"-->
- <!-- label="鐢熶骇鐝粍"-->
- <!-- width="110"-->
- <!-- show-tooltip-when-overflow-->
- <!-- sortable="custom"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.group_name">{{ row.group_name }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="report_qty"
- label="鎶ュ伐鏁伴噺"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.report_qty">{{ row.report_qty }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="step_price"
- label="宸ュ簭鍗曚环"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.step_price">{{ row.step_price }} 鍏�</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="ratio"-->
- <!-- label="鍒嗛厤姣斾緥"-->
- <!-- width="110"-->
- <!-- sortable="custom"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.step_price">{{ row.ratio }} %</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="moneys"
- label="涓汉璁′欢宸ヨ祫"
- width="130"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="username"
- label="鎶ュ伐浜哄憳"
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="report_date"
- label="鎶ュ伐鏃堕棿"
- width="160"
- sortable="custom"
- />
-
- </el-table>
- </div>
- <!--鍒嗛〉-->
- <pagination
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="total,prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getPeopleSalaryReportSearch"
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef2"
+ class="tableFixed"
+ :data="tableData2"
+ :height="isExpandForm?(tableHeight-120):(tableHeight-40)+'px'"
+ border
+ :summary-method="getSummaries"
+ show-summary
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?(tableHeight-120):(tableHeight-40)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="rowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
/>
- </el-tab-pane>
- <el-tab-pane label="閫愰亾宸ュ簭">
- <div class="elTableDiv" style="margin: 0 auto 10px;">
- <el-table
- ref="tableDataRef2"
- class="tableFixed"
- :data="tableData2"
- :height="isExpandForm?(tableHeight-80):(tableHeight-40)+'px'"
- border
- :summary-method="getSummaries"
- show-summary
- :row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandForm?(tableHeight-80):(tableHeight-40)+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="sortChange"
- >
- <el-table-column
- prop="rowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- 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
- prop="partcode"
- label="浜у搧缂栫爜"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wkshp_name"
- label="杞﹂棿鍚嶇О"
- width="130"
- show-tooltip-when-overflow
- sortable="custom"
- />
-
- <el-table-column
- prop="step_code"
- label="宸ュ簭缂栫爜"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="stepname"
- label="宸ュ簭鍚嶇О"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="plan_quantity"
- label="浠诲姟鏁伴噺"
- sortable="custom"
- show-overflow-tooltip
- min-width="110"
- />
- <el-table-column
- prop="task_qty"
- label="鎬诲彲鎶ユ暟閲�"
- sortable="custom"
- show-overflow-tooltip
- min-width="120"
- />
- <!-- <el-table-column-->
- <!-- prop="group_name"-->
- <!-- label="鐢熶骇鐝粍"-->
- <!-- width="110"-->
- <!-- show-tooltip-when-overflow-->
- <!-- sortable="custom"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.group_name">{{ row.group_name }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column
- prop="report_qty"
- label="鎶ュ伐鏁伴噺"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.report_qty">{{ row.report_qty }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="step_price"
- label="宸ュ簭鍗曚环"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.step_price">{{ row.step_price }} 鍏�</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="moneys"
- label="涓汉璁′欢宸ヨ祫"
- width="130"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="username"
- label="鎶ュ伐浜哄憳"
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="report_date"
- label="鎶ュ伐鏃堕棿"
- width="160"
- sortable="custom"
- />
-
- </el-table>
- </div>
- <!--鍒嗛〉-->
- <pagination
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="total,prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getPeopleSalaryReportSearch"
+ <el-table-column
+ prop="wo_code"
+ label="宸ュ崟缂栧彿"
+ width="160"
+ sortable="custom"
/>
- </el-tab-pane>
- </el-tabs>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partname"
+ label="浜у搧鍚嶇О"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="partspec"
+ label="浜у搧瑙勬牸"
+ width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ label="杞﹂棿鍚嶇О"
+ width="130"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+
+ <el-table-column
+ prop="step_code"
+ label="宸ュ簭缂栫爜"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭鍚嶇О"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="plan_quantity"
+ label="浠诲姟鏁伴噺"
+ sortable="custom"
+ show-overflow-tooltip
+ min-width="110"
+ />
+ <el-table-column
+ prop="task_qty"
+ label="鎬诲彲鎶ユ暟閲�"
+ sortable="custom"
+ show-overflow-tooltip
+ min-width="120"
+ />
+ <!-- <el-table-column-->
+ <!-- prop="group_name"-->
+ <!-- label="鐢熶骇鐝粍"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.group_name">{{ row.group_name }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column
+ prop="report_qty"
+ label="鎶ュ伐鏁伴噺"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.report_qty">{{ row.report_qty }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="step_price"
+ label="宸ュ簭鍗曚环"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.step_price">{{ row.step_price }} 鍏�</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="moneys"
+ label="涓汉璁′欢宸ヨ祫"
+ width="130"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="username"
+ label="鎶ュ伐浜哄憳"
+ width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="report_date"
+ label="鎶ュ伐鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+
+ </el-table>
+ </div>
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getPeopleSalaryReportSearch"
+ />
</div>
<el-dialog
@@ -571,9 +386,10 @@
reportname: '', // 鎿嶄綔浜哄憳
reportdate: '', // 鎿嶄綔鏃堕棿
rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
- compute: 'last', // 璁′欢鏂瑰紡
- prop: 'partcode', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
+ compute: 'contin', // 璁′欢鏂瑰紡
+ // prop: 'partcode', // 鎺掑簭瀛楁
+ prop: 'saleOrderCode,wo_code,step_seq', // 鎺掑簭瀛楁
+ order: 'asc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
@@ -620,7 +436,7 @@
},
// updated() {
// this.$nextTick(() => {
- // this.$refs.tableDataRef.doLayout()
+ //
// this.$refs.tableDataRef2.doLayout()
// })
// },
@@ -691,7 +507,6 @@
})
this.$nextTick(() => {
- this.$refs.tableDataRef.doLayout()
this.$refs.tableDataRef2.doLayout()
})
// (Math.round(sums * 100) / 100).toS
@@ -805,6 +620,8 @@
this.form.groupcode = ''
this.form.reportname = ''
this.form.reportdate = ''
+ this.form.prop = 'saleOrderCode,wo_code,step_seq'
+ this.form.order = 'asc'
this.getPeopleSalaryReportSearch()
},
@@ -885,8 +702,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 245
- this.$refs.tableDataRef.doLayout()
+ this.tableHeight = this.mainHeight - 175
this.$refs.tableDataRef2.doLayout()
})
},
--
Gitblit v1.9.3