From 611a5a14f9bcbc399f923f04521e69948ec77b60 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 01 十一月 2023 16:54:05 +0800
Subject: [PATCH] 1.工单管理、生产执行 新增 车间名称查询
---
src/views/workOrder/workOrderList.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 7a0a1b8..6c176b4 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -20,6 +20,22 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
@@ -43,7 +59,7 @@
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
<el-input v-model="form.sourceorder" style="width: 200px" placeholder="璇疯緭鍏�" />
</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.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">
@@ -905,6 +921,22 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="sourceForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="sourceForm.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -912,12 +944,12 @@
<el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">-->
+ <!-- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -1941,7 +1973,7 @@
UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
-import { PrentOrganization, StepData } from '@/api/GeneralBasicData'
+import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
@@ -1962,6 +1994,7 @@
tableHeight: 0,
username: '',
form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
mesorderstus: '', // 宸ュ崟鐘舵�佺爜
mesordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -1987,6 +2020,7 @@
// { code: 'NOSCHED', name: '寰呮帓绋�' },
// { code: 'SCHED', name: '宸叉帓绋�' }
],
+ wkshopcodeArr: [],
total: 10,
tableData: [],
dialogVisible: false,
@@ -2133,6 +2167,7 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
mesordercode: '', // 宸ュ崟缂栧彿
sourceorder: '', // 璁㈠崟缂栧彿
saleordercode: '', // 閿�鍞鍗曞彿
@@ -2255,8 +2290,13 @@
this.getMesOrderSearch().then(res => {
if (res.code === '200') {
this.getSelect()
+ this.getPrentOrganizationNoCompany()
}
})
+ },
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
},
async getMesOrderSearch() {
// let tempDate = this.form.createdate
@@ -2265,6 +2305,7 @@
// }
const data = {
+ wkshopcode: this.form.wkshopcode,
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -2336,6 +2377,7 @@
// 閲嶇疆
reset(val) {
+ this.form.wkshopcode = ''
this.form.mesorderstus = ''
this.form.mesordercode = ''
this.form.partcode = ''
@@ -2830,6 +2872,7 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
mesordercode: this.sourceForm.mesordercode, // 宸ュ崟缂栧彿
sourceorder: '', // 婧愬崟鍗曞彿
saleordercode: '', // 閿�鍞崟鍙�
@@ -2865,6 +2908,7 @@
this.getMesBadOrderSearch()
},
sourceReset() {
+ this.sourceForm.wkshopcode = ''
this.sourceForm.mesordercode = ''
this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
@@ -2879,6 +2923,7 @@
dialogVisibleSourceClose() {
this.radioSelectedId = ''
+ this.sourceForm.wkshopcode = ''
this.sourceForm.mesordercode = ''
this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
--
Gitblit v1.9.3