Merge remote-tracking branch 'origin/master'

src/components/scWorkflow/nodes/approver.vue

@@ -68,7 +68,7 @@
 							</el-form-item>
 
 							<el-form-item v-if="form.setType === 1" label="选择成员">
-								<el-button type="primary" icon="plus" round @click="selectHandle(1, form.nodeUserList)">选择人员 2222</el-button>
+								<el-button type="primary" icon="plus" round @click="selectHandle(1, form.nodeUserList)">选择人员</el-button>
 								<div class="tags-list">
 									<el-tag v-for="(user, index) in form.nodeUserList" :key="user.id" closable @close="delUser(index)">{{ user.name }}</el-tag>
 								</div>

src/views/approve/components/approvedContent.vue

@@ -108,7 +108,11 @@
 							@click="openComment('consentOrRefuseVisible', 'reject')"
 							>拒绝</el-button
 						>
-						<el-button v-if="currentTaskType === 'myApplication' && allowRevocation" :icon="Close" @click="openComment('reviewVisible', 'revoke')"
+						<el-button
+							v-if="currentTaskType === 'myApplication' && allowRevocation"
+							:icon="Close"
+							type="danger"
+							@click="openComment('reviewVisible', 'revoke')"
 							>撤回</el-button
 						>
 						<el-button v-if="currentTaskType === 'pendingClaim'" :icon="Close" @click="claimTaskEv">认领</el-button>