Skip to content

F
factory_front
Commit 36d86500 by zhuzhequan
Options

工厂端修改

parent 3b2bb40f
Showing with 33 additions and 13 deletions
src/api/order.ts
...@@ -58,9 +58,14 @@ export function printOrder(ids: number[]) { ...@@ -58,9 +58,14 @@ export function printOrder(ids: number[]) {
} }
// 导出生产单 // 导出生产单
export function exportOrder() { export function exportOrder(status?:string | number) {
return axios.get<never, BaseRespData<never>>( return axios.get<never, BaseRespData<never>>(
'factory/customJomallOrder/exportData', 'factory/customJomallOrder/exportData',
{
params:{
status
}
}
) )
} }
......
src/types/api/order.ts
...@@ -3,10 +3,10 @@ import type { TableColumnCtx } from 'element-plus' ...@@ -3,10 +3,10 @@ import type { TableColumnCtx } from 'element-plus'
export interface SearchForm { export interface SearchForm {
mainSku: string mainSku: string
endProductId: string endProductId: string
OrderNumber: string
shopNumber: string shopNumber: string
internalMemo: string internalMemo: string
status?: number status?: number
erpOrderNumber: string
subOrderNumber: string subOrderNumber: string
} }
export interface Tab { export interface Tab {
......
src/views/order/index.vue
...@@ -3,34 +3,47 @@ ...@@ -3,34 +3,47 @@
<div class="header-filter"> <div class="header-filter">
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm :model="searchForm" size="default" inline> <ElForm :model="searchForm" size="default" inline>
<ElFormItem label="Base SKU">
<ElFormItem label="SKU">
<ElInput <ElInput
@blur="searchForm.mainSku = searchForm.mainSku.trim()"
v-model="searchForm.mainSku" v-model="searchForm.mainSku"
placeholder="请输入Base SKU" placeholder=" SKU"
clearable clearable
style="width: 160px" style="width: 160px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="成品ID"> <ElFormItem label="成品ID">
<ElInput <ElInput
@blur="searchForm.endProductId = searchForm.endProductId.trim()"
v-model="searchForm.endProductId" v-model="searchForm.endProductId"
placeholder="请输入成品ID" placeholder="请输入成品ID"
clearable clearable
style="width: 160px" style="width: 160px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="第三方订单号"> <!-- <ElFormItem label="第三方订单号">-->
<!-- <ElInput-->
<!-- v-model="searchForm.erpOrderNumber"-->
<!-- placeholder="请输入第三方订单号"-->
<!-- clearable-->
<!-- style="width: 160px"-->
<!-- ></ElInput>-->
<!-- </ElFormItem>-->
<ElFormItem label="生产单号">
<ElInput <ElInput
v-model="searchForm.erpOrderNumber" @blur="searchForm.subOrderNumber = searchForm.subOrderNumber.trim()"
placeholder="请输入第三方订单号" v-model="searchForm.subOrderNumber"
placeholder="生产单号"
clearable clearable
style="width: 160px" style="width: 160px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="生产单号"> <ElFormItem label="订单号">
<ElInput <ElInput
v-model="searchForm.subOrderNumber" v-model="searchForm.orderNumber"
placeholder="生产单号" placeholder="订单号"
@blur="searchForm.orderNumber = searchForm.orderNumber.trim()"
clearable clearable
style="width: 160px" style="width: 160px"
></ElInput> ></ElInput>
...@@ -38,6 +51,7 @@ ...@@ -38,6 +51,7 @@
<ElFormItem label="店铺单号"> <ElFormItem label="店铺单号">
<ElInput <ElInput
v-model="searchForm.shopNumber" v-model="searchForm.shopNumber"
@blur="searchForm.shopNumber = searchForm.shopNumber.trim()"
placeholder="店铺单号" placeholder="店铺单号"
clearable clearable
style="width: 160px" style="width: 160px"
...@@ -46,6 +60,7 @@ ...@@ -46,6 +60,7 @@
<ElFormItem label="内部标签"> <ElFormItem label="内部标签">
<ElInput <ElInput
v-model="searchForm.internalMemo" v-model="searchForm.internalMemo"
@blur="searchForm.internalMemo = searchForm.internalMemo.trim()"
placeholder="内部标签" placeholder="内部标签"
clearable clearable
style="width: 160px" style="width: 160px"
...@@ -102,7 +117,7 @@ ...@@ -102,7 +117,7 @@
>打印生产单</ElButton >打印生产单</ElButton
> >
</span> </span>
<span v-if="statusCode === 2" class="item"> <span v-if="statusCode === 2 || statusCode === 3 || statusCode === 7" class="item">
<ElButton type="success" dark @click="exportManuscript" <ElButton type="success" dark @click="exportManuscript"
>导出生产单</ElButton >导出生产单</ElButton
> >
...@@ -531,8 +546,8 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({ ...@@ -531,8 +546,8 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
mainSku: '', mainSku: '',
endProductId: '', endProductId: '',
shopNumber: '', shopNumber: '',
OrderNumber: '',
internalMemo: '', internalMemo: '',
erpOrderNumber: '',
subOrderNumber: '', subOrderNumber: '',
}) })
const tabsNav = ref<Tab[]>([]) const tabsNav = ref<Tab[]>([])
...@@ -776,7 +791,7 @@ const printManuscript = async () => { ...@@ -776,7 +791,7 @@ const printManuscript = async () => {
// 导出生产单 // 导出生产单
const exportManuscript = async () => { const exportManuscript = async () => {
try { try {
const res = await exportOrder() const res = await exportOrder(statusCode.value)
window.open(filePath + res.message) window.open(filePath + res.message)
} catch (e) { } catch (e) {
showError(e) showError(e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment