Commit a20b5eae authored by dragondean@qq.com's avatar dragondean@qq.com

修复草稿无法新建,审批流尺寸异常

parent 2a442837
<template> <template>
<div class="app-container"> <div class="app-container">
<doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> <doc-alert title="工作流1" url="https://doc.iocoder.cn/bpm" />
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
...@@ -168,8 +168,8 @@ export default { ...@@ -168,8 +168,8 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.my-process-designer { /* .my-process-designer {
height: calc(100vh - 200px); height: calc(100vh - 200px);
} } */
</style> </style>
...@@ -538,8 +538,8 @@ export default { ...@@ -538,8 +538,8 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.my-process-designer { /* .my-process-designer {
height: calc(100vh - 200px); height: calc(100vh - 200px);
} } */
</style> </style>
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 流程设计器,负责绘制流程等 --> <!-- 流程设计器,负责绘制流程等 -->
<my-process-designer :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm" <my-process-designer :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm"
keyboard ref="processDesigner" @init-finished="initModeler" keyboard ref="processDesigner" @init-finished="initModeler"
...@@ -130,6 +129,9 @@ export default { ...@@ -130,6 +129,9 @@ export default {
// display: inline-grid; // display: inline-grid;
// grid-template-columns: 100px auto max-content; // grid-template-columns: 100px auto max-content;
//} //}
.app-container{
min-height: calc(100vh - 84px);
}
.demo-control-bar { .demo-control-bar {
position: fixed; position: fixed;
right: 8px; right: 8px;
...@@ -172,9 +174,9 @@ export default { ...@@ -172,9 +174,9 @@ export default {
color: #fafafa; color: #fafafa;
} }
.my-process-designer { /* .my-process-designer {
height: calc(100vh - 84px); height: calc(100vh - 84px);
} } */
.process-panel__container { .process-panel__container {
position: absolute; position: absolute;
right: 0; right: 0;
......
...@@ -164,9 +164,9 @@ export default { ...@@ -164,9 +164,9 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.my-process-designer { /* .my-process-designer {
height: calc(100vh - 200px); height: calc(100vh - 200px);
} } */
.box-card { .box-card {
width: 100%; width: 100%;
......
...@@ -937,6 +937,7 @@ export default { ...@@ -937,6 +937,7 @@ export default {
// 修改的提交 // 修改的提交
if (this.form.orderNo != null) { if (this.form.orderNo != null) {
let data = Object.assign({}, this.form, { let data = Object.assign({}, this.form, {
status: submitType,
customDraweeVOList: this.customDraweeList, customDraweeVOList: this.customDraweeList,
// transportUpdateReqVOList: this.transportList.filter(item => item._enabled), // transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
orderItemVOList: this.getProductListWithDefaultValue(), orderItemVOList: this.getProductListWithDefaultValue(),
......
...@@ -143,9 +143,9 @@ export default { ...@@ -143,9 +143,9 @@ export default {
padding: 8px; padding: 8px;
} }
} }
.my-process-designer { /* .my-process-designer {
height: calc(100vh - 200px); height: calc(100vh - 200px);
} } */
.box-card { .box-card {
width: 100%; width: 100%;
......
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