Skip to content

F
factory_front
Commit 01070396 by zhuzhequan
Options

工厂端提交

parent 5dc1a684
Showing with 136 additions and 71 deletions
components.d.ts
...@@ -11,6 +11,7 @@ declare module 'vue' { ...@@ -11,6 +11,7 @@ declare module 'vue' {
ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol'] ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDate: typeof import('element-plus/es')['ElDate']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog'] ElDialog: typeof import('element-plus/es')['ElDialog']
ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDrawer: typeof import('element-plus/es')['ElDrawer']
......
src/api/order.ts
...@@ -35,6 +35,7 @@ export function getOrderTabData() { ...@@ -35,6 +35,7 @@ export function getOrderTabData() {
'factory/customJomallOrder/findStateGroupList', 'factory/customJomallOrder/findStateGroupList',
) )
} }
// 确认生产 // 确认生产
export function confirmProductionOrder(ids: number[]) { export function confirmProductionOrder(ids: number[]) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
...@@ -50,18 +51,23 @@ export function downloadOrder(id: number) { ...@@ -50,18 +51,23 @@ export function downloadOrder(id: number) {
{ params: { id } }, { params: { id } },
) )
} }
// 重新生成稿件 // 重新生成稿件
export function reGenerateScriptUrlApi(ids: number[]) { export function reGenerateScriptUrlApi(ids: string) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
'factory/customJomallOrder/downloadAgain', 'factory/customJomallOrder/rebuildFileByOrderId',
ids, ids,
) )
} }
export function reCreateScriptUrlApi(ids: number[]) { export function reCreateScriptUrlApi(id: string) {
return axios.post<never, BaseRespData<never>>( return axios.get<never, BaseRespData<never>>(
'factory/customJomallOrder/rebuildFileByOrderIds', 'factory/customJomallOrder/rebuildFileByOrderId',
ids, {
params:{
id
}
},
) )
} }
...@@ -74,14 +80,10 @@ export function printOrder(ids: number[]) { ...@@ -74,14 +80,10 @@ export function printOrder(ids: number[]) {
} }
// 导出生产单 // 导出生产单
export function exportOrder(status?: string | number) { export function exportOrder(data?: { ids: number[], status: string | number }) {
return axios.get<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
'factory/customJomallOrder/exportData', 'factory/customJomallOrder/exportData',
{ data,
params: {
status,
},
},
) )
} }
...@@ -96,6 +98,7 @@ export function getOrderBySubOrderNumber(orderNumber: string) { ...@@ -96,6 +98,7 @@ export function getOrderBySubOrderNumber(orderNumber: string) {
}, },
) )
} }
export function getQaOrderBySubOrderNumber(orderNumber: string) { export function getQaOrderBySubOrderNumber(orderNumber: string) {
return axios.get<never, BaseRespData<QaData[]>>( return axios.get<never, BaseRespData<QaData[]>>(
'factory/customJomallOrder/inspectionQuery', 'factory/customJomallOrder/inspectionQuery',
...@@ -106,6 +109,7 @@ export function getQaOrderBySubOrderNumber(orderNumber: string) { ...@@ -106,6 +109,7 @@ export function getQaOrderBySubOrderNumber(orderNumber: string) {
}, },
) )
} }
// 质检完成 // 质检完成
export function qaFinishedApi(data: InspectionData[]) { export function qaFinishedApi(data: InspectionData[]) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
...@@ -132,6 +136,7 @@ export function addInternalTagApi(idList: number[], memo: string) { ...@@ -132,6 +136,7 @@ export function addInternalTagApi(idList: number[], memo: string) {
{ idList, content: memo }, { idList, content: memo },
) )
} }
// 查看发货单 // 查看发货单
export function loadSendOutList(id: number) { export function loadSendOutList(id: number) {
return axios.get<never, BaseRespData<SendOrderData[]>>( return axios.get<never, BaseRespData<SendOrderData[]>>(
...@@ -143,6 +148,7 @@ export function loadSendOutList(id: number) { ...@@ -143,6 +148,7 @@ export function loadSendOutList(id: number) {
}, },
) )
} }
// 操作日志 // 操作日志
export function getLogList(id: number) { export function getLogList(id: number) {
return axios.get<never, BaseRespData<LogListData[]>>( return axios.get<never, BaseRespData<LogListData[]>>(
...@@ -181,6 +187,7 @@ export function refreshProductInfo(data: number[]) { ...@@ -181,6 +187,7 @@ export function refreshProductInfo(data: number[]) {
data, data,
) )
} }
export function getDeliveryNoteList( export function getDeliveryNoteList(
data: DeliveryNoteSearchForm, data: DeliveryNoteSearchForm,
currentPage: number, currentPage: number,
...@@ -195,6 +202,7 @@ export function getDeliveryNoteList( ...@@ -195,6 +202,7 @@ export function getDeliveryNoteList(
}, },
) )
} }
export function customJomallReconciliation( export function customJomallReconciliation(
data: AccountStatementNoteSearchForm, data: AccountStatementNoteSearchForm,
currentPage: number, currentPage: number,
...@@ -209,7 +217,8 @@ export function customJomallReconciliation( ...@@ -209,7 +217,8 @@ export function customJomallReconciliation(
}, },
) )
} }
export function printDeliveryNote(data: string[],userMark?:string) {
export function printDeliveryNote(data: string[], userMark?: string) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
'factory/customJomallShipment/printInvoiceStatistics', 'factory/customJomallShipment/printInvoiceStatistics',
{ {
...@@ -219,6 +228,7 @@ export function printDeliveryNote(data: string[],userMark?:string) { ...@@ -219,6 +228,7 @@ export function printDeliveryNote(data: string[],userMark?:string) {
}, },
) )
} }
export function createReconciliation(data: { shipmentIdList: number[] }) { export function createReconciliation(data: { shipmentIdList: number[] }) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
'factory/customJomallReconciliation/createReconciliation', 'factory/customJomallReconciliation/createReconciliation',
...@@ -247,6 +257,7 @@ export function getOrderByIdApi(id?: number) { ...@@ -247,6 +257,7 @@ export function getOrderByIdApi(id?: number) {
}, },
) )
} }
export function getReconciliationAmount(id?: number) { export function getReconciliationAmount(id?: number) {
return axios.get<never, BaseRespData<CountStatus[]>>( return axios.get<never, BaseRespData<CountStatus[]>>(
'factory/customJomallReconciliation/getReconciliationAmount', 'factory/customJomallReconciliation/getReconciliationAmount',
...@@ -257,17 +268,18 @@ export function getReconciliationAmount(id?: number) { ...@@ -257,17 +268,18 @@ export function getReconciliationAmount(id?: number) {
}, },
) )
} }
export function getCustomJomallReconciliationById(id?: number) { export function getCustomJomallReconciliationById(id?: number) {
return axios.get<never, BaseRespData<OrderData>>( return axios.get<never, BaseRespData<OrderData>>(
'factory/customJomallReconciliation/getById', 'factory/customJomallReconciliation/getById',
{ {
params:{ params: {
id id,
} },
} },
) )
} }
export function customJomallReconciliationLog(reconciliationId?: number) { export function customJomallReconciliationLog(reconciliationId?: number) {
return axios.get<never, BaseRespData<OrderData>>( return axios.get<never, BaseRespData<OrderData>>(
'factory/customJomallReconciliationLog/getListById', 'factory/customJomallReconciliationLog/getListById',
...@@ -278,6 +290,7 @@ export function customJomallReconciliationLog(reconciliationId?: number) { ...@@ -278,6 +290,7 @@ export function customJomallReconciliationLog(reconciliationId?: number) {
}, },
) )
} }
export function updateReconciliation( export function updateReconciliation(
data: AccountStatementNote, data: AccountStatementNote,
) { ) {
...@@ -286,6 +299,7 @@ export function updateReconciliation( ...@@ -286,6 +299,7 @@ export function updateReconciliation(
data, data,
) )
} }
export function getShipmentDetailsById(shipmentId?: string) { export function getShipmentDetailsById(shipmentId?: string) {
return axios.get<never, BaseRespData<AccountStatementNote[]>>( return axios.get<never, BaseRespData<AccountStatementNote[]>>(
'factory/customJomallReconciliation/getShipmentDetailsById', 'factory/customJomallReconciliation/getShipmentDetailsById',
...@@ -302,6 +316,6 @@ export function factoryConfirm( ...@@ -302,6 +316,6 @@ export function factoryConfirm(
) { ) {
return axios.post( return axios.post(
'factory/customJomallReconciliation/factoryConfirm', 'factory/customJomallReconciliation/factoryConfirm',
data data,
) )
} }
\ No newline at end of file
src/components/splitDiv/splitDiv.vue
...@@ -2,68 +2,113 @@ ...@@ -2,68 +2,113 @@
import { Splitpanes, Pane } from 'splitpanes' import { Splitpanes, Pane } from 'splitpanes'
import 'splitpanes/dist/splitpanes.css' import 'splitpanes/dist/splitpanes.css'
import { onMounted, onUnmounted, ref } from 'vue'
defineProps({ const props = defineProps({
size: { size: {
default: '15', default: '',
type: String type: String,
} },
})
const domSize = ref<number>(0)
function domResize() {
const father = document.getElementsByClassName('splitpanes')[0]
const top = document.getElementById('top')
const v = ((top.clientHeight / father.clientHeight) * 100).toFixed(2)
if (props.size === '') {
domSize.value = v
} else {
domSize.value = props.size
}
}
onUnmounted(()=>{
window.removeEventListener('resize', domResize)
})
onMounted(() => {
window.addEventListener('resize', domResize)
domResize()
})
defineExpose({
domResize
}) })
</script> </script>
<template> <template>
<splitpanes horizontal style="height: 100%"> <splitpanes horizontal style="height: 100%">
<pane :size="size"> <pane :size="domSize">
<slot name="top"></slot> <div id="top">
</pane> <slot name="top"></slot>
<pane style="flex: 1; flex-shrink: 0"> </div>
<slot name="bottom"></slot>
</pane> </pane>
</splitpanes> <pane style="flex: 1; flex-shrink: 0">
<div id="bottom">
<slot name="bottom"></slot>
</div>
</pane>
</splitpanes>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
#top {
height: fit-content;
}
#bottom {
height: 100%;
}
#top, #bottom {
display: flex;
flex-direction: column;
}
::v-deep(.splitpanes__splitter) { ::v-deep(.splitpanes__splitter) {
width: 100%; width: 100%;
border-left: 1px solid #eee; border-left: 1px solid #eee;
margin-left: -1px; margin-left: -1px;
background-color: #ececec; background-color: #ececec;
cursor: row-resize; cursor: row-resize;
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
flex-shrink: 0; flex-shrink: 0;
min-width: 1px; min-width: 1px;
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
&::before{
margin-top: -2px; &::before {
background-color: #00000040; margin-top: -2px;
transform: translate(-50%); background-color: #00000040;
width: 30px; transform: translate(-50%);
height: 1px; width: 30px;
content: ""; height: 1px;
position: absolute; content: "";
top: 50%; position: absolute;
left: 50%; top: 50%;
transition: background-color .3s; left: 50%;
} transition: background-color .3s;
&::after{ }
margin-top: 1px;
background-color: #00000040; &::after {
transform: translate(-50%); margin-top: 1px;
width: 30px; background-color: #00000040;
height: 1px; transform: translate(-50%);
content: ""; width: 30px;
position: absolute; height: 1px;
top: 50%; content: "";
left: 50%; position: absolute;
transition: background-color .3s; top: 50%;
} left: 50%;
transition: background-color .3s;
}
} }
::v-deep(.splitpanes__pane) { ::v-deep(.splitpanes__pane) {
.el-card { .el-card {
height: 100%; height: 100%;
} }
} }
</style> </style>
src/types/api/order.ts
...@@ -5,6 +5,9 @@ export interface SearchForm { ...@@ -5,6 +5,9 @@ export interface SearchForm {
endProductId: string endProductId: string
orderNumber: string orderNumber: string
shopNumber: string shopNumber: string
timeType: string | null
startTime?: string | null
endTime?: string | null
logisticsTracking: string logisticsTracking: string
lanshouName: string lanshouName: string
billNumber: string billNumber: string
......
src/views/DeliveryNotePage.vue
...@@ -286,6 +286,7 @@ const productProps = [ ...@@ -286,6 +286,7 @@ const productProps = [
{ label: '质检(不通过)', key: 'notPassNum' }, { label: '质检(不通过)', key: 'notPassNum' },
], ],
] ]
const logisticsProps = [ const logisticsProps = [
{ label: '订单号', key: 'orderNumber', copyable: true }, { label: '订单号', key: 'orderNumber', copyable: true },
{ {
......
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