Merge branch 'dev_new' of http://114.132.189.42:9002/r/product-inventory-AP...

zhangwencui

10 小时以前 c99fb191db1ac786218b11f04ba82d3c6fe1d932

 src/pages/index.vue

@@ -1,24 +1,24 @@
<template>
  <view class="content">
    <view class="header-section">
      <view class="currentFactory">
        <up-text type="primary"
                 :text="userStore.currentFactoryName"
                 @click="show = true"
                 size="18"
                 class="factoryName"
                 suffixIcon="arrow-right"
                 :iconStyle="iconStyle"></up-text>
      </view>
      <up-picker :show="show"
                 :columns="factoryList"
                 @confirm="changeFactory"
                 @cancel="show = false"></up-picker>
    </view>
<!--    <view class="header-section">-->
<!--      <view class="currentFactory">-->
<!--        <up-text type="primary"-->
<!--                 :text="userStore.currentFactoryName"-->
<!--                 @click="show = true"-->
<!--                 size="18"-->
<!--                 class="factoryName"-->
<!--                 suffixIcon="arrow-right"-->
<!--                 :iconStyle="iconStyle"></up-text>-->
<!--      </view>-->
<!--      <up-picker :show="show"-->
<!--                 :columns="factoryList"-->
<!--                 @confirm="changeFactory"-->
<!--                 @cancel="show = false"></up-picker>-->
<!--    </view>-->
    <view class="hero-section">
      <view class="bg-img">
        <view class="hero-content">
          <text class="hero-title">军泰伟业</text>
<!--          <text class="hero-title">军泰伟业</text>-->
        </view>
        <view class="hero-wave"></view>
      </view>
@@ -220,8 +220,7 @@
  import modal from "@/plugins/modal";
  import useUserStore from "@/store/modules/user";

  const userStore = useUserStore();
  const factoryId = ref("");
  const userStore = useUserStore();;
  const show = ref(false);
  const factoryList = ref([]);
  const factoryListTem = ref([]);
@@ -700,8 +699,7 @@
          factoryListTem.value = res.data;
          res.data.forEach(item => {
            factoryList.value[0].push(item.deptName);
          });
          factoryId.value = userStore.currentDeptId;
          })
        } else {
          // 如果res.data不是数组，设置为空数组
          factoryList.value = [];
@@ -804,7 +802,6 @@
    const loginForm = {
      username: userStore.name,
      password: uni.getStorageSync("remembered_password"),
      factoryId: factoryId,
    };
    modal.loading("刷新中，请耐心等待...");
    userStore