From 7ca2ebcf5d2be08ad725f7cd4d1dd8fd18ee0220 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sat, 8 Mar 2025 15:36:52 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20:bug:=20=E9=A1=B5=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E5=A4=8D=E5=B9=B6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api-lock.json                         | 53 ++++++++++++++++---
 src/api/material/api.d.ts                     | 23 ++++----
 .../material/mods/apply/searchAuditPage.ts    |  2 +-
 src/views/stock/component/apply-form.vue      |  7 +--
 src/views/stock/component/scan-form.vue       |  4 +-
 src/views/stock/material/form.ts              |  2 +-
 src/views/stock/material/material-page.vue    |  7 ++-
 src/views/stock/report/inboundReport-page.vue |  5 ++
 .../stock/report/outboundReport-page.vue      |  5 ++
 .../stock/stocktaking/stocktaking-page.vue    | 44 +++++++++------
 vite.config.ts                                |  4 +-
 11 files changed, 110 insertions(+), 46 deletions(-)

diff --git a/src/api/api-lock.json b/src/api/api-lock.json
index 14e23b5..0736f08 100644
--- a/src/api/api-lock.json
+++ b/src/api/api-lock.json
@@ -3591,7 +3591,7 @@
 									"isDefsType": false,
 									"templateIndex": -1,
 									"compileTemplateKeyword": "#/definitions/",
-									"enum": ["'ALL'", "'PARTIAL'"],
+									"enum": ["'SCAN'", "'MANUAL'"],
 									"typeProperties": []
 								}
 							},
@@ -4398,7 +4398,7 @@
 							"isDefsType": false,
 							"templateIndex": -1,
 							"compileTemplateKeyword": "#/definitions/",
-							"enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'"],
+							"enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'", "'SCRAP_OUT'"],
 							"typeProperties": []
 						},
 						"name": "applyType",
@@ -4660,11 +4660,11 @@
 							"isDefsType": false,
 							"templateIndex": -1,
 							"compileTemplateKeyword": "#/definitions/",
-							"enum": ["'ALL'", "'PARTIAL'"],
+							"enum": ["'SCAN'", "'MANUAL'"],
 							"typeProperties": []
 						},
 						"name": "auditType",
-						"description": "盘点类型（1: 全盘 2: 部分盘点）",
+						"description": "盘点类型（1: 扫码 2: 人工）",
 						"required": false
 					},
 					{
@@ -4770,7 +4770,7 @@
 							"isDefsType": false,
 							"templateIndex": -1,
 							"compileTemplateKeyword": "#/definitions/",
-							"enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'"],
+							"enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'", "'SCRAP_OUT'"],
 							"typeProperties": []
 						},
 						"name": "type",
@@ -4900,11 +4900,11 @@
 							"isDefsType": false,
 							"templateIndex": -1,
 							"compileTemplateKeyword": "#/definitions/",
-							"enum": ["'ALL'", "'PARTIAL'"],
+							"enum": ["'SCAN'", "'MANUAL'"],
 							"typeProperties": []
 						},
 						"name": "auditType",
-						"description": "盘点类型（1: 全盘 2: 部分盘点）",
+						"description": "盘点类型（1: 扫码 2: 人工）",
 						"required": false
 					},
 					{
@@ -5034,13 +5034,37 @@
 							"isDefsType": false,
 							"templateIndex": -1,
 							"compileTemplateKeyword": "#/definitions/",
-							"enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'"],
+							"enum": ["'PURCHASE_RECEIPT'", "'RETURN_RECEIPT'", "'LOAN_OUT'", "'AUDIT'", "'SCRAP_OUT'"],
 							"typeProperties": []
 						},
 						"name": "type",
 						"description": "类型（1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请）",
 						"required": false
 					},
+					{
+						"dataType": {
+							"typeArgs": [
+								{
+									"typeArgs": [],
+									"typeName": "string",
+									"isDefsType": false,
+									"templateIndex": -1,
+									"compileTemplateKeyword": "#/definitions/",
+									"enum": [],
+									"typeProperties": []
+								}
+							],
+							"typeName": "Array",
+							"isDefsType": false,
+							"templateIndex": -1,
+							"compileTemplateKeyword": "#/definitions/",
+							"enum": [],
+							"typeProperties": []
+						},
+						"name": "types",
+						"description": "物料类型",
+						"required": false
+					},
 					{
 						"dataType": {
 							"typeArgs": [],
@@ -5580,6 +5604,19 @@
 						"description": "类型",
 						"required": false
 					},
+					{
+						"dataType": {
+							"typeArgs": [],
+							"typeName": "string",
+							"isDefsType": false,
+							"templateIndex": -1,
+							"compileTemplateKeyword": "#/definitions/",
+							"enum": [],
+							"typeProperties": []
+						},
+						"name": "typeName",
+						"required": false
+					},
 					{
 						"dataType": {
 							"typeArgs": [],
diff --git a/src/api/material/api.d.ts b/src/api/material/api.d.ts
index 8872bd5..40f6d56 100644
--- a/src/api/material/api.d.ts
+++ b/src/api/material/api.d.ts
@@ -13,7 +13,7 @@ declare namespace material {
 		applyNum?: string
 
 		/** 申请类型 */
-		applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'
+		applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT' | 'SCRAP_OUT'
 
 		/** 物料编码 */
 		code?: string
@@ -76,8 +76,8 @@ declare namespace material {
 		/** 申请日期 */
 		applyDate?: string
 
-		/** 盘点类型（1: 全盘 2: 部分盘点） */
-		auditType?: 'ALL' | 'PARTIAL'
+		/** 盘点类型（1: 扫码 2: 人工） */
+		auditType?: 'SCAN' | 'MANUAL'
 
 		/** 是否确认（0: 未确认 1: 已确认） */
 		confirm?: boolean
@@ -101,7 +101,7 @@ declare namespace material {
 		taker?: string
 
 		/** 类型（1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请） */
-		type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'
+		type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT' | 'SCRAP_OUT'
 
 		/** updatedTime */
 		updatedTime?: string
@@ -131,8 +131,8 @@ declare namespace material {
 		/** 申请日期 */
 		applyDate?: string
 
-		/** 盘点类型（1: 全盘 2: 部分盘点） */
-		auditType?: 'ALL' | 'PARTIAL'
+		/** 盘点类型（1: 扫码 2: 人工） */
+		auditType?: 'SCAN' | 'MANUAL'
 
 		/** 是否确认（0: 未确认 1: 已确认） */
 		confirm?: boolean
@@ -146,9 +146,6 @@ declare namespace material {
 		/** 物料ids */
 		ids?: Array<string>
 
-		/** 物料类型 */
-		types?: Array<string>
-
 		/** 审核意见 */
 		reviewRemark?: string
 
@@ -162,7 +159,10 @@ declare namespace material {
 		taker?: string
 
 		/** 类型（1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请） */
-		type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'
+		type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT' | 'SCRAP_OUT'
+
+		/** 物料类型 */
+		types?: Array<string>
 
 		/** updatedTime */
 		updatedTime?: string
@@ -213,6 +213,9 @@ declare namespace material {
 		/** 类型 */
 		type?: string
 
+		/** typeName */
+		typeName?: string
+
 		/** updatedTime */
 		updatedTime?: string
 	}
diff --git a/src/api/material/mods/apply/searchAuditPage.ts b/src/api/material/mods/apply/searchAuditPage.ts
index b4fe789..ec9b0eb 100644
--- a/src/api/material/mods/apply/searchAuditPage.ts
+++ b/src/api/material/mods/apply/searchAuditPage.ts
@@ -10,7 +10,7 @@ export interface Params {
 	/** 页面大小 */
 	size?: number
 	/** 盘点类型 */
-	auditType?: 'ALL' | 'PARTIAL'
+	auditType?: 'SCAN' | 'MANUAL'
 	/** 盘点人 */
 	taker?: string
 	/** 创建日期 */
diff --git a/src/views/stock/component/apply-form.vue b/src/views/stock/component/apply-form.vue
index aec0f7c..fc34012 100644
--- a/src/views/stock/component/apply-form.vue
+++ b/src/views/stock/component/apply-form.vue
@@ -3,7 +3,7 @@
 	<div>
 		<a-form :model="formData" name="basic" layout="horizontal" label-wrap>
 			<a-form-item label="申请人" name="applicant">
-				<a-input :value="formData.applicant" style="width: 40%" />
+				<a-input v-model="formData.applicant" style="width: 40%" />
 			</a-form-item>
 
 			<a-form-item label="申请类型" name="applyType">
@@ -29,7 +29,6 @@
 						:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
 						placeholder="请选择物料类型"
 						allow-clear
-						tree-default-expand-all
 						:tree-data="types"
 						tree-node-filter-prop="label"
 					/>
@@ -68,7 +67,7 @@
 			<vxe-column field="code" title="编码" />
 			<vxe-column field="spec" title="规格" />
 			<vxe-column field="price" title="价格" />
-			<vxe-column field="type" title="类型" />
+			<vxe-column field="typeName" title="类型" />
 			<vxe-column field="assignRule" title="是否赋码">
 				<template #default="{ row }">
 					{{ row.assignRule ? '是' : '否' }}
@@ -174,6 +173,7 @@
 		code: string
 		spec: string
 		type: string
+		typeName: string
 		quantity: number
 		disabled: boolean
 		checked: boolean
@@ -218,6 +218,7 @@
 				name: m.name ? m.name : '',
 				code: m.code ? m.code : '',
 				spec: m.spec ? m.spec : '',
+				typeName: m.typeName ? m.typeName : '',
 				type: m.type ? m.type : '',
 				price: m.price ? m.price : 0,
 				quantity: 1,
diff --git a/src/views/stock/component/scan-form.vue b/src/views/stock/component/scan-form.vue
index e3cd672..4b3d414 100644
--- a/src/views/stock/component/scan-form.vue
+++ b/src/views/stock/component/scan-form.vue
@@ -38,7 +38,7 @@
 		<vxe-column field="name" title="物料名称" />
 		<vxe-column field="code" title="编码" />
 		<vxe-column field="spec" title="规格" />
-		<vxe-column field="type" title="类型" />
+		<vxe-column field="typeName" title="类型" />
 		<vxe-column field="times" title="扫码时间" />
 		<vxe-column field="oprator" title="操作">
 			<template #default="{ row }">
@@ -127,6 +127,7 @@
 		code: string
 		spec: string
 		type: string
+		typeName: string
 		times: string
 	}
 
@@ -193,6 +194,7 @@
 				code: materialInfo?.code ?? '',
 				spec: materialInfo?.spec ?? '',
 				type: materialInfo?.type ?? '',
+				typeName: materialInfo?.typeName ?? '',
 				times: new Date().toLocaleString(),
 			}
 			$table.insert(row)
diff --git a/src/views/stock/material/form.ts b/src/views/stock/material/form.ts
index 2d79e2e..e5b9d7a 100644
--- a/src/views/stock/material/form.ts
+++ b/src/views/stock/material/form.ts
@@ -98,7 +98,7 @@ export const formItems = (types: TreeDataNode[]): FormItem[] => [
 			autoLink: true,
 			hasFeedback: false,
 			label: '是否赋码',
-			name: 'azry',
+			name: 'assignRule',
 			required: true,
 		},
 		properties: {
diff --git a/src/views/stock/material/material-page.vue b/src/views/stock/material/material-page.vue
index 1848f8c..7965ebc 100644
--- a/src/views/stock/material/material-page.vue
+++ b/src/views/stock/material/material-page.vue
@@ -3,7 +3,7 @@
 		<!-- 页面操作栏 -->
 		<template #ops>
 			<a-row>
-				<a-col :span="6">
+				<a-col :span="16">
 					<a-input-search
 						v-model:value="searchKey"
 						:placeholder="`名称/编码/类型`"
@@ -12,7 +12,7 @@
 						@search="loadData()"
 					></a-input-search>
 				</a-col>
-				<a-col :span="6">
+				<a-col :span="8">
 					<a-button type="primary" style="margin-left: 10px" @click="addOrEdit()">
 						<template #icon>
 							<icon-font type="icon-plus" />
@@ -161,7 +161,7 @@
 		},
 		{
 			title: '物料类型',
-			dataIndex: 'type',
+			dataIndex: 'typeName',
 		},
 		{
 			title: '物料型号',
@@ -178,7 +178,6 @@
 		{
 			title: '操作',
 			dataIndex: 'operation',
-			width: 400,
 		},
 	]
 
diff --git a/src/views/stock/report/inboundReport-page.vue b/src/views/stock/report/inboundReport-page.vue
index a5b80b0..b9daa4b 100644
--- a/src/views/stock/report/inboundReport-page.vue
+++ b/src/views/stock/report/inboundReport-page.vue
@@ -60,6 +60,11 @@
 
 	//表格列
 	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
+		},
 		{
 			title: '物料名称',
 			dataIndex: 'name',
diff --git a/src/views/stock/report/outboundReport-page.vue b/src/views/stock/report/outboundReport-page.vue
index 53476a1..91e46db 100644
--- a/src/views/stock/report/outboundReport-page.vue
+++ b/src/views/stock/report/outboundReport-page.vue
@@ -60,6 +60,11 @@
 
 	//表格列
 	const columns = [
+		{
+			title: '序号',
+			dataIndex: 'key',
+			customRender: ({ index }: { index: number }) => `${index + 1}`,
+		},
 		{
 			title: '物料名称',
 			dataIndex: 'name',
diff --git a/src/views/stock/stocktaking/stocktaking-page.vue b/src/views/stock/stocktaking/stocktaking-page.vue
index 7f345ab..37f68a2 100644
--- a/src/views/stock/stocktaking/stocktaking-page.vue
+++ b/src/views/stock/stocktaking/stocktaking-page.vue
@@ -35,10 +35,10 @@
 			>
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'auditType'">
-						{{ record.auditType === 'ALL' ? '全部盘点' : '部分盘点' }}
+						{{ record.auditType === 'SCAN' ? '扫码盘点' : '人工盘点' }}
 					</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'"><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>
@@ -53,7 +53,7 @@
 							<template #icon>
 								<icon-font type="icon-edit" />
 							</template>
-							开始扫码
+							开始盘点
 						</a-button>
 						<a-button
 							v-if="record.reviewResult === 'WAIT_SUBMIT'"
@@ -129,7 +129,7 @@
 	const confirmLoading = ref(false) // 盘点作业弹窗提交按钮loading
 	// 新增申请表单对象
 	const applyForm = ref<Partial<material.AuditApplyInfo>>({
-		auditType: 'ALL',
+		auditType: 'SCAN',
 		applicant: userStore.fullName,
 		type: 'AUDIT',
 		applyDate: dayjs() + '',
@@ -167,7 +167,14 @@
 		applyForm,
 		() => {
 			if (applyForm.value && applyForm.value.types && applyForm.value.types.length > 0) {
-				getMaterialList()
+				api.materialApi.material.all({ type: applyForm.value.types[0] }, (data) => {
+					materialList.value = data.map((item) => {
+						return {
+							value: item?.id + '',
+							label: item?.name,
+						}
+					})
+				})
 			}
 		},
 		{
@@ -189,16 +196,6 @@
 			key: areaTree.value,
 		}))
 	}
-	const getMaterialList = async () => {
-		await api.materialApi.material.all({ type: '' }, (data) => {
-			materialList.value = data.map((item) => {
-				return {
-					value: item?.id + '',
-					label: item?.name,
-				}
-			})
-		})
-	}
 
 	//抽屉组件
 	const formDrawer = ref<typeof FormDrawer>()
@@ -300,7 +297,21 @@
 	// 盘点作业弹窗相关
 	const open = ref<boolean>(false)
 	const applyIdRef = ref()
-	const showModal = (applyId: number) => {
+	const showModal = (applyId: number, auditType: string) => {
+		if (auditType === 'SCAN') {
+			showScanModal(applyId)
+		} else {
+			showManualModal(applyId)
+		}
+	}
+
+	// 人工
+	const showManualModal = (applyId: number) => {
+		console.log('点击传参' + applyId)
+	}
+
+	// 扫码弹窗
+	const showScanModal = (applyId: number) => {
 		open.value = true
 		applyIdRef.value = applyId
 		let m = '需要扫码的物料: '
@@ -313,6 +324,7 @@
 		window.console.log(m)
 		msg.value = m
 	}
+
 	// 盘点作业提交数据
 
 	//关闭弹窗 提交数据
diff --git a/vite.config.ts b/vite.config.ts
index 8974332..3b82e6b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -59,8 +59,8 @@ export default defineConfig(({ mode }) => {
 			open: true,
 			proxy: {
 				'/api': {
-					target: 'https://ims.riemann.tech/api/',
-					// target: 'http://127.0.0.1:8888',
+					// target: 'https://ims.riemann.tech/api/',
+					target: 'http://127.0.0.1:8888',
 					changeOrigin: true,
 					rewrite: (path) => path.replace(/^\/api/, ''),
 				},