From 844adb3a80b39f9a78dae89a6a27f19e58a931df Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 09 一月 2024 10:34:58 +0800
Subject: [PATCH] 1.图片预览地址配置
---
src/views/statistic/personSalaryList.vue | 140 ++++++++++++++++++++++++++++++----------------
1 files changed, 92 insertions(+), 48 deletions(-)
diff --git a/src/views/statistic/personSalaryList.vue b/src/views/statistic/personSalaryList.vue
index 362724d..d4aa68f 100644
--- a/src/views/statistic/personSalaryList.vue
+++ b/src/views/statistic/personSalaryList.vue
@@ -40,6 +40,22 @@
style="display: flex; "
>
<div class="elForm">
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -49,7 +65,7 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</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.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
@@ -169,7 +185,15 @@
</template>
</el-table-column>
<el-table-column
- prop="stepcode"
+ 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
@@ -189,18 +213,18 @@
show-tooltip-when-overflow
sortable="custom"
/>
- <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="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="鎶ュ伐鏁伴噺"
@@ -213,35 +237,35 @@
</template>
</el-table-column>
<el-table-column
- prop="unprice"
+ prop="step_price"
label="宸ュ簭鍗曚环"
width="110"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
+ <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="ratio"
- label="鍒嗛厤姣斾緥"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.ratio }} %</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="usermoney"
+ prop="moneys"
label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
+ <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -327,6 +351,14 @@
</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"
@@ -347,18 +379,18 @@
show-tooltip-when-overflow
sortable="custom"
/>
- <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="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="鎶ュ伐鏁伴噺"
@@ -371,24 +403,24 @@
</template>
</el-table-column>
<el-table-column
- prop="unprice"
+ prop="step_price"
label="宸ュ簭鍗曚环"
width="110"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.unprice">{{ row.unprice }} 鍏�</div>
+ <div v-if="row.step_price">{{ row.step_price }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
<el-table-column
- prop="usermoney"
+ prop="moneys"
label="涓汉璁′欢宸ヨ祫"
width="130"
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.usermoney">{{ row.usermoney }} 鍏�</div>
+ <div v-if="row.moneys">{{ row.moneys }} 鍏�</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -473,6 +505,7 @@
} from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
name: 'Zzjg',
@@ -488,6 +521,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -503,6 +537,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ wkshopcodeArr: [],
groupArr: [],
total: 10,
tableData: [],
@@ -559,10 +594,16 @@
handleRequest() {
this.getPeopleSalaryReportSearch().then(res => {
if (res.code === '200') {
+ this.getPrentOrganizationNoCompany()
+
// this.getMesOrderStepReportSelectUserGroup()
// this.getStepSelect()
}
})
+ },
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
// async getStepSelect() {
@@ -573,7 +614,7 @@
const { columns, data } = param
const sums = []
- const i = this.form.compute === 'last' ? 11 : 10
+ const i = this.form.compute === 'last' ? 9 : 9
columns.forEach((column, index) => {
if (index === i) {
@@ -581,7 +622,7 @@
return
}
const values = data.map(item => Number(item[column.property]))
- if (column.property === 'usermoney') {
+ if (column.property === 'moneys') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -615,6 +656,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -672,6 +714,7 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -700,6 +743,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
@@ -788,7 +832,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 255
+ this.tableHeight = this.mainHeight - 245
this.$refs.tableDataRef.doLayout()
this.$refs.tableDataRef2.doLayout()
})
--
Gitblit v1.9.3