更新录入合卷分卷新增内容

apps/hand-factory/components/panels/code/typing.vue

@@ -114,6 +114,21 @@
 				</view>
 			</view>
 			
+			<!-- 原材料选择（仅当选择了原材料库区时显示） -->
+			<view class="form-item form-item-optional" v-if="form.itemType === 'raw_material'">
+				<text class="form-label-optional">选择原材料</text>
+				<view 
+					class="picker-input" 
+					@click="coilDetail.dataType !== 0 && showRawMaterialPicker()"
+					:class="{ 'picker-input-disabled': coilDetail.dataType === 0 }"
+				>
+					<text class="picker-text" :class="{ 'picker-placeholder': !selectedRawMaterialName }">
+						{{ selectedRawMaterialName || '请选择原材料' }}
+					</text>
+					<text class="picker-arrow" v-if="coilDetail.dataType !== 0">▼</text>
+				</view>
+			</view>
+			
 			<!-- 毛重 -->
 			<view class="form-item form-item-optional">
 				<text class="form-label-optional">毛重 (吨)</text>
@@ -224,6 +239,38 @@
 			</view>
 		</uni-popup>
 		
+		<!-- 原材料选择弹窗 -->
+		<uni-popup ref="rawMaterialPopup" type="bottom">
+			<view class="warehouse-popup">
+				<view class="popup-header">
+					<text class="popup-title">选择原材料</text>
+					<text class="popup-close" @click="closeRawMaterialPicker">✕</text>
+				</view>
+				<view class="popup-search">
+					<input 
+						v-model="rawMaterialSearchKeyword" 
+						@input="filterRawMaterialsInPicker"
+						placeholder="搜索原材料名称" 
+						class="search-input"
+					/>
+				</view>
+				<scroll-view scroll-y class="popup-body">
+					<view 
+						class="warehouse-item" 
+						v-for="material in filteredRawMaterialsInPicker" 
+						:key="material.rawMaterialId"
+						@click="selectRawMaterialFromPicker(material)"
+					>
+						<text class="warehouse-name">{{ material.rawMaterialName }}</text>
+						<text class="warehouse-check" v-if="form.itemId === material.rawMaterialId">✓</text>
+					</view>
+					<view class="empty-tip" v-if="!filteredRawMaterialsInPicker || filteredRawMaterialsInPicker.length === 0">
+						<text>未找到匹配的原材料</text>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+		
 		<!-- BOM弹窗 -->
 		<uni-popup ref="bomPopup" type="bottom">
 			<view class="bom-popup">
@@ -258,7 +305,7 @@
 	import { getGenerateRecord } from '@/api/wms/code.js'
 import { updateMaterialCoil, getMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil.js'
 import { listWarehouse } from '@/api/wms/warehouse.js'
-import { getRawMaterial } from '@/api/wms/rawMaterial.js'
+import { getRawMaterial, listRawMaterial } from '@/api/wms/rawMaterial.js'
 import { listProduct } from '@/api/wms/product.js'
 	
 	export default { 
@@ -289,6 +336,10 @@ import { listProduct } from '@/api/wms/product.js'
 			productSearchKeyword: '',
 			filteredProductsInPicker: [],
 			selectedProductName: '', // 已选择的产品名称
+			rawMaterials: [], // 原材料列表
+			rawMaterialSearchKeyword: '',
+			filteredRawMaterialsInPicker: [],
+			selectedRawMaterialName: '', // 已选择的原材料名称
 			loading: false,
 			qrcodeStatus: 1 // 二维码状态：0=历史码，1=当前有效码
 		}
@@ -303,10 +354,14 @@ import { listProduct } from '@/api/wms/product.js'
 	
 	onLoad() {
 		this.loadWarehouses();
+		this.loadProducts();
+		this.loadRawMaterials();
 	},
 	
 	mounted() {
 		this.loadWarehouses();
+		this.loadProducts();
+		this.loadRawMaterials();
 	},
 	
 	methods: {
@@ -346,6 +401,24 @@ import { listProduct } from '@/api/wms/product.js'
 			}
 		},
 		
+		// 加载原材料列表
+		async loadRawMaterials() {
+			console.log('开始加载原材料列表...');
+			try {
+				const res = await listRawMaterial({ pageNum: 1, pageSize: 1000 });
+				console.log("原材料返回值", res);
+				if (res.code === 200) {
+					this.rawMaterials = res.rows || res.data || [];
+					this.filteredRawMaterialsInPicker = this.rawMaterials;
+					console.log('原材料加载成功，数量:', this.rawMaterials.length);
+				} else {
+					console.error('原材料加载失败:', res.msg);
+				}
+			} catch (err) {
+				console.error('加载原材料异常:', err);
+			}
+		},
+		
 		// 显示产品选择器
 		showProductPicker() {
 			this.productSearchKeyword = '';
@@ -384,6 +457,44 @@ import { listProduct } from '@/api/wms/product.js'
 			this.closeProductPicker();
 		},
 		
+		// 显示原材料选择器
+		showRawMaterialPicker() {
+			this.rawMaterialSearchKeyword = '';
+			this.filteredRawMaterialsInPicker = [...this.rawMaterials];
+			this.$refs.rawMaterialPopup.open();
+		},
+		
+		// 关闭原材料选择器
+		closeRawMaterialPicker() {
+			this.$refs.rawMaterialPopup.close();
+		},
+		
+		// 过滤原材料（在选择器中）
+		filterRawMaterialsInPicker() {
+			console.log('过滤原材料，关键词:', this.rawMaterialSearchKeyword);
+			const keyword = this.rawMaterialSearchKeyword.trim().toLowerCase();
+			if (!keyword) {
+				this.filteredRawMaterialsInPicker = [...this.rawMaterials];
+			} else {
+				this.filteredRawMaterialsInPicker = this.rawMaterials.filter(material => {
+					const name = (material.rawMaterialName || '').toLowerCase();
+					return name.includes(keyword);
+				});
+			}
+		},
+		
+		// 从选择器中选择原材料
+		selectRawMaterialFromPicker(material) {
+			this.form.itemId = material.rawMaterialId;
+			this.form.itemType = 'raw_material';
+			this.selectedRawMaterialName = material.rawMaterialName;
+			uni.showToast({
+				title: `已选择原材料：${material.rawMaterialName}`,
+				icon: 'success'
+			});
+			this.closeRawMaterialPicker();
+		},
+		
 		// 过滤库区
 		filterWarehouses() {
 			console.log('过滤库区，关键词:', this.warehouseKeyword);
@@ -444,14 +555,15 @@ import { listProduct } from '@/api/wms/product.js'
 			this.currentWarehouseName = warehouse.warehouseName;
 			this.closeWarehousePicker();
 			
-			// 检查是否选择了成品库区
-			if (warehouse.warehouseName && warehouse.warehouseName.includes('成品')) {
-				// 切换为产品类型
+			// 根据库区ID判断类型：999为成品库，其他为原材料库
+			if (warehouse.warehouseId === 999) {
+				// 成品库，显示产品选择器
 				this.form.itemType = 'product';
-				// 加载产品列表
-				await this.loadProducts();
-				// 弹出产品选择框
 				this.showProductPicker();
+			} else {
+				// 其他库区，显示原材料选择器
+				this.form.itemType = 'raw_material';
+				this.showRawMaterialPicker();
 			}
 		},