bug: 🐛 出入库申请逻辑修改

src/api/api-lock.json

@@ -4405,6 +4405,19 @@
 						"description": "申请类型",
 						"required": false
 					},
+					{
+						"dataType": {
+							"typeArgs": [],
+							"typeName": "Codebook",
+							"isDefsType": true,
+							"templateIndex": -1,
+							"compileTemplateKeyword": "#/definitions/",
+							"enum": [],
+							"typeProperties": []
+						},
+						"name": "applyTypeInfo",
+						"required": false
+					},
 					{
 						"dataType": {
 							"typeArgs": [],
@@ -4488,6 +4501,20 @@
 						"name": "type",
 						"description": "物料类型",
 						"required": false
+					},
+					{
+						"dataType": {
+							"typeArgs": [],
+							"typeName": "string",
+							"isDefsType": false,
+							"templateIndex": -1,
+							"compileTemplateKeyword": "#/definitions/",
+							"enum": [],
+							"typeProperties": []
+						},
+						"name": "typeName",
+						"description": "类型名称",
+						"required": false
 					}
 				]
 			},

src/api/material/api.d.ts

@@ -15,6 +15,9 @@ declare namespace material {
 		/** 申请类型 */
 		applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT' | 'SCRAP_OUT'
 
+		/** applyTypeInfo */
+		applyTypeInfo?: material.Codebook
+
 		/** 物料编码 */
 		code?: string
 
@@ -32,6 +35,9 @@ declare namespace material {
 
 		/** 物料类型 */
 		type?: string
+
+		/** 类型名称 */
+		typeName?: string
 	}
 
 	/**

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

@@ -24,7 +24,13 @@
 				:pagination="pagination"
 				:loading="loading"
 				row-key="key"
-			></a-table>
+			>
+				<template #bodyCell="{ column, record }">
+					<template v-if="column.dataIndex === 'applyTypeInfo'">
+						{{ record.applyTypeInfo.description }}
+					</template>
+				</template>
+			</a-table>
 		</div>
 	</page-container>
 </template>
@@ -69,13 +75,26 @@
 			title: '物料名称',
 			dataIndex: 'name',
 		},
+		{
+			title: '物料类型',
+			dataIndex: 'typeName',
+		},
 		{
 			title: '物料编码',
 			dataIndex: 'code',
 		},
 		{
-			title: '物料类型',
-			dataIndex: 'type',
+			title: '入库类型',
+			dataIndex: 'applyTypeInfo',
+		},
+
+		{
+			title: '申请数量',
+			dataIndex: 'applyNum',
+		},
+		{
+			title: '确认数量',
+			dataIndex: 'confirmNum',
 		},
 		{
 			title: '申请人',
@@ -85,14 +104,6 @@
 			title: '申请日期',
 			dataIndex: 'applyDate',
 		},
-		{
-			title: '申请数量',
-			dataIndex: 'applyNum',
-		},
-		{
-			title: '确认数量',
-			dataIndex: 'confirmNum',
-		},
 		{
 			title: '备注',
 			dataIndex: 'remark',

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

@@ -28,7 +28,7 @@
 				<!-- 操作按钮列 -->
 				<template #bodyCell="{ column, record }">
 					<template v-if="column.dataIndex === 'assignRule'">
-						{{ record.assignRule === 1 ? '高价值工具类' : '低值易耗品' }}
+						{{ record.assignRule ? '是' : '否' }}
 						<!-- 这里定义为0和1，0再回显的时候不展示？-->
 					</template>
 				</template>
@@ -66,24 +66,25 @@
 			dataIndex: 'key',
 			customRender: ({ index }: { index: number }) => `${index + 1}`,
 		},
-		{
-			title: '物料编码',
-			dataIndex: 'code',
-		},
 		{
 			title: '物料名称',
 			dataIndex: 'name',
 		},
+		{
+			title: '物料编码',
+			dataIndex: 'code',
+		},
+
 		{
 			title: '物料类型',
-			dataIndex: 'type',
+			dataIndex: 'typeName',
 		},
 		{
 			title: '物料型号',
 			dataIndex: 'spec',
 		},
 		{
-			title: '赋码规则',
+			title: '是否赋码',
 			dataIndex: 'assignRule',
 		},
 		{

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

@@ -24,7 +24,13 @@
 				:pagination="pagination"
 				:loading="loading"
 				row-key="key"
-			></a-table>
+			>
+				<template #bodyCell="{ column, record }">
+					<template v-if="column.dataIndex === 'applyTypeInfo'">
+						{{ record.applyTypeInfo.description }}
+					</template>
+				</template>
+			</a-table>
 		</div>
 	</page-container>
 </template>
@@ -69,10 +75,27 @@
 			title: '物料名称',
 			dataIndex: 'name',
 		},
+		{
+			title: '物料类型',
+			dataIndex: 'typeName',
+		},
 		{
 			title: '物料编码',
 			dataIndex: 'code',
 		},
+		{
+			title: '出库类型',
+			dataIndex: 'applyTypeInfo',
+		},
+
+		{
+			title: '申请数量',
+			dataIndex: 'applyNum',
+		},
+		{
+			title: '确认数量',
+			dataIndex: 'confirmNum',
+		},
 		{
 			title: '申请人',
 			dataIndex: 'applicant',
@@ -81,14 +104,6 @@
 			title: '申请日期',
 			dataIndex: 'applyDate',
 		},
-		{
-			title: '申请数量',
-			dataIndex: 'applyNum',
-		},
-		{
-			title: '确认数量',
-			dataIndex: 'confirmNum',
-		},
 		{
 			title: '备注',
 			dataIndex: 'remark',

src/views/stock/stocktaking/form.ts

@@ -37,7 +37,7 @@ export const formItems = (
 			defaultValue: 'SCAN',
 			options: [
 				{ value: 'SCAN', label: '扫码盘点' },
-				{ value: 'PARTIAL', label: '人工盘点' },
+				{ value: 'MANUAL', label: '人工盘点' },
 			],
 		},
 		rules: [],