commit

app/admin/controller/water/WaterOrder.php

@@ -8,10 +8,13 @@
 namespace app\admin\controller\water;
 
 use app\admin\controller\AuthController;
+use app\admin\model\user\User;
+use app\admin\model\water\WaterMaterial;
 use crmeb\services\{ExpressService,
     JsonService,
     JsonService as Json,
     MiniProgramService,
+    PHPExcelService,
     WechatService,
     FormBuilder as Form,
     CacheService,
@@ -225,4 +228,31 @@ class WaterOrder extends AuthController
 
     }
 
+
+    public function excel($id)
+    {
+        $details = model::where('id', $id)->find();
+        $list = WaterMaterial::where('query_id', $id)->select();
+        $user = User::where('uid', $details['uid'])->find();
+        $export = [];
+        foreach ($list as $item)
+        {
+            $export[] = [
+                $item['title'],
+                $item['name'],
+                $item['specifications'],
+                $item['number'],
+                $item['unit_price'],
+                $item['ot_price'],
+                $item['company'],
+                $item['create_time'],
+            ];
+        }
+        PHPExcelService::setExcelHeader(['标题', '名称', '规格', '数量', '单价', '总价', '单位','时间'])
+            ->setExcelTile('用户'.$user['phone'].'计算订单导出-总价'.$details['price'], '计算订单' . time(), '记录ID'.$details['id'].'-水口价格'.$details['water_mouth'].'-隔板价格'.$details['partition'].'-税点'.($details['tax_point']).'%')
+            ->setExcelContent($export)
+            ->ExcelSave();
+
+    }
+
 }

app/admin/controller/water/WaterQuery.php

@@ -8,11 +8,13 @@
 namespace app\admin\controller\water;
 
 use app\admin\controller\AuthController;
+use app\admin\model\user\User;
 use app\admin\model\water\WaterMaterial;
 use crmeb\services\{ExpressService,
     JsonService,
     JsonService as Json,
     MiniProgramService,
+    PHPExcelService,
     WechatService,
     FormBuilder as Form,
     CacheService,
@@ -61,6 +63,7 @@ class WaterQuery extends AuthController
         $f[] = Form::number('water_mouth', '水口价格');
         $f[] = Form::number('partition', '隔板价格');
         $f[] = Form::number('tax_point', '税点(百分比)');
+        $f[] = Form::textarea('remarks', '备注');
         $f[] = Form::hidden('id', $id);
         $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
         $this->assign(compact('form'));
@@ -77,6 +80,7 @@ class WaterQuery extends AuthController
             'partition',
             'tax_point',
             'id',
+            'remarks',
         ]);
         $validate = Validate::rule([
             'water_mouth' => 'require',
@@ -112,6 +116,7 @@ class WaterQuery extends AuthController
             'tax' => $money * ($data['tax_point']/100),
             'price' => $money,
             'weight' => $query['weight'],
+            'remarks' => $data['remarks'],
         ]);
         if ($res) return Json::successful('转为订单成功');
         return Json::fail('添加失败');
@@ -169,4 +174,30 @@ class WaterQuery extends AuthController
 
     }
 
+    public function excel($id)
+    {
+        $details = \app\admin\model\water\WaterQuery::where('id', $id)->find();
+        $list = WaterMaterial::where('query_id', $id)->select();
+        $user = User::where('uid', $details['uid'])->find();
+        $export = [];
+        foreach ($list as $item)
+        {
+            $export[] = [
+                $item['title'],
+                $item['name'],
+                $item['specifications'],
+                $item['number'],
+                $item['unit_price'],
+                $item['ot_price'],
+                $item['company'],
+                $item['create_time'],
+            ];
+        }
+        PHPExcelService::setExcelHeader(['标题', '名称', '规格', '数量', '单价', '总价', '单位','时间'])
+            ->setExcelTile('用户'.$user['phone'].'计算记录导出', '计算信息' . time(), '记录ID'.$details['id'].'-总价'.$details['price'])
+            ->setExcelContent($export)
+            ->ExcelSave();
+
+    }
+
 }

app/admin/view/water/water_order/index.php

@@ -114,6 +114,9 @@
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('water.WaterQuery/details')}?id={{d.query_id}}',{h:1100,w:1100})">
                             详情
                         </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='excel' >
+                            导出
+                        </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
                             删除
                         </button>
@@ -147,6 +150,7 @@
             {field: 'tax_point', title: '税点', align: 'center'},
             {field: 'tax', title: '总税', align: 'center'},
             {field: 'price', title: '总价', align: 'center'},
+            {field: 'remarks', title: '备注', align: 'center'},
             {field: 'create_time', title: '时间', align: 'center', width: '8%'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '8%'},
         ];
@@ -176,6 +180,9 @@
                     });
                 },code)
                 break;
+            case 'excel':
+                location.href = layList.U({c: 'water.water_order', a: 'excel', q: {id:data.id}});
+                break;
             case 'open_image':
                 $eb.openImage(data.image);
                 break;

app/admin/view/water/water_query/index.php

@@ -117,6 +117,9 @@
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('详情','{:Url('details')}?id={{d.id}}',{h:1100,w:1100})">
                             详情
                         </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event='excel' >
+                            导出
+                        </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('转为订单','{:Url('create')}?id={{d.id}}',{h:800,w:800})">
                             转为订单
                         </button>
@@ -178,6 +181,10 @@
                     });
                 },code)
                 break;
+
+            case 'excel':
+                location.href = layList.U({c: 'water.water_query', a: 'excel', q: {id:data.id}});
+                break;
             case 'open_image':
                 $eb.openImage(data.image);
                 break;