|
@@ -391,7 +391,7 @@
|
|
|
</div>
|
|
|
</el-popover>
|
|
|
|
|
|
- <!--【撤消】按钮 这个对应发起人的取消, 只有发起人可以取消 -->
|
|
|
+ <!--【取消】按钮 这个对应发起人的取消, 只有发起人可以取消 -->
|
|
|
<el-popover
|
|
|
:visible="popOverVisible.cancel"
|
|
|
placement="top-start"
|
|
@@ -403,7 +403,7 @@
|
|
|
>
|
|
|
<template #reference>
|
|
|
<div @click="openPopover('cancel')" class="hover-bg-gray-100 rounded-xl p-6px">
|
|
|
- <Icon :size="14" icon="fa:mail-reply" /> 撤消
|
|
|
+ <Icon :size="14" icon="fa:mail-reply" /> 取消
|
|
|
</div>
|
|
|
</template>
|
|
|
<div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading">
|
|
@@ -415,20 +415,20 @@
|
|
|
:rules="genericRule"
|
|
|
label-width="100px"
|
|
|
>
|
|
|
- <el-form-item label="撤消理由" prop="cancelReason">
|
|
|
- <span class="text-#878c93 text-12px"> 撤消后,该审批流程将自动结束</span>
|
|
|
+ <el-form-item label="取消理由" prop="cancelReason">
|
|
|
+ <span class="text-#878c93 text-12px"> 取消后,该审批流程将自动结束</span>
|
|
|
<el-input
|
|
|
v-model="genericForm.cancelReason"
|
|
|
clearable
|
|
|
- placeholder="请输入撤消理由"
|
|
|
+ placeholder="请输入取消理由"
|
|
|
type="textarea"
|
|
|
:rows="3"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button :disabled="formLoading" type="primary" @click="handleCancel()"
|
|
|
- >撤消</el-button
|
|
|
- >
|
|
|
+ <el-button :disabled="formLoading" type="primary" @click="handleCancel()">
|
|
|
+ 取消
|
|
|
+ </el-button>
|
|
|
<el-button @click="popOverVisible.cancel = false"> 取消 </el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
@@ -499,7 +499,7 @@ const formRef = ref()
|
|
|
const genericRule = reactive({
|
|
|
reason: [{ required: true, message: '审批意见不能为空', trigger: 'blur' }],
|
|
|
returnReason: [{ required: true, message: '退回理由不能为空', trigger: 'blur' }],
|
|
|
- cancelReason: [{ required: true, message: '撤消理由不能为空', trigger: 'blur' }],
|
|
|
+ cancelReason: [{ required: true, message: '取消理由不能为空', trigger: 'blur' }],
|
|
|
copyUserIds: [{ required: true, message: '抄送人不能为空', trigger: 'change' }],
|
|
|
assigneeUserId: [{ required: true, message: '新审批人不能为空', trigger: 'change' }],
|
|
|
delegateUserId: [{ required: true, message: '接收人不能为空', trigger: 'change' }],
|