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

2. 【新增】手工创建订单折扣可输入正数 3. 【优化】盘点申请单确认 4. 【修复】采购退货单模拟出库失败问题 5. 【新增】订单金额客户实付与结算金额 6. 【优化】仓库发货统计报表物料名称显示 7. 【优化】自有仓储虚拟发货逻辑 8. 【修复】基础物料分类管理问题
2026-04-23 21:05:35 +08:00 · 2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
--- a/app/financebase/lib/finder/account/chart.php
+++ b/app/financebase/lib/finder/account/chart.php
@@ -0,0 +1,60 @@
+<?php
+
+class financebase_finder_account_chart {
+
+    function __construct(){
+        if(in_array($_REQUEST['action'], ['exportcnf', 'to_export', 'export'])){
+            unset($this->column_edit);
+        }
+    }
+
+    var $column_edit = "操作";
+    var $column_edit_order = "1";
+    var $column_edit_width = "50";
+
+    function column_edit($row) {
+        $finder_id = $_GET['_finder']['finder_id'];
+
+        // 检查编辑权限
+        if (!kernel::single('desktop_user')->has_permission('shop_settlement_account_chart_edit')) {
+            return '';
+        }
+
+        $title = '编辑会计科目';
+        if (!empty($row['account_code'])) {
+            $title .= ' - ' . $row['account_code'];
+        }
+        $ret = '<a href="index.php?app=financebase&ctl=admin_shop_settlement_account_chart&act=setAccount&p[0]='.$row['id'].'&_finder[finder_id]=' . $finder_id . '&finder_id=' . $finder_id . '" target="dialog::{width:550,height:520,resizeable:false,title:\'' . $title . '\'}">编辑</a>';
+
+        return $ret;
+    }
+
+    // 添加操作日志功能
+    public $detail_show_log = '操作记录';
+    public function detail_show_log($account_id)
+    {
+        // 使用ome模块的read_log方法，与经销商品价格保持一致
+        $omeLogMdl = app::get('ome')->model('operation_log');
+        $logList = $omeLogMdl->read_log(array('obj_id' => $account_id, 'obj_type' => 'account_chart@financebase'), 0, -1);
+        
+        $finder_id = $_GET['_finder']['finder_id'];
+        
+        if ($logList) {
+            foreach ($logList as $k => $v) {
+                $logList[$k]['operate_time'] = date('Y-m-d H:i:s', $v['operate_time']);
+
+                // 检查操作类型，为编辑操作添加快照链接
+                if (strpos($v['operation'], '编辑') !== false) {
+                    $logList[$k]['memo'] = "<a href='index.php?app=financebase&ctl=admin_shop_settlement_account_chart&act=show_history&p[0]={$v['log_id']}&finder_id={$finder_id}' onclick=\"window.open(this.href, '_blank', 'width=550,height=520'); return false;\">查看快照</a>";
+                } else {
+                    // 其他操作（如新建）不显示快照链接，但保留原有的memo内容
+                    $logList[$k]['memo'] = $v['memo'] ?: '';
+                }
+            }
+        }
+        
+        $render = app::get('financebase')->render();
+        $render->pagedata['logs'] = $logList ?: array();
+        return $render->fetch('finder/account/chart/operation_log.html');
+    }
+}