diff --git a/src/apis/fullWorkOrder/fullWorkOrder.ts b/src/apis/fullWorkOrder/fullWorkOrder.ts index aa79ec6..87713a1 100644 --- a/src/apis/fullWorkOrder/fullWorkOrder.ts +++ b/src/apis/fullWorkOrder/fullWorkOrder.ts @@ -45,3 +45,13 @@ export function deleteFullWorkOrder(id: string) { export function exportFullWorkOrder(query: FullWorkOrderQuery) { return http.download(`${BASE_URL}/export`, query) } + +/** @desc 保存原材料详情 */ +export function saveFullWorkOrderDetail(data: any) { + return http.post(`${BASE_URL}/detail`, data) +} + +/** @desc 获取原材料详情列表 */ +export function getFullWorkOrderDetailList(id: string) { + return http.get(`${BASE_URL}/infos/${id}`) +} diff --git a/src/views/fullClaim/FullWorkOrderDetailListModal.vue b/src/views/fullClaim/FullWorkOrderDetailListModal.vue new file mode 100644 index 0000000..60e5b6c --- /dev/null +++ b/src/views/fullClaim/FullWorkOrderDetailListModal.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/views/fullClaim/FullWorkOrderDetailModal.vue b/src/views/fullClaim/FullWorkOrderDetailModal.vue new file mode 100644 index 0000000..df40418 --- /dev/null +++ b/src/views/fullClaim/FullWorkOrderDetailModal.vue @@ -0,0 +1,368 @@ + + + + + \ No newline at end of file diff --git a/src/views/fullClaim/index.vue b/src/views/fullClaim/index.vue index fcf71de..a1ac35f 100644 --- a/src/views/fullClaim/index.vue +++ b/src/views/fullClaim/index.vue @@ -50,6 +50,16 @@ - + \ No newline at end of file diff --git a/src/views/weightManage/index.vue b/src/views/weightManage/index.vue index ccea7e6..a1d2489 100644 --- a/src/views/weightManage/index.vue +++ b/src/views/weightManage/index.vue @@ -528,7 +528,7 @@ const workOrderResp = ref({ const inputQuantity = ref() const calculateNumber = ref() // todo -const ahDeviceWeight = ref('6') +const ahDeviceWeight = ref() const calculatedWeight = ref('') const weighingCount = ref(1) @@ -759,9 +759,17 @@ const printLabel = async (labelData: any) => { setTimeout(() => { printWindow.focus() printWindow.print() - printWindow.close() }, 500) } + + // 监听打印完成事件 + printWindow.onafterprint = () => { + printWindow.close() + Message.success('打印成功,正在初始化称重管理页面...') + // 重新加载页面以初始化称重管理 + window.location.reload() + } + } } @@ -927,7 +935,7 @@ const handleBackToFirst = () => { // 重置称重登记页面数据 inputQuantity.value = '' // todo - ahDeviceWeight.value = '6' + ahDeviceWeight.value = '' calculatedWeight.value = '' weighingCount.value = 1 // 清空称重列表 @@ -1014,7 +1022,7 @@ const handleConfirm = async () => { // 重置输入(让用户能继续输入) inputQuantity.value = '' // todo - ahDeviceWeight.value = '6' + ahDeviceWeight.value = '' calculatedWeight.value = '' weighingCount.value = weighingList.value.length + 1