浪潮对接单点登录:mis调整2

zouyu

19 小时以前 32f10392ab00b07e85c0b4229037c30af7c3f28e

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

@@ -16,20 +16,21 @@
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="申请部门：" prop="approveDeptName">
<!--              <el-input v-model="form.approveDeptName" placeholder="请输入" clearable/>-->
                     <el-select
                        v-model="form.approveDeptId"
                        placeholder="选择部门"
                @change="handleDeptChange"
                     >
                        <el-option
                           v-for="user in productOptions"
                           :key="user.deptId"
                           :label="user.deptName"
                           :value="user.deptId"
                        />
                     </el-select>
            <!-- 申请部门：校验使用部门ID，便于下拉选择后立即通过校验 -->
            <el-form-item label="申请部门：" prop="approveDeptId">
              <!--              <el-input v-model="form.approveDeptName" placeholder="请输入" clearable/>-->
              <el-select
                  v-model="form.approveDeptId"
                  placeholder="选择部门"
                  @change="handleDeptChange"
              >
                <el-option
                    v-for="user in productOptions"
                    :key="user.deptId"
                    :label="user.deptName"
                    :value="user.deptId"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
@@ -88,10 +89,10 @@
        <!-- 出差地点（仅当 approveType 为 3 时显示） -->
        <el-row v-if="props.approveType == 3">
          <el-col :span="24">
            <el-form-item label="出差地点：" prop="location">
            <el-form-item label="备注：" prop="location">
              <el-input
                  v-model="form.location"
                  placeholder="请输入出差地点"
                  placeholder="请输入备注"
                  clearable
              />
            </el-form-item>
@@ -107,32 +108,32 @@
              </template>
              <div style="display: flex; align-items: flex-end; flex-wrap: wrap;">
                <div
                  v-for="(node, index) in approverNodes"
                  :key="node.id"
                  style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
                    v-for="(node, index) in approverNodes"
                    :key="node.id"
                    style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
                >
                  <div>
                    <span>审批人</span>
                    →
                  </div>
                  <el-select
                    v-model="node.userId"
                    placeholder="选择人员"
                    style="width: 120px; margin-bottom: 8px;"
                      v-model="node.userId"
                      placeholder="选择人员"
                      style="width: 120px; margin-bottom: 8px;"
                  >
                    <el-option
                      v-for="user in userList"
                      :key="user.userId"
                      :label="user.nickName"
                      :value="user.userId"
                        v-for="user in userList"
                        :key="user.userId"
                        :label="user.nickName"
                        :value="user.userId"
                    />
                  </el-select>
                  <div>
                    <el-button
                      type="danger"
                      size="small"
                      @click="removeApproverNode(index)"
                      v-if="approverNodes.length > 1"
                        type="danger"
                        size="small"
                        @click="removeApproverNode(index)"
                        v-if="approverNodes.length > 1"
                    >删除</el-button>
                  </div>
                </div>
@@ -143,20 +144,20 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="申请人：" prop="approveUser">
                     <el-select
                        v-model="form.approveUser"
                        placeholder="选择人员"
                filterable
                default-first-option
                :reserve-keyword="false"
                     >
                        <el-option
                           v-for="user in userList"
                           :key="user.userId"
                           :label="user.nickName"
                           :value="user.userId"
                        />
                     </el-select>
              <el-select
                  v-model="form.approveUser"
                  placeholder="选择人员"
                  filterable
                  default-first-option
                  :reserve-keyword="false"
              >
                <el-option
                    v-for="user in userList"
                    :key="user.userId"
                    :label="user.nickName"
                    :value="user.userId"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -234,7 +235,7 @@
    approveTime: "",
    approveId: "",
    approveUser: "",
      approveDeptId: "",
    approveDeptId: "",
    approveDeptName: "",
    approveReason: "",
    checkResult: "",
@@ -246,10 +247,11 @@
    location: "" // 出差地点
  },
  rules: {
    approveTime: [{ required: false, message: "请输入", trigger: "change" },],
    approveTime: [{ required: false, message: "请输入", trigger: "change" }],
    approveId: [{ required: false, message: "请输入", trigger: "blur" }],
    approveUser: [{ required: false, message: "请输入", trigger: "blur" }],
    approveDeptName: [{ required: true, message: "请输入", trigger: "blur" }],
    // 使用部门ID做必填校验，避免名称未同步导致误报
    approveDeptId: [{ required: true, message: "请选择申请部门", trigger: "change" }],
    approveReason: [{ required: true, message: "请输入", trigger: "blur" }],
    checkResult: [{ required: false, message: "请输入", trigger: "blur" }],
    startDate: [{ required: true, message: "请选择请假开始时间", trigger: "change" }],
@@ -295,32 +297,30 @@
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
   userListNoPageByTenantId().then((res) => {
  userListNoPageByTenantId().then((res) => {
    userList.value = res.data;
  });
   form.value = {}
   approverNodes.value = [
      { id: 1, userId: null }
   ]
  getProductOptions();
  form.value = {}
  approverNodes.value = [
    { id: 1, userId: null }
  ]
  form.value.approveUser = userStore.id;
  form.value.approveTime = getCurrentDate();
  

  // 获取当前用户信息并设置部门ID
  form.value.approveDeptId = userStore.currentDeptId
  
  // 加载部门选项，并在加载完成后设置部门名称
  getProductOptions();
  if (operationType.value === 'edit') {
    fileList.value = row.commonFileList
    form.value.tempFileIds = fileList.value.map(file => file.id)
      currentApproveStatus.value = row.approveStatus
    currentApproveStatus.value = row.approveStatus
    approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {
         form.value = {...res.data}
      form.value = {...res.data}
      // 反显审批人
      if (res.data && res.data.approveUserIds) {
        const userIds = res.data.approveUserIds.split(',')
        approverNodes.value = userIds.map((userId, idx) => ({
          id: idx + 1, 
          id: idx + 1,
          userId: parseInt(userId.trim())
        }))
        nextApproverId = userIds.length + 1
@@ -332,18 +332,8 @@
  }
}
const getProductOptions = () => {
  return getDept().then((res) => {
  getDept().then((res) => {
    productOptions.value = res.data;
    // 如果已有部门ID，自动设置部门名称（用于验证）
    if (form.value.approveDeptId && productOptions.value.length > 0) {
      const matchedDept = productOptions.value.find(dept => 
        dept.deptId == form.value.approveDeptId || 
        String(dept.deptId) === String(form.value.approveDeptId)
      );
      if (matchedDept) {
        form.value.approveDeptName = matchedDept.deptName;
      }
    }
  });
};
function convertIdToValue(data) {
@@ -356,7 +346,7 @@
    if (children && children.length > 0) {
      newItem.children = convertIdToValue(children);
    }
    

    return newItem;
  });
}
@@ -473,4 +463,4 @@

<style scoped>

</style>
</style>