src/views/stock/material/material-page.vue

@@ -80,10 +80,10 @@
 		title="条形码打印"
 		width="100%"
 		wrap-class-name="full-modal"
-		@ok="closePrint"
+		@ok="openPrint = false"
-		@cancel="closePrint"
+		@cancel="openPrint = false"
 	>
-		<printCode ref="printcodeRef" :material-id="materialIdRef"></printCode>
+		<printCode :material-id="materialIdRef"></printCode>
 	</a-modal>
 </template>
 
@@ -103,7 +103,6 @@
 	const materialPage = ref<IPage<material.Material>>()
 	const loading = ref(false)
 	const materialIdRef = ref<number>()
-	const printcodeRef = ref()
 
 	// 加载数据的方法
 	const loadData = async (page = 1, size = 10) => {
@@ -234,17 +233,10 @@
 		})
 	}
 
-	// 打开打印弹窗
 	const showPrintModal = (applyId: number) => {
 		openPrint.value = true
 		materialIdRef.value = applyId
 	}
-
-	// 关闭打印弹窗
-	const closePrint = () => {
-		openPrint.value = false
-		printcodeRef.value.clearContent()
-	}
 </script>
 
 <style lang="less">

src/views/stock/material/print-code.vue

@@ -27,13 +27,6 @@
 			default: 0,
 		},
 	})
-	const clearContent = () => {
-		inputRef.value = 0
-		const container = document.getElementById('barcodes-container')
-		if (container) container.innerHTML = ''
-	}
-	// 向父组件暴露清空条形码容器的函数
-	defineExpose({ clearContent })
 
 	const inputRef = ref(0)
 

src/views/stock/report/stocktakingReport-page.vue

@@ -54,12 +54,11 @@
 						{{ record.auditType === 'ALL' ? '全部盘点' : '部分盘点' }}
 					</template>
 					<template v-if="column.dataIndex === 'reviewResult'">
-						<!-- 不同状态不同颜色 -->
+						<template v-if="record.reviewResult === 'WAIT_SCAN'">待扫码</template>
-						<template v-if="record.reviewResult === 'WAIT_SCAN'"><span style="color: #faad14">待扫码</span></template>
+						<template v-if="record.reviewResult === 'WAIT_SUBMIT'">待提交</template>
-						<template v-if="record.reviewResult === 'WAIT_SUBMIT'"><span style="color: #1890ff">待提交</span></template>
+						<template v-if="record.reviewResult === 'WAIT_REVIEW'">待审核</template>
-						<template v-if="record.reviewResult === 'WAIT_REVIEW'"><span style="color: #722ed1">待审核</span></template>
+						<template v-if="record.reviewResult === 'PASS'">审核通过</template>
-						<template v-if="record.reviewResult === 'PASS'"><span style="color: #52c41a">审核通过</span></template>
+						<template v-if="record.reviewResult === 'REJECT'">退回</template>
-						<template v-if="record.reviewResult === 'REJECT'"><span style="color: #f5222d">退回</span></template>
 					</template>
 					<template v-if="column.dataIndex === 'operation'">
 						<a-button
@@ -143,7 +142,7 @@
 	//表格列
 	const columns = [
 		{
-			title: '申请序号',
+			title: '申请id',
 			dataIndex: 'id',
 		},
 		{

src/views/stock/stocktaking/stocktaking-page.vue

@@ -38,11 +38,11 @@
 						{{ record.auditType === 'ALL' ? '全部盘点' : '部分盘点' }}
 					</template>
 					<template v-if="column.dataIndex === 'reviewResult'">
-						<template v-if="record.reviewResult === 'WAIT_SCAN'"><span style="color: #faad14">待扫码</span></template>
+						<template v-if="record.reviewResult === 'WAIT_SCAN'">待扫码</template>
-						<template v-if="record.reviewResult === 'WAIT_SUBMIT'"><span style="color: #1890ff">待提交</span></template>
+						<template v-if="record.reviewResult === 'WAIT_SUBMIT'">待提交</template>
-						<template v-if="record.reviewResult === 'WAIT_REVIEW'"><span style="color: #722ed1">待审核</span></template>
+						<template v-if="record.reviewResult === 'WAIT_REVIEW'">待审核</template>
-						<template v-if="record.reviewResult === 'PASS'"><span style="color: #52c41a">审核通过</span></template>
+						<template v-if="record.reviewResult === 'PASS'">审核通过</template>
-						<template v-if="record.reviewResult === 'REJECT'"><span style="color: #f5222d">退回</span></template>
+						<template v-if="record.reviewResult === 'REJECT'">退回</template>
 					</template>
 					<template v-if="column.dataIndex === 'operation'">
 						<a-button