Browse Source

feat(env): 更新测试环境配置

将测试环境的后端服务地址切换为新的测试服务器地址,并注释掉旧的配置项。同时,
移除了一个未使用的图标类型声明,优化了文件导出时的时间戳格式,并在两个财务模块
中新增了“人员属性”筛选字段及其权限控制。
zhangtao 1 week ago
parent
commit
0aaf33c759

+ 2 - 2
.env.test

@@ -2,12 +2,12 @@
 # VITE_SERVICE_BASE_URL=http://74949mkfh190.vicp.fun
 # VITE_SERVICE_BASE_URL=http://192.168.1.253:8114 #付
 # VITE_SERVICE_BASE_URL=http://192.168.0.157:8114 #王
-VITE_SERVICE_BASE_URL=http://192.168.1.166:8114 #张
+# VITE_SERVICE_BASE_URL=http://192.168.1.166:8114 #张
 # VITE_SERVICE_BASE_URL=http://192.168.1.66:8114 #邓
 # VITE_SERVICE_BASE_URL=https://mock.apifox.cn/m1/3109515-0-default
 # VITE_SERVICE_BASE_URL=https://shop.platform.zswlgz.com #服务器
 # VITE_SERVICE_BASE_URL=/plt #测试打包服务器
-# VITE_SERVICE_BASE_URL=http://47.109.84.152:8114 #测试本地服务器
+VITE_SERVICE_BASE_URL=http://47.109.84.152:8114 #测试本地服务器
 
 
 # other backend service base url, test environment

+ 0 - 1
src/typings/components.d.ts

@@ -41,7 +41,6 @@ declare module 'vue' {
     IconIcRoundPlus: typeof import('~icons/ic/round-plus')['default']
     IconLocalActivity: typeof import('~icons/local/activity')['default']
     IconLocalCast: typeof import('~icons/local/cast')['default']
-    IconLocalLogo: typeof import('~icons/local/logo')['default']
     'IconMaterialSymbolsLight:rotate90DegreesCcwOutlineRounded': typeof import('~icons/material-symbols-light/rotate90-degrees-ccw-outline-rounded')['default']
     'IconMdi:printer': typeof import('~icons/mdi/printer')['default']
     IconMdiArrowDownThin: typeof import('~icons/mdi/arrow-down-thin')['default']

+ 2 - 3
src/utils/common.ts

@@ -91,14 +91,13 @@ export function commonExport(url: string, params: any, filename: string) {
         link.href = exportUrl;
         const nameWithoutExt = filename.substring(0, filename.lastIndexOf('.'));
         const ext = filename.substring(filename.lastIndexOf('.'));
-        link.download = `${nameWithoutExt}_${dayjs().valueOf()}${ext}`;
+        const time = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        link.download = `${nameWithoutExt}_${time}${ext}`;
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);
         URL.revokeObjectURL(url);
         window.$message?.success('导出成功');
-        console.log(res, '导出');
-
         resolve(res);
       })
       .catch(err => {

+ 10 - 0
src/views/finance/commodity-freight/index.vue

@@ -138,6 +138,16 @@ const [registerTable, { refresh, setTableLoading, setFieldsValue, getSeachForm,
         componentProps: {
           type: 'datetimerange'
         }
+      },
+      {
+        field: 'userAttrType',
+        label: '人员属性',
+        component: 'dictSelect',
+        componentProps: {
+          dictCode: 'user_attr_type',
+          immediate: true
+        },
+        show: useAuth().hasAuth('user:attr:type')
       }
     ],
     labelWidth: 120,

+ 10 - 0
src/views/finance/summary/index.vue

@@ -89,6 +89,16 @@ const [registerTable, { refresh, setTableLoading, setFieldsValue, getSeachForm,
         componentProps: {
           type: 'datetimerange'
         }
+      },
+      {
+        field: 'userAttrType',
+        label: '人员属性',
+        component: 'dictSelect',
+        componentProps: {
+          dictCode: 'user_attr_type',
+          immediate: true
+        },
+        show: useAuth().hasAuth('user:attr:type')
       }
     ],
     labelWidth: 120,