snow 8 months ago
parent
commit
32457a3cc5

+ 8 - 7
.env.development

@@ -16,18 +16,16 @@ VITE_APP_ID = "ww6076e6fd4268ee31"
 # 微信开发环境基础重定向url
 REDIRECT_BASE_URL = "http://cxinv.api.caixiao365.com"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL1 = "http://user.api.caixiao365.com"
+VITE_PROXY_USER_REAL1 = "http://user.test241.wanyuhengtong.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://stockinv.test241.wanyuhengtong.com"
 
 VITE_IS_PROD = true
 
-# 跳转采销地址
-VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
-# 跳转工单地址
-VITE_GD_URL = 'http://bug.caixiao365.com/'
+# 跳转结算地址
+VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com/'
 
 # 报表地址
 VITE_DASHBOARD_URL = 'http://web.report.caixiao365.com/'
@@ -35,3 +33,6 @@ VITE_DASHBOARD_URL = 'http://web.report.caixiao365.com/'
 # token密钥
 VITE_SECRET_KEY = 'key123'
 
+
+# 跳转工单地址
+VITE_GD_URL = 'http//bugweb.test241.wanyuhengtong.com/'

BIN
dist-zip/build.zip


+ 2 - 2
src/views/InvoiceSales/sheetOrderPool/config/content.config.ts

@@ -240,9 +240,9 @@ const contentConfig: ContentConfig = {
   // 回票标签
   showReturnTagFn: ({ is_comon }, permissions) => permissions.includes("015"),
   // 解除付款标签
-  showUnPayTagFn: ({ status, is_comon }, permissions) => permissions.includes("061"),
+  showUnPayTagFn: ({ status, is_comon }, permissions) => permissions.includes("059"),
   // 解除回票标签
-  showUnReturnTagFn: ({ status, is_comon }, permissions) => permissions.includes("062"),
+  showUnReturnTagFn: ({ status, is_comon }, permissions) => permissions.includes("060"),
   apis: { httpList }
 };
 

+ 2 - 2
src/views/invCategory/invCategory/config/content.config.ts

@@ -43,12 +43,12 @@ const columns = [
   },
   {
     label: '建议开票税目',
-    prop: 'supplierName',
+    prop: 'cat_desc',
     minWidth: '200px'
   },
   {
     label: '备注',
-    prop: 'supplierName',
+    prop: 'remark',
     minWidth: '200px'
   },
 ];

+ 6 - 6
vite.config.ts

@@ -64,12 +64,12 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
             }
           : null
     },
-    plugins: [...getPluginsList(command, VITE_LEGACY)
-      //   zipPack({
-      //   inDir:'dist',
-      //   outFileName:'build.zip',
-      //   pathPrefix:''
-      // })
+    plugins: [...getPluginsList(command, VITE_LEGACY),
+      zipPack({
+        inDir:'dist',
+        outFileName:'build.zip',
+        pathPrefix:''
+      })
   ],
     optimizeDeps: {
       include: ["pinia", "lodash-es", "@vueuse/core"],