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
21cc65b9
Commit
21cc65b9
authored
Aug 21, 2024
by
wq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
8.21
parent
6a1b610a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
223 additions
and
77 deletions
+223
-77
package-lock.json
+0
-0
src/api/order.ts
+12
-1
src/views/order/ProductInfo.vue
+0
-1
src/views/order/index.vue
+211
-75
No files found.
package-lock.json
View file @
21cc65b9
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/api/order.ts
View file @
21cc65b9
...
@@ -148,7 +148,18 @@ export function loadSendOutList(id: number) {
...
@@ -148,7 +148,18 @@ export function loadSendOutList(id: number) {
},
},
)
)
}
}
// 设置备注
export
function
backEndCommentsApi
(
id
:
number
,
remark
:
string
)
{
return
axios
.
get
<
never
,
BaseRespData
<
SendOrderData
[]
>>
(
'factory/customJomallOrderProduct/setRemark'
,
{
params
:
{
id
,
remark
},
},
)
}
// 操作日志
// 操作日志
export
function
getLogList
(
id
:
number
)
{
export
function
getLogList
(
id
:
number
)
{
return
axios
.
get
<
never
,
BaseRespData
<
LogListData
[]
>>
(
return
axios
.
get
<
never
,
BaseRespData
<
LogListData
[]
>>
(
...
...
src/views/order/ProductInfo.vue
View file @
21cc65b9
...
@@ -102,7 +102,6 @@
...
@@ -102,7 +102,6 @@
</span>
</span>
</div>
</div>
<div
<div
v-if=
"item.remark"
:title=
"item.remark || ''"
:title=
"item.remark || ''"
class=
"order-list-expand_item_info_title"
class=
"order-list-expand_item_info_title"
>
>
...
...
src/views/order/index.vue
View file @
21cc65b9
...
@@ -6,15 +6,35 @@
...
@@ -6,15 +6,35 @@
<div
class=
"header-filter-form"
>
<div
class=
"header-filter-form"
>
<ElForm
:model=
"searchForm"
size=
"default"
inline
>
<ElForm
:model=
"searchForm"
size=
"default"
inline
>
<ElFormItem>
<ElFormItem>
<el-select
v-model=
"searchForm.timeType"
clearable
style=
"width:100px;margin-right: 5px ;"
placeholder=
"时间类型"
>
<el-select
<el-option
v-if=
"statusCode !== 6"
value=
"1"
label=
"创建时间"
></el-option>
v-model=
"searchForm.timeType"
clearable
style=
"width: 100px; margin-right: 5px"
placeholder=
"时间类型"
>
<el-option
v-if=
"statusCode !== 6"
value=
"1"
label=
"创建时间"
></el-option>
<el-option
value=
"2"
label=
"确认时间"
></el-option>
<el-option
value=
"2"
label=
"确认时间"
></el-option>
<el-option
v-if=
"statusCode !== 6"
value=
"3"
label=
"完成时间"
></el-option>
<el-option
<el-option
v-if=
"statusCode === 6"
value=
"4"
label=
"发货时间"
></el-option>
v-if=
"statusCode !== 6"
value=
"3"
label=
"完成时间"
></el-option>
<el-option
v-if=
"statusCode === 6"
value=
"4"
label=
"发货时间"
></el-option>
</el-select>
</el-select>
<el-date-picker
<el-date-picker
v-model=
"timeRange"
v-model=
"timeRange"
:default-time=
"[new Date(0,0,0,0,0,0),new Date(0,0,0,23,59,59)]"
:default-time=
"[
new Date(0, 0, 0, 0, 0, 0),
new Date(0, 0, 0, 23, 59, 59),
]"
placeholder=
"收货人"
placeholder=
"收货人"
value-format=
"YYYY-MM-DD HH:mm:ss"
value-format=
"YYYY-MM-DD HH:mm:ss"
type=
"datetimerange"
type=
"datetimerange"
...
@@ -24,7 +44,6 @@
...
@@ -24,7 +44,6 @@
clearable
clearable
style=
"width: 210px"
style=
"width: 210px"
>
>
</el-date-picker>
</el-date-picker>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"SKU"
>
<ElFormItem
label=
"SKU"
>
...
@@ -42,7 +61,9 @@
...
@@ -42,7 +61,9 @@
placeholder=
"请输入成品ID"
placeholder=
"请输入成品ID"
clearable
clearable
style=
"width: 130px"
style=
"width: 130px"
@
blur=
"searchForm.endProductId = searchForm.endProductId.trim()"
@
blur=
"
searchForm.endProductId = searchForm.endProductId.trim()
"
></ElInput>
></ElInput>
</ElFormItem>
</ElFormItem>
<ElFormItem
label=
"生产单号"
>
<ElFormItem
label=
"生产单号"
>
...
@@ -80,7 +101,9 @@
...
@@ -80,7 +101,9 @@
placeholder=
"内部标签"
placeholder=
"内部标签"
clearable
clearable
style=
"width: 130px"
style=
"width: 130px"
@
blur=
"searchForm.internalMemo = searchForm.internalMemo.trim()"
@
blur=
"
searchForm.internalMemo = searchForm.internalMemo.trim()
"
></ElInput>
></ElInput>
</ElFormItem>
</ElFormItem>
<ElFormItem
v-if=
"statusCode === 6"
label=
"物流跟踪号"
>
<ElFormItem
v-if=
"statusCode === 6"
label=
"物流跟踪号"
>
...
@@ -113,7 +136,6 @@
...
@@ -113,7 +136,6 @@
></ElInput>
></ElInput>
</ElFormItem>
</ElFormItem>
<ElFormItem>
<ElFormItem>
<ElButton
type=
"primary"
@
click=
"search"
>
查询
</ElButton>
<ElButton
type=
"primary"
@
click=
"search"
>
查询
</ElButton>
</ElFormItem>
</ElFormItem>
...
@@ -128,7 +150,9 @@
...
@@ -128,7 +150,9 @@
v-for=
"item in tabsNav"
v-for=
"item in tabsNav"
:key=
"item.statusCode"
:key=
"item.statusCode"
class=
"tabs-node"
class=
"tabs-node"
:class=
"item.statusCode === statusCode ? 'tabs-node_active' : ''"
:class=
"
item.statusCode === statusCode ? 'tabs-node_active' : ''
"
@
click=
"changeTab(item)"
@
click=
"changeTab(item)"
>
>
<span
class=
"tabs-node_label"
>
{{
item
.
statusName
}}
</span>
<span
class=
"tabs-node_label"
>
{{
item
.
statusName
}}
</span>
...
@@ -143,7 +167,9 @@
...
@@ -143,7 +167,9 @@
<!--
操作按钮
-->
<!--
操作按钮
-->
<
div
class
=
"order-operate-btn"
>
<
div
class
=
"order-operate-btn"
>
<
span
v
-
if
=
"statusCode === 2"
class
=
"item"
>
<
span
v
-
if
=
"statusCode === 2"
class
=
"item"
>
<
ElButton
type
=
"success"
@
click
=
"confirmProduce"
>
确认生产
<
/ElButton
>
<
ElButton
type
=
"success"
@
click
=
"confirmProduce"
>
确认生产
<
/ElButto
n
>
<
/span
>
<
/span
>
<
span
<
span
...
@@ -151,7 +177,11 @@
...
@@ -151,7 +177,11 @@
class
=
"item"
class
=
"item"
>
>
<
ElButton
<
ElButton
:
disabled
=
"selection.find(item=>item.manuscriptStatus !== 30)"
type
=
"warning"
is
-
dark
:
disabled
=
"
selection.find((item) => item.manuscriptStatus !== 30)
"
type
=
"warning"
is
-
dark
@
click
=
"downloadManuscript"
@
click
=
"downloadManuscript"
>
下载稿件
<
/ElButto
n
>
下载稿件
<
/ElButto
n
>
>
...
@@ -161,23 +191,37 @@
...
@@ -161,23 +191,37 @@
class
=
"item"
class
=
"item"
>
>
<
ElButton
<
ElButton
:
disabled
=
"selection.find(item=>item.manuscriptStatus !== 30) || selection.length!==1"
type
=
"success"
is
-
dark
:
disabled
=
"
selection.find((item) => item.manuscriptStatus !== 30) ||
selection.length !== 1
"
type
=
"success"
is
-
dark
@
click
=
"reGenerateManuscript"
@
click
=
"reGenerateManuscript"
>
重新打包稿件
<
/ElButto
n
>
重新打包稿件
>
<
/ElButton
>
<
/span
>
<
/span
>
<
span
<
span
v
-
if
=
"statusCode === 2 || statusCode === 3 || statusCode === 4"
v
-
if
=
"statusCode === 2 || statusCode === 3 || statusCode === 4"
class
=
"item"
class
=
"item"
>
>
<
ElButton
<
ElButton
:
disabled
=
"selection.find(item=>item.manuscriptStatus !== 30) || selection.length!==1"
:
disabled
=
"
type
=
"warning"
is
-
dark
@
click
=
"reCreateManuscript"
selection.find((item) => item.manuscriptStatus !== 30) ||
>
重新生成稿件
<
/ElButto
n
selection.length !== 1
>
"
type
=
"warning"
is
-
dark
@
click
=
"reCreateManuscript"
>
重新生成稿件
<
/ElButton
>
<
/span
>
<
/span
>
<
span
v
-
if
=
"statusCode === 2 || statusCode === 3"
class
=
"item"
>
<
span
v
-
if
=
"statusCode === 2 || statusCode === 3"
class
=
"item"
>
<
ElButton
:
loading
=
"btnLoading"
type
=
"primary"
dark
@
click
=
"printManuscript"
<
ElButton
:
loading
=
"btnLoading"
type
=
"primary"
dark
@
click
=
"printManuscript"
>
打印生产单
<
/ElButto
n
>
打印生产单
<
/ElButto
n
>
>
<
/span
>
<
/span
>
...
@@ -232,7 +276,11 @@
...
@@ -232,7 +276,11 @@
class
=
"order-list-expand"
class
=
"order-list-expand"
:
style
=
"{ width: `${thOrderDetailWidth + 50
}
px`
}
"
:
style
=
"{ width: `${thOrderDetailWidth + 50
}
px`
}
"
>
>
<
ProductInfo
:
row
=
"row"
:
status
=
"statusCode"
/>
<
ProductInfo
:
row
=
"row"
:
status
=
"statusCode"
@
update
-
remark
=
"handleUpdateRemark"
/>
<
template
v
-
if
=
"row.productList.length > 2"
>
<
template
v
-
if
=
"row.productList.length > 2"
>
<
div
class
=
"order-list-expand_more"
>
<
div
class
=
"order-list-expand_more"
>
<
span
@
click
=
"openAll(row)"
>
<
span
@
click
=
"openAll(row)"
>
...
@@ -243,7 +291,8 @@
...
@@ -243,7 +291,8 @@
><
ArrowDown
/><
/el-ico
n
><
ArrowDown
/><
/el-ico
n
><
/template
>
><
/template
>
<
template
v
-
else
>
<
template
v
-
else
>
收起商品信息
<
el
-
icon
style
=
"vertical-align: middle"
收起商品信息
<
el
-
icon
style
=
"vertical-align: middle"
><
ArrowUp
><
ArrowUp
/><
/el-icon
>
/><
/el-icon
>
<
/template
>
<
/template
>
...
@@ -254,14 +303,18 @@
...
@@ -254,14 +303,18 @@
<
div
class
=
"order-actual-payment"
>
<
div
class
=
"order-actual-payment"
>
<
div
class
=
"order-actual-payment_info"
>
<
div
class
=
"order-actual-payment_info"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
商品价
:
<
/span
>
<
span
class
=
"order-list-expand_item_label"
>
商品价
:
<
/spa
n
>
<
span
class
=
"order-list-expand_item_value"
>
{{
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
productAmount
row
.
productAmount
}}
<
/span
>
}}
<
/span
>
<
/div
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
小计
:
<
/span
>
<
span
class
=
"order-list-expand_item_label"
>
小计
:
<
/spa
n
>
<
span
class
=
"order-list-expand_item_value"
>
{{
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
totalAmount
||
'--'
row
.
totalAmount
||
'--'
}}
<
/span
>
}}
<
/span
>
...
@@ -295,7 +348,10 @@
...
@@ -295,7 +348,10 @@
>
>
<
span
>
{{
memo
.
operatorTime
||
''
}}
<
/span
>
<
span
>
{{
memo
.
operatorTime
||
''
}}
<
/span
>
<
/div
>
<
/div
>
<
div
v
-
if
=
"memo.content"
class
=
"order-memo-item__content"
>
<
div
v
-
if
=
"memo.content"
class
=
"order-memo-item__content"
>
<
span
>
{{
memo
.
content
||
''
}}
<
/span
>
<
span
>
{{
memo
.
content
||
''
}}
<
/span
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
@@ -332,7 +388,10 @@
...
@@ -332,7 +388,10 @@
<
div
class
=
"order-operate"
>
<
div
class
=
"order-operate"
>
<
div
class
=
"order-operate_info"
>
<
div
class
=
"order-operate_info"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
ElButton
text
type
=
"primary"
@
click
=
"openDetail(row.id)"
<
ElButton
text
type
=
"primary"
@
click
=
"openDetail(row.id)"
>
查看详情
>
查看详情
<
/ElButton
>
<
/ElButton
>
<
/div
>
<
/div
>
...
@@ -357,7 +416,10 @@
...
@@ -357,7 +416,10 @@
v
-
if
=
"statusCode === 1 || statusCode === 3"
v
-
if
=
"statusCode === 1 || statusCode === 3"
class
=
"order-list-expand_item_info_title"
class
=
"order-list-expand_item_info_title"
>
>
<
ElButton
text
type
=
"danger"
@
click
=
"cancelOrder(row.id)"
<
ElButton
text
type
=
"danger"
@
click
=
"cancelOrder(row.id)"
>
取消
>
取消
<
/ElButton
>
<
/ElButton
>
<
/div
>
<
/div
>
...
@@ -375,7 +437,10 @@
...
@@ -375,7 +437,10 @@
>
>
<
template
#
default
=
"scope"
>
<
template
#
default
=
"scope"
>
<
div
class
=
"order-detail"
>
<
div
class
=
"order-detail"
>
<
div
:
title
=
"scope.row.orderNumber"
class
=
"order-detail_item"
>
<
div
:
title
=
"scope.row.orderNumber"
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
订单号
:
<
/span
>
<
span
class
=
"label"
>
订单号
:
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
orderNumber
}}
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
orderNumber
}}
<
/span
>
<
/div
>
<
/div
>
...
@@ -393,16 +458,24 @@
...
@@ -393,16 +458,24 @@
class
=
"order-detail_item"
class
=
"order-detail_item"
>
>
<
span
class
=
"label"
>
稿件状态
:
<
/span
>
<
span
class
=
"label"
>
稿件状态
:
<
/span
>
<
span
class
=
"value"
:
title
=
"scope.row.manuscriptStatusStr"
>
{{
<
span
scope
.
row
.
manuscriptStatusStr
||
'--'
class
=
"value"
}}
<
/span
>
:
title
=
"scope.row.manuscriptStatusStr"
>
{{
scope
.
row
.
manuscriptStatusStr
||
'--'
}}
<
/spa
n
>
<
/div
>
<
/div
>
<
div
:
title
=
"scope.row.lanshouName"
class
=
"order-detail_item"
>
<
div
:
title
=
"scope.row.lanshouName"
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
收货人
:
<
/span
>
<
span
class
=
"label"
>
收货人
:
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
lanshouName
}}
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
lanshouName
}}
<
/span
>
<
/div
>
<
/div
>
<
div
:
title
=
"scope.row.lanshouPhone"
class
=
"order-detail_item"
>
<
div
:
title
=
"scope.row.lanshouPhone"
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
电话
:
<
/span
>
<
span
class
=
"label"
>
电话
:
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
lanshouPhone
}}
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
lanshouPhone
}}
<
/span
>
<
/div
>
<
/div
>
...
@@ -415,7 +488,10 @@
...
@@ -415,7 +488,10 @@
scope
.
row
.
lanshouAddress
scope
.
row
.
lanshouAddress
}}
<
/span
>
}}
<
/span
>
<
/div
>
<
/div
>
<
div
:
title
=
"scope.row.lanshouPost"
class
=
"order-detail_item"
>
<
div
:
title
=
"scope.row.lanshouPost"
class
=
"order-detail_item"
>
<
span
class
=
"label"
>
邮编
:
<
/span
>
<
span
class
=
"label"
>
邮编
:
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
lanshouPost
}}
<
/span
>
<
span
class
=
"value"
>
{{
scope
.
row
.
lanshouPost
}}
<
/span
>
<
/div
>
<
/div
>
...
@@ -482,7 +558,8 @@
...
@@ -482,7 +558,8 @@
><
ArrowDown
/><
/el-ico
n
><
ArrowDown
/><
/el-ico
n
><
/template
>
><
/template
>
<
template
v
-
else
>
<
template
v
-
else
>
收起商品信息
<
el
-
icon
style
=
"vertical-align: middle"
收起商品信息
<
el
-
icon
style
=
"vertical-align: middle"
><
ArrowUp
><
ArrowUp
/><
/el-icon
>
/><
/el-icon
>
<
/template
>
<
/template
>
...
@@ -493,14 +570,17 @@
...
@@ -493,14 +570,17 @@
<
div
class
=
"order-actual-payment"
>
<
div
class
=
"order-actual-payment"
>
<
div
class
=
"order-actual-payment_info"
>
<
div
class
=
"order-actual-payment_info"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
订单号
:
<
/span
>
<
span
class
=
"order-list-expand_item_label"
>
订单号
:
<
/spa
n
>
<
span
class
=
"order-list-expand_item_value"
>
{{
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
orderNumber
row
.
orderNumber
}}
<
/span
>
}}
<
/span
>
<
el
-
icon
class
=
"icon"
@
click
=
"copy(row.orderNumber || '')"
<
el
-
icon
class
=
"icon"
@
click
=
"copy(row.orderNumber || '')"
>
>
<
DocumentCopy
<
DocumentCopy
/>
/>
<
/el-icon
>
<
/el-icon
>
<
/div
>
<
/div
>
...
@@ -569,7 +649,9 @@
...
@@ -569,7 +649,9 @@
<
/div
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
收货人
:
<
/span
>
<
span
class
=
"order-list-expand_item_label"
>
收货人
:
<
/spa
n
>
<
span
<
span
style
=
"color: red"
style
=
"color: red"
class
=
"order-list-expand_item_value"
class
=
"order-list-expand_item_value"
...
@@ -585,7 +667,9 @@
...
@@ -585,7 +667,9 @@
}}
<
/span
>
}}
<
/span
>
<
/div
>
<
/div
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
div
class
=
"order-list-expand_item_info_title"
>
<
span
class
=
"order-list-expand_item_label"
>
邮编
:
<
/span
>
<
span
class
=
"order-list-expand_item_label"
>
邮编
:
<
/spa
n
>
<
span
class
=
"order-list-expand_item_value"
>
{{
<
span
class
=
"order-list-expand_item_value"
>
{{
row
.
lanshouPost
||
'--'
row
.
lanshouPost
||
'--'
}}
<
/span
>
}}
<
/span
>
...
@@ -789,6 +873,16 @@
...
@@ -789,6 +873,16 @@
<
/div
>
<
/div
>
<
/template
>
<
/template
>
<
/el-dialog
>
<
/el-dialog
>
<!--
设置备注
-->
<
el
-
dialog
v
-
model
=
"dialogVisible"
title
=
"设置备注"
width
=
"30%"
>
<
el
-
input
v
-
model
=
"inputValue"
clearable
placeholder
=
"请输入备注"
/>
<
template
#
footer
>
<
span
class
=
"dialog-footer"
>
<
el
-
button
@
click
=
"dialogVisible = false"
>
取消
<
/el-button
>
<
el
-
button
type
=
"primary"
@
click
=
"submitRemark"
>
确认
<
/el-button
>
<
/span
>
<
/template
>
<
/el-dialog
>
<
ElDrawer
<
ElDrawer
v
-
model
=
"orderDetailDialogVisible"
v
-
model
=
"orderDetailDialogVisible"
title
=
"生产订单详情"
title
=
"生产订单详情"
...
@@ -824,12 +918,14 @@ import {
...
@@ -824,12 +918,14 @@ import {
printOrder
,
printOrder
,
exportOrder
,
exportOrder
,
addInternalTagApi
,
addInternalTagApi
,
backEndCommentsApi
,
loadSendOutList
,
loadSendOutList
,
getLogList
,
getLogList
,
getOrderDetail
,
getOrderDetail
,
cancelOrderApi
,
cancelOrderApi
,
reGenerateScriptUrlApi
,
reGenerateScriptUrlApi
,
refreshProductInfo
,
reCreateScriptUrlApi
,
refreshProductInfo
,
reCreateScriptUrlApi
,
}
from
'@/api/order'
}
from
'@/api/order'
import
{
showConfirm
}
from
'@/utils/ui'
import
{
showConfirm
}
from
'@/utils/ui'
import
{
useValue
}
from
'@/utils/hooks/useValue'
import
{
useValue
}
from
'@/utils/hooks/useValue'
...
@@ -860,6 +956,9 @@ const [searchForm] = useValue<SearchForm>({
...
@@ -860,6 +956,9 @@ const [searchForm] = useValue<SearchForm>({
const
tabsNav
=
ref
<
Tab
[]
>
([])
const
tabsNav
=
ref
<
Tab
[]
>
([])
const
splitRef
=
ref
<
InstanceType
<
typeof
SplitDiv
>>
()
const
splitRef
=
ref
<
InstanceType
<
typeof
SplitDiv
>>
()
const
btnLoading
=
ref
<
boolean
>
(
false
)
const
btnLoading
=
ref
<
boolean
>
(
false
)
const
dialogVisible
=
ref
<
boolean
>
(
false
)
const
inputValue
=
ref
<
string
>
(
''
)
const
remarkId
=
ref
<
number
>
(
0
)
function
getStartTime
()
{
function
getStartTime
()
{
const
date
=
new
Date
()
const
date
=
new
Date
()
const
year
=
date
.
getFullYear
()
const
year
=
date
.
getFullYear
()
...
@@ -871,111 +970,111 @@ const pickerOptions = {
...
@@ -871,111 +970,111 @@ const pickerOptions = {
shortcuts
:
[
shortcuts
:
[
{
{
text
:
'今日'
,
text
:
'今日'
,
value
:
()
=>
{
value
:
()
=>
{
const
start
=
new
Date
(
new
Date
(
getStartTime
()).
getTime
())
const
start
=
new
Date
(
new
Date
(
getStartTime
()).
getTime
())
const
end
=
new
Date
()
const
end
=
new
Date
()
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'昨天'
,
text
:
'昨天'
,
value
:
()
=>
{
value
:
()
=>
{
const
start
=
new
Date
()
const
start
=
new
Date
()
const
end
=
new
Date
(
new
Date
(
getStartTime
()).
getTime
()
-
1
)
const
end
=
new
Date
(
new
Date
(
getStartTime
()).
getTime
()
-
1
)
start
.
setTime
(
end
.
getTime
()
-
3600
*
1000
*
24
*
1
+
1
)
start
.
setTime
(
end
.
getTime
()
-
3600
*
1000
*
24
*
1
+
1
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'最近7天'
,
text
:
'最近7天'
,
value
:
()
=>
{
value
:
()
=>
{
const
end
=
new
Date
()
const
end
=
new
Date
()
const
start
=
new
Date
(
getStartTime
())
const
start
=
new
Date
(
getStartTime
())
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
6
)
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
6
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'最近14天'
,
text
:
'最近14天'
,
value
:
()
=>
{
value
:
()
=>
{
const
end
=
new
Date
()
const
end
=
new
Date
()
const
start
=
new
Date
(
getStartTime
())
const
start
=
new
Date
(
getStartTime
())
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
13
)
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
13
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'最近30天'
,
text
:
'最近30天'
,
value
:
()
=>
{
value
:
()
=>
{
const
end
=
new
Date
()
const
end
=
new
Date
()
const
start
=
new
Date
(
getStartTime
())
const
start
=
new
Date
(
getStartTime
())
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
29
)
start
.
setTime
(
start
.
getTime
()
-
3600
*
1000
*
24
*
29
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'本星期'
,
text
:
'本星期'
,
value
:
()
=>
{
value
:
()
=>
{
const
end
=
new
Date
()
const
end
=
new
Date
()
const
start
=
new
Date
()
const
start
=
new
Date
()
const
nowDay
=
new
Date
().
getDay
()
-
1
const
nowDay
=
new
Date
().
getDay
()
-
1
start
.
setTime
(
start
.
setTime
(
new
Date
(
getStartTime
()).
getTime
()
-
3600
*
1000
*
24
*
nowDay
new
Date
(
getStartTime
()).
getTime
()
-
3600
*
1000
*
24
*
nowDay
,
)
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'上星期'
,
text
:
'上星期'
,
value
:
()
=>
{
value
:
()
=>
{
const
end
=
new
Date
()
const
end
=
new
Date
()
const
start
=
new
Date
()
const
start
=
new
Date
()
const
nowDay
=
new
Date
().
getDay
()
-
1
const
nowDay
=
new
Date
().
getDay
()
-
1
end
.
setTime
(
end
.
setTime
(
new
Date
(
getStartTime
()).
getTime
()
-
3600
*
1000
*
24
*
nowDay
-
1
new
Date
(
getStartTime
()).
getTime
()
-
3600
*
1000
*
24
*
nowDay
-
1
,
)
)
start
.
setTime
(
end
.
getTime
()
-
3600
*
1000
*
24
*
7
+
1
)
start
.
setTime
(
end
.
getTime
()
-
3600
*
1000
*
24
*
7
+
1
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'这个月'
,
text
:
'这个月'
,
value
:
()
=>
{
value
:
()
=>
{
const
end
=
new
Date
()
const
end
=
new
Date
()
const
start
=
new
Date
()
const
start
=
new
Date
()
const
nowDate
=
new
Date
().
getDate
()
-
1
const
nowDate
=
new
Date
().
getDate
()
-
1
start
.
setTime
(
start
.
setTime
(
new
Date
(
getStartTime
()).
getTime
()
-
3600
*
1000
*
24
*
nowDate
new
Date
(
getStartTime
()).
getTime
()
-
3600
*
1000
*
24
*
nowDate
,
)
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'上个月'
,
text
:
'上个月'
,
value
:
()
=>
{
value
:
()
=>
{
const
date
=
new
Date
()
const
date
=
new
Date
()
let
year
=
date
.
getFullYear
()
let
year
=
date
.
getFullYear
()
let
month
=
date
.
getMonth
()
let
month
=
date
.
getMonth
()
const
end
=
new
Date
(
const
end
=
new
Date
(
new
Date
(
`${year
}
-${month + 1
}
-1 00:00:00`
).
getTime
()
-
1
new
Date
(
`${year
}
-${month + 1
}
-1 00:00:00`
).
getTime
()
-
1
,
)
)
if
(
month
===
0
)
{
if
(
month
===
0
)
{
month
=
12
month
=
12
year
=
year
-
1
year
=
year
-
1
}
}
const
start
=
new
Date
(
const
start
=
new
Date
(
new
Date
(
`${year
}
-${month
}
-1 00:00:00`
).
getTime
()
new
Date
(
`${year
}
-${month
}
-1 00:00:00`
).
getTime
()
,
)
)
return
[
start
,
end
]
return
[
start
,
end
]
}
}
,
}
,
}
,
{
{
text
:
'历史'
,
text
:
'历史'
,
value
:
()
=>
{
value
:
()
=>
{
return
[
''
,
''
]
return
[
''
,
''
]
}
}
,
}
}
,
]
]
,
}
}
const
statusCode
=
ref
(
2
)
const
statusCode
=
ref
(
2
)
const
selection
=
ref
<
OrderData
[]
>
([])
const
selection
=
ref
<
OrderData
[]
>
([])
...
@@ -1025,8 +1124,18 @@ const {
...
@@ -1025,8 +1124,18 @@ const {
...
searchForm
.
value
,
...
searchForm
.
value
,
status
:
statusCode
.
value
,
status
:
statusCode
.
value
,
timeType
:
timeRange
.
value
.
length
>
0
?
searchForm
.
value
.
timeType
:
null
,
timeType
:
timeRange
.
value
.
length
>
0
?
searchForm
.
value
.
timeType
:
null
,
startTime
:
searchForm
.
value
.
timeType
===
''
?
null
:
timeRange
.
value
.
length
>
0
?
timeRange
.
value
[
0
]
:
null
,
startTime
:
endTime
:
searchForm
.
value
.
timeType
===
''
?
null
:
timeRange
.
value
.
length
>
0
?
timeRange
.
value
[
1
]
:
null
,
searchForm
.
value
.
timeType
===
''
?
null
:
timeRange
.
value
.
length
>
0
?
timeRange
.
value
[
0
]
:
null
,
endTime
:
searchForm
.
value
.
timeType
===
''
?
null
:
timeRange
.
value
.
length
>
0
?
timeRange
.
value
[
1
]
:
null
,
}
,
}
,
page
,
page
,
pageSize
,
pageSize
,
...
@@ -1107,10 +1216,34 @@ const changeTab = (item: Tab) => {
...
@@ -1107,10 +1216,34 @@ const changeTab = (item: Tab) => {
statusCode
.
value
=
item
.
statusCode
statusCode
.
value
=
item
.
statusCode
searchForm
.
value
.
timeType
=
''
searchForm
.
value
.
timeType
=
''
search
()
search
()
nextTick
(()
=>
{
nextTick
(()
=>
{
(
splitRef
.
value
)
!
.
domResize
()
splitRef
.
value
!
.
domResize
()
}
)
}
const
handleUpdateRemark
=
(
payload
:
{
id
:
number
;
remark
:
string
}
)
=>
{
dialogVisible
.
value
=
true
inputValue
.
value
=
payload
.
remark
remarkId
.
value
=
payload
.
id
}
const
submitRemark
=
async
()
=>
{
try
{
const
res
=
await
backEndCommentsApi
(
remarkId
.
value
,
inputValue
.
value
)
search
()
dialogVisible
.
value
=
false
inputValue
.
value
=
''
ElMessage
({
message
:
res
.
message
,
type
:
'success'
,
offset
:
window
.
innerHeight
/
2
,
}
)
}
catch
(
e
)
{
ElMessage
({
message
:
'提交失败,请重试'
,
type
:
'error'
,
offset
:
window
.
innerHeight
/
2
,
}
)
}
)
dialogVisible
.
value
=
true
}
}
}
const
copy
=
(
text
:
string
)
=>
{
const
copy
=
(
text
:
string
)
=>
{
navigator
.
clipboard
.
writeText
(
text
)
navigator
.
clipboard
.
writeText
(
text
)
...
@@ -1280,7 +1413,10 @@ const printManuscript = async () => {
...
@@ -1280,7 +1413,10 @@ const printManuscript = async () => {
// 导出生产单
// 导出生产单
const
exportManuscript
=
async
()
=>
{
const
exportManuscript
=
async
()
=>
{
try
{
try
{
const
res
=
await
exportOrder
({
ids
:
selection
.
value
.
map
(
el
=>
el
.
id
),
status
:
statusCode
.
value
}
)
const
res
=
await
exportOrder
({
ids
:
selection
.
value
.
map
((
el
)
=>
el
.
id
),
status
:
statusCode
.
value
,
}
)
window
.
open
(
filePath
+
res
.
message
)
window
.
open
(
filePath
+
res
.
message
)
}
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