Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

6 months ago · 09877c3996
6 changed files with 16 additions and 11 deletions
--- a/.env
+++ b/.env
@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=SFMS管理系统
+VITE_APP_TITLE=富维海拉管理系统

 # 项目本地运行端口号
 VITE_PORT=80
--- a/index.html
+++ b/index.html
@ -3,16 +3,16 @@
  <head>
    <meta charset="UTF-8" />
    <!-- <link rel="icon" href="/favicon.ico" /> -->
-    <link rel="icon" href="/src/assets/imgs/logo1.png" />
+    <!-- <link rel="icon" href="/src/assets/imgs/logo1.png" /> -->
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <meta
      name="keywords"
-      content="SFMS管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
+      content="富维海拉管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
    />
    <meta
      name="description"
-      content="SFMS管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
+      content="富维海拉管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
    />
    <title>%VITE_APP_TITLE%</title>
  </head>
@ -137,7 +137,7 @@
      <div class="app-loading">
        <div class="app-loading-wrap">
          <div class="app-loading-title">
-            <img src="/src/assets/imgs/logo.png" class="app-loading-logo" alt="Logo" />
+            <img src="/src/assets/imgs/logo_white.png" class="app-loading-logo" alt="Logo" />
            <div class="app-loading-title">%VITE_APP_TITLE%</div>
          </div>
          <div class="app-loading-item">
--- a/src/assets/imgs/logo_white.png
+++ b/src/assets/imgs/logo_white.png
--- a/src/layout/components/Logo/src/Logo.vue
+++ b/src/layout/components/Logo/src/Logo.vue
@ -78,6 +78,10 @@ watch(
      to="/"
    >
    <img
+        class="h-24px w-160px h-40px"
+        src="@/assets/imgs/logo_white.png"
+      />
+      <!-- <img
        class="h-24px w-[calc(var(--logo-height)-20px)]"
        src="@/assets/imgs/logo_white.svg"
      />
@ -93,7 +97,7 @@ watch(
        ]"
      >
        {{ title }}
-      </div>
+      </div> -->
    </router-link>
  </div>
 </template>
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@ -9,7 +9,7 @@
      >
        <!-- 左上角的 logo + 系统标题 -->
        <div class="relative flex items-center text-white">
-          <img alt="" class="mr-10px h-24px w-48px" src="@/assets/imgs/logo.png" />
+          <img alt="" class="mr-10px h-40px w-160px" src="@/assets/imgs/logo_white.png" />
          <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
        </div>
        <!-- 左边的背景图 + 欢迎语 -->
@ -33,7 +33,7 @@
          class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
        >
          <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
+            <img alt="" class="mr-10px h-40px w-160px" src="@/assets/imgs/logo_white.png" />
            <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
          </div>
          <div class="flex items-center justify-end space-x-10px">
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@ -156,10 +156,11 @@ const handlePoint = async (row) => {
  // 判断是采购还是制造
  if (labelType.value == 'cg') {
    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    console.log(159,row.number )
+    window.open(src.value+'&asn_number='+row.number)
  } else {
    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    window.open(src.value+'&asn_number='+row.number)
  }
 }