From ff76b3ed3494474e9301c49cf635f1553d49ecc5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 17 六月 2023 14:58:03 +0800
Subject: [PATCH] 1.生产管理、报表管理引入分车间概念
---
src/views/reportManager/produceSchedule.vue | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/views/reportManager/produceSchedule.vue b/src/views/reportManager/produceSchedule.vue
index 6687144..01014fa 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
@@ -31,7 +41,7 @@
<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-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 +50,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"
@@ -139,6 +149,13 @@
prop="partname"
label="浜у搧鍚嶇О"
width="155"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="105"
show-tooltip-when-overflow
sortable="custom"
/>
@@ -254,6 +271,8 @@
ProductionScheduleReportExcelSearch,
ProductionScheduleReportSearch
} from '@/api/reportManager'
+import { WorkShopSelect } from '@/api/deviceManager'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -275,6 +294,7 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 瑙勬牸鍨嬪彿
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
lm_date: '', // 鍗曟嵁鏃ユ湡
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -288,19 +308,27 @@
],
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) {
@@ -314,6 +342,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,
@@ -340,6 +369,7 @@
partcode: this.form.partcode,
partname: this.form.partname,
partspec: this.form.partspec,
+ wkshopcode: this.form.wkshopcode,
lm_date: tempDate
}
@@ -373,6 +403,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