8 Commits (a223cc521db7b91562ab3f520353027c0071dbad)

Author	SHA1	Message	Date
yuanwei	5aa6359c78	Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw ... # Conflicts: # src/views/basic/business/stockOrder.vue # src/views/basic/product/UdiInfoSelectLocalUdi.vue # src/views/basic/product/product.vue # src/views/basic/product/udiInfoManageSp.vue # src/views/inout/InvoiceRegByFp.vue # src/views/inout/InvoiceRegByOrder.vue # src/views/inout/IoAuditedOrder.vue # src/views/inout/IoCheckAuditOrder.vue # src/views/inout/IoCheckErrorOrder.vue # src/views/inout/IoCheckSuccessOrder.vue # src/views/inout/IoCreateBusOrder.vue # src/views/inout/IoCreateErrorOrder.vue # src/views/inout/IoCreateOrder.vue # src/views/inout/IoCreateScanOrder.vue # src/views/inout/IoDealOrder.vue # src/views/inout/IoWaitAllocateOrder.vue # src/views/inout/muti/ioOrderMuti.vue # src/views/inout/muti/ioOrderMutiAudit.vue # src/views/inout/muti/ioOrderMutiSelect.vue # src/views/inout/receive/receiveAdd.vue # src/views/inout/receive/receiveAudit.vue # src/views/inout/receive/receiveMySearch.vue # src/views/inout/receive/receiveSearch.vue # src/views/inventory/InvPreProducts.vue # src/views/inventory/InvProducts.vue # src/views/inventory/InvSupPreInProducts.vue # src/views/inventory/count/InvCountOrderAudit.vue # src/views/inventory/count/InvCountOrderCompleted.vue # src/views/inventory/count/InvCountOrderNew.vue # src/views/inventory/supInoutSearchOrder.vue # src/views/purchase/cert/supCertAudit.vue # src/views/purchase/cert/supCertSearch.vue # src/views/purchase/purApply/purApply.vue # src/views/purchase/purApply/pureApplyAudit.vue # src/views/purchase/purApply/pureApplyMySearch.vue # src/views/purchase/purApply/pureApplySearch.vue # src/views/purchase/purOrder/purOrder.vue # src/views/purchase/purOrder/purOrderAudit.vue # src/views/purchase/purOrder/purOrderSearch.vue # src/views/purchase/purOrder/purOrderSearchDetails.vue # src/views/purchase/purPlan/purPlan.vue # src/views/purchase/purPlan/purPlanAudit.vue # src/views/purchase/purPlan/purPlanSearch.vue # src/views/purchase/purPlan/purPlanSearchDetails.vue # src/views/remind/invRemindMsg.vue # src/views/remind/supCertRemindMsg.vue	1 year ago
wj	1e7a037a41	设备相关	2 years ago
yuanwei	9e9d02b99c	出入库单管理配置	2 years ago
1178634255	2c03209a2c	单据新增备注字段 ... (cherry picked from commit 210793bcb7) # Conflicts: # src/layout/components/Navbar.vue	2 years ago
anthonywj	88ff28e3ca	单据详情新增DI/物资编码，申购新增备注字段	2 years ago
wangwei	201375c6d5	单据排序	2 years ago
anthonywj	7ec3a7d70c	单据删除做限制	2 years ago
anthonywj	abeae655e3	新增三期拣货，无三期拣货，为配货等页面	2 years ago