Skip to content

T
TF-MOM-WEB
Commit a7bbbf9d authored by “lixuyan”'s avatar “lixuyan”
Browse files
Options

Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

parents 24fa2fc2 12147b9a
Hide whitespace changes
Inline Side-by-side
Showing with 293 additions and 45 deletions
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/outStorageMatchConfirm/components/right copy.vue 0 → 100644
View file @ a7bbbf9d
<template>
<div class="matchConfirmRight">
<split-pane
ref="splitPane"
:min-percent="20"
:default-percent="30"
split="horizontal"
:class="['detail-pane','collapse']"
>
<template slot="paneL">
<div class="table-box">
<dee-as-com
ref="outStorageMatch"
:table-height="autoTopHeight"
:basic-data=" { selectData: selectData }"
:lay-config="{ typeName: 'OutStorageMatch', layKey: 'batchSign_OutStorageMatch'}"
@selectionChange="selectionChange"
/>
</div>
</template>
<template slot="paneR">
<div class="detail">
<split-pane
ref="splitPaneInner"
:min-percent="20"
:default-percent="30"
split="horizontal"
:class="['detail-pane','collapse']"
>
<template slot="paneL">
<div class="table-box">
<dee-as-com
ref="outStorageMatchItem"
:lay-config="{ typeName: 'OutStorageMatchItem', layKey: 'batchSign_OutStorageMatchItem'}"
:table-height="autoBottomHeight"
@selectionChange="selectionChange_item"
/>
</div>
</template>
<template slot="paneR">
<div class="detail">
<dee-as-com
ref="jobResponseOutStorageMatch"
table-height="100%"
:lay-config="{ typeName: 'JobResponseOutStorageMatch', layKey: 'batchSign_JobResOutStorageMatch'}"
@selectionChange="selectionChange_jobRes"
/>
</div>
</template>
</split-pane>
</div>
</template>
</split-pane>
</div>
</template>
<script>
export default {
name: 'MatchConfirmRight',
components: {},
props: {
selectData: {
type: Object,
default: () => {}
}
},
data() {
return {
selectionRows: [],
selectionItemRows: [],
selectionJobResRows: [],
autoBottomHeight: '280px',
autoTopHeight: '280px'
}
},
computed: {},
watch: {},
created() {},
mounted() {
this.$bus.$on('refreshMatchConfirm', (hasFlag) => {
this.$nextTick(() => {
this.selectionChange(this.selectionRows)
this.selectionChange_item(this.selectionItemRows)
})
})
this.$nextTick(function() {
const splitPane = this.$refs.splitPane
const height = document.getElementById('app').offsetHeight
if (splitPane) {
this.$watch(
function() {
return splitPane.percent
},
(val, oval) => {
this.autoTopHeight = val / 100 * height - 80 + 'px'
// this.autoBottomHeight = (100 - val) / 100 * height - 270 + 'px'
}
)
}
})
},
// 组件方法
methods: {
selectionChange(val) {
this.selectionRows = val
const requestIds = val && val.map(item => item.id)
this.$refs.outStorageMatchItem.$refs.asCom.getData(requestIds)
},
selectionChange_item(val) {
this.selectionItemRows = val
const itemIds = val && val.map(item => item.id)
this.$refs.jobResponseOutStorageMatch.$refs.asCom.getData(itemIds)
},
selectionChange_jobRes(val) {
this.selectionJobResRows = val
},
init(checkList) {
const aoIds = checkList && checkList.map(item => item.id)
this.$refs.outStorageMatch.$refs.asCom.getData(aoIds)
}
}
}
</script>
<style lang='scss'>
.matchConfirmRight{
overflow: auto;
width: 100%;
height: 100%;
box-sizing: border-box;
padding-left: 8px;
// .sub-title{
// padding-top: 0px!important;
// }
.splitter-pane-resizer.horizontal {
opacity: 1;
background-color: #F1F4F5;
height: 8px;
border-bottom: 1px solid #e0e0e0;
border-top: 1px solid #e0e0e0;
}
.detail{
height: 100%;
background-color: #fff;
}
.dee-table{
.dee-tools {
margin: 2px 0!important;
}
.dee-table-config-bar{
margin: 2px 0!important;
}
.dee-table-pagination {
margin-top: 12px!important;
}
}
}
</style>
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/outStorageOutConfirm/components/right.vue
View file @ a7bbbf9d
<template> <template>
<div class="proPreConfirmRight"> <div class="proPreConfirmRight">
<dee-as-com <split-pane
ref="requestTable" ref="splitPane"
:basic-data=" { selectData,...currentLeftData,selectionRows}" :min-percent="30"
:lay-config="{ typeName: 'OutStorageOut', layKey:topLayKey}" :default-percent="47"
table-height="auto" split="horizontal"
@selectionChange="selectionChange" :class="['detail-pane','collapse']"
/> >
<dee-as-com <template slot="paneL">
ref="itemsTable" <div class="table-box">
:lay-config="{ typeName: 'OutStorageOutItem', layKey: 'edit_outStorageOutItem_confirm'}" <dee-as-com
table-height="35%" ref="requestTable"
:basic-data=" { selectData,selectionRowsItem,...currentLeftData }" :basic-data=" { selectData,...currentLeftData,selectionRows}"
@selectionChange="selectionChangeItem" :lay-config="{ typeName: 'OutStorageOut', layKey:topLayKey}"
/> table-height="auto"
<dee-as-com @selectionChange="selectionChange"
ref="responseTable" />
:lay-config="{ typeName: 'JobResponseOutStorageOut', layKey: 'batchSign_outStorageOutJobResponse'}" <dee-as-com
table-height="47%" ref="itemsTable"
:basic-data=" { selectData,selectionRowsRes,...currentLeftData }" :lay-config="{ typeName: 'OutStorageOutItem', layKey: 'edit_outStorageOutItem_confirm'}"
@selectionChangeRes="selectionChangeRes" :table-height="autoTopHeight"
/> :basic-data=" { selectData,selectionRowsItem,...currentLeftData }"
@selectionChange="selectionChangeItem"
/>
</div>
</template>
<template slot="paneR">
<div class="detail">
<dee-as-com
ref="responseTable"
:lay-config="{ typeName: 'JobResponseOutStorageOut', layKey: 'batchSign_outStorageOutJobResponse'}"
:table-height="autoBottomHeight"
:basic-data=" { selectData,selectionRowsRes,...currentLeftData }"
@selectionChangeRes="selectionChangeRes"
/>
</div>
</template>
</split-pane>
</div> </div>
</template> </template>
...@@ -43,7 +59,9 @@ export default { ...@@ -43,7 +59,9 @@ export default {
selectionRows: [], selectionRows: [],
selectionRowsItem: [], selectionRowsItem: [],
selectionRowsRes: [], selectionRowsRes: [],
topLayKey: 'e3b7e2e1-af45-4e28-99f6-6f7583d2c216' topLayKey: 'e3b7e2e1-af45-4e28-99f6-6f7583d2c216',
autoBottomHeight: '100%',
autoTopHeight: '300px'
} }
}, },
computed: {}, computed: {},
...@@ -68,6 +86,21 @@ export default { ...@@ -68,6 +86,21 @@ export default {
this.$bus.$on('refreshUseItemConfirm', (data) => { this.$bus.$on('refreshUseItemConfirm', (data) => {
this.$refs.itemsTable && this.$refs.itemsTable.$refs.asCom.getData() this.$refs.itemsTable && this.$refs.itemsTable.$refs.asCom.getData()
}) })
this.$nextTick(function() {
const splitPane = this.$refs.splitPane
const height = document.getElementById('app').offsetHeight - 140
if (splitPane) {
this.$watch(
function() {
return splitPane.percent
},
(val, oval) => {
this.autoTopHeight = val / 100 * height - 120 + 'px'
// this.autoBottomHeight = (100 - val) / 100 * height - 270 + 'px'
}
)
}
})
}, },
// 组件方法 // 组件方法
methods: { methods: {
...@@ -100,6 +133,17 @@ export default { ...@@ -100,6 +133,17 @@ export default {
.sub-title{ .sub-title{
padding-top: 10px!important; padding-top: 10px!important;
} }
.splitter-pane-resizer.horizontal {
opacity: 1;
background-color: #F1F4F5;
height: 8px;
border-bottom: 1px solid #e0e0e0;
border-top: 1px solid #e0e0e0;
}
.detail{
height: 100%;
background-color: #fff;
}
.dee-table{ .dee-table{
.dee-tools { .dee-tools {
margin: 2px 0!important; margin: 2px 0!important;
......
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/proPreparatWorkerConfirm/components/right.vue
View file @ a7bbbf9d
<template> <template>
<div class="proPreConfirmRight"> <div class="proPreConfirmRight">
<dee-as-com <split-pane
:basic-data=" {...(currentAo&&currentAo.joExecutePlan&&currentAo.joExecutePlan[0]||{})}" ref="splitPane"
:lay-config="{ typeName: 'JoExecutePlan', layKey: 'batchSign_proPreConfirm_aoInfo'}" :min-percent="30"
/> :default-percent="60"
<dee-as-com split="horizontal"
ref="outStorageMatch" :class="['detail-pane','collapse']"
:basic-data=" { selectData: selectData }" >
:lay-config="{ typeName: 'ExtSupportingItem', layKey: 'batchSign_proPreConfirm_rightTop'}" <template slot="paneL">
table-height="calc(50vh - 80px)" <div class="table-box">
/> <dee-as-com
<dee-as-com :basic-data=" {...(currentAo&&currentAo.joExecutePlan&&currentAo.joExecutePlan[0]||{})}"
ref="outStorageMatchItem" :lay-config="{ typeName: 'JoExecutePlan', layKey: 'batchSign_proPreConfirm_aoInfo'}"
:lay-config="{ typeName: 'OutStorageMatchItem', layKey: 'batchSign_proPreConfirm_rightBottom'}" />
table-height="calc(50vh - 80px)" <dee-as-com
:basic-data=" { selectData,selectionRows }" ref="outStorageMatch"
@selectionChange="selectionChange" :basic-data=" { selectData: selectData }"
/> :lay-config="{ typeName: 'ExtSupportingItem', layKey: 'batchSign_proPreConfirm_rightTop'}"
:table-height="autoTopHeight"
/>
</div>
</template>
<template slot="paneR">
<div class="detail">
<dee-as-com
ref="outStorageMatchItem"
:lay-config="{ typeName: 'OutStorageMatchItem', layKey: 'batchSign_proPreConfirm_rightBottom'}"
:table-height="autoBottomHeight"
:basic-data=" { selectData,selectionRows }"
@selectionChange="selectionChange"
/>
</div>
</template>
</split-pane>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'MatchConfirmRight', name: 'ProPreConfirmRight',
components: {}, components: {},
props: { props: {
selectData: { selectData: {
...@@ -36,7 +52,9 @@ export default { ...@@ -36,7 +52,9 @@ export default {
}, },
data() { data() {
return { return {
selectionRows: [] selectionRows: [],
autoBottomHeight: '100%',
autoTopHeight: '480px'
} }
}, },
computed: {}, computed: {},
...@@ -48,6 +66,21 @@ export default { ...@@ -48,6 +66,21 @@ export default {
this.init() this.init()
}) })
}) })
this.$nextTick(function() {
const splitPane = this.$refs.splitPane
const height = document.getElementById('app').offsetHeight - 120
if (splitPane) {
this.$watch(
function() {
return splitPane.percent
},
(val, oval) => {
this.autoTopHeight = val / 100 * height - 80 + 'px'
// this.autoBottomHeight = (100 - val) / 100 * height - 270 + 'px'
}
)
}
})
}, },
// 组件方法 // 组件方法
methods: { methods: {
...@@ -71,9 +104,20 @@ export default { ...@@ -71,9 +104,20 @@ export default {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
padding-left: 8px; padding-left: 8px;
.sub-title{ // .sub-title{
padding-top: 0px!important; // padding-top: 10px!important;
} // }
.splitter-pane-resizer.horizontal {
opacity: 1;
background-color: #F1F4F5;
height: 8px;
border-bottom: 1px solid #e0e0e0;
border-top: 1px solid #e0e0e0;
}
.detail{
height: 100%;
background-color: #fff;
}
.dee-table{ .dee-table{
.dee-tools { .dee-tools {
margin: 2px 0!important; margin: 2px 0!important;
......
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/taskList.vue
View file @ a7bbbf9d
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
padding-right: 10px; padding-right: 10px;
} }
.TaskComponentView { .TaskComponentView {
height: calc(100% - 40px); height: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
} }
......
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