ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-23 05:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. 【新增】售后单售后原因类型支持搜索

Browse Source 
2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dealer/controller/admin/bs.php
View File

@@ -28,7 +28,7 @@ class dealer_ctl_admin_bs extends desktop_controller
array(
'label' => '添加经销商',
'href' => 'index.php?app=dealer&ctl=admin_bs&act=create',
'target' => "dialog::{width:760,height:635,title:'添加经销商'}",
'target' => "dialog::{width:780,height:635,title:'添加经销商'}",
),
array(
'label' => '导出模板',

24
app/dealer/controller/admin/goods/price.php
View File

@@ -19,7 +19,7 @@
* @Author: Assistant
* @Version: 1.0
* @DateTime: 2024年
* @describe: 经销商品价格管理
* @describe: 经销商物料价格管理
* ============================
*/
class dealer_ctl_admin_goods_price extends desktop_controller
@@ -34,7 +34,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
// 检查导出权限
if (isset($_GET['action']) && $_GET['action'] == 'to_export') {
if (!$this->has_permission('dealer_goods_price_export')) {
$this->splash('error', null, '您没有导出经销商品价格的权限');
$this->splash('error', null, '您没有导出经销商物料价格的权限');
}
}
@@ -54,7 +54,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
$actions[] = array(
'label' => '导入',
'href' => 'index.php?app=dealer&ctl=admin_goods_price&act=displayImportV2&p[0]=goods_price&finder_id={finder_id}',
'target' => 'dialog::{width:760,height:300,title:\'经销商品价格导入\'}',
'target' => 'dialog::{width:760,height:300,title:\'经销基础物料价格导入\'}',
);
}
@@ -73,7 +73,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
}
$params = array(
'title' => '经销商品价格管理',
'title' => '经销基础物料价格管理',
'use_buildin_set_tag' => false,
'use_buildin_filter' => true,
'use_buildin_export' => $this->has_permission('dealer_goods_price_export'),
@@ -92,7 +92,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
*/
public function exportTemplateV2()
{
$fileName = "经销商品价格导入模板.xlsx";
$fileName = "经销商物料价格导入模板.xlsx";
$title = app::get('dealer')->model('goods_price')->exportTemplateV2('dealer_goods_price_importV2');
kernel::single('omecsv_phpoffice')->export($fileName, [0 => $title]);
}
@@ -101,7 +101,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
{
// 检查编辑权限
if (!$this->has_permission('dealer_goods_price_edit')) {
$this->splash('error', null, '您没有编辑经销商品价格的权限');
$this->splash('error', null, '您没有编辑经销商物料价格的权限');
}
$id = $_GET['p'][0];
@@ -177,7 +177,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
{
// 检查新增权限
if (!$this->has_permission('dealer_goods_price_add')) {
$this->splash('error', null, '您没有新增经销商品价格的权限');
$this->splash('error', null, '您没有新增经销商物料价格的权限');
}
// 获取所有经销商
@@ -207,11 +207,11 @@ class dealer_ctl_admin_goods_price extends desktop_controller
// 根据操作类型检查对应权限
if ($is_edit) {
if (!$this->has_permission('dealer_goods_price_edit')) {
$this->end(false, '您没有编辑经销商品价格的权限');
$this->end(false, '您没有编辑经销商物料价格的权限');
}
} else {
if (!$this->has_permission('dealer_goods_price_add')) {
$this->end(false, '您没有新增经销商品价格的权限');
$this->end(false, '您没有新增经销商物料价格的权限');
}
}
@@ -478,7 +478,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
{
// 检查批量更新权限
if (!$this->has_permission('dealer_goods_price_batchupdate')) {
$this->splash('error', null, '您没有批量更新经销商品价格的权限');
$this->splash('error', null, '您没有批量更新经销商物料价格的权限');
}
// 获取选中的记录ID
@@ -500,7 +500,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
{
// 检查批量更新权限
if (!$this->has_permission('dealer_goods_price_batchupdate')) {
$this->splash('error', null, '您没有批量更新经销商品价格的权限');
$this->splash('error', null, '您没有批量更新经销商物料价格的权限');
}
// 获取选中的记录ID
@@ -523,7 +523,7 @@ class dealer_ctl_admin_goods_price extends desktop_controller
// 检查批量更新权限
if (!$this->has_permission('dealer_goods_price_batchupdate')) {
header('Content-Type: application/json');
echo json_encode(array('success' => false, 'message' => '您没有批量更新经销商品价格的权限', 'error_messages' => array()));
echo json_encode(array('success' => false, 'message' => '您没有批量更新经销商物料价格的权限', 'error_messages' => array()));
exit;
}