Browse Source

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

master_hella_20240701
zhaoxuebing 8 months ago
parent
commit
d6c951e3ae
  1. 4
      src/views/login/components/LoginForm.vue
  2. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

4
src/views/login/components/LoginForm.vue

@ -100,7 +100,7 @@ const iconLock = useIcon({ icon: 'ep:lock' })
const formLogin = ref() const formLogin = ref()
const { validForm } = useFormValid(formLogin) const { validForm } = useFormValid(formLogin)
const { setLoginState, getLoginState } = useLoginState() const { setLoginState, getLoginState } = useLoginState()
const { currentRoute, push } = useRouter() const { currentRoute, push , replace} = useRouter()
const permissionStore = usePermissionStore() const permissionStore = usePermissionStore()
const redirect = ref<string>('') const redirect = ref<string>('')
const loginLoading = ref(false) const loginLoading = ref(false)
@ -215,7 +215,7 @@ const handleLogin = async (params) => {
window.location.href = window.location.href.replace('/login?redirect=', '') window.location.href = window.location.href.replace('/login?redirect=', '')
} else { } else {
console.log(redirect.value) console.log(redirect.value)
push({ path: redirect.value || permissionStore.addRouters[0].path }) replace({ path: redirect.value || permissionStore.addRouters[0].path })
} }
// //
const { wsCache } = useCache() const { wsCache } = useCache()

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@ -818,7 +818,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
export const PurchaseDetailRules = reactive({ export const PurchaseDetailRules = reactive({
lineNumber: [ lineNumber: [
{ required: true, message: '请输入行号', trigger: 'blur' }, { required: true, message: '请输入行号', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
packQty: [ packQty: [
{ required: true, message: '请输入包装数量', trigger: 'blur' } { required: true, message: '请输入包装数量', trigger: 'blur' }

Loading…
Cancel
Save