!257 feat: 【工作流】--委派 解决构建失败等问题

Merge pull request !257 from clockdotnet/master-vxe

src/views/bpm/processInstance/detail.vue

@@ -191,7 +191,7 @@
     </XModal>
 
     <!-- 弹窗，回退节点 -->
-    <TaskReturnDialog ref="taskReturnDialogRef" @success="getDetail" />
+    <TaskReturnDialogForm ref="taskReturnDialogRef" @success="getDetail" />
     <!-- 委派，将任务委派给别人处理，处理完成后，会重新回到原审批人手中-->
     <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" />
   </ContentWrap>
@@ -209,8 +209,8 @@ import { setConfAndFields2 } from '@/utils/formCreate'
 import type { ApiAttrs } from '@form-create/element-ui/types/config'
 import { useUserStore } from '@/store/modules/user'
 import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
-import TaskReturnDialog from './detail/TaskReturnDialogForm.vue'
-import TaskDelegateForm from './detail/taskDelegateForm.vue'
+import TaskReturnDialogForm from './detail/TaskReturnDialogForm.vue'
+import TaskDelegateForm from './detail/TaskDelegateForm.vue'
 
 defineOptions({ name: 'BpmProcessInstanceDetail' })
 

src/views/bpm/processInstance/detail/TaskDelegateForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="委派任务" width="500">
+  <XModal v-model="dialogVisible" title="委派任务" width="500">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -25,7 +25,7 @@
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
-  </Dialog>
+  </XModal>
 </template>
 <script lang="ts" setup>
 import * as TaskApi from '@/api/bpm/task'

src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="回退" width="500">
+  <XModal v-model="dialogVisible" title="回退" width="500">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -25,11 +25,13 @@
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
-  </Dialog>
+  </XModal>
 </template>
-<script lang="ts" name="TaskRollbackDialogForm" setup>
+<script lang="ts" setup>
 import * as TaskApi from '@/api/bpm/task'
 
+defineOptions({ name: 'BpmTaskReturnDialogForm' })
+
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中

src/views/member/user/detail/index.vue

@@ -37,8 +37,8 @@
             <UserSignList :user-id="id" />
           </el-tab-pane>
           <el-tab-pane label="成长值" name="experience" lazy>
-            <UserExperienceRecordList :user-id="id"
-            /></el-tab-pane>
+            <UserExperienceRecordList :user-id="id" />
+          </el-tab-pane>
           <el-tab-pane label="余额" name="fourth">余额(WIP)</el-tab-pane>
           <el-tab-pane label="收货地址" name="address" lazy>
             <UserAddressList :user-id="id" />