|
|
|
|
@ -140,31 +140,31 @@
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<!-- 审批信息（仅非市场部用户显示） -->
|
|
|
|
|
<template v-if="showApproverSelector && !isFormDisabled">
|
|
|
|
|
<el-divider content-position="left">审批信息</el-divider>
|
|
|
|
|
<el-row :gutter="20">
|
|
|
|
|
<el-col :span="12">
|
|
|
|
|
<el-form-item label="下一步审批人" prop="variables.approverId">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="form.variables.approverId"
|
|
|
|
|
placeholder="请选择或搜索审批人"
|
|
|
|
|
filterable
|
|
|
|
|
clearable
|
|
|
|
|
style="width: 100%"
|
|
|
|
|
@change="handleApproverSelectChange"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="user in userList"
|
|
|
|
|
:key="user.userId"
|
|
|
|
|
:label="`${user.nickName} (${user.deptName || '未知部门'})`"
|
|
|
|
|
:value="user.userId"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
<div style="font-size: 12px; color: #909399; margin-top: 4px">请选择部门/科室负责人作为第一级审批人</div>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</template>
|
|
|
|
|
<!-- <template v-if="showApproverSelector && !isFormDisabled">-->
|
|
|
|
|
<!-- <el-divider content-position="left">审批信息</el-divider>-->
|
|
|
|
|
<!-- <el-row :gutter="20">-->
|
|
|
|
|
<!-- <el-col :span="12">-->
|
|
|
|
|
<!-- <el-form-item label="下一步审批人" prop="variables.approverId">-->
|
|
|
|
|
<!-- <el-select-->
|
|
|
|
|
<!-- v-model="form.variables.approverId"-->
|
|
|
|
|
<!-- placeholder="请选择或搜索审批人"-->
|
|
|
|
|
<!-- filterable-->
|
|
|
|
|
<!-- clearable-->
|
|
|
|
|
<!-- style="width: 100%"-->
|
|
|
|
|
<!-- @change="handleApproverSelectChange"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="user in userList"-->
|
|
|
|
|
<!-- :key="user.userId"-->
|
|
|
|
|
<!-- :label="`${user.nickName} (${user.deptName || '未知部门'})`"-->
|
|
|
|
|
<!-- :value="user.userId"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- <div style="font-size: 12px; color: #909399; margin-top: 4px">请选择部门/科室负责人作为第一级审批人</div>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- </el-row>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
|
|
|
|
|
<!-- 备注 -->
|
|
|
|
|
<el-divider content-position="left">其他信息</el-divider>
|
|
|
|
|
@ -266,20 +266,20 @@ const rules = reactive({
|
|
|
|
|
applicationCode: [], // 编号由后端自动生成，前端不需要校验
|
|
|
|
|
applicationDate: [{ required: true, message: '申请日期不能为空', trigger: 'change' }],
|
|
|
|
|
applicantId: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
|
|
|
|
|
customerUnitId: [{ required: true, message: '客户不能为空', trigger: 'change' }],
|
|
|
|
|
'variables.approverId': [
|
|
|
|
|
{
|
|
|
|
|
validator: (rule: any, value: any, callback: any) => {
|
|
|
|
|
// 非市场部用户必须选择审批人
|
|
|
|
|
if (showApproverSelector.value && !value) {
|
|
|
|
|
callback(new Error('请选择下一步审批人'));
|
|
|
|
|
} else {
|
|
|
|
|
callback();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
trigger: 'change'
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
customerUnitId: [{ required: true, message: '客户不能为空', trigger: 'change' }]
|
|
|
|
|
// 'variables.approverId': [
|
|
|
|
|
// {
|
|
|
|
|
// validator: (rule: any, value: any, callback: any) => {
|
|
|
|
|
// // 非市场部用户必须选择审批人
|
|
|
|
|
// if (showApproverSelector.value && !value) {
|
|
|
|
|
// callback(new Error('请选择下一步审批人'));
|
|
|
|
|
// } else {
|
|
|
|
|
// callback();
|
|
|
|
|
// }
|
|
|
|
|
// },
|
|
|
|
|
// trigger: 'change'
|
|
|
|
|
// }
|
|
|
|
|
// ]
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// 计算属性：判断是否显示审批人选择器（非市场部用户显示）
|
|
|
|
|
|
