Commit 62a03fa7 authored by 15008242619's avatar 15008242619

工作包bug修改及派工页面列表增加工作包字段

parent c0015b3c
...@@ -344,7 +344,6 @@ export default { ...@@ -344,7 +344,6 @@ export default {
created() { created() {
this.jurisdId = this.$route.query.taskDefinitionKey this.jurisdId = this.$route.query.taskDefinitionKey
this.getTools() this.getTools()
console.log(1)
}, },
mounted() { mounted() {
this.$bus.$on('getPlanData', (data, level) => { this.$bus.$on('getPlanData', (data, level) => {
...@@ -370,6 +369,8 @@ export default { ...@@ -370,6 +369,8 @@ export default {
* 工作包选项数据 * 工作包选项数据
*/ */
getWPOptions(data) { getWPOptions(data) {
this.wpOptions = []
this.wpDictionary = []
const params = { const params = {
'pageFrom': 1, 'pageFrom': 1,
'pageSize': 9999, 'pageSize': 9999,
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="6"> <el-col :span="5">
<el-form-item label="班组:"> <el-form-item label="班组:">
<el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup"> <el-select v-model="searchFormData.group" placeholder="班组" @change="changeGroup">
<el-option <el-option
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
<el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" /> <el-input v-model="searchFormData.aoName" clearable placeholder="请输入AO(号/名称)" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="工作包名称:">
<el-input v-model="searchFormData.wpName" clearable placeholder="请输入工作包名称" />
</el-form-item>
</el-col>
<el-col :span="2"> <el-col :span="2">
<el-button <el-button
type="primary" type="primary"
...@@ -194,7 +199,8 @@ export default { ...@@ -194,7 +199,8 @@ export default {
group: '', group: '',
postion: '', postion: '',
aoName: '', aoName: '',
sorties: '' sorties: '',
wpName: ''
}, },
groupList: [], groupList: [],
groupUserList: [], groupUserList: [],
...@@ -252,6 +258,7 @@ export default { ...@@ -252,6 +258,7 @@ export default {
{ title: '机型', key: 'extProcessPlan.planeType', align: 'left' }, { title: '机型', key: 'extProcessPlan.planeType', align: 'left' },
{ title: '架次', key: 'extProcessPlan.sorties', align: 'left' }, { title: '架次', key: 'extProcessPlan.sorties', align: 'left' },
{ title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' }, { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' },
{ title: '工作包名称', key: 'extProcessPlan.extWorkPackageLinks[0].source.name', align: 'left' },
{ title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' }, { title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' },
{ title: '工时', key: 'extProcessPlan.workHour', align: 'left' }, { title: '工时', key: 'extProcessPlan.workHour', align: 'left' },
{ title: '计划员', key: 'planner.name', align: 'left' }, { title: '计划员', key: 'planner.name', align: 'left' },
...@@ -608,7 +615,17 @@ export default { ...@@ -608,7 +615,17 @@ export default {
}, },
'openProps': [ 'openProps': [
{ {
'name': 'extProcessPlan' 'name': 'extProcessPlan',
'openProps': [
{
'name': 'extWorkPackageLinks',
'openProps': [
{
'name': 'source'
}
]
}
]
}, },
{ {
'name': 'cooperatives' 'name': 'cooperatives'
...@@ -628,6 +645,15 @@ export default { ...@@ -628,6 +645,15 @@ export default {
'value': this.searchFormData.sorties 'value': this.searchFormData.sorties
}) })
} }
if (this.searchFormData.wpName) {
params.searchItems.children[0].items.push(
{
'fieldName': 'extProcessPlan.extWorkPackageLinks.source.name',
'operator': 'LIKE',
'value': this.searchFormData.wpName
}
)
}
post('/JoExecutePlan/search', params).then(res => { post('/JoExecutePlan/search', params).then(res => {
if (res.items && res.items.content) { if (res.items && res.items.content) {
this.tableData = res.items.content this.tableData = res.items.content
......
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