From 09bc0a81c166562bc4523f3a3d3fc86203f64b1e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 十一月 2023 14:50:52 +0800
Subject: [PATCH] 1.生产管理、报表管理 新增销售单号查询
---
src/views/reportManager/produceSchedule.vue | 80 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/src/views/reportManager/produceSchedule.vue b/src/views/reportManager/produceSchedule.vue
index 610b990..44f9351 100644
--- a/src/views/reportManager/produceSchedule.vue
+++ b/src/views/reportManager/produceSchedule.vue
@@ -15,6 +15,16 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select v-model="form.status" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
@@ -28,10 +38,13 @@
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
- <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <!-- <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">-->
+ <!-- <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input v-model="form.saleordercode" 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.routename" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
@@ -40,9 +53,9 @@
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
+ <!-- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="鍗曟嵁鏃ユ湡" style="display: flex;align-items: center">
<el-date-picker
v-model="form.lm_date"
@@ -122,6 +135,17 @@
sortable="custom"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="155"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
width="155"
@@ -143,6 +167,13 @@
sortable="custom"
/>
<el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="105"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
prop="partpesc"
label="浜у搧瑙勬牸"
width="105"
@@ -154,13 +185,13 @@
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="route_code"
- label="宸ヨ壓璺嚎缂栫爜"
- width="130"
- show-tooltip-when-overflow
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="route_code"-->
+ <!-- label="宸ヨ壓璺嚎缂栫爜"-->
+ <!-- width="130"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="route_name"
label="宸ヨ壓璺嚎鍚嶇О"
@@ -180,7 +211,6 @@
label="鐢熶骇杩涘害"
min-width="521"
sortable="custom"
- show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div style="min-width: 900px;display: flex;overflow-x: auto;overflow-y: hidden">
@@ -236,7 +266,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getProductionScheduleReportSearch"
/>
@@ -255,6 +285,8 @@
ProductionScheduleReportExcelSearch,
ProductionScheduleReportSearch
} from '@/api/reportManager'
+import { WorkShopSelect } from '@/api/deviceManager'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -269,6 +301,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '',
status: '', // 宸ュ崟鐘舵��
wocode: '', // 宸ュ崟缂栧彿
routecode: '', // 宸ヨ壓璺嚎缂栫爜
@@ -276,6 +309,7 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 瑙勬牸鍨嬪彿
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
lm_date: '', // 鍗曟嵁鏃ユ湡
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -289,25 +323,34 @@
],
total: 10,
- tableData: []
+ tableData: [],
+
+ WorkShopArr: [] // 鎵�灞炶溅闂存暟缁�
}
},
created() {
this.getProductionScheduleReportSearch()
+ this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
async getProductionScheduleReportSearch() {
let tempDate = this.form.lm_date
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
status: this.form.status,
wocode: this.form.wocode,
routecode: this.form.routecode,
@@ -315,6 +358,7 @@
partcode: this.form.partcode,
partname: this.form.partname,
partspec: this.form.partspec,
+ wkshopcode: this.form.wkshopcode,
lm_date: tempDate,
prop: this.form.prop,
order: this.form.order,
@@ -334,6 +378,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ saleordercode: this.form.saleordercode,
status: this.form.status,
wocode: this.form.wocode,
routecode: this.form.routecode,
@@ -341,6 +386,7 @@
partcode: this.form.partcode,
partname: this.form.partname,
partspec: this.form.partspec,
+ wkshopcode: this.form.wkshopcode,
lm_date: tempDate
}
@@ -366,6 +412,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.status = ''
this.form.wocode = ''
this.form.routecode = ''
@@ -374,6 +421,7 @@
this.form.partname = ''
this.form.partspec = ''
this.form.lm_date = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : ''// 鎵�灞炶溅闂�
this.getProductionScheduleReportSearch()
},
--
Gitblit v1.9.3