Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue

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

@@ -7,8 +7,8 @@
       :rules="formRules"
       :rules="formRules"
       label-width="110px"
       label-width="110px"
     >
     >
-      <el-form-item label="接收人" prop="receiveId">
-        <el-select v-model="formData.receiveId" clearable style="width: 100%">
+      <el-form-item label="接收人" prop="delegateUserId">
+        <el-select v-model="formData.delegateUserId" clearable style="width: 100%">
           <el-option
           <el-option
             v-for="item in userList"
             v-for="item in userList"
             :key="item.id"
             :key="item.id"
@@ -37,10 +37,10 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
 const formLoading = ref(false) // 表单的加载中
 const formData = ref({
 const formData = ref({
   id: '',
   id: '',
-  receiveId: undefined
+  delegateUserId: undefined
 })
 })
 const formRules = ref({
 const formRules = ref({
-  receiveId: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
+  delegateUserId: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
 })
 })
 
 
 const formRef = ref() // 表单 Ref
 const formRef = ref() // 表单 Ref
@@ -79,7 +79,7 @@ const submitForm = async () => {
 const resetForm = () => {
 const resetForm = () => {
   formData.value = {
   formData.value = {
     id: '',
     id: '',
-    receiveId: undefined
+    delegateUserId: undefined
   }
   }
   formRef.value?.resetFields()
   formRef.value?.resetFields()
 }
 }

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

@@ -92,7 +92,7 @@
     <!-- 弹窗：转派审批人 -->
     <!-- 弹窗：转派审批人 -->
     <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
     <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
     <!-- 弹窗，回退节点 -->
     <!-- 弹窗，回退节点 -->
-    <TaskRollbackDialog ref="taskRollbackRef" @success="getDetail" />
+    <TaskReturnDialog ref="taskReturnDialogRef" @success="getDetail" />
     <!-- 委派，将任务委派给别人处理，处理完成后，会重新回到原审批人手中-->
     <!-- 委派，将任务委派给别人处理，处理完成后，会重新回到原审批人手中-->
     <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" />
     <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" />
   </ContentWrap>
   </ContentWrap>
@@ -107,7 +107,7 @@ import * as TaskApi from '@/api/bpm/task'
 import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue'
 import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue'
 import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
 import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
 import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
 import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
-import TaskRollbackDialog from './TaskRollbackDialogForm.vue'
+import TaskReturnDialog from './TaskReturnDialogForm.vue'
 import TaskDelegateForm from './taskDelegateForm.vue'
 import TaskDelegateForm from './taskDelegateForm.vue'
 import { registerComponent } from '@/utils/routerHelper'
 import { registerComponent } from '@/utils/routerHelper'
 
 
@@ -179,10 +179,10 @@ const handleDelegate = async (task) => {
 }
 }
 
 
 //回退弹框组件
 //回退弹框组件
-const taskRollbackRef = ref()
+const taskReturnDialogRef = ref()
 /** 处理审批退回的操作 */
 /** 处理审批退回的操作 */
 const handleBack = async (task) => {
 const handleBack = async (task) => {
-  taskRollbackRef.value.open(task.id)
+  taskReturnDialogRef.value.open(task.id)
 }
 }
 
 
 /** 获得详情 */
 /** 获得详情 */

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

@@ -24,7 +24,7 @@
       </template>
       </template>
       {{ user.totalPoint || 0 }}
       {{ user.totalPoint || 0 }}
     </el-descriptions-item>
     </el-descriptions-item>
-    <!-- TODO 芋艿：后续接入余额、支付金额 -->
+    <!-- TODO @疯狂：从 wallet 读取下对应字段 -->
     <el-descriptions-item>
     <el-descriptions-item>
       <template #label>
       <template #label>
         <descriptions-item-label label=" 当前余额 " icon="svg-icon:member_balance" />
         <descriptions-item-label label=" 当前余额 " icon="svg-icon:member_balance" />

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

@@ -39,6 +39,7 @@
           <el-tab-pane label="成长值" name="experience" lazy>
           <el-tab-pane label="成长值" name="experience" lazy>
             <UserExperienceRecordList :user-id="id"
             <UserExperienceRecordList :user-id="id"
           /></el-tab-pane>
           /></el-tab-pane>
+          <!-- TODO @jason：增加一个余额变化； -->
           <el-tab-pane label="余额" name="fourth">余额(WIP)</el-tab-pane>
           <el-tab-pane label="余额" name="fourth">余额(WIP)</el-tab-pane>
           <el-tab-pane label="收货地址" name="address" lazy>
           <el-tab-pane label="收货地址" name="address" lazy>
             <UserAddressList :user-id="id" />
             <UserAddressList :user-id="id" />
@@ -48,7 +49,9 @@
           </el-tab-pane>
           </el-tab-pane>
           <el-tab-pane label="售后管理" name="fourth">售后管理(WIP)</el-tab-pane>
           <el-tab-pane label="售后管理" name="fourth">售后管理(WIP)</el-tab-pane>
           <el-tab-pane label="收藏记录" name="fourth">收藏记录(WIP)</el-tab-pane>
           <el-tab-pane label="收藏记录" name="fourth">收藏记录(WIP)</el-tab-pane>
+          <!-- TODO @疯狂：优惠劵的读取 -->
           <el-tab-pane label="优惠劵" name="fourth">优惠劵(WIP)</el-tab-pane>
           <el-tab-pane label="优惠劵" name="fourth">优惠劵(WIP)</el-tab-pane>
+          <!-- TODO @疯狂：增加获得分校用户；直接查询出所有；需要体现出是一级还是二级；用户编号、昵称、级别、绑定时间 -->
         </el-tabs>
         </el-tabs>
       </el-card>
       </el-card>
     </el-row>
     </el-row>

src/views/member/user/index.vue

@@ -128,6 +128,8 @@
           >
           >
             编辑
             编辑
           </el-button>
           </el-button>
+          <!-- todo @jason：增加一个【修改余额】 -->
+          <!-- todo @疯狂：增加一个【修改积分】，表单是：radio 增加/减少；input 具体的变化积分 -->
           <!-- todo 放到更多菜单中 -->
           <!-- todo 放到更多菜单中 -->
           <el-button
           <el-button
             link
             link