Merge remote-tracking branch 'refs/remotes/origin/dev_New' into dev_tide_mi...

zouyu

2 天以前 1c0863efe062af3ebcdecb8c10568d779f5c8295

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

@@ -6,7 +6,7 @@
      width="700px"
      @close="closeDia"
    >
         <el-form :model="form" label-width="140px" label-position="top" ref="formRef">
         <el-form :model="form" :rules="rules" label-width="140px" label-position="top" ref="formRef">
            <el-row>
               <el-col :span="24">
                  <el-form-item label="流程编号：" prop="approveId">
@@ -16,7 +16,7 @@
            </el-row>
            <el-row>
               <el-col :span="24">
                  <el-form-item label="申请部门：">
                  <el-form-item label="申请部门：" prop="approveDeptId">
                     <el-select
                        disabled
                        v-model="form.approveDeptId"
@@ -218,8 +218,12 @@
      approveReason: "",
      checkResult: "",
   },
  rules: {
    // 使用部门ID做必填校验，避免名称未同步导致误报
    approveDeptId: [{ required: true, message: "请选择申请部门", trigger: "change" }],
  },
});
const { form } = toRefs(data);
const { form, rules } = toRefs(data);

// 节点标题
const getNodeTitle = (index, len) => {
@@ -261,8 +265,8 @@
   getProductOptions().then(() => {
      // 确保值类型匹配（如果选项已加载）
      if (productOptions.value.length > 0 && form.value.approveDeptId) {
         const matchedOption = productOptions.value.find(opt => 
            opt.deptId == form.value.approveDeptId || 
         const matchedOption = productOptions.value.find(opt =>
            opt.deptId == form.value.approveDeptId ||
            String(opt.deptId) === String(form.value.approveDeptId)
         );
         if (matchedOption) {
@@ -379,4 +383,4 @@
   width: 200px;
   height: 60px;
}
</style>
</style>