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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 基本信息
+
+ {{form.number}}
+
+
+ {{form.belong_dept_name || userDeptName}}
+
+
+ {{form.create_by_name || userName}}
+
+
+
+ {{form.req_date || '请选择日期'}}
+
+ {{form.req_date}}
+
+
+
+ {{form.collector}}
+
+
+
+ {{form.note}}
+
+
+
+
+
+ 领用物品
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+ {{item.req_type}}
+
+
+
+ {{item.spec}}
+
+
+
+ {{item.unit}}
+
+
+ {{item.stock_quantity}}
+
+
+
+ {{item.quantity}}
+
+
+
+ {{item.note}}
+
+
+ 暂无领用物品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 申购信息
+
+ {{form.number}}
+
+
+ {{form.belong_dept_name || userDeptName}}
+
+
+ {{form.create_by_name || userName}}
+
+
+
+ {{form.phone}}
+
+
+ {form.req_date=e.detail.value}" v-if="mode!='show'">
+ {{form.req_date || '请选择日期'}}
+
+ {{form.req_date}}
+
+
+ ¥ {{calcTotalAmount}}
+
+
+
+ {{form.note}}
+
+
+
+
+
+ 申购明细
+
+
+
+
+
+
+
+ {{item.item_name}}
+
+
+
+ {{item.spec}}
+
+
+
+ {{item.unit}}
+
+
+
+ {{item.req_quantity}}
+
+
+
+ {{item.current_stock}}
+
+
+ {item.need_date=e.detail.value}" v-if="mode!='show'">
+ {{item.need_date || '请选择日期'}}
+
+ {{item.need_date}}
+
+
+
+ {{item.purchase_quantity}}
+
+
+
+ {{item.unit_price}}
+
+
+ ¥ {{calcRowTotal(item)}}
+
+
+
+ {{item.note}}
+
+
+ 暂无申购物品
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 入库信息
+
+ {{form.number}}
+
+
+ {{form.belong_dept_name || userDeptName}}
+
+
+ {{form.create_by_name || userName}}
+
+
+
+ {{form.warehouse_name}}
+
+
+ {form.entry_date=e.detail.value}" v-if="mode!='show'">
+ {{form.entry_date || '请选择日期'}}
+
+ {{form.entry_date}}
+
+
+
+ {{form.entry_type_display || getLabel(entryTypeList, form.entry_type)}}
+
+
+
+ {{form.entry_method_display || getLabel(entryMethodList, form.entry_method)}}
+
+
+ ¥ {{calcTotalAmount}}
+
+
+
+ {{form.note}}
+
+
+
+
+
+ 入库明细
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+ {{item.spec}}
+
+
+
+ {{item.unit}}
+
+
+
+ {{item.quantity}}
+
+
+
+ {{item.unit_price}}
+
+
+ ¥ {{calcRowAmount(item)}}
+
+
+
+ {{item.supplier_name}}
+
+
+ {item.invoice_received=e.detail.value}" v-if="mode!='show'" color="#2BA471"/>
+ {{item.invoice_received ? '已收到' : '未收到'}}
+
+
+
+ {{item.note}}
+
+
+ 暂无入库物品
+
+
+
+
+
+
+
+
+
+
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