fix: 修复采购发票台账、付款台账、不合格品管理和协同审批表单的问题

ZN

4 天以前 e8b30f7b0156600f3e4703a9c4de793cdf7729c8

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -16,11 +16,15 @@
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="申请部门：" prop="approveDeptId">
            <el-form-item label="申请部门：" prop="approveDeptName">
<!--              <el-input v-model="form.approveDeptName" placeholder="请输入" clearable/>-->
                     <el-select
                        disabled
                        v-model="form.approveDeptId"
                        v-model="form.approveDeptIdArray"
                        placeholder="选择部门"
                multiple
                collapse-tags
                @change="handleDeptChange"
                style="width: 100%"
                     >
                        <el-option
                           v-for="user in productOptions"
@@ -145,6 +149,9 @@
                     <el-select
                        v-model="form.approveUser"
                        placeholder="选择人员"
                filterable
                default-first-option
                :reserve-keyword="false"
                     >
                        <el-option
                           v-for="user in userList"
@@ -212,6 +219,8 @@
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
import useUserStore from "@/store/modules/user";
import { getCurrentDate } from "@/utils/index.js";
import log from "@/views/monitor/job/log.vue";
const userStore = useUserStore();

const dialogFormVisible = ref(false);
@@ -228,7 +237,8 @@
    approveTime: "",
    approveId: "",
    approveUser: "",
      approveDeptId: "",
      approveDeptIdArray: [],
    approveDeptName: "",
    approveReason: "",
    checkResult: "",
    tempFileIds: [],
@@ -242,7 +252,7 @@
    approveTime: [{ required: false, message: "请输入", trigger: "change" },],
    approveId: [{ required: false, message: "请输入", trigger: "blur" }],
    approveUser: [{ required: false, message: "请输入", trigger: "blur" }],
      approveDeptId: [{ 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" }],
@@ -273,7 +283,17 @@
function removeApproverNode(index) {
  approverNodes.value.splice(index, 1)
}

// 处理部门选择变化
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 = '';
  }
};
// 打开弹框
const openDialog = (type, row) => {
  operationType.value = type;
@@ -290,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(',')
@@ -374,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();
        })
@@ -395,14 +430,6 @@
  dialogFormVisible.value = false;
  emit('close')
};
// 获取当前日期并格式化为 YYYY-MM-DD
function getCurrentDate() {
  const today = new Date();
  const year = today.getFullYear();
  const month = String(today.getMonth() + 1).padStart(2, "0"); // 月份从0开始
  const day = String(today.getDate()).padStart(2, "0");
  return `${year}-${month}-${day}`;
}

// 上传前校检
function handleBeforeUpload(file) {