From 3e08217c0dfadb4f39de4e8afe29b61e4f6baaa8 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 27 Sep 2023 11:22:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E3=80=90=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91--=E5=A7=94=E6=B4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/processInstance/detail.vue                  | 2 +-
 src/views/bpm/processInstance/detail/TaskDelegateForm.vue | 4 ++--
 .../bpm/processInstance/detail/TaskReturnDialogForm.vue   | 8 +++++---
 src/views/member/user/detail/index.vue                    | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/bpm/processInstance/detail.vue b/src/views/bpm/processInstance/detail.vue
index 32b36026..4aab9792 100644
--- a/src/views/bpm/processInstance/detail.vue
+++ b/src/views/bpm/processInstance/detail.vue
@@ -210,7 +210,7 @@ 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 TaskDelegateForm from './detail/TaskDelegateForm.vue'
 
 defineOptions({ name: 'BpmProcessInstanceDetail' })
 
diff --git a/src/views/bpm/processInstance/detail/TaskDelegateForm.vue b/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
index dc757a0c..d0313731 100644
--- a/src/views/bpm/processInstance/detail/TaskDelegateForm.vue
+++ b/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'
diff --git a/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue b/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
index f93bf2c5..f9b309a0 100644
--- a/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
+++ b/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: 'TaskReturnDialogForm.vue' })
+
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue
index deba548b..a2f40978 100644
--- a/src/views/member/user/detail/index.vue
+++ b/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" />

From 76f8f9d942659700107215b05d95e227a4873ce0 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 27 Sep 2023 16:00:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E3=80=90=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91--=E5=A7=94=E6=B4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue b/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
index f9b309a0..7ca8a9f5 100644
--- a/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
+++ b/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
@@ -30,7 +30,7 @@
 <script lang="ts" setup>
 import * as TaskApi from '@/api/bpm/task'
 
-defineOptions({ name: 'TaskReturnDialogForm.vue' })
+defineOptions({ name: 'TaskReturnDialogForm' })
 
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示

From 842ca8f672a423aaa490f2a7b450e1009897d929 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 27 Sep 2023 16:13:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E3=80=90=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91--=E5=A7=94=E6=B4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/processInstance/detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/bpm/processInstance/detail.vue b/src/views/bpm/processInstance/detail.vue
index 4aab9792..53bf4ba1 100644
--- a/src/views/bpm/processInstance/detail.vue
+++ b/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,7 +209,7 @@ 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 TaskReturnDialogForm from './detail/TaskReturnDialogForm.vue'
 import TaskDelegateForm from './detail/TaskDelegateForm.vue'
 
 defineOptions({ name: 'BpmProcessInstanceDetail' })

From 1b9bdf851c702d47116222e73151f4954f7501d8 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 27 Sep 2023 16:22:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E3=80=90=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91--=E5=A7=94=E6=B4=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue b/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
index 7ca8a9f5..392537ba 100644
--- a/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
+++ b/src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
@@ -30,7 +30,7 @@
 <script lang="ts" setup>
 import * as TaskApi from '@/api/bpm/task'
 
-defineOptions({ name: 'TaskReturnDialogForm' })
+defineOptions({ name: 'BpmTaskReturnDialogForm' })
 
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示