szh-new
张同海 7 months ago
parent 21481b0d83
commit cfc85b3ca5

@ -2,7 +2,7 @@
# @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com # @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
# @Date: 2024-04-17 10:30:29 # @Date: 2024-04-17 10:30:29
# @LastEditors: 张同海 14166000+zhangtonghai@user.noreply.gitee.com # @LastEditors: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
# @LastEditTime: 2024-05-06 15:42:39 # @LastEditTime: 2024-05-08 17:52:03
# @FilePath: \ds-wms-client-web\.env.development # @FilePath: \ds-wms-client-web\.env.development
# @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
### ###
@ -22,8 +22,8 @@ VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666
VITE_DROP_CONSOLE = false VITE_DROP_CONSOLE = false
# 后台接口父地址(必填) # 后台接口父地址(必填)
# VITE_GLOB_API_URL=http://localhost:3008 VITE_GLOB_API_URL=http://localhost:3008
VITE_GLOB_API_URL="/api" # 开发 测试环境 # VITE_GLOB_API_URL="/api" # 开发 测试环境
# File upload address optional # File upload address optional
#VITE_GLOB_UPLOAD_URL=http://localhost:8091/api/Common/UploadFile #VITE_GLOB_UPLOAD_URL=http://localhost:8091/api/Common/UploadFile

@ -1,6 +1,9 @@
<!-- <!--
* @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com * @Author: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
* @Date: 2024-04-17 10:30:29 * @Date: 2024-05-06 09:18:47
* @LastEditors: 张同海 14166000+zhangtonghai@user.noreply.gitee.com
* @LastEditTime: 2024-05-08 15:17:28
* @FilePath: \ds-wms-client-web\src\App.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
<template> <template>

@ -1,3 +1,11 @@
/*
* @Author: 14166000+zhangtonghai@user.noreply.gitee.com
* @Date: 2024-04-17 10:30:30
* @LastEditors: 14166000+zhangtonghai@user.noreply.gitee.com
* @LastEditTime: 2024-05-08 17:51:51
* @FilePath: \ds-wms-client-web\src\hooks\web\usePage.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import type { RouteLocationRaw, Router } from 'vue-router' import type { RouteLocationRaw, Router } from 'vue-router'
import { PageEnum } from '/@/enums/pageEnum' import { PageEnum } from '/@/enums/pageEnum'
@ -19,6 +27,8 @@ function handleError(e: Error) {
export function useGo(_router?: Router) { export function useGo(_router?: Router) {
const { push, replace } = _router || useRouter() const { push, replace } = _router || useRouter()
function go(opt: RouteLocationRawEx = PageEnum.BASE_HOME, isReplace = false) { function go(opt: RouteLocationRawEx = PageEnum.BASE_HOME, isReplace = false) {
console.log('go' ,opt ,isReplace);
if (!opt) { if (!opt) {
return return
} }

@ -59,6 +59,8 @@
) )
function handleContext(e) { function handleContext(e) {
console.log('handleContext')
props.tabItem && handleContextMenu(props.tabItem)(e) props.tabItem && handleContextMenu(props.tabItem)(e)
} }

@ -111,6 +111,8 @@
}) })
function handleChange(activeKey: any) { function handleChange(activeKey: any) {
console.log(activeKey)
activeKeyRef.value = activeKey activeKeyRef.value = activeKey
go(activeKey, false) go(activeKey, false)
} }

@ -2408,7 +2408,7 @@ export const cargoInfoFormSchema1: FormSchema[] = [
span: 24, span: 24,
}, },
componentProps: { componentProps: {
rows: 4, rows: 6,
}, },
}, },
] ]

@ -5,9 +5,10 @@
:class="!Showtabs ? 'Showtabs' : ''" :class="!Showtabs ? 'Showtabs' : ''"
:tabBarStyle="tabBarStyle" :tabBarStyle="tabBarStyle"
:activeKey="tabActiveKey" :activeKey="tabActiveKey"
:animated="Object.keys($refs).includes('RefsedOrder') ? false : true"
@change="changeTab" @change="changeTab"
> >
<!-- 暂时隐藏 ZTH -->
<!-- :animated="Object.keys($refs).includes('RefsedOrder') ? false : true" -->
<a-tab-pane key="1" tab="主单信息" :forceRender="true"> <a-tab-pane key="1" tab="主单信息" :forceRender="true">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="18" class="left-box" style="padding-right: 0"> <a-col :span="18" class="left-box" style="padding-right: 0">

@ -1537,7 +1537,6 @@
BookingOrderBachUpdate, BookingOrderBachUpdate,
GetCarrierlist, GetCarrierlist,
DjyCustomerSuggest, DjyCustomerSuggest,
GetYardlist,
GetSysUserPage, GetSysUserPage,
DjyCustomerpage, DjyCustomerpage,
GetCtn, GetCtn,
@ -2653,8 +2652,8 @@
switch (type) { switch (type) {
case 'CARRIER': case 'CARRIER':
return GetCarrierlist return GetCarrierlist
case 'YARDID': // case 'YARDID':
return GetYardlist // return GetYardlist
case 'CNTRTOTAL': case 'CNTRTOTAL':
return GetCtn return GetCtn
case 'KINDPKGS': case 'KINDPKGS':

@ -60,7 +60,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
proxy: createProxy(VITE_PROXY), proxy: createProxy(VITE_PROXY),
}, },
esbuild: { esbuild: {
pure: VITE_DROP_CONSOLE ? ['console.log', 'debugger'] : [], // pure: VITE_DROP_CONSOLE ? ['console.log', 'debugger'] : [], //暂时 关闭 ZTH
}, },
build: { build: {
target: 'es2015', target: 'es2015',

Loading…
Cancel
Save