微调

src/views/system/bpm/form/editor/index.vue

@@ -51,7 +51,6 @@
 import { onMounted, ref, reactive } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import FcDesigner from '@form-create/designer'
-import { useI18n } from '@/hooks/web/useI18n'
 import { encodeConf, encodeFields, setConfAndFields } from '@/utils/formCreate'
 import { useTagsViewStore } from '@/stores/modules/tagsView'
 import { useFormCreateDesigner } from '@/components/FormCreate'

src/views/system/bpm/form/index.vue

@@ -17,8 +17,8 @@
         <!--表格-->
         <Table ref='tableRef'></Table>
         <!-- 预览表单对话框 -->
-        <el-dialog :title='render.title' v-model='render.visible' width='60%' append-to-body>
+        <el-dialog v-model="detailVisible" title="表单详情" width="800">
-            <v-form-render :form-json='formJson' :form-data='formData' :option-data='optionData' ref='vfRenderRef' />
+            <form-create :option="detailData.option" :rule="detailData.rule" />
         </el-dialog>
     </div>
 </template>
@@ -31,6 +31,7 @@ import { ElMessage } from 'element-plus'
 import { onMounted, provide, ref, reactive,nextTick } from 'vue'
 import { useRouter } from 'vue-router'
 import { deleteForm, getById } from '@/api/bpm-boot/form'
+import { setConfAndFields2 } from '@/utils/formCreate'
 
 
 const { push } = useRouter()
@@ -46,6 +47,12 @@ const render = reactive({
     title: ''
 })
 
+const detailVisible = ref(false)
+const detailData = ref({
+    rule: [],
+    option: {}
+})
+
 const tableStore = new TableStore({
     url: '/bpm-boot/bpm/form/list',
     method: 'POST',
@@ -72,24 +79,24 @@ const tableStore = new TableStore({
             minWidth: '230',
             fixed: 'right',
             buttons: [
-                // {
+                {
-                //     name: 'view',
+                    name: 'view',
-                //     title: '预览',
+                    title: '预览',
-                //     type: 'primary',
+                    type: 'primary',
-                //     icon: 'el-icon-EditPen',
+                    icon: 'el-icon-EditPen',
-                //     render: 'basicButton',
+                    render: 'basicButton',
-                //     click: row => {
+                    click: row => {
-                //         //首先根据id查询出详细数据，然后渲染json
+                        //首先根据id查询出详细数据，然后渲染json
-                //         getById(row.id).then(res => {
+                        getById(row.id).then(res => {
-                //             render.visible = true;
+                            nextTick(async () => {
-                //             render.title = '查看表单详情';
+                                setConfAndFields2(detailData, res.data.conf, res.data.fields)
-                //             nextTick(async () => {
+                                // 弹窗打开
-                //                 vfRenderRef.value.setFormJson(res.data.content || {formConfig: {}, widgetList: []});
+                                detailVisible.value = true
-                //             });
+                            });
-                //
+
-                //         })
+                        })
-                //     }
+                    }
-                // },
+                },
                 {
                     name: 'update',
                     title: '设计表单',

src/views/system/bpm/processInstance/detail/ProcessInstanceTaskList.vue

@@ -44,7 +44,6 @@
                                 <el-button
                                     class='ml-10px'
                                     size='small'
-                    v-if='item.formId > 0'
                                     @click='handleFormDetail(item)'
                                 >
                                     <Icon icon='ep:document' />
@@ -90,7 +89,7 @@
     <!-- 弹窗：子任务  -->
     <TaskSignList ref='taskSignListRef' @success='refresh' />
     <!-- 弹窗：表单 -->
-  <el-dialog title='表单详情' v-model='taskFormVisible' width='600'>
+    <el-dialog title='表单详情' v-model='taskFormVisible' width='750'>
         <form-create ref='fApi' v-model='taskForm.value' :option='taskForm.option' :rule='taskForm.rule' />
     </el-dialog>
 </template>

src/views/system/bpm/task/myInstance/index.vue

@@ -111,9 +111,6 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
                     click: row => {
                         flag.value = true
                         handleAudit(row.id, row.historyInstanceId)