From e20c8cf7ad6d2a85817c5627fc9ee7c755884d5b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 十一月 2023 09:22:53 +0800
Subject: [PATCH] 1.统计报表 加上车间名称的查询条件
---
src/views/statistic/groupSalaryList.vue | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/views/statistic/groupSalaryList.vue b/src/views/statistic/groupSalaryList.vue
index 117be34..9d61962 100644
--- a/src/views/statistic/groupSalaryList.vue
+++ b/src/views/statistic/groupSalaryList.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,9 +65,9 @@
<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-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item 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;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -68,7 +84,7 @@
<el-form-item v-show="isExpandForm" label="鎿嶄綔浜哄憳" style=" display: flex;">
<el-input v-model="form.username" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鎶ュ伐鏃堕棿" style="display: flex;align-items: center">
+ <el-form-item v-show="isExpandForm" label="鎿嶄綔鏃堕棿" style="display: flex;align-items: center">
<el-date-picker
v-model="form.operdate"
type="daterange"
@@ -169,6 +185,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
@@ -333,6 +356,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
@@ -500,7 +530,7 @@
} from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
-import { GroupsPermissions } from '@/api/GeneralBasicData'
+import { GroupsPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
name: 'Zzjg',
@@ -516,6 +546,7 @@
tableHeight: 0,
StepSelectArr: [], // 鍓旈櫎宸ュ簭鏁扮粍
form: {
+ wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -531,6 +562,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ wkshopcodeArr: [],
groupArr: [],
total: 10,
tableData: [],
@@ -588,9 +620,14 @@
this.getGroupSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
+ this.getPrentOrganizationNoCompany()
// this.getStepSelect()
}
})
+ },
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
// async getStepSelect() {
@@ -635,6 +672,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,
@@ -693,6 +731,7 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -721,6 +760,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
--
Gitblit v1.9.3