修复模板表单src\business\platform\data\templaterender\templates\list.vue文件的dataTemplate为空的问题

src/business/platform/bpmn/form/dialog.vue

@@ -1,6 +1,5 @@
 <template>
     <el-dialog
-        v-if="orderOpen"
         :visible.sync="dialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -20,6 +19,9 @@
             :task-id="taskId"
             :wai-jian="waiJian"
             :instance-id="instanceId"
+            :data-resultitem="dataResultitem"
+            :time-modification="timeModification"
+            :time-modificationbtn="timeModificationbtn"
             :task-change-id="taskChangeId"
             :copy-flow="copyFlow"
             :add-data-cont="addDataCont"
@@ -48,6 +50,18 @@ export default {
         instanceId: { // 流程实例ID
             type: String
         },
+        dataResultitem: { // 流程实例
+            type: Object
+        },
+        timeModification: { // 修改流程时间
+            type: Boolean,
+            default: false
+        },
+        // 修改流程时间按钮
+        timeModificationbtn: {
+            type: Boolean,
+            default: false
+        },
         taskId: { // 流程任务ID
             type: String
         },
@@ -67,6 +81,9 @@ export default {
         waiJian: { // 新增参数
             type: String
         },
+        previousDataTemplate: {
+            type: Object
+        },
         processName: { // 流程名称
             type: String,
             default: ''
@@ -75,8 +92,7 @@ export default {
     data () {
         return {
             dialogVisible: this.visible,
-            dialogWidth: '80%',
-            orderOpen: true
+            dialogWidth: '80%'
         }
     },
     watch: {
@@ -88,10 +104,8 @@ export default {
         }
     },
     created () {
-        this.orderOpen = true
     },
     beforeDestroy () {
-        this.orderOpen = false
     },
     methods: {
         loadFormData () {
@@ -107,34 +121,39 @@ export default {
         },
         // 关闭当前窗口
         closeDialog () {
-            this.$emit('close', false)
+            this.$emit('close', false, this.previousDataTemplate)
         }
     }
 }
 </script>
 <style lang="scss">
-    .bpmn-formrenderer-dialog{
-        .el-dialog__header{
-            padding: 0;
-            border-bottom:0;
-        }
-        .el-dialog__body {
-            padding: 0;
+.bpmn-formrenderer-dialog {
+    .el-dialog__header {
+        padding: 0;
+        border-bottom: 0;
+    }
+
+    .el-dialog__body {
+        padding: 0;
+    }
+
+    .el-dialog__headerbtn {
+        z-index: 99999;
+    }
+
+    @media print {
+        .dynamic-form {
+            margin-top: 0 !important;
         }
-        .el-dialog__headerbtn{
-            z-index: 99999;
+
+        .el-dialog__headerbtn {
+            display: none !important;
         }
-        @media print {
-            .dynamic-form{
-                margin-top:0 !important;
-            }
-            .el-dialog__headerbtn {
-                display: none !important;
-            }
-            .hidden-print{
-                padding: 0;
-                margin:  0;
-            }
+
+        .hidden-print {
+            padding: 0;
+            margin: 0;
         }
     }
+}
 </style>

src/business/platform/data/templaterender/form/dialog.vue

@@ -1,96 +1,99 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    class="data-template-form-renderer-dialog"
-    fullscreen
-    destroy-on-close
-    append-to-body
-    @open="loadFormData"
-    @close="closeDialog"
-  >
-   <data-formrender
-      ref="formrender"
-      :template-key="templateKey"
-      :form-key="formKey"
-      :print-template-id="printTemplateId"
-      :pk-value="pkValue"
-      :addDataCont = "addDataCont"
-      :dynamicParams = "dynamicParams"
-      :toolbars="toolbars"
-      :readonly="readonly"
-      :default-data="defaultData"
-      @close="closeDialog"
-      @callback="handleCallback"
-    />
-  </el-dialog>
+    <el-dialog
+        :visible.sync="dialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        class="data-template-form-renderer-dialog"
+        fullscreen
+        destroy-on-close
+        append-to-body
+        @open="loadFormData"
+        @close="closeDialog"
+    >
+        <data-formrender
+            ref="formrender"
+            :template-key="templateKey"
+            :form-key="formKey"
+            :print-template-id="printTemplateId"
+            :pk-value="pkValue"
+            :add-data-cont="addDataCont"
+            :dynamic-params="dynamicParams"
+            :toolbars="toolbars"
+            :readonly="readonly"
+            :default-data="defaultData"
+            @close="closeDialog"
+            @callback="handleCallback"
+        />
+    </el-dialog>
 </template>
 <script>
 import DataFormrender from './index'
 export default {
-  components: {
-    DataFormrender
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
+    components: {
+        DataFormrender
     },
-    templateKey: { // 模版Key
-      type: String
+    props: {
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        templateKey: { // 模版Key
+            type: String
+        },
+        dynamicParams: Object,
+        formKey: { // 表单key
+            type: String
+        },
+        addDataCont: { // 表单参数
+            type: Object
+        },
+        printTemplateId: {
+            type: String
+        },
+        pkValue: { // 主键
+            type: [String, Number]
+        },
+        toolbars: { // 工具栏
+            type: Array
+        },
+        readonly: {
+            type: Boolean,
+            default: false
+        },
+        defaultData: { // 默认数据
+            type: Object
+        },
+        previousDataTemplate: {
+            type: Object
+        }
     },
-    dynamicParams: Object,
-    formKey: { // 表单key
-      type: String
+    data () {
+        return {
+            dialogVisible: this.visible
+        }
     },
-    addDataCont: { // 表单参数
-      type: Object
+    watch: {
+        visible: {
+            handler: function (val, oldVal) {
+                this.dialogVisible = this.visible
+            },
+            immediate: true
+        }
     },
-    printTemplateId: {
-      type: String
-    },
-    pkValue: { // 主键
-      type: [String, Number]
-    },
-    toolbars: { // 工具栏
-      type: Array
-    },
-    readonly: {
-      type: Boolean,
-      default: false
-    },
-    defaultData: { // 默认数据
-      type: Object
-    }
-  },
-  data() {
-    return {
-      dialogVisible: this.visible
+    methods: {
+        loadFormData () {
+            this.$nextTick(() => {
+                this.$refs.formrender.loadFormData()
+            })
+        },
+        handleCallback (data) {
+            this.$emit('callback', data)
+        },
+        // 关闭当前窗口
+        closeDialog () {
+            this.$emit('close', false, this.previousDataTemplate)
+        }
     }
-  },
-  watch: {
-    visible: {
-      handler: function(val, oldVal) {
-        this.dialogVisible = this.visible
-      },
-      immediate: true
-    }
-  },
-  methods: {
-    loadFormData() {
-      this.$nextTick(() => {
-        this.$refs.formrender.loadFormData()
-      })
-    },
-    handleCallback(data) {
-      this.$emit('callback', data)
-    },
-    // 关闭当前窗口
-    closeDialog() {
-      this.$emit('close', false)
-    }
-  }
 }
 </script>
 <style lang="scss">