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/subcontractingOperation.vue | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/views/statistic/subcontractingOperation.vue b/src/views/statistic/subcontractingOperation.vue
index acff893..1eec12e 100644
--- a/src/views/statistic/subcontractingOperation.vue
+++ b/src/views/statistic/subcontractingOperation.vue
@@ -14,6 +14,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>
@@ -23,9 +39,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>
@@ -143,6 +159,13 @@
<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="stepcode"
label="宸ュ簭缂栫爜"
@@ -329,6 +352,7 @@
import { OutSourceReportExcelSearch, OutSourceReportSearch } from '@/api/ReportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
name: 'Zzjg',
@@ -343,6 +367,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -360,6 +385,7 @@
{ code: 'F', name: '鍙戞枡' },
{ code: 'S', name: '鏀舵枡' }
],
+ wkshopcodeArr: [],
total: 10,
tableData: [],
dialogVisible: false,
@@ -398,12 +424,17 @@
},
created() {
this.getOutSourceReportSearch()
+ this.getPrentOrganizationNoCompany()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
+ },
async getOutSourceReportSearch() {
let tempDate = this.form.receivdate
if (tempDate.length > 0) {
@@ -411,6 +442,7 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -425,7 +457,7 @@
rows: this.form.rows
}
- console.log(data, 1)
+ // console.log(data, 1)
const res = await OutSourceReportSearch(data)
this.tableData = res.data
this.total = res.count
@@ -450,6 +482,7 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
@@ -477,6 +510,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
--
Gitblit v1.9.3