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
0
Merge Requests
0
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
1a062df6
Commit
1a062df6
authored
Jul 10, 2024
by
zhuzhequan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eslint
parent
2ddc95c3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
39 additions
and
29 deletions
+39
-29
src/api/axios.ts
+1
-1
src/views/AccountStatementNote.vue
+13
-3
src/views/DeliveryNotePage.vue
+4
-4
src/views/UserPage.vue
+3
-3
src/views/order/ProductInfo.vue
+1
-1
src/views/order/ProductInfoInspected.vue
+1
-1
src/views/order/hook/useQuarantine.ts
+2
-2
src/views/order/hook/useShipment.ts
+2
-2
src/views/order/index.vue
+12
-12
No files found.
src/api/axios.ts
View file @
1a062df6
...
@@ -40,7 +40,7 @@ axios.interceptors.response.use((response) => {
...
@@ -40,7 +40,7 @@ axios.interceptors.response.use((response) => {
return
Promise
.
reject
(
data
)
return
Promise
.
reject
(
data
)
}
}
if
(
data
.
code
!==
200
){
if
(
data
.
code
!==
200
){
//
showError(data.message)
showError
(
data
.
message
)
return
Promise
.
reject
(
data
)
return
Promise
.
reject
(
data
)
}
}
}
}
...
...
src/views/AccountStatementNote.vue
View file @
1a062df6
...
@@ -111,6 +111,15 @@
...
@@ -111,6 +111,15 @@
align=
"center"
align=
"center"
></ElTableColumn>
></ElTableColumn>
<ElTableColumn
<ElTableColumn
label=
"客户"
show-overflow-tooltip
prop=
"userMark"
width=
"200"
header-align=
"center"
align=
"center"
></ElTableColumn>
<ElTableColumn
label=
"发货单号"
label=
"发货单号"
show-overflow-tooltip
show-overflow-tooltip
prop=
"billNumber"
prop=
"billNumber"
...
@@ -119,6 +128,7 @@
...
@@ -119,6 +128,7 @@
align=
"center"
align=
"center"
></ElTableColumn>
></ElTableColumn>
<ElTableColumn
<ElTableColumn
label=
"订单号"
label=
"订单号"
show-overflow-tooltip
show-overflow-tooltip
...
@@ -546,7 +556,7 @@ const onEditOrder = async (item: AccountStatementNote) => {
...
@@ -546,7 +556,7 @@ const onEditOrder = async (item: AccountStatementNote) => {
editForm
.
value
=
(
res
.
data
)
as
never
editForm
.
value
=
(
res
.
data
)
as
never
dialogVisible
.
value
=
true
dialogVisible
.
value
=
true
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
...
@@ -556,7 +566,7 @@ const logOrder = async (item: AccountStatementNote) => {
...
@@ -556,7 +566,7 @@ const logOrder = async (item: AccountStatementNote) => {
logList
.
value
=
(
res
.
data
)
as
never
logList
.
value
=
(
res
.
data
)
as
never
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
...
@@ -568,7 +578,7 @@ const submitData = async () => {
...
@@ -568,7 +578,7 @@ const submitData = async () => {
ElMessage
.
success
(
'修改成功'
)
ElMessage
.
success
(
'修改成功'
)
search
()
search
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
rowClick
=
(
row
:
AccountStatementNote
)
=>
{
const
rowClick
=
(
row
:
AccountStatementNote
)
=>
{
...
...
src/views/DeliveryNotePage.vue
View file @
1a062df6
...
@@ -338,7 +338,7 @@ const getNameSpaceList = async () => {
...
@@ -338,7 +338,7 @@ const getNameSpaceList = async () => {
const
res
=
await
getUserMarkList
()
const
res
=
await
getUserMarkList
()
nameSpaceList
.
value
=
res
.
data
nameSpaceList
.
value
=
res
.
data
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
dialogVisible
=
ref
(
false
)
const
dialogVisible
=
ref
(
false
)
...
@@ -363,7 +363,7 @@ const onConfirmDateRange = async () => {
...
@@ -363,7 +363,7 @@ const onConfirmDateRange = async () => {
search
()
search
()
btnLoading
.
value
=
false
btnLoading
.
value
=
false
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
btnLoading
.
value
=
false
btnLoading
.
value
=
false
}
}
}
}
...
@@ -389,7 +389,7 @@ const generateStatement = async () => {
...
@@ -389,7 +389,7 @@ const generateStatement = async () => {
search
()
search
()
ElMessage
.
success
(
'操作成功'
)
ElMessage
.
success
(
'操作成功'
)
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
btnLoading
.
value
=
false
btnLoading
.
value
=
false
}
}
}
}
...
@@ -420,7 +420,7 @@ const onViewOrder = async (item: DeliveryNoteData) => {
...
@@ -420,7 +420,7 @@ const onViewOrder = async (item: DeliveryNoteData) => {
orderDetailData
.
value
=
res
.
data
orderDetailData
.
value
=
res
.
data
orderDetailDialogVisible
.
value
=
true
orderDetailDialogVisible
.
value
=
true
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
copy
=
(
text
:
string
)
=>
{
const
copy
=
(
text
:
string
)
=>
{
...
...
src/views/UserPage.vue
View file @
1a062df6
...
@@ -280,7 +280,7 @@ const deleteUser = async () => {
...
@@ -280,7 +280,7 @@ const deleteUser = async () => {
})
})
search
()
search
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
editUser
=
async
(
item
:
userData
)
=>
{
const
editUser
=
async
(
item
:
userData
)
=>
{
...
@@ -292,7 +292,7 @@ const editUser = async (item: userData) => {
...
@@ -292,7 +292,7 @@ const editUser = async (item: userData) => {
editForm
.
value
=
res
.
data
editForm
.
value
=
res
.
data
dialogVisible
.
value
=
true
dialogVisible
.
value
=
true
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
save
=
async
()
=>
{
const
save
=
async
()
=>
{
...
@@ -343,7 +343,7 @@ const onChangeStatus = async (value: number, item: userData) => {
...
@@ -343,7 +343,7 @@ const onChangeStatus = async (value: number, item: userData) => {
})
})
search
()
search
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
</
script
>
</
script
>
...
...
src/views/order/ProductInfo.vue
View file @
1a062df6
...
@@ -170,7 +170,7 @@ const downloadManuscriptBySubOrder = async (item: ProductList) => {
...
@@ -170,7 +170,7 @@ const downloadManuscriptBySubOrder = async (item: ProductList) => {
const
res
=
await
downloadOrder
(
item
.
id
)
const
res
=
await
downloadOrder
(
item
.
id
)
window
.
open
(
filePath
+
res
.
message
)
window
.
open
(
filePath
+
res
.
message
)
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
copy
=
(
text
:
string
)
=>
{
const
copy
=
(
text
:
string
)
=>
{
...
...
src/views/order/ProductInfoInspected.vue
View file @
1a062df6
...
@@ -200,7 +200,7 @@ const downloadManuscriptBySubOrder = async (item: ProductList) => {
...
@@ -200,7 +200,7 @@ const downloadManuscriptBySubOrder = async (item: ProductList) => {
const
res
=
await
downloadOrder
(
item
.
id
)
const
res
=
await
downloadOrder
(
item
.
id
)
window
.
open
(
filePath
+
res
.
message
)
window
.
open
(
filePath
+
res
.
message
)
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
copy
=
(
text
:
string
)
=>
{
const
copy
=
(
text
:
string
)
=>
{
...
...
src/views/order/hook/useQuarantine.ts
View file @
1a062df6
...
@@ -129,7 +129,7 @@ export default function useQuarantine() {
...
@@ -129,7 +129,7 @@ export default function useQuarantine() {
qaInputRef
.
value
.
focus
()
qaInputRef
.
value
.
focus
()
isLock
.
value
=
false
isLock
.
value
=
false
qaCode
.
value
=
''
qaCode
.
value
=
''
showError
(
e
)
//
showError(e)
playAudio
(
'picking_search_error'
)
playAudio
(
'picking_search_error'
)
}
}
}
}
...
@@ -159,7 +159,7 @@ export default function useQuarantine() {
...
@@ -159,7 +159,7 @@ export default function useQuarantine() {
dzjTotal
.
value
=
0
dzjTotal
.
value
=
0
callback
&&
callback
()
callback
&&
callback
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
onQaDialogOpened
=
()
=>
{
const
onQaDialogOpened
=
()
=>
{
...
...
src/views/order/hook/useShipment.ts
View file @
1a062df6
...
@@ -140,7 +140,7 @@ export default function useShipment(callback?: () => void) {
...
@@ -140,7 +140,7 @@ export default function useShipment(callback?: () => void) {
productionOrderNumber.value = ''
productionOrderNumber.value = ''
isLock.value = false
isLock.value = false
inputRef.value.focus()
inputRef.value.focus()
showError(e)
//
showError(e)
playAudio('picking_search_error')
playAudio('picking_search_error')
} finally {
} finally {
shipmentLoading.value = false
shipmentLoading.value = false
...
@@ -195,7 +195,7 @@ export default function useShipment(callback?: () => void) {
...
@@ -195,7 +195,7 @@ export default function useShipment(callback?: () => void) {
shipmentVisible.value = false
shipmentVisible.value = false
callback && callback()
callback && callback()
} catch (e) {
} catch (e) {
showError(e)
//
showError(e)
}
}
}
}
const confirmDelivery = async () => {
const confirmDelivery = async () => {
...
...
src/views/order/index.vue
View file @
1a062df6
...
@@ -924,7 +924,7 @@ const getLogisticsList = async () => {
...
@@ -924,7 +924,7 @@ const getLogisticsList = async () => {
const
res
=
await
getLogisticsCompanyList
()
const
res
=
await
getLogisticsCompanyList
()
logisticsCompanyList
.
value
=
res
.
data
logisticsCompanyList
.
value
=
res
.
data
}
catch
(
error
)
{
}
catch
(
error
)
{
showError
(
error
)
//
showError(error)
}
}
}
}
const
sendOrderList
=
ref
<
SendOrderData
[]
>
([])
const
sendOrderList
=
ref
<
SendOrderData
[]
>
([])
...
@@ -936,7 +936,7 @@ const openShipment = async (id: number) => {
...
@@ -936,7 +936,7 @@ const openShipment = async (id: number) => {
sendOrderList
.
value
=
res
.
data
sendOrderList
.
value
=
res
.
data
sendOrderVisible
.
value
=
true
sendOrderVisible
.
value
=
true
}
catch
(
error
)
{
}
catch
(
error
)
{
showError
(
error
)
//
showError(error)
}
}
}
}
const
arraySpanMethod
=
({
columnIndex
}
:
SpanMethodProps
)
=>
{
const
arraySpanMethod
=
({
columnIndex
}
:
SpanMethodProps
)
=>
{
...
@@ -962,7 +962,7 @@ const loadTabData = async () => {
...
@@ -962,7 +962,7 @@ const loadTabData = async () => {
const
res
=
await
getOrderTabData
()
const
res
=
await
getOrderTabData
()
tabsNav
.
value
=
res
.
data
tabsNav
.
value
=
res
.
data
}
catch
(
error
)
{
}
catch
(
error
)
{
showError
(
error
)
//
showError(error)
}
}
}
}
const
handleSelectionChange
=
(
s
:
OrderData
[])
=>
{
const
handleSelectionChange
=
(
s
:
OrderData
[])
=>
{
...
@@ -993,7 +993,7 @@ const confirmProduce = async () => {
...
@@ -993,7 +993,7 @@ const confirmProduce = async () => {
await
loadTabData
()
await
loadTabData
()
ElMessage
.
success
(
res
.
message
)
ElMessage
.
success
(
res
.
message
)
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
// 下载稿件
// 下载稿件
...
@@ -1055,7 +1055,7 @@ const reGenerateManuscript = async () => {
...
@@ -1055,7 +1055,7 @@ const reGenerateManuscript = async () => {
ElMessage
.
success
(
res
.
message
)
ElMessage
.
success
(
res
.
message
)
search
()
search
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
// 打印生产单
// 打印生产单
...
@@ -1084,7 +1084,7 @@ const printManuscript = async () => {
...
@@ -1084,7 +1084,7 @@ const printManuscript = async () => {
btnLoading
.
value
=
false
btnLoading
.
value
=
false
window
.
open
(
filePath
+
res
.
message
)
window
.
open
(
filePath
+
res
.
message
)
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
btnLoading
.
value
=
false
btnLoading
.
value
=
false
}
}
}
}
...
@@ -1094,7 +1094,7 @@ const exportManuscript = async () => {
...
@@ -1094,7 +1094,7 @@ const exportManuscript = async () => {
const
res
=
await
exportOrder
(
statusCode
.
value
)
const
res
=
await
exportOrder
(
statusCode
.
value
)
window
.
open
(
filePath
+
res
.
message
)
window
.
open
(
filePath
+
res
.
message
)
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
refreshProduct
=
async
()
=>
{
const
refreshProduct
=
async
()
=>
{
...
@@ -1124,7 +1124,7 @@ const refreshProduct = async () => {
...
@@ -1124,7 +1124,7 @@ const refreshProduct = async () => {
loadTabData
()
loadTabData
()
search
()
search
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
// 添加内部便签
// 添加内部便签
...
@@ -1153,7 +1153,7 @@ const addInternalTag = async () => {
...
@@ -1153,7 +1153,7 @@ const addInternalTag = async () => {
loadTabData
()
loadTabData
()
search
()
search
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
)
}
)
}
}
...
@@ -1166,7 +1166,7 @@ const openDetail = async (id: number) => {
...
@@ -1166,7 +1166,7 @@ const openDetail = async (id: number) => {
orderDetailData
.
value
=
res
.
data
orderDetailData
.
value
=
res
.
data
orderDetailDialogVisible
.
value
=
true
orderDetailDialogVisible
.
value
=
true
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
const
logVisible
=
ref
(
false
)
const
logVisible
=
ref
(
false
)
...
@@ -1178,7 +1178,7 @@ const openLog = async (id: number) => {
...
@@ -1178,7 +1178,7 @@ const openLog = async (id: number) => {
logList
.
value
=
res
.
data
logList
.
value
=
res
.
data
logVisible
.
value
=
true
logVisible
.
value
=
true
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
// 取消
// 取消
...
@@ -1202,7 +1202,7 @@ const cancelOrder = async (id: number) => {
...
@@ -1202,7 +1202,7 @@ const cancelOrder = async (id: number) => {
loadTabData
()
loadTabData
()
search
()
search
()
}
catch
(
e
)
{
}
catch
(
e
)
{
showError
(
e
)
//
showError(e)
}
}
}
}
...
...
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