diff --git a/src/views/weightManage/index.vue b/src/views/weightManage/index.vue index 931a09a..1bf93d1 100644 --- a/src/views/weightManage/index.vue +++ b/src/views/weightManage/index.vue @@ -554,6 +554,8 @@ const workOrderResp = ref({ totalCount: '', createUserString: '', updateUserString: '', + totalCalculatedWeight: '', + workOrderInfos: [], matchResult: 'failed' }) @@ -771,7 +773,30 @@ const handlePrevious = () => { // 返回第一步 const handleBackToFirst = () => { + // 重置所有数据 activeStep.value = 1 + + // 重置表单数据 + formData.inputMaterialCode = '' + formData.id = '' + formData.encoding = '' + formData.materialName = '' + formData.materialSpec = '' + formData.unitWeight = 0 + formData.photoUrl = '' + formData.matchResult = '' + + // 重置称重登记页面数据 + inputQuantity.value = '' + ahDeviceWeight.value = '10' + calculatedWeight.value = '' + weighingCount.value = 1 + // 清空称重列表 + weighingList.value = [] + + // 重置工作订单响应数据 + workOrderResp.value = {} + // 离开称重页面时关闭WebSocket连接 closeWebSocket() } diff --git a/src/views/workOrder/index.vue b/src/views/workOrder/index.vue index 1e2fdeb..d6c35d3 100644 --- a/src/views/workOrder/index.vue +++ b/src/views/workOrder/index.vue @@ -172,7 +172,7 @@ const columns = ref(processColumns([ { title: '物料编码', dataIndex: 'encoding' }, { title: '单位克重', dataIndex: 'unitWeight' ,slotName: 'unitWeight'}, { title: '总重量', dataIndex: 'totalWeight' ,slotName: 'totalWeight'}, - { title: '称重次数', dataIndex: 'totalCount' }, + { title: '总数量', dataIndex: 'totalCount' }, { title: '创建时间', dataIndex: 'createTime', width: 180 }, { title: '操作',