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/workOrderClose.vue | 29 +++++
src/views/workOrder/produceOrderList.vue | 29 +++++
src/api/GeneralBasicData.js | 8 +
src/views/produce/reportCorrect.vue | 37 ++++++
src/views/produce/stepReport.vue | 33 ++++++
src/views/workOrder/workOrderList.vue | 57 ++++++++++-
src/views/workOrder/workOrderSend.vue | 29 +++++
src/views/produce/reportVerify.vue | 36 ++++++
8 files changed, 241 insertions(+), 17 deletions(-)
diff --git a/src/api/GeneralBasicData.js b/src/api/GeneralBasicData.js
index 74a66a2..1b58b28 100644
--- a/src/api/GeneralBasicData.js
+++ b/src/api/GeneralBasicData.js
@@ -8,6 +8,14 @@
params: data
})
}
+// 缁勭粐鏋舵瀯鍩虹璧勬枡(鏃犲叕鍙�)
+export function PrentOrganizationNoCompany(data) {
+ return request({
+ url: 'GeneralBasicData/PrentOrganizationNoCompany',
+ method: 'get',
+ params: data
+ })
+}
// 鎸夐挳鍩虹璧勬枡
export function ButtonData() {
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index eafea2f..7df5531 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -11,6 +11,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-input v-model="form.wo_code" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -20,7 +36,7 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" 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.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -111,6 +127,13 @@
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ sortable="custom"
+ show-overflow-tooltip
+ min-width="110"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="杞﹂棿鍚嶇О"
sortable="custom"
show-overflow-tooltip
min-width="110"
@@ -437,7 +460,7 @@
import { handleDatetime } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
-import { DefectPermissions } from '@/api/GeneralBasicData'
+import { DefectPermissions, PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
import { MesOrderStepModelSearch, MesOrderStepUpdateSeave, MesOrderStepVerifySearch } from '@/api/WorkOrder'
export default {
@@ -453,6 +476,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '',
wo_code: '', // 宸ュ崟缂栫爜
partnumber: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -467,7 +491,7 @@
},
total: 10,
tableData: [],
-
+ wkshopcodeArr: [],
dialogVisible: false,
dialogForm: {
'id': '',
@@ -517,8 +541,13 @@
this.getMesOrderStepVerifySearch()
this.getDefectPermissions()
+ this.getPrentOrganizationNoCompany()
},
methods: {
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
+ },
async getDefectPermissions() {
const { data: res3 } = await DefectPermissions() // 缂洪櫡
this.defectArr = res3
@@ -530,6 +559,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ wkshopcode: this.form.wkshopcode,
wo_code: this.form.wo_code,
partnumber: this.form.partnumber,
partname: this.form.partname,
@@ -561,6 +591,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.wo_code = ''
this.form.partnumber = ''
this.form.partname = ''
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 97831a9..2f0b3fc 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -16,6 +16,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-input v-model="form.wo_code" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -25,7 +41,7 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" 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.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -134,6 +150,13 @@
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
+ sortable="custom"
+ show-overflow-tooltip
+ min-width="110"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="杞﹂棿鍚嶇О"
sortable="custom"
show-overflow-tooltip
min-width="110"
@@ -288,6 +311,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { MesOrderDistribution, MesOrderStepReportVerifySearch, MesOrderStepReportVerifySeave } from '@/api/WorkOrder'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
export default {
name: 'Zzjg',
@@ -302,6 +326,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '',
wo_code: '', // 宸ュ崟缂栫爜
partnumber: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -318,6 +343,7 @@
},
total: 10,
tableData: [],
+ wkshopcodeArr: [],
multipleSelection: []
@@ -330,9 +356,13 @@
this.getHeight()
this.getMesOrderStepReportVerifySearch()
+ this.getPrentOrganizationNoCompany()
},
methods: {
-
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
+ },
// 鎶ュ伐璋冩暣鍒楄〃鏌ヨ
async getMesOrderStepReportVerifySearch() {
let tempDate = this.form.reportdate
@@ -340,6 +370,7 @@
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
}
const data = {
+ wkshopcode: this.form.wkshopcode,
wo_code: this.form.wo_code,
partnumber: this.form.partnumber,
partname: this.form.partname,
@@ -372,6 +403,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.wo_code = ''
this.form.partnumber = ''
this.form.partname = ''
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 2b67881..008b90c 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -88,6 +88,23 @@
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
+ <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-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />-->
<!-- </el-form-item>-->
@@ -204,6 +221,13 @@
{{ row.partspec ? row.partspec : '/' }}
</template>
</el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ min-width="110"
+ show-tooltip-when-overflow
+ label="杞﹂棿鍚嶇О"
+ sortable="custom"
+ />
<el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
@@ -778,7 +802,7 @@
EqpPermissions,
GroupsPermissions,
GroupsPersonPermissions,
- PersonPermissions
+ PersonPermissions, PrentOrganizationNoCompany
} from '@/api/GeneralBasicData'
import { nanoid } from 'nanoid'
import { LabelBarCode } from '@/api/systemSetting'
@@ -795,6 +819,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '',
wocode: '', // 宸ュ崟鍙�
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -804,6 +829,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ wkshopcodeArr: [],
total: 10,
tableData: [],
activeName: '鐢熶骇鍒楄〃',
@@ -813,6 +839,7 @@
{ code: 'IN', name: '澶栧崗鏀舵枡' },
{ code: 'BAD', name: '涓嶈壇寰呭鐞�' }
],
+
radioSelected: '', // 澶氶�夋閫変腑鍊�
dialogVisible: false,
@@ -928,6 +955,9 @@
const { data: res5 } = await CustomerPermissions() // 寰�鏉ュ崟浣�
this.wxArr = res5
+
+ const { data: res6 } = await PrentOrganizationNoCompany()// 鏃犲叕鍙哥殑缁勭粐涓嬫媺
+ this.wkshopcodeArr = res6
},
tabClick() {
let belong
@@ -1424,6 +1454,7 @@
})
},
reset() {
+ this.form.wkshopcode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 9cc5d24..d0340cd 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -30,6 +30,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.erporderstus"
@@ -54,7 +70,7 @@
<el-input v-model="form.saleordercode" 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.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -466,6 +482,7 @@
MarkSaveErpOrder
} from '@/api/WorkOrder'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
+import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -492,6 +509,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
erporderstus: '', // 璁㈠崟鐘舵�佺爜
erpordercode: '', // 璁㈠崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -514,6 +532,7 @@
{ code: 'CREATED', name: '鍏ㄩ儴涓嬭揪' },
{ code: 'CLOSED', name: '宸插叧闂�' }
],
+ wkshopcodeArr: [],
total: 10,
radioSelectedId: '',
tableData: [],
@@ -578,12 +597,18 @@
created() {
this.getErpOrderSearch()
// this.getPartSelect()// 鑾峰彇浜у搧缂栫爜淇℃伅
+
+ this.getPrentOrganizationNoCompany()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
+ },
async getErpOrderSearch() {
console.log(this.form, 1)
let tempDate2 = this.form.paystartdate
@@ -597,6 +622,7 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode,
erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -667,6 +693,7 @@
},
// 閲嶇疆
reset() {
+ this.form.wkshopcode = ''
this.form.erporderstus = ''
this.form.erpordercode = ''
this.form.partcode = ''
diff --git a/src/views/workOrder/workOrderClose.vue b/src/views/workOrder/workOrderClose.vue
index f7fe008..4435910 100644
--- a/src/views/workOrder/workOrderClose.vue
+++ b/src/views/workOrder/workOrderClose.vue
@@ -15,6 +15,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"
@@ -38,7 +54,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;">
@@ -1963,7 +1979,7 @@
UpdateMesOrderStepSearch, MesOrderBitchClosedSeave
} 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
@@ -1984,6 +2000,7 @@
tableHeight: 0,
username: '',
form: {
+ wkshopcode: '',
mesorderstus: '', // 宸ュ崟鐘舵�佺爜
mesordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -2010,6 +2027,7 @@
// { code: 'NOSCHED', name: '寰呮帓绋�' },
// { code: 'SCHED', name: '宸叉帓绋�' }
],
+ wkshopcodeArr: [],
total: 10,
tableData: [],
dialogVisible: false,
@@ -2278,8 +2296,13 @@
this.getMesOrderClosedSearch().then(res => {
if (res.code === '200') {
this.getSelect()
+ this.getPrentOrganizationNoCompany()
}
})
+ },
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
},
async getMesOrderClosedSearch() {
// let tempDate = this.form.createdate
@@ -2288,6 +2311,7 @@
// }
const data = {
+ wkshopcode: this.form.wkshopcode,
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -2359,6 +2383,7 @@
// 閲嶇疆
reset(val) {
+ this.form.wkshopcode = ''
this.form.mesorderstus = ''
this.form.mesordercode = ''
this.form.partcode = ''
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 = ''
diff --git a/src/views/workOrder/workOrderSend.vue b/src/views/workOrder/workOrderSend.vue
index f685a4f..c726f93 100644
--- a/src/views/workOrder/workOrderSend.vue
+++ b/src/views/workOrder/workOrderSend.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"
@@ -44,7 +60,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;">
@@ -1959,7 +1975,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
@@ -1980,6 +1996,7 @@
tableHeight: 0,
username: '',
form: {
+ wkshopcode: '',
mesorderstus: 'ALLO', // 宸ュ崟鐘舵�佺爜
mesordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -2005,6 +2022,7 @@
// { code: 'NOSCHED', name: '寰呮帓绋�' },
// { code: 'SCHED', name: '宸叉帓绋�' }
],
+ wkshopcodeArr: [],
total: 10,
tableData: [],
dialogVisible: false,
@@ -2273,8 +2291,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
@@ -2283,6 +2306,7 @@
// }
const data = {
+ wkshopcode: this.form.wkshopcode, //
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -2354,6 +2378,7 @@
// 閲嶇疆
reset(val) {
+ this.form.wkshopcode = ''
this.form.mesorderstus = 'ALLO'
this.form.mesordercode = ''
this.form.partcode = ''
--
Gitblit v1.9.3