From 541fc2ff8a1cd58a624e3674eedc0890d171696e Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sun, 2 Mar 2025 20:02:53 +0800
Subject: [PATCH] =?UTF-8?q?sparkles:=20:sparkles:=20=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stock/component/apply-confirm.vue |  6 +++---
 src/views/stock/component/apply-form.vue    | 21 +++++++++++----------
 src/views/stock/material/material-page.vue  |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/stock/component/apply-confirm.vue b/src/views/stock/component/apply-confirm.vue
index 8867a18..3b6710c 100644
--- a/src/views/stock/component/apply-confirm.vue
+++ b/src/views/stock/component/apply-confirm.vue
@@ -14,13 +14,13 @@
 			<vxe-column field="name" title="物料名称" />
 			<vxe-column field="assignRule" title="是否扫码">
 				<template #default="{ row }">
-					{{ row.assignRule === 'HIGH_VALUE' ? '是' : '否' }}
+					{{ row.assignRule ? '是' : '否' }}
 				</template>
 			</vxe-column>
 			<vxe-column field="applyNum" title="申请数量" :edit-render="{ name: 'VxeInput', props: { type: 'integer' } }" />
-			<vxe-column field="scanNum" title="扫码数量" :edit-render="{ name: 'VxeInput', props: { type: 'integer' } }">
+			<vxe-column field="scanNum" title="扫码数量">
 				<template #default="{ row }">
-					{{ row.assignRule === 'LOW_VALUE' ? '~' : row.scanNum }}
+					{{ row.assignRule ? row.scanNum : '~' }}
 				</template>
 			</vxe-column>
 			<vxe-column field="remark" title="备注" :edit-render="{ name: 'VxeInput' }" />
diff --git a/src/views/stock/component/apply-form.vue b/src/views/stock/component/apply-form.vue
index 64f9a7d..7eb6684 100644
--- a/src/views/stock/component/apply-form.vue
+++ b/src/views/stock/component/apply-form.vue
@@ -50,10 +50,11 @@
 			<vxe-column field="name" title="物料名称" />
 			<vxe-column field="code" title="编码" />
 			<vxe-column field="spec" title="规格" />
+			<vxe-column field="price" title="价格" />
 			<vxe-column field="type" title="类型" />
 			<vxe-column field="assignRule" title="是否赋码">
 				<template #default="{ row }">
-					{{ row.assignRule === 'HIGH_VALUE' ? '是' : '否' }}
+					{{ row.assignRule ? '是' : '否' }}
 				</template>
 			</vxe-column>
 			<vxe-column
@@ -80,7 +81,6 @@
 <script setup lang="ts">
 	import { VxeTableInstance } from 'vxe-table'
 	import api from '@/api'
-	import { useUserStore } from '@/stores/user'
 	import dayjs, { Dayjs } from 'dayjs'
 	import { LabeledValue, DefaultOptionType } from 'ant-design-vue/es/select'
 	import { SelectHandler } from 'ant-design-vue/es/vc-select/Select'
@@ -116,9 +116,8 @@
 		slectedList: number[] // 入库物料
 	}
 
-	const userStore = useUserStore()
 	const formData = ref<FormData>({
-		applicant: userStore.fullName,
+		applicant: '',
 		applyDate: dayjs(),
 		applyType: props.applyType,
 		slectedList: [],
@@ -134,7 +133,8 @@
 		quantity: number
 		disabled: boolean
 		checked: boolean
-		assignRule: string
+		price: number
+		assignRule: boolean
 	}
 	const tableRef = ref<VxeTableInstance<RowVO>>()
 	// vxe-table 数据结果
@@ -161,12 +161,13 @@
 		if (m) {
 			const row: RowVO = {
 				id: m.id ? m.id : -1,
-				name: m.name ? m.name : '未知',
-				code: m.code ? m.code : '未知',
-				spec: m.spec ? m.spec : '未知',
-				type: m.type ? m.type : '未知',
+				name: m.name ? m.name : '',
+				code: m.code ? m.code : '',
+				spec: m.spec ? m.spec : '',
+				type: m.type ? m.type : '',
+				price: m.price ? m.price : 0,
 				quantity: 1,
-				assignRule: m.assignRule ? m.assignRule : 'HIGH_VALUE',
+				assignRule: m.assignRule ? m.assignRule : false,
 				disabled: false,
 				checked: false,
 			}
diff --git a/src/views/stock/material/material-page.vue b/src/views/stock/material/material-page.vue
index 6cf4d73..c2b24a1 100644
--- a/src/views/stock/material/material-page.vue
+++ b/src/views/stock/material/material-page.vue
@@ -36,7 +36,7 @@
 				<!-- 操作按钮列 -->
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'assignRule'">
-						{{ record.assignRule === 'HIGH_VALUE' ? '是' : '否' }}
+						{{ record.assignRule ? '是' : '否' }}
 					</template>
 					<template v-if="column.dataIndex === 'operation'">
 						<a-button type="link" :style="{ color: token.colorPrimary }" @click="addOrEdit(record)">