Skip to content

F
factory_front
Commit 39d71b28 by qinjianhui
Options

fix: POD US 修改

parent 3742f158
Showing with 37 additions and 68 deletions
src/api/podUsOrder.ts
...@@ -11,11 +11,11 @@ import { ...@@ -11,11 +11,11 @@ import {
import axios from './axios' import axios from './axios'
import { PodMakeOrderData } from '@/types/api/podMakeOrder' import { PodMakeOrderData } from '@/types/api/podMakeOrder'
export interface LogisticsData { export interface LogisticsData {
logisticsWayName: string; // 物流名称 logisticsWayName: string // 物流名称
warehouseName: string; // 发货仓库 warehouseName: string // 发货仓库
status: boolean; status: boolean
logisticsWayCode: string; // 物流编码 logisticsWayCode: string // 物流编码
partition: string; // 所在分区 partition: string // 所在分区
} }
export function getOrderTabData() { export function getOrderTabData() {
return axios.get<never, BaseRespData<Tab[]>>( return axios.get<never, BaseRespData<Tab[]>>(
...@@ -50,7 +50,12 @@ export function getCardOrderList( ...@@ -50,7 +50,12 @@ export function getCardOrderList(
}, },
) )
} }
export function confirmOrderApi(data: number[], productionClient: string,type:string,logisticsTrialCalculation?:LogisticsData | null) { export function confirmOrderApi(
data: number[],
productionClient: string,
type: string,
logisticsTrialCalculation?: LogisticsData | null,
) {
return axios.post<never, BaseRespData<never>>( return axios.post<never, BaseRespData<never>>(
'factory/podJomallOrderUs/confirmOrders', 'factory/podJomallOrderUs/confirmOrders',
{ {
...@@ -128,27 +133,19 @@ export function printProductionOrderApi(orderIds: number[]) { ...@@ -128,27 +133,19 @@ export function printProductionOrderApi(orderIds: number[]) {
orderIds, orderIds,
) )
} }
export function printPrintOrderApi( export function printPrintOrderApi(orderIds: number[]) {
orderIds: number[],
productionClient: string,
) {
return axios.post<never, BaseRespData<string>>( return axios.post<never, BaseRespData<string>>(
'factory/podJomallOrderUs/printPickPdf', 'factory/podJomallOrderUs/printPickPdf',
{ {
ids: orderIds.join(','), ids: orderIds.join(',')
productionClient,
}, },
) )
} }
export function printPickingOrderApi( export function printPickingOrderApi(orderIds: number[]) {
orderIds: number[],
productionClient: string,
) {
return axios.post<never, BaseRespData<string>>( return axios.post<never, BaseRespData<string>>(
'factory/podJomallOrderUs/pickingComplete', 'factory/podJomallOrderUs/pickingComplete',
{ {
ids: orderIds.join(','), ids: orderIds.join(','),
productionClient,
}, },
) )
} }
...@@ -238,7 +235,7 @@ export function updateRemarkApi(id: number, content: string) { ...@@ -238,7 +235,7 @@ export function updateRemarkApi(id: number, content: string) {
export function getLogisticsCalculation(id: number) { export function getLogisticsCalculation(id: number) {
return axios.get<never, BaseRespData<never>>( return axios.get<never, BaseRespData<never>>(
'factory/podJomallOrderUs/getLogisticsCalculation', 'factory/podJomallOrderUs/getLogisticsCalculation',
{ params:{id} }, { params: { id } },
) )
} }
export function loadWarehouseListApi() { export function loadWarehouseListApi() {
......
src/views/order/podUs/index.vue
...@@ -751,7 +751,7 @@ ...@@ -751,7 +751,7 @@
</ElSelect> </ElSelect>
</div> </div>
<el-table <el-table
v-if="productionClientValue==='JOMALL'" v-if="productionClientValue === 'JOMALL'"
height="400px" height="400px"
class="production-client-table" class="production-client-table"
:data="confirmData" :data="confirmData"
...@@ -862,7 +862,7 @@ ...@@ -862,7 +862,7 @@
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<ElButton @click="productionClientVisible = false">取消</ElButton> <ElButton @click="productionClientVisible = false">取消</ElButton>
<ElButton type="primary" @click="submit">确认</ElButton> <ElButton type="primary" @click="submitConfirm">确认</ElButton>
</div> </div>
</template> </template>
</ElDialog> </ElDialog>
...@@ -890,7 +890,8 @@ import { ...@@ -890,7 +890,8 @@ import {
toBeConfirmedApi, toBeConfirmedApi,
loadWarehouseListApi, loadWarehouseListApi,
getLogisticsCalculation, getLogisticsCalculation,
refreshMaterialApi, LogisticsData, refreshMaterialApi,
LogisticsData,
} from '@/api/podUsOrder' } from '@/api/podUsOrder'
import TableView from '@/components/TableView.vue' import TableView from '@/components/TableView.vue'
import { import {
...@@ -919,7 +920,7 @@ import dayjs from 'dayjs' ...@@ -919,7 +920,7 @@ import dayjs from 'dayjs'
declare global { declare global {
interface Window { interface Window {
ActiveXObject: { ActiveXObject: {
new(type: string): XMLHttpRequest new (type: string): XMLHttpRequest
} }
VBS_BinaryToArray: { VBS_BinaryToArray: {
(data: unknown): { toArray(): number[] } (data: unknown): { toArray(): number[] }
...@@ -1184,7 +1185,6 @@ const confirm = async (row: ProductList) => { ...@@ -1184,7 +1185,6 @@ const confirm = async (row: ProductList) => {
confirmRowData.value = row confirmRowData.value = row
confirmData.value = [] confirmData.value = []
confirmSelectionData.value = [] confirmSelectionData.value = []
} }
const handleConfirm = async () => { const handleConfirm = async () => {
if (!productionClientValue.value) { if (!productionClientValue.value) {
...@@ -1204,7 +1204,7 @@ const handleConfirm = async () => { ...@@ -1204,7 +1204,7 @@ const handleConfirm = async () => {
[Number(id)], [Number(id)],
productionClientValue.value, productionClientValue.value,
'customize', 'customize',
confirmSelectionData.value[0]||null, confirmSelectionData.value[0] || null,
) )
if (res.code !== 200) return if (res.code !== 200) return
ElMessage.success('操作成功') ElMessage.success('操作成功')
...@@ -1236,16 +1236,10 @@ const handleUpdateRemark = async (item: ProductList) => { ...@@ -1236,16 +1236,10 @@ const handleUpdateRemark = async (item: ProductList) => {
const productionClientValue = ref('') const productionClientValue = ref('')
const productionClient = ref<ProductionClient[]>() const productionClient = ref<ProductionClient[]>()
const productionClientVisible = ref(false) const productionClientVisible = ref(false)
let confirmBtn = false
let pickingBtn = false
let printBtn = false
const confirmOrder = async () => { const confirmOrder = async () => {
if (selection.value.length === 0) { if (selection.value.length === 0) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
} }
confirmBtn = true
pickingBtn = false
printBtn = false
productionClientValue.value = '' productionClientValue.value = ''
productionClientVisible.value = true productionClientVisible.value = true
} }
...@@ -1258,15 +1252,6 @@ const loadProductionClient = async () => { ...@@ -1258,15 +1252,6 @@ const loadProductionClient = async () => {
console.error(e) console.error(e)
} }
} }
const submit = async () => {
if (confirmBtn) {
await submitConfirm()
} else if (printBtn) {
await submitPrintPickingOrder()
} else if (pickingBtn) {
await submitPickingOrder()
}
}
const submitConfirm = async () => { const submitConfirm = async () => {
const ids = selection.value.map((item) => item.id) const ids = selection.value.map((item) => item.id)
try { try {
...@@ -1278,7 +1263,6 @@ const submitConfirm = async () => { ...@@ -1278,7 +1263,6 @@ const submitConfirm = async () => {
if (res.code !== 200) return if (res.code !== 200) return
ElMessage.success('操作成功') ElMessage.success('操作成功')
productionClientVisible.value = false productionClientVisible.value = false
confirmBtn = false
search() search()
loadTabData() loadTabData()
} catch (e) { } catch (e) {
...@@ -1327,46 +1311,36 @@ const printPickingOrder = async () => { ...@@ -1327,46 +1311,36 @@ const printPickingOrder = async () => {
if (selection.value.length === 0) { if (selection.value.length === 0) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
} }
pickingBtn = false
printBtn = true
confirmBtn = false
productionClientVisible.value = true
productionClientValue.value = ''
}
const pickingComplete = async () => {
if (selection.value.length === 0) {
return ElMessage.warning('请选择数据')
}
pickingBtn = true
printBtn = false
confirmBtn = false
productionClientVisible.value = true
productionClientValue.value = ''
}
const submitPrintPickingOrder = async () => {
const orderIds = selection.value.map((item) => item.id) const orderIds = selection.value.map((item) => item.id)
try { try {
const res = await printPrintOrderApi(orderIds, productionClientValue.value) const res = await printPrintOrderApi(orderIds)
if (res.code !== 200) return if (res.code !== 200) return
ElMessage.success('操作成功') ElMessage.success('操作成功')
window.open(filePath + res.message) window.open(filePath + res.message)
printBtn = false
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} }
} }
const submitPickingOrder = async () => { const pickingComplete = async () => {
if (selection.value.length === 0) {
return ElMessage.warning('请选择数据')
}
try {
await ElMessageBox.confirm('确定完成拣胚完成吗?', '提示', {
cancelButtonText: '取消',
confirmButtonText: '确认',
type: 'warning',
})
} catch {
return
}
const orderIds = selection.value.map((item) => item.id) const orderIds = selection.value.map((item) => item.id)
try { try {
const res = await printPickingOrderApi( const res = await printPickingOrderApi(orderIds)
orderIds,
productionClientValue.value,
)
if (res.code !== 200) return if (res.code !== 200) return
ElMessage.success('操作成功') ElMessage.success('操作成功')
search() search()
loadTabData() loadTabData()
printBtn = false
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} }
...@@ -1947,8 +1921,7 @@ onMounted(() => { ...@@ -1947,8 +1921,7 @@ onMounted(() => {
} }
.production-client-table { .production-client-table {
::v-deep(.current-row > td.el-table__cell) {
::v-deep(.current-row>td.el-table__cell) {
background-color: green; background-color: green;
color: white; color: white;
...@@ -1958,5 +1931,4 @@ onMounted(() => { ...@@ -1958,5 +1931,4 @@ onMounted(() => {
} }
} }
} }
</style> </style>
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