From 8ebf15cdc464f8da716e32a996fec701383ab1a1 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Thu, 19 Dec 2024 12:11:13 +0800
Subject: [PATCH] =?UTF-8?q?art:=20=E7=9B=98=E7=82=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stock/report/stocktakingReport-page.vue | 13 +++++++------
 src/views/stock/stocktaking/stocktaking-page.vue  | 10 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/stock/report/stocktakingReport-page.vue b/src/views/stock/report/stocktakingReport-page.vue
index 66bff80..ed47bee 100644
--- a/src/views/stock/report/stocktakingReport-page.vue
+++ b/src/views/stock/report/stocktakingReport-page.vue
@@ -54,11 +54,12 @@
 						{{ record.auditType === 'ALL' ? '全部盘点' : '部分盘点' }}
 					</template>
 					<template v-if="column.dataIndex === 'reviewResult'">
-						<template v-if="record.reviewResult === 'WAIT_SCAN'">待扫码</template>
-						<template v-if="record.reviewResult === 'WAIT_SUBMIT'">待提交</template>
-						<template v-if="record.reviewResult === 'WAIT_REVIEW'">待审核</template>
-						<template v-if="record.reviewResult === 'PASS'">审核通过</template>
-						<template v-if="record.reviewResult === 'REJECT'">退回</template>
+						<!-- 不同状态不同颜色 -->
+						<template v-if="record.reviewResult === 'WAIT_SCAN'"><span style="color: #faad14">待扫码</span></template>
+						<template v-if="record.reviewResult === 'WAIT_SUBMIT'"><span style="color: #1890ff">待提交</span></template>
+						<template v-if="record.reviewResult === 'WAIT_REVIEW'"><span style="color: #722ed1">待审核</span></template>
+						<template v-if="record.reviewResult === 'PASS'"><span style="color: #52c41a">审核通过</span></template>
+						<template v-if="record.reviewResult === 'REJECT'"><span style="color: #f5222d">退回</span></template>
 					</template>
 					<template v-if="column.dataIndex === 'operation'">
 						<a-button
@@ -142,7 +143,7 @@
 	//表格列
 	const columns = [
 		{
-			title: '申请id',
+			title: '申请序号',
 			dataIndex: 'id',
 		},
 		{
diff --git a/src/views/stock/stocktaking/stocktaking-page.vue b/src/views/stock/stocktaking/stocktaking-page.vue
index a809800..842b0e8 100644
--- a/src/views/stock/stocktaking/stocktaking-page.vue
+++ b/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'">待扫码</template>
-						<template v-if="record.reviewResult === 'WAIT_SUBMIT'">待提交</template>
-						<template v-if="record.reviewResult === 'WAIT_REVIEW'">待审核</template>
-						<template v-if="record.reviewResult === 'PASS'">审核通过</template>
-						<template v-if="record.reviewResult === 'REJECT'">退回</template>
+						<template v-if="record.reviewResult === 'WAIT_SCAN'"><span style="color: #faad14">待扫码</span></template>
+						<template v-if="record.reviewResult === 'WAIT_SUBMIT'"><span style="color: #1890ff">待提交</span></template>
+						<template v-if="record.reviewResult === 'WAIT_REVIEW'"><span style="color: #722ed1">待审核</span></template>
+						<template v-if="record.reviewResult === 'PASS'"><span style="color: #52c41a">审核通过</span></template>
+						<template v-if="record.reviewResult === 'REJECT'"><span style="color: #f5222d">退回</span></template>
 					</template>
 					<template v-if="column.dataIndex === 'operation'">
 						<a-button