|
391 | 391 | </div>
|
392 | 392 | </el-popover>
|
393 | 393 |
|
394 |
| - <!--【撤消】按钮 这个对应发起人的取消, 只有发起人可以取消 --> |
| 394 | + <!--【取消】按钮 这个对应发起人的取消, 只有发起人可以取消 --> |
395 | 395 | <el-popover
|
396 | 396 | :visible="popOverVisible.cancel"
|
397 | 397 | placement="top-start"
|
|
403 | 403 | >
|
404 | 404 | <template #reference>
|
405 | 405 | <div @click="openPopover('cancel')" class="hover-bg-gray-100 rounded-xl p-6px">
|
406 |
| - <Icon :size="14" icon="fa:mail-reply" /> 撤消 |
| 406 | + <Icon :size="14" icon="fa:mail-reply" /> 取消 |
407 | 407 | </div>
|
408 | 408 | </template>
|
409 | 409 | <div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading">
|
|
415 | 415 | :rules="genericRule"
|
416 | 416 | label-width="100px"
|
417 | 417 | >
|
418 |
| - <el-form-item label="撤消理由" prop="cancelReason"> |
419 |
| - <span class="text-#878c93 text-12px"> 撤消后,该审批流程将自动结束</span> |
| 418 | + <el-form-item label="取消理由" prop="cancelReason"> |
| 419 | + <span class="text-#878c93 text-12px"> 取消后,该审批流程将自动结束</span> |
420 | 420 | <el-input
|
421 | 421 | v-model="genericForm.cancelReason"
|
422 | 422 | clearable
|
423 |
| - placeholder="请输入撤消理由" |
| 423 | + placeholder="请输入取消理由" |
424 | 424 | type="textarea"
|
425 | 425 | :rows="3"
|
426 | 426 | />
|
427 | 427 | </el-form-item>
|
428 | 428 | <el-form-item>
|
429 |
| - <el-button :disabled="formLoading" type="primary" @click="handleCancel()" |
430 |
| - >撤消</el-button |
431 |
| - > |
| 429 | + <el-button :disabled="formLoading" type="primary" @click="handleCancel()"> |
| 430 | + 取消 |
| 431 | + </el-button> |
432 | 432 | <el-button @click="popOverVisible.cancel = false"> 取消 </el-button>
|
433 | 433 | </el-form-item>
|
434 | 434 | </el-form>
|
@@ -499,7 +499,7 @@ const formRef = ref()
|
499 | 499 | const genericRule = reactive({
|
500 | 500 | reason: [{ required: true, message: '审批意见不能为空', trigger: 'blur' }],
|
501 | 501 | returnReason: [{ required: true, message: '退回理由不能为空', trigger: 'blur' }],
|
502 |
| - cancelReason: [{ required: true, message: '撤消理由不能为空', trigger: 'blur' }], |
| 502 | + cancelReason: [{ required: true, message: '取消理由不能为空', trigger: 'blur' }], |
503 | 503 | copyUserIds: [{ required: true, message: '抄送人不能为空', trigger: 'change' }],
|
504 | 504 | assigneeUserId: [{ required: true, message: '新审批人不能为空', trigger: 'change' }],
|
505 | 505 | delegateUserId: [{ required: true, message: '接收人不能为空', trigger: 'change' }],
|
|
0 commit comments