From 06ed10bd5e8d60e8477cc13e45889e539dd2112b Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 16 Aug 2023 09:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/views/view.xml                        | 31 +++++++++++++++----
 .../static/src/js/3d_viewer.js                |  3 ++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 9e82fd8a..c3cc8218 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -27,8 +27,14 @@
                 <form string="坯料预制计划">
                     <header>
                         <button string="执行排程" name="get_plan_end_time" type="object" class="oe_highlight"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,produce"/>
                     </header>
                     <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="pl_no" readonly="1"/>
+                            </h1>
+                        </div>
                         <group>
                             <group string="基本信息">
                                 <field name="pl_no"/>
@@ -38,12 +44,25 @@
                                 <field name="plan_end_time"/>
                                 <field name="state"/>
                             </group>
-                            <group string="规格信息">
-                                <field name="length"/>
-                                <field name="width"/>
-                                <field name="thickness"/>
-                                <field name="diameter"/>
-                                <field name="material"/>
+                            <group string="规格信息" col="1">
+                                <group col="3">
+                                    <group>
+                                    <field name="length"/>
+                                    </group>
+                                    <group>
+                                    <field name="width"/>
+                                    </group>
+                                    <group>
+                                    <field name="thickness"/>
+                                    </group>
+                                </group>
+<!--                                 <field name="length"/> -->
+<!--                                 <field name="width"/> -->
+<!--                                 <field name="thickness"/> -->
+                                <group>
+                                    <field name="diameter"/>
+                                    <field name="material"/>
+                                </group>
                             </group>
                             <group string="绑定订单">
                                 <field name="customer_name"/>
diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js
index 261590fb..582c887f 100644
--- a/web_widget_model_viewer/static/src/js/3d_viewer.js
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.js
@@ -20,6 +20,7 @@ import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo
 
 export class StepViewer extends Component {
    setup() {
+       console.log('setup')
         this.props.url = this.formatUrl();
     }
 
@@ -33,9 +34,11 @@ export class StepViewer extends Component {
                     id: JSON.stringify(this.props.record.data['id']),
                     field: this.props.name}
                 url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
+                console.log('url', url)
 
             } else {
                 url = "data:model/gltf-binary;base64," + this.props.value;
+                console.log('url222', url)
             }
         }
         return url