Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
factory_front
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qinjianhui
factory_front
Commits
304a579e
Commit
304a579e
authored
Jul 16, 2024
by
zhuzhequan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eslint 报错
parent
01070396
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
18 additions
and
22 deletions
+18
-22
components.d.ts
+0
-1
src/api/order.ts
+2
-2
src/components/NavMenu.vue
+0
-1
src/components/splitDiv/splitDiv.vue
+10
-7
src/store/user.ts
+0
-1
src/utils/hooks/usePageList.ts
+0
-1
src/views/DeliveryNotePage.vue
+1
-1
src/views/Login.vue
+0
-1
src/views/UserPage.vue
+1
-1
src/views/order/ProductInfo.vue
+0
-1
src/views/order/ProductInfoInspected.vue
+0
-1
src/views/order/hook/useQuarantine.ts
+1
-1
src/views/order/hook/useShipment.ts
+0
-1
src/views/order/index.vue
+3
-2
No files found.
components.d.ts
View file @
304a579e
...
...
@@ -11,7 +11,6 @@ declare module 'vue' {
ElCheckbox
:
typeof
import
(
'element-plus/es'
)[
'ElCheckbox'
]
ElCol
:
typeof
import
(
'element-plus/es'
)[
'ElCol'
]
ElConfigProvider
:
typeof
import
(
'element-plus/es'
)[
'ElConfigProvider'
]
ElDate
:
typeof
import
(
'element-plus/es'
)[
'ElDate'
]
ElDatePicker
:
typeof
import
(
'element-plus/es'
)[
'ElDatePicker'
]
ElDialog
:
typeof
import
(
'element-plus/es'
)[
'ElDialog'
]
ElDrawer
:
typeof
import
(
'element-plus/es'
)[
'ElDrawer'
]
...
...
src/api/order.ts
View file @
304a579e
...
...
@@ -53,14 +53,14 @@ export function downloadOrder(id: number) {
}
// 重新生成稿件
export
function
reGenerateScriptUrlApi
(
ids
:
string
)
{
export
function
reGenerateScriptUrlApi
(
ids
:
number
[]
)
{
return
axios
.
post
<
never
,
BaseRespData
<
never
>>
(
'factory/customJomallOrder/rebuildFileByOrderId'
,
ids
,
)
}
export
function
reCreateScriptUrlApi
(
id
:
string
)
{
export
function
reCreateScriptUrlApi
(
id
:
number
)
{
return
axios
.
get
<
never
,
BaseRespData
<
never
>>
(
'factory/customJomallOrder/rebuildFileByOrderId'
,
{
...
...
src/components/NavMenu.vue
View file @
304a579e
...
...
@@ -107,7 +107,6 @@ import Menu from '@/router/menu'
import
userUserStore
from
'@/store/user'
import
type
{
FormRules
}
from
'element-plus'
import
{
useValue
}
from
'@/utils/hooks/useValue'
import
{
showError
}
from
'@/utils/ui'
import
{
changePasswordApi
}
from
'@/api/auth'
interface
PasswordForm
{
oldPwd
:
string
...
...
src/components/splitDiv/splitDiv.vue
View file @
304a579e
...
...
@@ -7,21 +7,24 @@ import { onMounted, onUnmounted, ref } from 'vue'
const
props
=
defineProps
({
size
:
{
default
:
''
,
type
:
String
,
type
:
String
||
Number
,
},
})
const
domSize
=
ref
<
number
>
(
0
)
const
domSize
=
ref
<
string
>
(
'0'
)
function
domResize
()
{
const
father
=
document
.
getElementsByClassName
(
'splitpanes'
)[
0
]
const
top
=
document
.
getElementById
(
'top'
)
const
v
=
((
top
.
clientHeight
/
father
.
clientHeight
)
*
100
).
toFixed
(
2
)
if
(
top
&&
father
){
const
v
=
((
top
.
clientHeight
/
father
?.
clientHeight
)
*
100
).
toFixed
(
2
)
if
(
props
.
size
===
''
)
{
domSize
.
value
=
v
}
else
{
domSize
.
value
=
props
.
size
if
(
props
.
size
===
''
)
{
domSize
.
value
=
v
}
else
{
domSize
.
value
=
props
.
size
}
}
}
onUnmounted
(()
=>
{
window
.
removeEventListener
(
'resize'
,
domResize
)
...
...
src/store/user.ts
View file @
304a579e
...
...
@@ -2,7 +2,6 @@ import { defineStore } from 'pinia'
import
{
LoginReq
,
SysUser
}
from
'@/types/api/auth'
import
{
loginApi
}
from
'@/api/auth'
import
{
showError
}
from
'@/utils/ui'
import
{
setToken
}
from
'@/api/axios'
import
router
from
'@/router'
...
...
src/utils/hooks/usePageList.ts
View file @
304a579e
import
{
Ref
,
onMounted
,
ref
}
from
'vue'
import
{
showError
}
from
'../ui'
import
type
{
PaginationData
}
from
'@/types/api'
...
...
src/views/DeliveryNotePage.vue
View file @
304a579e
...
...
@@ -264,7 +264,7 @@ import {
import
{
getUserMarkList
}
from
'@/api/auth'
import
{
ref
,
onMounted
}
from
'vue'
import
{
val
}
from
'@/utils'
import
{
showConfirm
,
showError
}
from
'@/utils/ui'
import
{
showConfirm
}
from
'@/utils/ui'
import
{
filePath
}
from
'@/api/axios'
import
{
type
CellCls
,
ElMessage
}
from
'element-plus'
import
OrderDetail
from
'./order/OrderDetail.vue'
...
...
src/views/Login.vue
View file @
304a579e
...
...
@@ -74,7 +74,6 @@ import { reactive, ref } from 'vue'
import
{
LoginReq
}
from
'@/types/api/auth'
import
type
{
FormInstance
,
FormRules
}
from
'element-plus'
import
useUserStore
from
'@/store/user'
import
{
showError
}
from
'@/utils/ui'
const
loginFormRef
=
ref
<
FormInstance
>
()
const
loginForm
=
reactive
<
LoginReq
>
({
...
...
src/views/UserPage.vue
View file @
304a579e
...
...
@@ -207,7 +207,7 @@ import Icon from '@/components/Icon.vue'
import
{
UserEditForm
,
userData
,
userSearchForm
}
from
'@/types/api/user'
import
usePageList
from
'@/utils/hooks/usePageList'
import
{
useValue
}
from
'@/utils/hooks/useValue'
import
{
showConfirm
,
showError
}
from
'@/utils/ui'
import
{
showConfirm
}
from
'@/utils/ui'
import
{
Edit
}
from
'@element-plus/icons-vue'
import
type
{
FormRules
}
from
'element-plus'
import
{
reactive
,
ref
}
from
'vue'
...
...
src/views/order/ProductInfo.vue
View file @
304a579e
...
...
@@ -149,7 +149,6 @@ import { DocumentCopy } from '@element-plus/icons-vue'
import
{
filePath
}
from
'@/api/axios'
import
{
downloadOrder
}
from
'@/api/order'
import
{
OrderData
,
ProductList
}
from
'@/types/api/order'
import
{
showError
}
from
'@/utils/ui'
import
{
PropType
}
from
'vue'
defineProps
({
...
...
src/views/order/ProductInfoInspected.vue
View file @
304a579e
...
...
@@ -179,7 +179,6 @@ import { DocumentCopy } from '@element-plus/icons-vue'
import
{
filePath
}
from
'@/api/axios'
import
{
downloadOrder
}
from
'@/api/order'
import
{
OrderData
,
ProductList
}
from
'@/types/api/order'
import
{
showError
}
from
'@/utils/ui'
import
{
PropType
}
from
'vue'
defineProps
({
...
...
src/views/order/hook/useQuarantine.ts
View file @
304a579e
import
{
getQaOrderBySubOrderNumber
,
qaFinishedApi
}
from
'@/api/order'
import
{
InspectionData
,
QaData
}
from
'@/types/api/order'
import
{
useValue
}
from
'@/utils/hooks/useValue'
import
{
showConfirm
,
showError
}
from
'@/utils/ui'
import
{
showConfirm
}
from
'@/utils/ui'
import
{
computed
,
ref
}
from
'vue'
export
default
function
useQuarantine
()
{
...
...
src/views/order/hook/useShipment.ts
View file @
304a579e
...
...
@@ -6,7 +6,6 @@ import {
ShipmentOrderRes
,
}
from
'@/types/api/order'
import
{
useValue
}
from
'@/utils/hooks/useValue'
import
{
showError
}
from
'@/utils/ui'
import
{
nextTick
,
ref
}
from
'vue'
import
{
ShipmentType
}
from
'../Shipment.vue'
export
default
function
useShipment
(
callback
?:
()
=>
void
)
{
...
...
src/views/order/index.vue
View file @
304a579e
...
...
@@ -858,7 +858,7 @@ const [searchForm] = useValue<SearchForm>({
subOrderNumber
:
''
,
}
)
const
tabsNav
=
ref
<
Tab
[]
>
([])
const
splitRef
=
ref
<
never
>
()
const
splitRef
=
ref
<
InstanceType
<
typeof
SplitDiv
>
>
()
const
btnLoading
=
ref
<
boolean
>
(
false
)
function
getStartTime
()
{
const
date
=
new
Date
()
...
...
@@ -1108,7 +1108,8 @@ const changeTab = (item: Tab) => {
searchForm
.
value
.
timeType
=
''
search
()
nextTick
(()
=>
{
splitRef
.
value
.
domResize
()
(
splitRef
.
value
)
!
.
domResize
()
}
)
}
const
copy
=
(
text
:
string
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment