src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -19,9 +19,12 @@
            <el-form-item label="申请部门:" prop="approveDeptName">
<!--              <el-input v-model="form.approveDeptName" placeholder="请输入" clearable/>-->
                     <el-select
                        v-model="form.approveDeptId"
                        v-model="form.approveDeptIdArray"
                        placeholder="选择部门"
                multiple
                collapse-tags
                @change="handleDeptChange"
                style="width: 100%"
                     >
                        <el-option
                           v-for="user in productOptions"
@@ -234,7 +237,7 @@
    approveTime: "",
    approveId: "",
    approveUser: "",
      approveDeptId: "",
      approveDeptIdArray: [],
    approveDeptName: "",
    approveReason: "",
    checkResult: "",
@@ -249,7 +252,7 @@
    approveTime: [{ required: false, message: "请输入", trigger: "change" },],
    approveId: [{ required: false, message: "请输入", trigger: "blur" }],
    approveUser: [{ required: false, message: "请输入", trigger: "blur" }],
    approveDeptName: [{ required: true, message: "请输入", trigger: "blur" }],
    approveDeptName: [{ required: true, message: "请选择申请部门", trigger: "change" }],
    approveReason: [{ required: true, message: "请输入", trigger: "blur" }],
    checkResult: [{ required: false, message: "请输入", trigger: "blur" }],
    startDate: [{ required: true, message: "请选择请假开始时间", trigger: "change" }],
@@ -281,12 +284,12 @@
  approverNodes.value.splice(index, 1)
}
// 处理部门选择变化
const handleDeptChange = (deptId) => {
  if (deptId) {
    const selectedDept = productOptions.value.find(dept => dept.deptId === deptId);
    if (selectedDept) {
      form.value.approveDeptName = selectedDept.deptName;
    }
const handleDeptChange = (deptIds) => {
  if (deptIds && deptIds.length > 0) {
    const selectedNames = productOptions.value
      .filter(dept => deptIds.includes(dept.deptId))
      .map(dept => dept.deptName);
    form.value.approveDeptName = selectedNames.join(',');
  } else {
    form.value.approveDeptName = '';
  }
@@ -307,13 +310,26 @@
  form.value.approveTime = getCurrentDate();
  
  // 获取当前用户信息并设置部门ID
  form.value.approveDeptId = userStore.currentDeptId
  form.value.approveDeptIdArray = []
  if (operationType.value === 'edit') {
    fileList.value = row.commonFileList
    form.value.tempFileIds = fileList.value.map(file => file.id)
      currentApproveStatus.value = row.approveStatus
    approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {
         form.value = {...res.data}
      // 处理部门反显(根据后端返回的 approveDeptId 处理为数组)
      const deptId = res.data.approveDeptId;
      if (deptId !== undefined && deptId !== null) {
        if (Array.isArray(deptId)) {
          form.value.approveDeptIdArray = deptId;
        } else if (typeof deptId === 'string' && deptId.includes(',')) {
          form.value.approveDeptIdArray = deptId.split(',').map(id => parseInt(id.trim())).filter(id => !isNaN(id));
        } else if (typeof deptId === 'string' || typeof deptId === 'number') {
          form.value.approveDeptIdArray = [parseInt(deptId)];
        }
      } else {
        form.value.approveDeptIdArray = [];
      }
      // 反显审批人
      if (res.data && res.data.approveUserIds) {
        const userIds = res.data.approveUserIds.split(',')
@@ -391,13 +407,15 @@
  }
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      const submitData = { ...form.value };
      submitData.approveDeptId = submitData.approveDeptIdArray;
      if (operationType.value === "add" || currentApproveStatus.value == 3) {
        approveProcessAdd(form.value).then(res => {
        approveProcessAdd(submitData).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
      } else {
        approveProcessUpdate(form.value).then(res => {
        approveProcessUpdate(submitData).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })