From c02a3ebf5b4338710c4f9ae231d72cf591dfb97f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 02 十二月 2024 11:28:04 +0800
Subject: [PATCH] 1.修改 批量派发 没绑定工艺路线的单子，显示在最前面
---
src/views/deviceManager/maintainRecord.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/deviceManager/maintainRecord.vue b/src/views/deviceManager/maintainRecord.vue
index 67d5aa0..0c3b4c8 100644
--- a/src/views/deviceManager/maintainRecord.vue
+++ b/src/views/deviceManager/maintainRecord.vue
@@ -20,9 +20,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>
@@ -158,7 +158,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="getDeviceRepairTakeSearch"
/>
@@ -254,9 +254,9 @@
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime } from '@/utils/global'
-import { DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch
+import {
+ DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch, 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'
@@ -274,7 +274,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType !== 'W' ? '' : getCookie('stu_torgcode'), // 鎵�灞炶溅闂�
eqpcode: '', // 璁惧缂栫爜
eqpname: '', // 璁惧鍚嶇О
stanedname: '', // 鏍囧噯鍚嶇О
@@ -492,7 +492,7 @@
},
// 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
async getShopSearch() {
- const { data: res } = await ShopSearch()
+ const { data: res } = await WorkShopSelect()
this.wkshopSelectArr = res
},
// 鎺掑簭鏀瑰彉鏃�
@@ -522,7 +522,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.stanedname = ''
--
Gitblit v1.9.3