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/installationLampList.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/views/reportManager/installationLampList.vue b/src/views/reportManager/installationLampList.vue
index b1aee76..4e28365 100644
--- a/src/views/reportManager/installationLampList.vue
+++ b/src/views/reportManager/installationLampList.vue
@@ -18,9 +18,9 @@
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -109,7 +109,7 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style="display: flex;">
<el-select
v-model="formSum.wkshopcode"
style="width: 200px"
@@ -118,13 +118,13 @@
>
<el-option
v-for="item in wkshopSelectArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
- <el-form-item label="鐢熶骇璁惧" style=" display: flex;">
+ <el-form-item label="鐢熶骇璁惧" style="display: flex;">
<el-select
v-model="formSum.eqpcode"
:disabled="formSum.wkshopcode===''"
@@ -348,9 +348,10 @@
AnDonReportSumExcelSearch,
AnDonReportSumSearch
} from '@/api/reportManager'
-import { ShopSearch } from '@/api/kanbanManager'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { WorkShopSelect } from '@/api/deviceManager'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -365,7 +366,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
calltypecode: '', // 鍛煎彨绫诲瀷缂栫爜
calluser: '', // 鍛煎彨浜哄憳
calldate: '', // 鍛煎彨鏃堕棿
@@ -493,7 +494,7 @@
currentTabPositionName: '瀹夌伅鏄庣粏', // Tab鏍囩浣嶄簬鐨勪綅缃� 榛樿绗��0鈥欎釜
formSum: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
calltypecode: '', // 鍛煎彨绫诲瀷缂栫爜
calldate: '', // 鍛煎彨鏃堕棿
eqpcode: '', // 璁惧缂栫爜
@@ -608,6 +609,10 @@
if (res.code === '200') {
this.getShopSearch()
this.getAnDengTypeSearch()
+
+ if (this.$store.state.settings.orgType === 'W') {
+ this.getWhkspIsEqpSearch(getCookie('stu_torgcode'))
+ }
}
})
},
@@ -669,7 +674,7 @@
},
// 鑾峰彇鐢熶骇杞﹂棿
async getShopSearch() {
- const { data: res } = await ShopSearch()
+ const { data: res } = await WorkShopSelect()
this.wkshopSelectArr = res
},
// 鑾峰彇鍛煎彨绫诲瀷
--
Gitblit v1.9.3