From 03e0d58dc3e64e191ba45be2648393f09c88c302 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Mon, 27 Oct 2025 11:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Manager/OrdersController.php  |  6 +--
 ...12804_update_order_agreements_add_html.php | 30 +++++++++++++
 public/8FHBOphQYY.txt                         |  1 -
 public/WOvfNADgkm.txt                         |  1 -
 public/XtCHrnvfsL.txt                         |  1 -
 .../admin/order-agreement/index.blade.php     | 44 ++++++++++++-------
 6 files changed, 61 insertions(+), 22 deletions(-)
 create mode 100644 database/migrations/2025_10_27_012804_update_order_agreements_add_html.php
 delete mode 100644 public/8FHBOphQYY.txt
 delete mode 100644 public/WOvfNADgkm.txt
 delete mode 100644 public/XtCHrnvfsL.txt

diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php
index 7cb18a4..a6235ef 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -423,7 +423,7 @@ class OrdersController extends CommonController
                     $query->select("paramedic_level.id", "paramedic_level.name");
                 },
                 "project" => function ($query) {
-                    $query->select("id", "name", "range_mobile", "complaint_mobile", "content","agreement");
+                    $query->select("id", "name", "range_mobile", "complaint_mobile", "content", "agreement");
                 },
                 "bed" => function ($query) {
                     $query->select("bed.id", "bed.name", "bed.building_id", "bed.area_id")
@@ -1919,7 +1919,7 @@ class OrdersController extends CommonController
      *     @OA\Parameter(name="customer_id", in="query", @OA\Schema(type="integer"), required=true, description="客户id"),
      *     @OA\Parameter(name="customer_sign_id", in="query", @OA\Schema(type="integer"), required=true, description="客户签名图片id"),
      *     @OA\Parameter(name="company_sign_id", in="query", @OA\Schema(type="integer"), required=true, description="公司签名图片id"),
-     *     @OA\Parameter(name="file_id", in="query", @OA\Schema(type="integer"), required=true, description="协议文件id"),
+     *     @OA\Parameter(name="html", in="query", @OA\Schema(type="string"), required=true, description="协议html内容"),
      *     @OA\Response(
      *      response="200",
      *      description="更新订单状态"
@@ -1937,7 +1937,7 @@ class OrdersController extends CommonController
      * @OA\Post(
      *     path="/manager/html-to-image",
      *     tags={"管理端订单处理"},
-     *     summary="html生成图片",
+     *     summary="html生成图片(废弃)",
      *     description="html生成图片",
      *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
      *     @OA\Parameter(name="html", in="query", @OA\Schema(type="string"), required=true, description="html内容"),
diff --git a/database/migrations/2025_10_27_012804_update_order_agreements_add_html.php b/database/migrations/2025_10_27_012804_update_order_agreements_add_html.php
new file mode 100644
index 0000000..850564a
--- /dev/null
+++ b/database/migrations/2025_10_27_012804_update_order_agreements_add_html.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateOrderAgreementsAddHtml extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('order_agreements', function (Blueprint $table) {
+            $table->mediumText('html')->nullable()->comment('协议内容html');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/public/8FHBOphQYY.txt b/public/8FHBOphQYY.txt
deleted file mode 100644
index 3c0b536..0000000
--- a/public/8FHBOphQYY.txt
+++ /dev/null
@@ -1 +0,0 @@
-7e01ae195d6d866fb688b83a9c7081b0
\ No newline at end of file
diff --git a/public/WOvfNADgkm.txt b/public/WOvfNADgkm.txt
deleted file mode 100644
index 08dfadf..0000000
--- a/public/WOvfNADgkm.txt
+++ /dev/null
@@ -1 +0,0 @@
-520c7bfbde672e65a89206776e3b9be4
\ No newline at end of file
diff --git a/public/XtCHrnvfsL.txt b/public/XtCHrnvfsL.txt
deleted file mode 100644
index 0ea216c..0000000
--- a/public/XtCHrnvfsL.txt
+++ /dev/null
@@ -1 +0,0 @@
-9a929b5b5e0990e40920a6e57b6e40a5
\ No newline at end of file
diff --git a/resources/views/admin/order-agreement/index.blade.php b/resources/views/admin/order-agreement/index.blade.php
index d19b300..d82fa7c 100644
--- a/resources/views/admin/order-agreement/index.blade.php
+++ b/resources/views/admin/order-agreement/index.blade.php
@@ -6,10 +6,10 @@
             <div class="card">
                 <div class="card-body">
                     <!-- <div class="mb-3">
-                                        <a class="btn btn-primary" href="{{url($urlPrefix . '/create')}}">
-                                            @lang("icons.action_create") @lang('actions.create'){{$modelName}}
-                                        </a>
-                                    </div> -->
+                                                <a class="btn btn-primary" href="{{url($urlPrefix . '/create')}}">
+                                                    @lang("icons.action_create") @lang('actions.create'){{$modelName}}
+                                                </a>
+                                            </div> -->
 
                     <!-- 搜索表单 -->
                     <div class="mb-3">
@@ -88,17 +88,17 @@
                                         @endif
                                     </td>
                                     <!-- <td>
-                                                @if($row->companySign)
-                                                    <a href="{{Storage::url($row->companySign->folder . '/' . $row->companySign->name)}}"
-                                                        target="_blank">查看</a>
-                                                @else
-                                                    -
-                                                @endif
-                                            </td> -->
+                                                                @if($row->companySign)
+                                                                    <a href="{{Storage::url($row->companySign->folder . '/' . $row->companySign->name)}}"
+                                                                        target="_blank">查看</a>
+                                                                @else
+                                                                    -
+                                                                @endif
+                                                            </td> -->
                                     <td>
-                                        @if($row->file)
-                                            <a href="{{Storage::url($row->file->folder . '/' . $row->file->name)}}"
-                                                target="_blank">查看</a>
+                                        @if($row->html)
+                                            <a href="javascript:void(0);" onclick="showHtml(this)"
+                                                data-html="{{base64_encode($row->html)}}">查看</a>
                                         @else
                                             -
                                         @endif
@@ -106,8 +106,8 @@
                                     <td>{{ $row->created_at->format('Y-m-d H:i:s') }}</td>
                                     <td>
                                         <!-- <a class="btn btn-sm btn-primary"
-                                                                            href="{{url("{$urlPrefix}/edit?id={$row['id']}")}}">@lang("icons.action_edit")
-                                                                            @lang("actions.edit")</a> -->
+                                                                                            href="{{url("{$urlPrefix}/edit?id={$row['id']}")}}">@lang("icons.action_edit")
+                                                                                            @lang("actions.edit")</a> -->
                                         <a class="btn btn-sm btn-danger btn-delete" data-id="{{$row['id']}}"
                                             href="javascript:;">@lang("icons.action_delete") @lang("actions.delete")</a>
                                     </td>
@@ -127,6 +127,18 @@
 
 @push("footer")
     <script>
+        function showHtml(element) {
+            // 获取base64编码的HTML内容
+            var encodedHtml = element.getAttribute('data-html');
+            // 解码HTML内容
+            var htmlContent = atob(encodedHtml);
 
+            // 打开新窗口
+            var newWindow = window.open('', '_blank');
+            // 写入HTML内容
+            newWindow.document.open();
+            newWindow.document.write(htmlContent);
+            newWindow.document.close();
+        }
     </script>
 @endpush
\ No newline at end of file