Преглед изворни кода

修改的跳转到工单管理

xiaodai2017 пре 1 година
родитељ
комит
26d093fa80
5 измењених фајлова са 24 додато и 8 уклоњено
  1. 4 2
      .env.development
  2. 2 0
      .env.v3_pro
  3. 3 2
      .env.v3_sit
  4. 2 0
      src/components/ReIcon/src/iconifyIconOffline.ts
  5. 13 4
      src/layout/components/navbar.vue

+ 4 - 2
.env.development

@@ -16,14 +16,16 @@ VITE_APP_ID = "ww6076e6fd4268ee31"
 # 微信开发环境基础重定向url
 REDIRECT_BASE_URL = "http://cxinv.api.caixiao365.com"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL = "http://cxinv.api.caixiao365.com"
+VITE_PROXY_USER_REAL = "http://stockinv.test241.wanyuhengtong.com"
 # 开发环境后端业务地址
-VITE_PROXY_DOMAIN_REAL = "http://cxinv.api.caixiao365.com"
+VITE_PROXY_DOMAIN_REAL = "http://cxinv.test241.wanyuhengtong.com"
 
 VITE_IS_PROD = true
 
 # 跳转采销地址
 VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
+# 跳转工单地址
+VITE_GD_URL='http://localhost:8080/'
 
 # token密钥
 VITE_SECRET_KEY = 'key123'

+ 2 - 0
.env.v3_pro

@@ -24,6 +24,8 @@ VITE_IS_PROD = true
 
 # 跳转采销地址
 VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
+# 跳转工单地址
+VITE_GD_URL='http://bugweb.test241.wanyuhengtong.com/'
 
 # token密钥
 VITE_SECRET_KEY = 'key123'

+ 3 - 2
.env.v3_sit

@@ -22,7 +22,8 @@ VITE_PROXY_DOMAIN_REAL = "http://cxinv.test241.wanyuhengtong.com"
 VITE_IS_PROD = false
 
 # 跳转结算地址
-VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com'
-
+VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com/'
+# 跳转工单地址
+VITE_GD_URL='http://bugweb.test241.wanyuhengtong.com/'
 # token密钥
 VITE_SECRET_KEY = 'key123'

+ 2 - 0
src/components/ReIcon/src/iconifyIconOffline.ts

@@ -46,8 +46,10 @@ import BellFilled from "@iconify-icons/ep/bell-filled";
 import downloadLine from "@iconify-icons/ep/download";
 import QuestionFilled from "@iconify-icons/ep/question-filled";
 import Sort from "@iconify-icons/ep/sort";
+import Management from "@iconify-icons/ep/management";
 
 addIcon("sort", Sort);
+addIcon("Management", Management);
 addIcon("download-line", downloadLine);
 addIcon("question-filled", QuestionFilled);
 addIcon("bell-filled", BellFilled);

+ 13 - 4
src/layout/components/navbar.vue

@@ -29,7 +29,7 @@ const { logout, toggleSideBar, pureApp, avatarsStyle } = useNav();
 
 let timerID: NodeJS.Timeout | null = null;
 
-const { VITE_PURCHASE_URL, VITE_SECRET_KEY } = loadEnv();
+const { VITE_PURCHASE_URL, VITE_GD_URL, VITE_SECRET_KEY } = loadEnv();
 
 const SuperCompanyRef = ref<InstanceType<typeof Super> | null>(null);
 
@@ -50,7 +50,7 @@ function routeToList() {
   );
 }
 
-function openPurchaseSystem() {
+function openPurchaseSystem(type) {
   const encJson = CryptoJS.AES.encrypt(
     JSON.stringify({ token: getToken() }),
     VITE_SECRET_KEY
@@ -59,8 +59,12 @@ function openPurchaseSystem() {
   const encData = CryptoJS.enc.Base64.stringify(
     CryptoJS.enc.Utf8.parse(encJson)
   );
+  const url =
+    type === 1
+      ? VITE_PURCHASE_URL + "#/accept?t="
+      : VITE_GD_URL + "#/demand/index?t=";
 
-  window.open(VITE_PURCHASE_URL + "/#/accept?t=" + encData);
+  window.open(url + encData);
 }
 
 //超管切换供应商、业务公司视角
@@ -131,8 +135,13 @@ async function onSwitchAccountMode() {
       </el-tooltip>
 
       <!-- 采销系统入口 -->
+      <el-tooltip placement="bottom" content="登录工单管理系统">
+        <p class="bell-icon shake" @click="openPurchaseSystem(2)">
+          <IconifyIconOffline icon="Management" />
+        </p>
+      </el-tooltip>
       <el-tooltip placement="bottom" content="登录采销平台">
-        <p class="bell-icon shake" @click="openPurchaseSystem">
+        <p class="bell-icon shake" @click="openPurchaseSystem(1)">
           <IconifyIconOffline icon="promotion" />
         </p>
       </el-tooltip>