Commit f5df9180 authored by jingnan's avatar jingnan 👀

AO标识维护的批量签审里面左侧需要去掉

parent 8e561b4c
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
<div class="table"> <div class="table">
<div> <div>
<div> <div class="dee-table">
<el-table <el-table
ref="table" ref="table"
:data="tableData" :data="tableData"
...@@ -63,6 +63,13 @@ ...@@ -63,6 +63,13 @@
:width="120" :width="120"
sortable sortable
/> />
<el-table-column
prop="positionNumber"
align="center"
label="站位"
:width="120"
sortable
/>
<el-table-column <el-table-column
prop="firstCheckFlag" prop="firstCheckFlag"
align="center" align="center"
...@@ -157,7 +164,7 @@ ...@@ -157,7 +164,7 @@
/> />
</div> </div>
<div> <div>
<div> <div class="dee-table">
<el-table <el-table
:data="workProcedureData" :data="workProcedureData"
height="100%" height="100%"
...@@ -294,6 +301,7 @@ export default { ...@@ -294,6 +301,7 @@ export default {
created() { created() {
this.jurisdId = this.$route.query.taskDefinitionKey this.jurisdId = this.$route.query.taskDefinitionKey
this.getTools() this.getTools()
this.getSearchTableData()
}, },
mounted() { mounted() {
this.$bus.$on('getPlanData', (data, level) => { this.$bus.$on('getPlanData', (data, level) => {
...@@ -589,16 +597,16 @@ export default { ...@@ -589,16 +597,16 @@ export default {
pageSize: this.tablePagination.pageSize, pageSize: this.tablePagination.pageSize,
searchItems: { searchItems: {
children: [ children: [
{ // {
items: [ // items: [
{ // {
fieldName: 'sorties', // fieldName: 'sorties',
operator: 'EQ', // operator: 'EQ',
value: data.serialNo // value: data.serialNo
} // }
], // ],
operator: 'AND' // operator: 'AND'
}, // },
{ {
'items': [ 'items': [
{ {
...@@ -625,14 +633,14 @@ export default { ...@@ -625,14 +633,14 @@ export default {
} }
] ]
} }
if (level === 2) { // if (level === 2) {
params.searchItems.children[0].items.push( // params.searchItems.children[0].items.push(
{ // {
fieldName: 'positionNumber', // fieldName: 'positionNumber',
operator: 'EQ', // operator: 'EQ',
value: data.title // value: data.title
}) // })
} // }
post('/ExtProcessPlan/searchBatchExamineAo?taskDefinitionKey=' + this.$route.query.taskDefinitionKey, params) post('/ExtProcessPlan/searchBatchExamineAo?taskDefinitionKey=' + this.$route.query.taskDefinitionKey, params)
.then((res) => { .then((res) => {
if (res && res.items && res.items.content) { if (res && res.items && res.items.content) {
...@@ -644,7 +652,8 @@ export default { ...@@ -644,7 +652,8 @@ export default {
number: p.pbo.serialNumber, number: p.pbo.serialNumber,
name: p.pbo.name, name: p.pbo.name,
gaceVersion: p.pbo.gaceVersion, gaceVersion: p.pbo.gaceVersion,
sorties: data.serialNo, sorties: p.pbo.sorties,
positionNumber: p.pbo.positionNumber,
firstCheckFlag: p.pbo.firstCheckFlag, firstCheckFlag: p.pbo.firstCheckFlag,
firstCheckFlagSelect: false, firstCheckFlagSelect: false,
workHour: p.pbo.workHour, workHour: p.pbo.workHour,
......
<template> <template>
<section v-loading="instructionIdentificationShow" class="single-sortie-instruction-identification"> <section v-loading="instructionIdentificationShow" class="single-sortie-instruction-identification">
<dee-fold-pane :min-percent="18" :default-percent="18" split="vertical" class="detail-pane"> <!-- <dee-fold-pane :min-percent="18" :default-percent="18" split="vertical" class="detail-pane">
<template slot="paneL"> <template slot="paneL">
<div class="left"> <div class="left">
<left <left
...@@ -10,22 +10,22 @@ ...@@ -10,22 +10,22 @@
/> />
</div> </div>
</template> </template>
<template slot="paneR"> <template slot="paneR"> -->
<div class="right"> <div class="right">
<right ref="right" /> <right ref="right" />
</div> </div>
</template> <!-- </template>
</dee-fold-pane> </dee-fold-pane> -->
</section> </section>
</template> </template>
<script> <script>
import left from './components/left/index' // import left from './components/left/index'
import right from './components/right/index' import right from './components/right/index'
export default { export default {
components: { components: {
left, // left,
right right
}, },
data() { data() {
...@@ -82,21 +82,21 @@ export default { ...@@ -82,21 +82,21 @@ export default {
</script> </script>
<style lang="scss" > <style lang="scss" >
.single-sortie-instruction-identification { .single-sortie-instruction-identification {
display: flex; // display: flex;
height: 100%;
.detail-pane{
width: 100%;
.left{
height: 100%; height: 100%;
overflow-x: hidden; // .detail-pane{
} // width: 100%;
// .left{
// height: 100%;
// overflow-x: hidden;
// }
.right { .right {
height: 100%; height: 100%;
.table { .table {
margin-top: 0; margin-top: 0;
} }
} }
} // }
} }
</style> </style>
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