Commit 8cb3597a authored by “lixuyan”'s avatar “lixuyan”

执行派工和检验派工添加指令号查询

parent 00fed2b5
<template>
<div class="inspection-disptach">
<div class="instructions-issued-top">
<el-form :inline="true" :model="searchFormData" class="instructions-issued-search" label-width="50px">
<el-col :span="8">
<el-form :inline="true" :model="searchFormData" class="instructions-issued-search" label-width="100px">
<el-col :span="6">
<el-form-item label="架次:">
<el-select v-model="searchFormData.sorties" placeholder="架次" @change="changeSorties">
<el-option
......@@ -14,7 +14,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="站位:">
<el-select v-model="searchFormData.postion" placeholder="站位" @change="changePostion">
<el-option
......@@ -26,7 +26,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col v-if="activeName === '0'" :span="8">
<el-col v-if="activeName === '0'" :span="6">
<el-form-item label="班组:">
<el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup">
<el-option
......@@ -38,6 +38,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="AO(号/名称):">
<el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" @clear="getTableData" @keyup.enter.native="getTableData" />
</el-form-item>
</el-col>
</el-form>
</div>
<split-pane
......@@ -129,7 +134,8 @@ export default {
searchFormData: {
group: '',
postion: '',
sorties: ''
sorties: '',
aoName: ''
},
sortiesList: [],
postionList: [],
......@@ -387,6 +393,7 @@ export default {
this.getGroupUser()
},
tabClick(tab) {
this.searchFormData.aoName = ''
this.activeName = tab.index
if (this.activeName === '1') {
this.defaultPercent = 100
......@@ -440,6 +447,21 @@ export default {
}
],
'operator': 'AND'
},
{
'items': [
{
'fieldName': 'extProcessPlan.serialNumber',
'operator': 'LIKE',
'value': this.searchFormData.aoName
},
{
'fieldName': 'extProcessPlan.name',
'operator': 'LIKE',
'value': this.searchFormData.aoName
}
],
'operator': 'OR'
}
],
'items': [],
......@@ -628,7 +650,7 @@ export default {
.instructions-issued-search {
padding: 10px 8px;
height: 40px;
width: 65%;
width: 85%;
}
}
}
......
<template>
<div class="instructions-disptach">
<div class="instructions-issued-top">
<el-form :inline="true" :model="searchFormData" class="instructions-issued-search" label-width="50px">
<el-col :span="12">
<el-form :inline="true" :model="searchFormData" class="instructions-issued-search" label-width="100px">
<el-col :span="8">
<el-form-item label="站位:">
<el-select v-model="searchFormData.postion" placeholder="站位" @change="changePostion">
<el-option
......@@ -14,7 +14,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-form-item label="班组:">
<el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup">
<el-option
......@@ -26,10 +26,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="AO(号/名称):">
<el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" @clear="getTableData" @keyup.enter.native="getTableData" />
</el-form-item>
</el-col>
</el-form>
</div>
<split-pane
:min-percent="18"
:min-percent="8"
:default-percent="defaultPercent"
split="vertical"
class="detail-pane"
......@@ -167,7 +172,8 @@ export default {
return {
searchFormData: {
group: '',
postion: ''
postion: '',
aoName: ''
},
groupList: [],
groupUserList: [],
......@@ -394,6 +400,7 @@ export default {
this.getTableData()
},
tabClick(tab) {
this.searchFormData.aoName = ''
this.activeName = tab.index
if (this.activeName === '1') {
this.defaultPercent = 100
......@@ -446,6 +453,21 @@ export default {
}
],
'operator': 'AND'
},
{
'items': [
{
'fieldName': 'extProcessPlan.serialNumber',
'operator': 'LIKE',
'value': this.searchFormData.aoName
},
{
'fieldName': 'extProcessPlan.name',
'operator': 'LIKE',
'value': this.searchFormData.aoName
}
],
'operator': 'OR'
}
],
'items': [],
......@@ -630,7 +652,7 @@ export default {
.instructions-issued-search {
padding: 10px 8px;
height: 40px;
width: 40%;
width: 86%;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment