From e922e87f5b0f912fb3d446e92a83cc202006494d Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Wed, 22 Apr 2026 10:20:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=89=E8=8A=AF=E4=B8=8B=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9=20=E4=B8=BB=E8=A6=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20=E5=85=A5=E5=BA=93=E5=8D=95=E5=AE=A1=E6=89=B9=20?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=AE=A1=E6=89=B9=20=E7=89=A9?=
 =?UTF-8?q?=E8=B5=84=E9=A2=86=E7=94=A8=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  23 +-
 pages/mpr/material_requisition_form.vue | 319 ++++++++++++++++++++++++
 pages/mpr/requisition_form.vue          | 239 ++++++++++++++++++
 pages/mpr/warehouse_entry_form.vue      | 283 +++++++++++++++++++++
 utils/api.js                            |  17 ++
 5 files changed, 880 insertions(+), 1 deletion(-)
 create mode 100644 pages/mpr/material_requisition_form.vue
 create mode 100644 pages/mpr/requisition_form.vue
 create mode 100644 pages/mpr/warehouse_entry_form.vue

diff --git a/pages.json b/pages.json
index 6b5180e..04f7937 100644
--- a/pages.json
+++ b/pages.json
@@ -172,8 +172,29 @@
 			{
 				"navigationBarTitleText" : "合同变更"
 			}
+		},
+		{
+			"path" : "pages/mpr/material_requisition_form",
+			"style" :
+			{
+				"navigationBarTitleText" : "物资领用"
+			}
+		},
+		{
+			"path" : "pages/mpr/warehouse_entry_form",
+			"style" :
+			{
+				"navigationBarTitleText" : "入库单审批"
+			}
+		},
+		{
+			"path" : "pages/mpr/requisition_form",
+			"style" :
+			{
+				"navigationBarTitleText" : "物资申购单"
+			}
 		}
-		
+
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/pages/mpr/material_requisition_form.vue b/pages/mpr/material_requisition_form.vue
new file mode 100644
index 0000000..f8880cb
--- /dev/null
+++ b/pages/mpr/material_requisition_form.vue
@@ -0,0 +1,319 @@
+<!-- 物资领用 -->
+<template>
+	<view class="form-page">
+		<scroll-view scroll-y class="form-scroll">
+			<uni-forms v-model="form" label-width="200rpx" ref="customForm">
+				<!-- 审批状态卡片 -->
+				<view class="form-card" v-if="form.ticket_">
+					<ticketd :ticket_="form.ticket_"></ticketd>
+				</view>
+
+				<!-- 基本信息 -->
+				<view class="form-card">
+					<view class="form-card-title">基本信息</view>
+					<uni-forms-item label="编号" v-if="form.number">
+						<span>{{form.number}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="领用部门">
+						<span>{{form.belong_dept_name || userDeptName}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="操作人">
+						<span>{{form.create_by_name || userName}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="填报时间" required>
+						<picker mode="date" :value="form.req_date" @change="onDateChange" v-if="mode!='show'">
+							<view class="picker-value">{{form.req_date || '请选择日期'}}</view>
+						</picker>
+						<span v-else>{{form.req_date}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="领取人">
+						<uni-easyinput v-model="form.collector" placeholder="请输入领取人" v-if="mode!='show'"/>
+						<span v-else>{{form.collector}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="备注">
+						<textarea placeholder-style="color:#c0c4cc" v-model="form.note" placeholder="请输入备注" class="form-textarea" v-if="mode!='show'"/>
+						<span v-else>{{form.note}}</span>
+					</uni-forms-item>
+				</view>
+
+				<!-- 领用物品明细 -->
+				<view class="form-card">
+					<view class="form-card-title">领用物品</view>
+					<view v-if="mode!='show'" class="item-add-row">
+						<button class="item-add-btn item-add-btn-stock" @click="openStockPicker" size="mini">从库存选择</button>
+						<button class="item-add-btn" @click="addItem" size="mini">+ 手动添加</button>
+					</view>
+					<view v-for="(item, idx) in items" :key="idx" class="item-card">
+						<view class="item-card-header">
+							<text class="item-card-index">第{{idx+1}}项 {{item.is_stock_item ? '(库存)' : ''}}</text>
+							<text v-if="mode!='show'" class="item-card-del" @click="delItem(idx)">删除</text>
+						</view>
+						<uni-forms-item label="物资名称" required>
+							<uni-easyinput v-model="item.name" placeholder="物资名称" :disabled="item.is_stock_item" v-if="mode!='show'"/>
+							<span v-else>{{item.name}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="领用类型">
+							<uni-easyinput v-model="item.req_type" placeholder="领用类型" v-if="mode!='show'"/>
+							<span v-else>{{item.req_type}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="规格型号">
+							<uni-easyinput v-model="item.spec" placeholder="规格型号" :disabled="item.is_stock_item" v-if="mode!='show'"/>
+							<span v-else>{{item.spec}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="单位">
+							<uni-easyinput v-model="item.unit" placeholder="单位" :disabled="item.is_stock_item" v-if="mode!='show'"/>
+							<span v-else>{{item.unit}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="库存量" v-if="item.is_stock_item">
+							<span style="color:#9CA3AF;">{{item.stock_quantity}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="领用量" required>
+							<uni-number-box v-model="item.quantity" :min="0" :max="item.is_stock_item ? Number(item.stock_quantity) : 99999" :step="1" v-if="mode!='show'"/>
+							<span v-else>{{item.quantity}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="备注">
+							<uni-easyinput v-model="item.note" placeholder="备注" v-if="mode!='show'"/>
+							<span v-else>{{item.note}}</span>
+						</uni-forms-item>
+					</view>
+					<view v-if="items.length === 0" class="empty-hint">暂无领用物品</view>
+				</view>
+			</uni-forms>
+		</scroll-view>
+		<view class="footer_fixed">
+			<button v-if="mode=='edit'" class="form-btn form-btn-danger" @click="handleDel" :loading="saveLoading" :disabled="saveLoading">
+				删除
+			</button>
+			<button v-if="mode!='show'" class="form-btn form-btn-primary" @click="handleSave" :loading="saveLoading" :disabled="saveLoading">
+				提交审批
+			</button>
+			<ticketd_b :workflow_key="'wf_material_requis'" v-if="form.ticket_ && mode == 'show'" :t_id="form.id" :ticket_="form.ticket_"
+			:ticket_data="ticket_data" @success="()=>{uni.navigateBack()}" ref="ticketd_b"></ticketd_b>
+		</view>
+
+		<!-- 库存选择弹窗 -->
+		<uni-popup ref="stockPopup" type="bottom" background-color="#fff">
+			<view class="stock-popup">
+				<view class="stock-popup-header">
+					<text class="stock-popup-title">选择库存物品</text>
+					<text class="stock-popup-close" @click="closeStockPicker">关闭</text>
+				</view>
+				<view class="stock-search-row">
+					<uni-easyinput v-model="stockSearch" placeholder="搜索名称/规格/供应商" @confirm="loadStockList" prefixIcon="search"/>
+				</view>
+				<scroll-view scroll-y class="stock-list">
+					<view v-for="stock in stockList" :key="stock.id" class="stock-item" @click="pickStock(stock)" hover-class="stock-item-hover">
+						<view class="stock-item-name">{{stock.name}}</view>
+						<view class="stock-item-info">
+							<text v-if="stock.spec">规格: {{stock.spec}}</text>
+							<text>库存: {{stock.quantity}} {{stock.unit}}</text>
+						</view>
+						<view class="stock-item-info" v-if="stock.warehouse_name || stock.supplier_name">
+							<text v-if="stock.warehouse_name">仓库: {{stock.warehouse_name}}</text>
+							<text v-if="stock.supplier_name">供应商: {{stock.supplier_name}}</text>
+						</view>
+					</view>
+					<view v-if="stockList.length === 0 && stockLoadStatus !== 'loading'" class="empty-hint">暂无可用库存</view>
+					<uni-load-more v-if="stockLoadStatus === 'loading'" status="loading"/>
+				</scroll-view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import ticketd_b from "../wf/ticketd_b.vue"
+import ticketd from "../wf/ticketd.vue"
+export default {
+	components: { ticketd_b, ticketd },
+	data(){
+		return{
+			saveLoading: false,
+			mode:"add",
+			t_id: null,
+			form:{},
+			items:[],
+			ticket_data:{},
+			userName:'',
+			userDeptName:'',
+			// 库存选择
+			stockSearch:'',
+			stockList:[],
+			stockLoadStatus: 'more',
+		}
+	},
+	computed: {
+		isEditable() {
+			return this.mode === 'add' || this.mode === 'edit'
+		}
+	},
+	async onLoad(options) {
+		let userInfo = uni.getStorageSync("userInfo")
+		this.userName = userInfo.name
+		this.userDeptName = userInfo.belong_dept_name || ''
+		this.mode = options.mode || 'add'
+		this.t_id = options.t_id || null
+		if(this.t_id) {
+			const res = await this.$api.materialRequisitionItem(this.t_id)
+			this.form = res
+			this.items = (res.items_ || []).map(i => ({
+				...i,
+				stock_id: i.stock,
+				stock_quantity: '—',
+			}))
+			if(res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == userInfo.id) {
+				this.mode = "edit"
+			} else {
+				this.mode = "show"
+			}
+		}
+	},
+	methods:{
+		onDateChange(e) {
+			this.form.req_date = e.detail.value
+		},
+		// 库存选择相关
+		async openStockPicker() {
+			this.stockSearch = ''
+			this.stockList = []
+			this.stockLoadStatus = 'loading'
+			await this.loadStockList()
+			this.$refs.stockPopup.open()
+		},
+		closeStockPicker() {
+			this.$refs.stockPopup.close()
+		},
+		async loadStockList() {
+			this.stockLoadStatus = 'loading'
+			try {
+				let params = { page: 0 }
+				if(this.stockSearch) {
+					params.search = this.stockSearch
+				}
+				console.log('加载库存列表, 参数:', JSON.stringify(params))
+				const res = await this.$api.warehouseStockList(params)
+				console.log('库存列表响应:', JSON.stringify(res).substring(0, 200))
+				const list = Array.isArray(res) ? res : (res.results || [])
+				// 过滤掉库存为0和已选择的
+				const existingIds = new Set(this.items.filter(i=>i.is_stock_item).map(i=>i.stock_id))
+				this.stockList = list.filter(s => Number(s.quantity) > 0 && !existingIds.has(s.id))
+				console.log('过滤后库存数量:', this.stockList.length)
+				this.stockLoadStatus = 'noMore'
+			} catch(e) {
+				console.error('加载库存失败:', e)
+				this.stockLoadStatus = 'noMore'
+			}
+		},
+		pickStock(stock) {
+			this.items.push({
+				is_stock_item: true,
+				stock_id: stock.id,
+				name: stock.name,
+				spec: stock.spec || '',
+				unit: stock.unit || '',
+				stock_quantity: stock.quantity,
+				quantity: 0,
+				req_type: '',
+				note: '',
+			})
+			// 从列表中移除已选
+			this.stockList = this.stockList.filter(s => s.id !== stock.id)
+			uni.showToast({ title: `已添加: ${stock.name}`, icon: 'none' })
+		},
+		// 手动添加
+		addItem() {
+			this.items.push({
+				is_stock_item: false,
+				name: '', req_type: '', spec: '', unit: '',
+				quantity: 0, note: ''
+			})
+		},
+		delItem(idx) {
+			this.items.splice(idx, 1)
+		},
+		async handleDel(){
+			await this.$api.materialRequisitionDelete(this.form.id)
+			uni.navigateBack()
+		},
+		async handleSave(){
+			if(!this.form.req_date) {
+				uni.showToast({ title: '请选择填报时间', icon: 'none' }); return
+			}
+			if(this.items.length === 0) {
+				uni.showToast({ title: '请至少添加一项领用物品', icon: 'none' }); return
+			}
+			for(let i = 0; i < this.items.length; i++) {
+				if(!this.items[i].name) {
+					uni.showToast({ title: `第${i+1}项：请填写物资名称`, icon: 'none' }); return
+				}
+				if(!this.items[i].quantity || this.items[i].quantity <= 0) {
+					uni.showToast({ title: `第${i+1}项：领用量必须大于0`, icon: 'none' }); return
+				}
+				if(this.items[i].is_stock_item && Number(this.items[i].quantity) > Number(this.items[i].stock_quantity)) {
+					uni.showToast({ title: `第${i+1}项：领用量超过库存量`, icon: 'none' }); return
+				}
+			}
+			this.saveLoading = true
+			try {
+				const payload = {
+					req_date: this.form.req_date,
+					collector: this.form.collector,
+					note: this.form.note,
+					items: this.items.map(row => ({
+						is_stock_item: row.is_stock_item,
+						stock: row.is_stock_item ? row.stock_id : null,
+						req_type: row.req_type,
+						name: row.name,
+						spec: row.spec,
+						unit: row.unit,
+						quantity: row.quantity,
+						note: row.note,
+					}))
+				}
+				if(this.mode === 'edit') {
+					await this.$api.materialRequisitionUpdate(this.form.id, payload)
+				} else {
+					await this.$api.materialRequisitionCreate(payload)
+				}
+				uni.navigateBack()
+			} catch(e) {
+				uni.showToast({ title: '提交失败', icon: 'none' })
+			} finally {
+				this.saveLoading = false
+			}
+		},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.form-page { min-height: 100vh; background: #F0F2F5; }
+.form-scroll { padding: 0; padding-bottom: 180rpx; }
+.form-card { background: #fff; border-radius: 0; padding: 24rpx; margin-bottom: 0; box-shadow: none; }
+.form-card-title { font-size: 30rpx; font-weight: 600; color: #1F2937; margin-bottom: 16rpx; padding-left: 16rpx; border-left: 6rpx solid #2BA471; }
+.form-textarea { width: 100%; min-height: 120rpx; border: 2rpx solid #E5E7EB; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; color: #374151; box-sizing: border-box; background: #F9FAFB; }
+.form-btn { flex: 1; height: 80rpx; line-height: 80rpx; border-radius: 14rpx !important; font-size: 28rpx; font-weight: 500; border: none !important; }
+.form-btn-primary { background: linear-gradient(135deg, #2BA471, #1F8C5E) !important; color: #fff !important; box-shadow: 0 4rpx 12rpx rgba(43,164,113,0.2); }
+.form-btn-danger { background: linear-gradient(135deg, #EF4444, #DC2626) !important; color: #fff !important; box-shadow: 0 4rpx 12rpx rgba(239,68,68,0.3); }
+.picker-value { padding: 12rpx 16rpx; background: #F9FAFB; border: 2rpx solid #E5E7EB; border-radius: 8rpx; font-size: 28rpx; color: #374151; }
+.item-add-row { display: flex; justify-content: flex-end; margin-bottom: 16rpx; gap: 16rpx; }
+.item-add-btn { background: #2BA471 !important; color: #fff !important; font-size: 24rpx; border: none !important; border-radius: 8rpx !important; padding: 0 24rpx !important; height: 56rpx; line-height: 56rpx; }
+.item-add-btn-stock { background: #3594E6 !important; }
+.item-card { background: #F9FAFB; border-radius: 12rpx; padding: 20rpx; margin-bottom: 16rpx; border: 1rpx solid #E5E7EB; }
+.item-card-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12rpx; }
+.item-card-index { font-size: 26rpx; font-weight: 600; color: #2BA471; }
+.item-card-del { font-size: 24rpx; color: #EF4444; }
+.empty-hint { text-align: center; padding: 40rpx 0; color: #9CA3AF; font-size: 26rpx; }
+
+// 库存选择弹窗
+.stock-popup { height: 70vh; display: flex; flex-direction: column; }
+.stock-popup-header { display: flex; justify-content: space-between; align-items: center; padding: 24rpx; border-bottom: 1rpx solid #E5E7EB; }
+.stock-popup-title { font-size: 32rpx; font-weight: 600; color: #1F2937; }
+.stock-popup-close { font-size: 28rpx; color: #9CA3AF; padding: 8rpx 16rpx; }
+.stock-search-row { padding: 16rpx 24rpx; }
+.stock-list { flex: 1; padding: 0 24rpx; }
+.stock-item { padding: 20rpx; margin-bottom: 12rpx; background: #F9FAFB; border-radius: 12rpx; border: 1rpx solid #E5E7EB; }
+.stock-item-hover { background: #E0F5EA; border-color: #2BA471; }
+.stock-item-name { font-size: 28rpx; font-weight: 600; color: #1F2937; margin-bottom: 8rpx; }
+.stock-item-info { display: flex; gap: 24rpx; font-size: 24rpx; color: #6B7280; margin-top: 4rpx; }
+</style>
diff --git a/pages/mpr/requisition_form.vue b/pages/mpr/requisition_form.vue
new file mode 100644
index 0000000..17bd6c0
--- /dev/null
+++ b/pages/mpr/requisition_form.vue
@@ -0,0 +1,239 @@
+<!-- 物资申购单 -->
+<template>
+	<view class="form-page">
+		<scroll-view scroll-y class="form-scroll">
+			<uni-forms v-model="form" label-width="200rpx" ref="customForm">
+				<!-- 审批状态卡片 -->
+				<view class="form-card" v-if="form.ticket_">
+					<ticketd :ticket_="form.ticket_"></ticketd>
+				</view>
+
+				<!-- 基本信息 -->
+				<view class="form-card">
+					<view class="form-card-title">申购信息</view>
+					<uni-forms-item label="编号" v-if="form.number">
+						<span>{{form.number}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="申购部门">
+						<span>{{form.belong_dept_name || userDeptName}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="申购人">
+						<span>{{form.create_by_name || userName}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="联系电话">
+						<uni-easyinput v-model="form.phone" placeholder="联系电话" type="number" v-if="mode!='show'"/>
+						<span v-else>{{form.phone}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="申购日期" required>
+						<picker mode="date" :value="form.req_date" @change="(e)=>{form.req_date=e.detail.value}" v-if="mode!='show'">
+							<view class="picker-value">{{form.req_date || '请选择日期'}}</view>
+						</picker>
+						<span v-else>{{form.req_date}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="合计金额">
+						<span style="font-weight:bold;color:#E37318;">¥ {{calcTotalAmount}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="备注">
+						<textarea placeholder-style="color:#c0c4cc" v-model="form.note" placeholder="请输入备注" class="form-textarea" v-if="mode!='show'"/>
+						<span v-else>{{form.note}}</span>
+					</uni-forms-item>
+				</view>
+
+				<!-- 申购明细 -->
+				<view class="form-card">
+					<view class="form-card-title">申购明细</view>
+					<view v-if="mode!='show'" class="item-add-row">
+						<button class="item-add-btn" @click="addItem" size="mini">+ 添加物品</button>
+					</view>
+					<view v-for="(item, idx) in items" :key="idx" class="item-card">
+						<view class="item-card-header">
+							<text class="item-card-index">第{{idx+1}}项</text>
+							<text v-if="mode!='show'" class="item-card-del" @click="delItem(idx)">删除</text>
+						</view>
+						<uni-forms-item label="物品名称" required>
+							<uni-easyinput v-model="item.item_name" placeholder="物品名称" v-if="mode!='show'"/>
+							<span v-else>{{item.item_name}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="规格及型号">
+							<uni-easyinput v-model="item.spec" placeholder="规格及型号" v-if="mode!='show'"/>
+							<span v-else>{{item.spec}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="单位">
+							<uni-easyinput v-model="item.unit" placeholder="单位" v-if="mode!='show'"/>
+							<span v-else>{{item.unit}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="申购数量">
+							<uni-number-box v-model="item.req_quantity" :min="0" :step="1" v-if="mode!='show'"/>
+							<span v-else>{{item.req_quantity}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="现库存量">
+							<uni-number-box v-model="item.current_stock" :min="0" :step="1" v-if="mode!='show'"/>
+							<span v-else>{{item.current_stock}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="需用日期">
+							<picker mode="date" :value="item.need_date" @change="(e)=>{item.need_date=e.detail.value}" v-if="mode!='show'">
+								<view class="picker-value">{{item.need_date || '请选择日期'}}</view>
+							</picker>
+							<span v-else>{{item.need_date}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="需采购数量">
+							<uni-number-box v-model="item.purchase_quantity" :min="0" :step="1" v-if="mode!='show'"/>
+							<span v-else>{{item.purchase_quantity}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="单价">
+							<uni-number-box v-model="item.unit_price" :min="0" :step="0.01" v-if="mode!='show'"/>
+							<span v-else>{{item.unit_price}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="总价">
+							<span style="font-weight:bold;">¥ {{calcRowTotal(item)}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="备注">
+							<uni-easyinput v-model="item.note" placeholder="备注" v-if="mode!='show'"/>
+							<span v-else>{{item.note}}</span>
+						</uni-forms-item>
+					</view>
+					<view v-if="items.length === 0" class="empty-hint">暂无申购物品</view>
+				</view>
+			</uni-forms>
+		</scroll-view>
+		<view class="footer_fixed">
+			<button v-if="mode=='edit'" class="form-btn form-btn-danger" @click="handleDel" :loading="saveLoading" :disabled="saveLoading">
+				删除
+			</button>
+			<button v-if="mode!='show'" class="form-btn form-btn-primary" @click="handleSave" :loading="saveLoading" :disabled="saveLoading">
+				提交审批
+			</button>
+			<ticketd_b :workflow_key="'wf_mpr'" v-if="form.ticket_ && mode == 'show'" :t_id="form.id" :ticket_="form.ticket_"
+			:ticket_data="ticket_data" @success="()=>{uni.navigateBack()}" ref="ticketd_b"></ticketd_b>
+		</view>
+	</view>
+</template>
+
+<script>
+import ticketd_b from "../wf/ticketd_b.vue"
+import ticketd from "../wf/ticketd.vue"
+export default {
+	components: { ticketd_b, ticketd },
+	data(){
+		return{
+			saveLoading: false,
+			mode:"add",
+			t_id: null,
+			form:{},
+			items:[],
+			ticket_data:{},
+			userName:'',
+			userDeptName:'',
+		}
+	},
+	computed: {
+		isEditable() {
+			return this.mode === 'add' || this.mode === 'edit'
+		},
+		calcTotalAmount() {
+			let total = 0
+			this.items.forEach(row => {
+				total += Number(this.calcRowTotal(row))
+			})
+			return total.toFixed(2)
+		}
+	},
+	async onLoad(options) {
+		let userInfo = uni.getStorageSync("userInfo")
+		this.userName = userInfo.name
+		this.userDeptName = userInfo.belong_dept_name || ''
+		this.mode = options.mode || 'add'
+		this.t_id = options.t_id || null
+		if(this.t_id) {
+			const res = await this.$api.purchaseRequisitionItemDetail(this.t_id)
+			this.form = res
+			this.items = res.items_ || []
+			if(res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == userInfo.id) {
+				this.mode = "edit"
+			} else {
+				this.mode = "show"
+			}
+		}
+	},
+	methods:{
+		calcRowTotal(row) {
+			return (Number(row.purchase_quantity || 0) * Number(row.unit_price || 0)).toFixed(2)
+		},
+		addItem() {
+			this.items.push({
+				item_name: '', spec: '', unit: '',
+				req_quantity: 0, current_stock: 0, need_date: null,
+				purchase_quantity: 0, unit_price: 0, note: ''
+			})
+		},
+		delItem(idx) {
+			this.items.splice(idx, 1)
+		},
+		async handleDel(){
+			await this.$api.purchaseRequisitionDelete(this.form.id)
+			uni.navigateBack()
+		},
+		async handleSave(){
+			if(!this.form.req_date) {
+				uni.showToast({ title: '请选择申购日期', icon: 'none' }); return
+			}
+			if(this.items.length === 0) {
+				uni.showToast({ title: '请至少添加一项申购物品', icon: 'none' }); return
+			}
+			for(let i = 0; i < this.items.length; i++) {
+				if(!this.items[i].item_name) {
+					uni.showToast({ title: `第${i+1}项：请填写物品名称`, icon: 'none' }); return
+				}
+			}
+			this.saveLoading = true
+			try {
+				const payload = {
+					phone: this.form.phone,
+					req_date: this.form.req_date,
+					note: this.form.note,
+					items: this.items.map(row => ({
+						item_name: row.item_name,
+						spec: row.spec,
+						unit: row.unit,
+						req_quantity: row.req_quantity,
+						current_stock: row.current_stock,
+						need_date: row.need_date,
+						purchase_quantity: row.purchase_quantity,
+						unit_price: row.unit_price,
+						note: row.note
+					}))
+				}
+				if(this.mode === 'edit') {
+					await this.$api.purchaseRequisitionUpdate(this.form.id, payload)
+				} else {
+					await this.$api.purchaseRequisitionCreate(payload)
+				}
+				uni.navigateBack()
+			} catch(e) {
+				uni.showToast({ title: '提交失败', icon: 'none' })
+			} finally {
+				this.saveLoading = false
+			}
+		},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.form-page { min-height: 100vh; background: #F0F2F5; }
+.form-scroll { padding: 0; padding-bottom: 180rpx; }
+.form-card { background: #fff; border-radius: 0; padding: 24rpx; margin-bottom: 0; box-shadow: none; }
+.form-card-title { font-size: 30rpx; font-weight: 600; color: #1F2937; margin-bottom: 16rpx; padding-left: 16rpx; border-left: 6rpx solid #2BA471; }
+.form-textarea { width: 100%; min-height: 120rpx; border: 2rpx solid #E5E7EB; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; color: #374151; box-sizing: border-box; background: #F9FAFB; }
+.form-btn { flex: 1; height: 80rpx; line-height: 80rpx; border-radius: 14rpx !important; font-size: 28rpx; font-weight: 500; border: none !important; }
+.form-btn-primary { background: linear-gradient(135deg, #2BA471, #1F8C5E) !important; color: #fff !important; box-shadow: 0 4rpx 12rpx rgba(43,164,113,0.2); }
+.form-btn-danger { background: linear-gradient(135deg, #EF4444, #DC2626) !important; color: #fff !important; box-shadow: 0 4rpx 12rpx rgba(239,68,68,0.3); }
+.picker-value { padding: 12rpx 16rpx; background: #F9FAFB; border: 2rpx solid #E5E7EB; border-radius: 8rpx; font-size: 28rpx; color: #374151; }
+.item-add-row { display: flex; justify-content: flex-end; margin-bottom: 16rpx; }
+.item-add-btn { background: #2BA471 !important; color: #fff !important; font-size: 24rpx; border: none !important; border-radius: 8rpx !important; padding: 0 24rpx !important; height: 56rpx; line-height: 56rpx; }
+.item-card { background: #F9FAFB; border-radius: 12rpx; padding: 20rpx; margin-bottom: 16rpx; border: 1rpx solid #E5E7EB; }
+.item-card-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12rpx; }
+.item-card-index { font-size: 26rpx; font-weight: 600; color: #2BA471; }
+.item-card-del { font-size: 24rpx; color: #EF4444; }
+.empty-hint { text-align: center; padding: 40rpx 0; color: #9CA3AF; font-size: 26rpx; }
+</style>
diff --git a/pages/mpr/warehouse_entry_form.vue b/pages/mpr/warehouse_entry_form.vue
new file mode 100644
index 0000000..507ab8f
--- /dev/null
+++ b/pages/mpr/warehouse_entry_form.vue
@@ -0,0 +1,283 @@
+<!-- 入库单审批 -->
+<template>
+	<view class="form-page">
+		<scroll-view scroll-y class="form-scroll">
+			<uni-forms v-model="form" label-width="200rpx" ref="customForm">
+				<!-- 审批状态卡片 -->
+				<view class="form-card" v-if="form.ticket_">
+					<ticketd :ticket_="form.ticket_"></ticketd>
+				</view>
+
+				<!-- 基本信息 -->
+				<view class="form-card">
+					<view class="form-card-title">入库信息</view>
+					<uni-forms-item label="编号" v-if="form.number">
+						<span>{{form.number}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="所属部门">
+						<span>{{form.belong_dept_name || userDeptName}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="操作人">
+						<span>{{form.create_by_name || userName}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="仓库" required>
+						<uni-data-select
+						  v-if="mode!='show'"
+						  v-model="form.warehouse"
+						  :localdata="warehouseOptions"
+						/>
+						<span v-else>{{form.warehouse_name}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="入库日期" required>
+						<picker mode="date" :value="form.entry_date" @change="(e)=>{form.entry_date=e.detail.value}" v-if="mode!='show'">
+							<view class="picker-value">{{form.entry_date || '请选择日期'}}</view>
+						</picker>
+						<span v-else>{{form.entry_date}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="入库类型" required>
+						<uni-data-select
+						  v-if="mode!='show'"
+						  v-model="form.entry_type"
+						  :localdata="entryTypeList"
+						/>
+						<span v-else>{{form.entry_type_display || getLabel(entryTypeList, form.entry_type)}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="入库方式" required>
+						<uni-data-select
+						  v-if="mode!='show'"
+						  v-model="form.entry_method"
+						  :localdata="entryMethodList"
+						/>
+						<span v-else>{{form.entry_method_display || getLabel(entryMethodList, form.entry_method)}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="合计金额">
+						<span style="font-weight:bold;color:#E37318;">¥ {{calcTotalAmount}}</span>
+					</uni-forms-item>
+					<uni-forms-item label="备注">
+						<textarea placeholder-style="color:#c0c4cc" v-model="form.note" placeholder="请输入备注" class="form-textarea" v-if="mode!='show'"/>
+						<span v-else>{{form.note}}</span>
+					</uni-forms-item>
+				</view>
+
+				<!-- 入库明细 -->
+				<view class="form-card">
+					<view class="form-card-title">入库明细</view>
+					<view v-if="mode!='show'" class="item-add-row">
+						<button class="item-add-btn" @click="addItem" size="mini">+ 添加物品</button>
+					</view>
+					<view v-for="(item, idx) in items" :key="idx" class="item-card">
+						<view class="item-card-header">
+							<text class="item-card-index">第{{idx+1}}项</text>
+							<text v-if="mode!='show'" class="item-card-del" @click="delItem(idx)">删除</text>
+						</view>
+						<uni-forms-item label="名称" required>
+							<uni-easyinput v-model="item.name" placeholder="名称" v-if="mode!='show'"/>
+							<span v-else>{{item.name}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="规格">
+							<uni-easyinput v-model="item.spec" placeholder="规格" v-if="mode!='show'"/>
+							<span v-else>{{item.spec}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="单位">
+							<uni-easyinput v-model="item.unit" placeholder="单位" v-if="mode!='show'"/>
+							<span v-else>{{item.unit}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="数量" required>
+							<uni-number-box v-model="item.quantity" :min="0" :step="1" v-if="mode!='show'"/>
+							<span v-else>{{item.quantity}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="单价">
+							<uni-number-box v-model="item.unit_price" :min="0" :step="0.01" v-if="mode!='show'"/>
+							<span v-else>{{item.unit_price}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="金额">
+							<span style="font-weight:bold;">¥ {{calcRowAmount(item)}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="供应商名称">
+							<uni-easyinput v-model="item.supplier_name" placeholder="供应商名称" v-if="mode!='show'"/>
+							<span v-else>{{item.supplier_name}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="账单是否收到">
+							<switch :checked="item.invoice_received" @change="(e)=>{item.invoice_received=e.detail.value}" v-if="mode!='show'" color="#2BA471"/>
+							<span v-else>{{item.invoice_received ? '已收到' : '未收到'}}</span>
+						</uni-forms-item>
+						<uni-forms-item label="备注">
+							<uni-easyinput v-model="item.note" placeholder="备注" v-if="mode!='show'"/>
+							<span v-else>{{item.note}}</span>
+						</uni-forms-item>
+					</view>
+					<view v-if="items.length === 0" class="empty-hint">暂无入库物品</view>
+				</view>
+			</uni-forms>
+		</scroll-view>
+		<view class="footer_fixed">
+			<button v-if="mode=='edit'" class="form-btn form-btn-danger" @click="handleDel" :loading="saveLoading" :disabled="saveLoading">
+				删除
+			</button>
+			<button v-if="mode!='show'" class="form-btn form-btn-primary" @click="handleSave" :loading="saveLoading" :disabled="saveLoading">
+				提交审批
+			</button>
+			<ticketd_b :workflow_key="'wf_warehouse_entry'" v-if="form.ticket_ && mode == 'show'" :t_id="form.id" :ticket_="form.ticket_"
+			:ticket_data="ticket_data" @success="()=>{uni.navigateBack()}" ref="ticketd_b"></ticketd_b>
+		</view>
+	</view>
+</template>
+
+<script>
+import ticketd_b from "../wf/ticketd_b.vue"
+import ticketd from "../wf/ticketd.vue"
+export default {
+	components: { ticketd_b, ticketd },
+	data(){
+		return{
+			saveLoading: false,
+			mode:"add",
+			t_id: null,
+			form:{
+				entry_type: 'raw_normal',
+				entry_method: 'purchase',
+			},
+			items:[],
+			ticket_data:{},
+			userName:'',
+			userDeptName:'',
+			warehouseOptions:[],
+			entryTypeList: [
+				{ value: 'raw_normal', text: '原材料正常入库' },
+				{ value: 'raw_estimated', text: '原材料暂估入库' },
+				{ value: 'product', text: '产品入库' },
+				{ value: 'other', text: '其他' },
+			],
+			entryMethodList: [
+				{ value: 'purchase', text: '采购' },
+				{ value: 'self_made', text: '自制' },
+				{ value: 'other', text: '其他' },
+			],
+		}
+	},
+	computed: {
+		isEditable() {
+			return this.mode === 'add' || this.mode === 'edit'
+		},
+		calcTotalAmount() {
+			let total = 0
+			this.items.forEach(row => {
+				total += Number(this.calcRowAmount(row))
+			})
+			return total.toFixed(2)
+		}
+	},
+	async onLoad(options) {
+		let userInfo = uni.getStorageSync("userInfo")
+		this.userName = userInfo.name
+		this.userDeptName = userInfo.belong_dept_name || ''
+		this.mode = options.mode || 'add'
+		this.t_id = options.t_id || null
+		// 加载仓库列表
+		try {
+			const res = await this.$api.warehouseList({ page: 0 })
+			const list = Array.isArray(res) ? res : (res.results || [])
+			this.warehouseOptions = list.map(w => ({ value: w.id, text: w.name }))
+		} catch(e) {}
+		if(this.t_id) {
+			const res = await this.$api.warehouseEntryItemDetail(this.t_id)
+			this.form = res
+			this.items = res.items_ || []
+			if(res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == userInfo.id) {
+				this.mode = "edit"
+			} else {
+				this.mode = "show"
+			}
+		}
+	},
+	methods:{
+		calcRowAmount(row) {
+			return (Number(row.quantity || 0) * Number(row.unit_price || 0)).toFixed(2)
+		},
+		getLabel(list, value) {
+			if (!list || !value) return ''
+			const item = list.find(i => String(i.value) === String(value))
+			return item ? item.text : ''
+		},
+		addItem() {
+			this.items.push({
+				name: '', spec: '', unit: '',
+				quantity: 0, unit_price: 0,
+				supplier_name: '', invoice_received: false, note: ''
+			})
+		},
+		delItem(idx) {
+			this.items.splice(idx, 1)
+		},
+		async handleDel(){
+			await this.$api.warehouseEntryDelete(this.form.id)
+			uni.navigateBack()
+		},
+		async handleSave(){
+			if(!this.form.warehouse) {
+				uni.showToast({ title: '请选择仓库', icon: 'none' }); return
+			}
+			if(!this.form.entry_date) {
+				uni.showToast({ title: '请选择入库日期', icon: 'none' }); return
+			}
+			if(this.items.length === 0) {
+				uni.showToast({ title: '请至少添加一项入库物品', icon: 'none' }); return
+			}
+			for(let i = 0; i < this.items.length; i++) {
+				if(!this.items[i].name) {
+					uni.showToast({ title: `第${i+1}项：请填写名称`, icon: 'none' }); return
+				}
+			}
+			this.saveLoading = true
+			try {
+				const payload = {
+					warehouse: this.form.warehouse,
+					entry_date: this.form.entry_date,
+					entry_type: this.form.entry_type,
+					entry_method: this.form.entry_method,
+					note: this.form.note,
+					items: this.items.map(row => ({
+						name: row.name,
+						spec: row.spec,
+						unit: row.unit,
+						quantity: row.quantity,
+						unit_price: row.unit_price,
+						supplier_name: row.supplier_name,
+						invoice_received: row.invoice_received,
+						note: row.note
+					}))
+				}
+				if(this.mode === 'edit') {
+					await this.$api.warehouseEntryUpdate(this.form.id, payload)
+				} else {
+					await this.$api.warehouseEntryCreate(payload)
+				}
+				uni.navigateBack()
+			} catch(e) {
+				uni.showToast({ title: '提交失败', icon: 'none' })
+			} finally {
+				this.saveLoading = false
+			}
+		},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.form-page { min-height: 100vh; background: #F0F2F5; }
+.form-scroll { padding: 0; padding-bottom: 180rpx; }
+.form-card { background: #fff; border-radius: 0; padding: 24rpx; margin-bottom: 0; box-shadow: none; }
+.form-card-title { font-size: 30rpx; font-weight: 600; color: #1F2937; margin-bottom: 16rpx; padding-left: 16rpx; border-left: 6rpx solid #2BA471; }
+.form-textarea { width: 100%; min-height: 120rpx; border: 2rpx solid #E5E7EB; border-radius: 12rpx; padding: 16rpx; font-size: 28rpx; color: #374151; box-sizing: border-box; background: #F9FAFB; }
+.form-btn { flex: 1; height: 80rpx; line-height: 80rpx; border-radius: 14rpx !important; font-size: 28rpx; font-weight: 500; border: none !important; }
+.form-btn-primary { background: linear-gradient(135deg, #2BA471, #1F8C5E) !important; color: #fff !important; box-shadow: 0 4rpx 12rpx rgba(43,164,113,0.2); }
+.form-btn-danger { background: linear-gradient(135deg, #EF4444, #DC2626) !important; color: #fff !important; box-shadow: 0 4rpx 12rpx rgba(239,68,68,0.3); }
+.picker-value { padding: 12rpx 16rpx; background: #F9FAFB; border: 2rpx solid #E5E7EB; border-radius: 8rpx; font-size: 28rpx; color: #374151; }
+.item-add-row { display: flex; justify-content: flex-end; margin-bottom: 16rpx; }
+.item-add-btn { background: #2BA471 !important; color: #fff !important; font-size: 24rpx; border: none !important; border-radius: 8rpx !important; padding: 0 24rpx !important; height: 56rpx; line-height: 56rpx; }
+.item-card { background: #F9FAFB; border-radius: 12rpx; padding: 20rpx; margin-bottom: 16rpx; border: 1rpx solid #E5E7EB; }
+.item-card-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 12rpx; }
+.item-card-index { font-size: 26rpx; font-weight: 600; color: #2BA471; }
+.item-card-del { font-size: 24rpx; color: #EF4444; }
+.empty-hint { text-align: center; padding: 40rpx 0; color: #9CA3AF; font-size: 26rpx; }
+</style>
diff --git a/utils/api.js b/utils/api.js
index e996981..659dfb5 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -139,5 +139,22 @@ export default {
 	empcontractItem:(id,data) => http(`/hrm/empcontract/${id}/`, 'GET', data),
 	empcontractUpdate:(id,data) => http(`/hrm/empcontract/${id}/`, 'PUT', data),
 	empcontractDelete:(id) => http(`/hrm/empcontract/${id}/`, 'DELETE'),
+	//物资领用
+	materialRequisitionCreate:(data) => http(`/mpr/material_requisition/`, 'POST', data),
+	materialRequisitionItem:(id,data) => http(`/mpr/material_requisition/${id}/`, 'GET', data),
+	materialRequisitionUpdate:(id,data) => http(`/mpr/material_requisition/${id}/`, 'PUT', data),
+	materialRequisitionDelete:(id) => http(`/mpr/material_requisition/${id}/`, 'DELETE'),
+	warehouseStockList:(data) => http(`/mpr/warehouse_stock/`, 'GET', data),
+	//入库单审批
+	warehouseEntryCreate:(data) => http(`/mpr/warehouse_entry/`, 'POST', data),
+	warehouseEntryItemDetail:(id,data) => http(`/mpr/warehouse_entry/${id}/`, 'GET', data),
+	warehouseEntryUpdate:(id,data) => http(`/mpr/warehouse_entry/${id}/`, 'PUT', data),
+	warehouseEntryDelete:(id) => http(`/mpr/warehouse_entry/${id}/`, 'DELETE'),
+	warehouseList:(data) => http(`/mpr/warehouse/`, 'GET', data),
+	//物资申购单
+	purchaseRequisitionCreate:(data) => http(`/mpr/requisition/`, 'POST', data),
+	purchaseRequisitionItemDetail:(id,data) => http(`/mpr/requisition/${id}/`, 'GET', data),
+	purchaseRequisitionUpdate:(id,data) => http(`/mpr/requisition/${id}/`, 'PUT', data),
+	purchaseRequisitionDelete:(id) => http(`/mpr/requisition/${id}/`, 'DELETE'),
 
 }
\ No newline at end of file