From db407663e3024050ab3eb701f10ee00ddaf5f1ee Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 16 六月 2023 11:28:38 +0800
Subject: [PATCH] 1.制造模型引入车间概念
---
src/views/deviceManager/repairRecord.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/deviceManager/repairRecord.vue b/src/views/deviceManager/repairRecord.vue
index 62ca8a0..1f01a75 100644
--- a/src/views/deviceManager/repairRecord.vue
+++ b/src/views/deviceManager/repairRecord.vue
@@ -14,13 +14,13 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鐢熶骇杞﹂棿"style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<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>
@@ -327,11 +327,12 @@
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime } from '@/utils/global'
-import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/deviceManager'
+import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch, WorkShopSelect } from '@/api/deviceManager'
import { ShopSearch } from '@/api/kanbanManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -346,7 +347,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
eqpcode: '', // 璁惧缂栫爜
eqpname: '', // 璁惧鍚嶇О
reportuser: '', // 鎶ヤ慨浜哄憳
@@ -582,7 +583,7 @@
},
// 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
async getShopSearch() {
- const { data: res } = await ShopSearch()
+ const { data: res } = await WorkShopSelect()
this.wkshopSelectArr = res
},
// 鎺掑簭鏀瑰彉鏃�
@@ -612,7 +613,7 @@
},
// 閲嶇疆
reset() {
- this.form.wkshopcode = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode') // 鎵�灞炶溅闂�
this.form.eqpcode = ''
this.form.eqpname = ''
this.form.reportuser = ''
--
Gitblit v1.9.3