diff --git a/src/views/stock/report/stocktakingReport-page.vue b/src/views/stock/report/stocktakingReport-page.vue
index 18410b9..6e2af94 100644
--- a/src/views/stock/report/stocktakingReport-page.vue
+++ b/src/views/stock/report/stocktakingReport-page.vue
@@ -66,7 +66,7 @@
v-if="record.reviewResult === 'WAIT_REVIEW'"
type="link"
style="margin-left: 10px"
- @click="showResultModal(record.id)"
+ @click="showResultModal(record.id, record.auditType)"
>
@@ -81,20 +81,38 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 审核通过
- 退回重盘
-
-
-
-
+
+
+ 审核通过
+ 退回重盘
+
+
+
@@ -194,9 +212,22 @@
})
const openResult = ref(false)
- const showResultModal = (applyId: number) => {
- openResult.value = true
+ const auditTypeRef = ref<'SCAN' | 'MANUAL'>()
+ const showResultModal = (applyId: number, auditType: 'SCAN' | 'MANUAL') => {
+ auditTypeRef.value = auditType
applyIdRef.value = applyId
+ openResult.value = true
+ if (auditType === 'MANUAL') {
+ getManualData(applyId)
+ }
+ }
+
+ // 查询人工盘点数据
+ const manualData = ref>()
+ const getManualData = (applyId: number) => {
+ api.materialApi.apply.getManualStock(applyId, (data) => {
+ manualData.value = data
+ })
}
//提交审核结果
diff --git a/src/views/stock/stocktaking/stocktaking-page.vue b/src/views/stock/stocktaking/stocktaking-page.vue
index 6143bc7..06a0aaa 100644
--- a/src/views/stock/stocktaking/stocktaking-page.vue
+++ b/src/views/stock/stocktaking/stocktaking-page.vue
@@ -270,7 +270,6 @@
{
title: '操作',
dataIndex: 'operation',
- width: 400,
},
]