Merge branch 'dev_NEW_pro' into dev_NEW_pro_OA

yyb

9 天以前 1c8c18285e5676df8b5eaabff33bfac9d1f33b13

 src/pages/login.vue

@@ -22,6 +22,21 @@
                  clearable
                  type="password"></up-input>
      </view>
      <!-- <view class="input-item flex align-center"
            v-if="factoryList.length > 0">
        <up-input prefixIcon="home"
                  placeholder="请选择工厂"
                  border="bottom"
                  readonly
                  @click="showFactorySelect = true"
                  v-model="selectedFactoryName"
                  clearable></up-input>
        <up-action-sheet :show="showFactorySelect"
                         :actions="factoryList"
                         title="请选择工厂"
                         @close="showFactorySelect = false"
                         @select="handleFactorySelect"></up-action-sheet>
      </view> -->
      <view>
        <button @click="handleLogin"
                class="login-btn cu-btn block bg-blue lg round">登录</button>
@@ -70,9 +85,17 @@
  const loginForm = ref({
    userName: "",
    password: "",
    currentFatoryName: "",
    factoryId: "",
  });
  const factoryList = ref([]); // 公司列表
  const showFactorySelect = ref(false);
  const selectedFactoryName = ref("");

  const handleFactorySelect = e => {
    loginForm.value.factoryId = e.id;
    selectedFactoryName.value = e.name;
    showFactorySelect.value = false;
  };

  // 保存密码到本地存储
  function savePassword() {
@@ -127,17 +150,28 @@
              id: item.deptId,
              name: item.deptName,
            }));
            // 如果只有一个工厂，默认选中
            if (factoryList.value.length === 1) {
              loginForm.value.factoryId = factoryList.value[0].id;
              selectedFactoryName.value = factoryList.value[0].name;
            }
          } else {
            // 如果res.data不是数组，设置为空数组
            factoryList.value = [];
            loginForm.value.factoryId = "";
            selectedFactoryName.value = "";
          }
        })
        .catch(error => {
          showToast("获取公司列表失败:", error);
          factoryList.value = [];
          loginForm.value.factoryId = "";
          selectedFactoryName.value = "";
        });
    } else {
      factoryList.value = [];
      loginForm.value.factoryId = "";
      selectedFactoryName.value = "";
    }
  }

@@ -146,6 +180,8 @@
      showToast("请输入您的账号");
    } else if (loginForm.value.password === "") {
      showToast("请输入您的密码");
    } else if (factoryList.value.length > 0 && loginForm.value.factoryId === "") {
      showToast("请选择工厂");
    } else {
      showToast("登录中，请耐心等待...");
      pwdLogin();
@@ -254,7 +290,10 @@
      const accountInfo = uni.getAccountInfoSync();
      if (accountInfo?.miniProgram?.version) {
        versionName.value = accountInfo.miniProgram.version;
        console.log("[login-version] 当前环境=MP-WEIXIN，版本=", versionName.value);
        console.log(
          "[login-version] 当前环境=MP-WEIXIN，版本=",
          versionName.value
        );
      }
    } catch (e) {
      // 获取失败时使用默认值
@@ -270,18 +309,27 @@
        // @ts-ignore
        const appid = plus.runtime.appid;
        // @ts-ignore
        plus.runtime.getProperty(appid, (info) => {
        plus.runtime.getProperty(appid, info => {
          const v = info?.version || info?.versionName || "";
          if (v) {
            versionName.value = String(v);
            console.log("[login-version] 当前环境=APP-PLUS，版本=", versionName.value);
            console.log(
              "[login-version] 当前环境=APP-PLUS，版本=",
              versionName.value
            );
          } else {
            console.log("[login-version] APP-PLUS 获取到的版本字段为空，使用默认值:", versionName.value);
            console.log(
              "[login-version] APP-PLUS 获取到的版本字段为空，使用默认值:",
              versionName.value
            );
          }
          console.log("[login-version] 最终版本号:", versionName.value);
        });
      } else {
        console.log("[login-version] APP-PLUS 环境下缺少 getProperty，使用默认值:", versionName.value);
        console.log(
          "[login-version] APP-PLUS 环境下缺少 getProperty，使用默认值:",
          versionName.value
        );
        console.log("[login-version] 最终版本号:", versionName.value);
      }
      // #endif