Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

# Conflicts:
#	src/views/supermarketerp/components/linkCodeDialog.vue

src/views/supermarketerp/components/linkCodeDialog.vue

@@ -17,7 +17,11 @@
 			<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
       <vxe-column field="productName" title="商品名称" align="center" width="200"></vxe-column>
 			<vxe-column field="handlerUserId" title="经办人" align="center" width="100"></vxe-column>
-<!--			<vxe-column field="checkStatus" title="审批状态" align="center" width="100"></vxe-column>-->
+			<vxe-column field="checkStatus" title="审批状态" align="center" width="100">
+				<template #default="{ row }">
+					<dict-tag :options="check_status" :value="row.checkStatus" />
+				</template>
+			</vxe-column>
 			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
 		</vxe-table>
 		<!-- <pagination
@@ -57,7 +61,9 @@
 <script setup lang="ts" name="linkCgCodeDialog">
 import { ref } from "vue"
 import { VxeTableEvents } from "vxe-table"
+import { useDict } from "/@/hooks/dict"
 
+const { check_status } = useDict("check_status")
 const linkCodeDialogVisible = defineModel()
 const emit = defineEmits(["getSelectedLinkCode"])
 const props = withDefaults(