陈昶聿
5 天以前 9799e992bc987425f21ad0b799e3d25d822329e3
src/views/login.vue
@@ -47,6 +47,7 @@
        >
          <el-option
            v-for="item in options"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          >
@@ -184,23 +185,15 @@
    getorganization() {
      getorganization({ pageSize: 30 }).then((res) => {
        if (res.code == 200) {
          // 同德系列 / 南华系列 / 浙江省新华医院:用 campusid(organizationID) 作下拉键值;
          // 其余(丽水区域 organizationID 全为 "1" 不唯一):用 orgid 作下拉键值
          const campusidKeywords = ["同德", "南华", "浙江省新华医院"];
          this.options = (res.rows || []).map((item) => {
            console.log(item.organizationName);
            const name = item.organizationName || "";
            const useCampusid = campusidKeywords.some((kw) =>
              name.includes(kw)
            );
            return {
              value: String(useCampusid ? item.organizationID : item.orgid),
              label: name,
              campusid: item.organizationID,
              orgid: item.orgid,
            };
          });
          // 下拉值必须唯一:市一 3 个院区的 orgid 都是 1,
          // 丽水区域各机构的 organizationID 都是 1,单用任一字段都会重复。
          // 这里用「orgid + organizationID + 下标」组成唯一键,登录时再取真实参数。
          this.options = (res.rows || []).map((item, index) => ({
            value: `${item.orgid}__${item.organizationID}__${index}`,
            label: item.organizationName || "",
            campusid: item.organizationID,
            orgid: item.orgid,
          }));
        }
      });
    },
@@ -245,29 +238,23 @@
            Cookies.remove("rememberMe");
          }
          // 键值规则:丽水区域用 orgid(organizationID/campusid 均为 "1" 不唯一);
          // 同德/南华/浙江省新华医院等区域用 campusid(organizationID) 作下拉键值
          const selectedOrg = this.options.find(
            (item) => String(item.value) === String(this.loginForm.orgid)
            (item) => item.value === this.loginForm.orgid
          );
          if (selectedOrg) {
            this.loginForm.campusid = selectedOrg.campusid;
            this.loginForm.orgid = selectedOrg.orgid;
            this.loginForm.orgname = selectedOrg.label;
          if (!selectedOrg) {
            this.loading = false;
            this.$message.error("院区信息已失效,请重新选择院区");
            return;
          }
          // 市一处理-----------------
          // if (selectedOrg) {
          //   if (selectedOrg.label.includes("湖滨")) {
          //     this.loginForm.campusid = 1;
          //   } else if (selectedOrg.label.includes("吴山")) {
          //     this.loginForm.campusid = 2;
          //   } else {
          //     this.loginForm.campusid = 1; // 默认值或其他处理
          //   }
          // }
          // --------------------------------
          // 下拉框存的是唯一键,提交前换成后端需要的真实 orgid / campusid
          const loginInfo = {
            ...this.loginForm,
            campusid: selectedOrg.campusid,
            orgid: selectedOrg.orgid,
            orgname: selectedOrg.label,
          };
          this.$store
            .dispatch("Login", this.loginForm)
            .dispatch("Login", loginInfo)
            .then((res) => {
              if (this.loginForm.username == "admin") {
                this.$router.push({ path: "/index" }).catch(() => {});