【文案修改】工作流:“撤销”统一改成“取消”,更好理解

This commit is contained in:
YunaiV 2024-10-19 22:03:37 +08:00
parent 43b7dff0d0
commit aa6610e36c

View File

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