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

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

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

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

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

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

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

8. 【修复】基础物料分类管理问题

app/material/lib/finder/seller.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * ============================
+ * @Author:   yaokangming
+ * @describe: 销售人员
+ * ============================
+ */
+class material_finder_seller {
+    public $addon_cols = "";
+    public $column_edit = "操作";
+    public $column_edit_width = 120;
+    public $column_edit_order = 1;
+    public function column_edit($row){
+        $btn = [];
+        $btn[] = '<a class="lnk" target="dialog::{width:450,height:200,title:\'编辑\'}" href="index.php?app=material&ctl=admin_seller&act=edit&p[0]='.$row['id'].'&finder_id='.$_GET['_finder']['finder_id'].'&finder_vid='.$_GET['finder_vid'].'">编辑</a>';
+        return implode('|', $btn);
+    }
+
+    public $detail_oplog = "操作记录";
+    public function detail_oplog($id){
+        $render = app::get('console')->render();
+        $opObj  = app::get('ome')->model('operation_log');
+        $logdata = $opObj->read_log(array('obj_id'=>$id,'obj_type'=>'seller@material'), 0, -1);
+        foreach($logdata as $k=>$v){
+            $logdata[$k]['operate_time'] = date('Y-m-d H:i:s',$v['operate_time']);
+            $logdata[$k]['memo'] = str_replace('查看快照', '<a class="lnk" target="dialog::{width:450,height:200,title:\'查看\'}" href="index.php?app=material&ctl=admin_seller&act=oplog&p[0]='.$v['log_id'].'&finder_id='.$_GET['_finder']['finder_id'].'&finder_vid='.$_GET['finder_vid'].'">查看快照</a>', $v['memo']);
+        }
+        $render->pagedata['log'] = $logdata;
+        return $render->fetch('admin/oplog.html');
+    }
+}