|
@@ -7412,23 +7412,16 @@
|
|
|
//库内自采
|
|
//库内自采
|
|
|
houseSelfCollect:{
|
|
houseSelfCollect:{
|
|
|
customerManagement:'客户管理',
|
|
customerManagement:'客户管理',
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
acquisitionManagement:'仓库设置',
|
|
acquisitionManagement:'仓库设置',
|
|
|
-=======
|
|
|
|
|
- acquisitionManagement:'收购管理',
|
|
|
|
|
acquisitionManagementAdd:'收购管理新增',
|
|
acquisitionManagementAdd:'收购管理新增',
|
|
|
acquisitionManagementEdit:'收购管理编辑',
|
|
acquisitionManagementEdit:'收购管理编辑',
|
|
|
->>>>>>> d520598f0af8dd105275ef8c3a02b19af5a731c1
|
|
|
|
|
inspectionManagement:'质检管理',
|
|
inspectionManagement:'质检管理',
|
|
|
paymentManagement:'付款管理',
|
|
paymentManagement:'付款管理',
|
|
|
weighingManagement:'检斤管理',
|
|
weighingManagement:'检斤管理',
|
|
|
houseSelfCollect:"库内自采",
|
|
houseSelfCollect:"库内自采",
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- houseSelfCollectPrint:"查看"
|
|
|
|
|
-=======
|
|
|
|
|
|
|
+ houseSelfCollectPrint:"查看",
|
|
|
customerManagementEdit:"客户管理编辑",
|
|
customerManagementEdit:"客户管理编辑",
|
|
|
customerManagementAdd:"客户管理添加"
|
|
customerManagementAdd:"客户管理添加"
|
|
|
->>>>>>> d520598f0af8dd105275ef8c3a02b19af5a731c1
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
zhongtianhaoyuan