Merge remote-tracking branch 'origin/master'

src/api/flow/processTask.ts

@@ -16,7 +16,7 @@ const api = {
 	transfer: '/v1/process-task/transfer', // 转交任务
 	claimProcess: '/v1/process-task/claim', // 认领任务
 	revokeProcess: '/v1/process-task/revoke', // 撤回任务
-	previousNodeName: '/v1/process-task/previous-node-names', // 以前节点名称列表
+	previousNodeName: '/v1/process-task/previous-nodes', // 以前节点名称列表
 	processTaskJump: '/v1/process-task/jump', // 跳到指定节点任务
 	countTask: '/v1/process-task/count-pending-approval' // 我的待办数量
 }

src/views/approve/components/rollbackDialog.vue

@@ -2,9 +2,9 @@
 	<!-- 回退审批弹窗 -->
 	<el-dialog v-model="reviewVisibleDialog" class="le-dialog" title="回退审批" width="700" destroy-on-close :close-on-click-modal="false">
 		<el-form ref="formRef" v-loading="uploadLoading" label-position="top" element-loading-text="图片上传中..." :model="form" label-width="80px">
-			<el-form-item label="回退到" prop="nodeName" :rules="[{ required: true, message: '请选择回退节点' }]">
-				<el-select v-model="form.nodeName" placeholder="请选择回退节点">
-					<el-option v-for="item in rollbackOptions" :key="item" :label="item" :value="item" />
+			<el-form-item label="回退到" prop="nodeKey" :rules="[{ required: true, message: '请选择回退节点' }]">
+				<el-select v-model="form.nodeKey" placeholder="请选择回退节点">
+						<el-option v-for="item in rollbackOptions" :key="item.nodeKey" :label="item.nodeName" :value="item.nodeKey" />
 				</el-select>
 			</el-form-item>
 			<el-form-item label="回退原因" prop="content">
@@ -51,7 +51,7 @@ const props = defineProps({
 })
 const btnDisabled = ref(false)
 const form = reactive({
-	nodeName: '',
+	nodeKey: '',
 	content: ''
 	// attachment: []
 })